commit cd8f5e701547739f241594b43e9470c92d98e9cf
author Carl Shapiro <cshapiro@google.com> Wed Apr 20 16:12:46 2011 -0700
committer Carl Shapiro <cshapiro@google.com> Wed Apr 20 16:14:21 2011 -0700
tree c8bec491277efce8f47bcbda488b113142858b54
parent 58ddbada8c4d4a74a7d3ea0c7379c7e1fec6c255

Move the interpreter into C++.

Change-Id: I4b7d6ed9c54dbf3244304a7ea0f13e6c37cca2aa

vm/Dvm.mk

diff --git a/vm/Dvm.mk b/vm/Dvm.mk
index 87cc9ea..4ebaba5 100644
--- a/vm/Dvm.mk
+++ b/vm/Dvm.mk
@@ -147,7 +147,7 @@
 	jdwp/JdwpMain.cpp \
 	jdwp/JdwpSocket.cpp \
 	mterp/Mterp.cpp.arm \
-	mterp/out/InterpC-portable.c.arm \
+	mterp/out/InterpC-portable.cpp.arm \
 	native/InternalNative.cpp \
 	native/dalvik_bytecode_OpcodeInfo.cpp \
 	native/dalvik_system_DexFile.cpp \
@@ -246,8 +246,8 @@
   LOCAL_SRC_FILES += \
 		arch/arm/CallOldABI.S \
 		arch/arm/CallEABI.S \
-		arch/arm/HintsEABI.c \
-		mterp/out/InterpC-$(dvm_arch_variant).c.arm \
+		arch/arm/HintsEABI.cpp \
+		mterp/out/InterpC-$(dvm_arch_variant).cpp.arm \
 		mterp/out/InterpAsm-$(dvm_arch_variant).S
 
   ifeq ($(WITH_JIT),true)
@@ -270,8 +270,8 @@
     LOCAL_CFLAGS += -DDVM_JMP_TABLE_MTERP=1
     LOCAL_SRC_FILES += \
 		arch/$(dvm_arch_variant)/Call386ABI.S \
-		arch/$(dvm_arch_variant)/Hints386ABI.c \
-		mterp/out/InterpC-$(dvm_arch_variant).c \
+		arch/$(dvm_arch_variant)/Hints386ABI.cpp \
+		mterp/out/InterpC-$(dvm_arch_variant).cpp \
 		mterp/out/InterpAsm-$(dvm_arch_variant).S
     ifeq ($(WITH_JIT),true)
       LOCAL_SRC_FILES += \
@@ -288,8 +288,8 @@
   MTERP_ARCH_KNOWN := true
   LOCAL_SRC_FILES += \
 		arch/sh/CallSH4ABI.S \
-		arch/generic/Hints.c \
-		mterp/out/InterpC-allstubs.c \
+		arch/generic/Hints.cpp \
+		mterp/out/InterpC-allstubs.cpp \
 		mterp/out/InterpAsm-allstubs.S
 endif
 
@@ -305,9 +305,9 @@
   endif
 
   LOCAL_SRC_FILES += \
-		arch/generic/Call.c \
-		arch/generic/Hints.c \
-		mterp/out/InterpC-allstubs.c
+		arch/generic/Call.cpp \
+		arch/generic/Hints.cpp \
+		mterp/out/InterpC-allstubs.cpp
 
   # The following symbols are usually defined in the asm file, but
   # since we don't have an asm file in this case, we instead just

vm/Inlines.cpp

diff --git a/vm/Inlines.cpp b/vm/Inlines.cpp
index f1bd621..3ab7717 100644
--- a/vm/Inlines.cpp
+++ b/vm/Inlines.cpp
@@ -22,7 +22,7 @@
 #include "Dalvik.h"
 #include "analysis/CodeVerify.h"
 #include "analysis/RegisterMap.h"
-#include "mterp/c/header.c"
+#include "mterp/c/header.cpp"
 
 #undef LOG_TAG
 #include "jdwp/JdwpPriv.h"

vm/arch/arm/HintsEABI.cpp

diff --git a/vm/arch/arm/HintsEABI.c b/vm/arch/arm/HintsEABI.cpp
similarity index 100%
rename from vm/arch/arm/HintsEABI.c
rename to vm/arch/arm/HintsEABI.cpp

vm/arch/generic/Call.cpp

diff --git a/vm/arch/generic/Call.c b/vm/arch/generic/Call.cpp
similarity index 100%
rename from vm/arch/generic/Call.c
rename to vm/arch/generic/Call.cpp

vm/arch/generic/Hints.cpp

diff --git a/vm/arch/generic/Hints.c b/vm/arch/generic/Hints.cpp
similarity index 100%
rename from vm/arch/generic/Hints.c
rename to vm/arch/generic/Hints.cpp

vm/arch/x86-atom/Hints386ABI.cpp

diff --git a/vm/arch/x86-atom/Hints386ABI.c b/vm/arch/x86-atom/Hints386ABI.cpp
similarity index 100%
rename from vm/arch/x86-atom/Hints386ABI.c
rename to vm/arch/x86-atom/Hints386ABI.cpp

vm/arch/x86/Hints386ABI.cpp

diff --git a/vm/arch/x86/Hints386ABI.c b/vm/arch/x86/Hints386ABI.cpp
similarity index 100%
rename from vm/arch/x86/Hints386ABI.c
rename to vm/arch/x86/Hints386ABI.cpp

vm/mterp/Mterp.h

diff --git a/vm/mterp/Mterp.h b/vm/mterp/Mterp.h
index d1419c8..2dbc325 100644
--- a/vm/mterp/Mterp.h
+++ b/vm/mterp/Mterp.h
@@ -49,6 +49,12 @@
 bool dvmMterpStdRun(Thread* self);
 void dvmMterpStdBail(Thread* self, bool changeInterp);
 
+/*
+ * Helper for common_printMethod(), invoked from the assembly
+ * interpreter.
+ */
+void dvmMterpPrintMethod(Method* method);
+
 #ifdef __cplusplus
 }
 #endif

vm/mterp/armv5te/debug.cpp

diff --git a/vm/mterp/armv5te/debug.c b/vm/mterp/armv5te/debug.cpp
similarity index 100%
rename from vm/mterp/armv5te/debug.c
rename to vm/mterp/armv5te/debug.cpp

vm/mterp/c/OP_ADD_DOUBLE.cpp

diff --git a/vm/mterp/c/OP_ADD_DOUBLE.c b/vm/mterp/c/OP_ADD_DOUBLE.cpp
similarity index 100%
rename from vm/mterp/c/OP_ADD_DOUBLE.c
rename to vm/mterp/c/OP_ADD_DOUBLE.cpp

vm/mterp/c/OP_ADD_DOUBLE_2ADDR.cpp

diff --git a/vm/mterp/c/OP_ADD_DOUBLE_2ADDR.c b/vm/mterp/c/OP_ADD_DOUBLE_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_ADD_DOUBLE_2ADDR.c
rename to vm/mterp/c/OP_ADD_DOUBLE_2ADDR.cpp

vm/mterp/c/OP_ADD_FLOAT.cpp

diff --git a/vm/mterp/c/OP_ADD_FLOAT.c b/vm/mterp/c/OP_ADD_FLOAT.cpp
similarity index 100%
rename from vm/mterp/c/OP_ADD_FLOAT.c
rename to vm/mterp/c/OP_ADD_FLOAT.cpp

vm/mterp/c/OP_ADD_FLOAT_2ADDR.cpp

diff --git a/vm/mterp/c/OP_ADD_FLOAT_2ADDR.c b/vm/mterp/c/OP_ADD_FLOAT_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_ADD_FLOAT_2ADDR.c
rename to vm/mterp/c/OP_ADD_FLOAT_2ADDR.cpp

vm/mterp/c/OP_ADD_INT.cpp

diff --git a/vm/mterp/c/OP_ADD_INT.c b/vm/mterp/c/OP_ADD_INT.cpp
similarity index 100%
rename from vm/mterp/c/OP_ADD_INT.c
rename to vm/mterp/c/OP_ADD_INT.cpp

vm/mterp/c/OP_ADD_INT_2ADDR.cpp

diff --git a/vm/mterp/c/OP_ADD_INT_2ADDR.c b/vm/mterp/c/OP_ADD_INT_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_ADD_INT_2ADDR.c
rename to vm/mterp/c/OP_ADD_INT_2ADDR.cpp

vm/mterp/c/OP_ADD_INT_LIT16.cpp

diff --git a/vm/mterp/c/OP_ADD_INT_LIT16.c b/vm/mterp/c/OP_ADD_INT_LIT16.cpp
similarity index 100%
rename from vm/mterp/c/OP_ADD_INT_LIT16.c
rename to vm/mterp/c/OP_ADD_INT_LIT16.cpp

vm/mterp/c/OP_ADD_INT_LIT8.cpp

diff --git a/vm/mterp/c/OP_ADD_INT_LIT8.c b/vm/mterp/c/OP_ADD_INT_LIT8.cpp
similarity index 100%
rename from vm/mterp/c/OP_ADD_INT_LIT8.c
rename to vm/mterp/c/OP_ADD_INT_LIT8.cpp

vm/mterp/c/OP_ADD_LONG.cpp

diff --git a/vm/mterp/c/OP_ADD_LONG.c b/vm/mterp/c/OP_ADD_LONG.cpp
similarity index 100%
rename from vm/mterp/c/OP_ADD_LONG.c
rename to vm/mterp/c/OP_ADD_LONG.cpp

vm/mterp/c/OP_ADD_LONG_2ADDR.cpp

diff --git a/vm/mterp/c/OP_ADD_LONG_2ADDR.c b/vm/mterp/c/OP_ADD_LONG_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_ADD_LONG_2ADDR.c
rename to vm/mterp/c/OP_ADD_LONG_2ADDR.cpp

vm/mterp/c/OP_AGET.cpp

diff --git a/vm/mterp/c/OP_AGET.c b/vm/mterp/c/OP_AGET.cpp
similarity index 100%
rename from vm/mterp/c/OP_AGET.c
rename to vm/mterp/c/OP_AGET.cpp

vm/mterp/c/OP_AGET_BOOLEAN.cpp

diff --git a/vm/mterp/c/OP_AGET_BOOLEAN.c b/vm/mterp/c/OP_AGET_BOOLEAN.cpp
similarity index 100%
rename from vm/mterp/c/OP_AGET_BOOLEAN.c
rename to vm/mterp/c/OP_AGET_BOOLEAN.cpp

vm/mterp/c/OP_AGET_BYTE.cpp

diff --git a/vm/mterp/c/OP_AGET_BYTE.c b/vm/mterp/c/OP_AGET_BYTE.cpp
similarity index 100%
rename from vm/mterp/c/OP_AGET_BYTE.c
rename to vm/mterp/c/OP_AGET_BYTE.cpp

vm/mterp/c/OP_AGET_CHAR.cpp

diff --git a/vm/mterp/c/OP_AGET_CHAR.c b/vm/mterp/c/OP_AGET_CHAR.cpp
similarity index 100%
rename from vm/mterp/c/OP_AGET_CHAR.c
rename to vm/mterp/c/OP_AGET_CHAR.cpp

vm/mterp/c/OP_AGET_OBJECT.cpp

diff --git a/vm/mterp/c/OP_AGET_OBJECT.c b/vm/mterp/c/OP_AGET_OBJECT.cpp
similarity index 100%
rename from vm/mterp/c/OP_AGET_OBJECT.c
rename to vm/mterp/c/OP_AGET_OBJECT.cpp

vm/mterp/c/OP_AGET_SHORT.cpp

diff --git a/vm/mterp/c/OP_AGET_SHORT.c b/vm/mterp/c/OP_AGET_SHORT.cpp
similarity index 100%
rename from vm/mterp/c/OP_AGET_SHORT.c
rename to vm/mterp/c/OP_AGET_SHORT.cpp

vm/mterp/c/OP_AGET_WIDE.cpp

diff --git a/vm/mterp/c/OP_AGET_WIDE.c b/vm/mterp/c/OP_AGET_WIDE.cpp
similarity index 100%
rename from vm/mterp/c/OP_AGET_WIDE.c
rename to vm/mterp/c/OP_AGET_WIDE.cpp

vm/mterp/c/OP_AND_INT.cpp

diff --git a/vm/mterp/c/OP_AND_INT.c b/vm/mterp/c/OP_AND_INT.cpp
similarity index 100%
rename from vm/mterp/c/OP_AND_INT.c
rename to vm/mterp/c/OP_AND_INT.cpp

vm/mterp/c/OP_AND_INT_2ADDR.cpp

diff --git a/vm/mterp/c/OP_AND_INT_2ADDR.c b/vm/mterp/c/OP_AND_INT_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_AND_INT_2ADDR.c
rename to vm/mterp/c/OP_AND_INT_2ADDR.cpp

vm/mterp/c/OP_AND_INT_LIT16.cpp

diff --git a/vm/mterp/c/OP_AND_INT_LIT16.c b/vm/mterp/c/OP_AND_INT_LIT16.cpp
similarity index 100%
rename from vm/mterp/c/OP_AND_INT_LIT16.c
rename to vm/mterp/c/OP_AND_INT_LIT16.cpp

vm/mterp/c/OP_AND_INT_LIT8.cpp

diff --git a/vm/mterp/c/OP_AND_INT_LIT8.c b/vm/mterp/c/OP_AND_INT_LIT8.cpp
similarity index 100%
rename from vm/mterp/c/OP_AND_INT_LIT8.c
rename to vm/mterp/c/OP_AND_INT_LIT8.cpp

vm/mterp/c/OP_AND_LONG.cpp

diff --git a/vm/mterp/c/OP_AND_LONG.c b/vm/mterp/c/OP_AND_LONG.cpp
similarity index 100%
rename from vm/mterp/c/OP_AND_LONG.c
rename to vm/mterp/c/OP_AND_LONG.cpp

vm/mterp/c/OP_AND_LONG_2ADDR.cpp

diff --git a/vm/mterp/c/OP_AND_LONG_2ADDR.c b/vm/mterp/c/OP_AND_LONG_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_AND_LONG_2ADDR.c
rename to vm/mterp/c/OP_AND_LONG_2ADDR.cpp

vm/mterp/c/OP_APUT.cpp

diff --git a/vm/mterp/c/OP_APUT.c b/vm/mterp/c/OP_APUT.cpp
similarity index 100%
rename from vm/mterp/c/OP_APUT.c
rename to vm/mterp/c/OP_APUT.cpp

vm/mterp/c/OP_APUT_BOOLEAN.cpp

diff --git a/vm/mterp/c/OP_APUT_BOOLEAN.c b/vm/mterp/c/OP_APUT_BOOLEAN.cpp
similarity index 100%
rename from vm/mterp/c/OP_APUT_BOOLEAN.c
rename to vm/mterp/c/OP_APUT_BOOLEAN.cpp

vm/mterp/c/OP_APUT_BYTE.cpp

diff --git a/vm/mterp/c/OP_APUT_BYTE.c b/vm/mterp/c/OP_APUT_BYTE.cpp
similarity index 100%
rename from vm/mterp/c/OP_APUT_BYTE.c
rename to vm/mterp/c/OP_APUT_BYTE.cpp

vm/mterp/c/OP_APUT_CHAR.cpp

diff --git a/vm/mterp/c/OP_APUT_CHAR.c b/vm/mterp/c/OP_APUT_CHAR.cpp
similarity index 100%
rename from vm/mterp/c/OP_APUT_CHAR.c
rename to vm/mterp/c/OP_APUT_CHAR.cpp

vm/mterp/c/OP_APUT_OBJECT.cpp

diff --git a/vm/mterp/c/OP_APUT_OBJECT.c b/vm/mterp/c/OP_APUT_OBJECT.cpp
similarity index 100%
rename from vm/mterp/c/OP_APUT_OBJECT.c
rename to vm/mterp/c/OP_APUT_OBJECT.cpp

vm/mterp/c/OP_APUT_SHORT.cpp

diff --git a/vm/mterp/c/OP_APUT_SHORT.c b/vm/mterp/c/OP_APUT_SHORT.cpp
similarity index 100%
rename from vm/mterp/c/OP_APUT_SHORT.c
rename to vm/mterp/c/OP_APUT_SHORT.cpp

vm/mterp/c/OP_APUT_WIDE.cpp

diff --git a/vm/mterp/c/OP_APUT_WIDE.c b/vm/mterp/c/OP_APUT_WIDE.cpp
similarity index 100%
rename from vm/mterp/c/OP_APUT_WIDE.c
rename to vm/mterp/c/OP_APUT_WIDE.cpp

vm/mterp/c/OP_ARRAY_LENGTH.cpp

diff --git a/vm/mterp/c/OP_ARRAY_LENGTH.c b/vm/mterp/c/OP_ARRAY_LENGTH.cpp
similarity index 100%
rename from vm/mterp/c/OP_ARRAY_LENGTH.c
rename to vm/mterp/c/OP_ARRAY_LENGTH.cpp

vm/mterp/c/OP_BREAKPOINT.cpp

diff --git a/vm/mterp/c/OP_BREAKPOINT.c b/vm/mterp/c/OP_BREAKPOINT.cpp
similarity index 100%
rename from vm/mterp/c/OP_BREAKPOINT.c
rename to vm/mterp/c/OP_BREAKPOINT.cpp

vm/mterp/c/OP_CHECK_CAST.cpp

diff --git a/vm/mterp/c/OP_CHECK_CAST.c b/vm/mterp/c/OP_CHECK_CAST.cpp
similarity index 100%
rename from vm/mterp/c/OP_CHECK_CAST.c
rename to vm/mterp/c/OP_CHECK_CAST.cpp

vm/mterp/c/OP_CHECK_CAST_JUMBO.cpp

diff --git a/vm/mterp/c/OP_CHECK_CAST_JUMBO.c b/vm/mterp/c/OP_CHECK_CAST_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_CHECK_CAST_JUMBO.c
rename to vm/mterp/c/OP_CHECK_CAST_JUMBO.cpp

vm/mterp/c/OP_CMPG_DOUBLE.cpp

diff --git a/vm/mterp/c/OP_CMPG_DOUBLE.c b/vm/mterp/c/OP_CMPG_DOUBLE.cpp
similarity index 100%
rename from vm/mterp/c/OP_CMPG_DOUBLE.c
rename to vm/mterp/c/OP_CMPG_DOUBLE.cpp

vm/mterp/c/OP_CMPG_FLOAT.cpp

diff --git a/vm/mterp/c/OP_CMPG_FLOAT.c b/vm/mterp/c/OP_CMPG_FLOAT.cpp
similarity index 100%
rename from vm/mterp/c/OP_CMPG_FLOAT.c
rename to vm/mterp/c/OP_CMPG_FLOAT.cpp

vm/mterp/c/OP_CMPL_DOUBLE.cpp

diff --git a/vm/mterp/c/OP_CMPL_DOUBLE.c b/vm/mterp/c/OP_CMPL_DOUBLE.cpp
similarity index 100%
rename from vm/mterp/c/OP_CMPL_DOUBLE.c
rename to vm/mterp/c/OP_CMPL_DOUBLE.cpp

vm/mterp/c/OP_CMPL_FLOAT.cpp

diff --git a/vm/mterp/c/OP_CMPL_FLOAT.c b/vm/mterp/c/OP_CMPL_FLOAT.cpp
similarity index 100%
rename from vm/mterp/c/OP_CMPL_FLOAT.c
rename to vm/mterp/c/OP_CMPL_FLOAT.cpp

vm/mterp/c/OP_CMP_LONG.cpp

diff --git a/vm/mterp/c/OP_CMP_LONG.c b/vm/mterp/c/OP_CMP_LONG.cpp
similarity index 100%
rename from vm/mterp/c/OP_CMP_LONG.c
rename to vm/mterp/c/OP_CMP_LONG.cpp

vm/mterp/c/OP_CONST.cpp

diff --git a/vm/mterp/c/OP_CONST.c b/vm/mterp/c/OP_CONST.cpp
similarity index 100%
rename from vm/mterp/c/OP_CONST.c
rename to vm/mterp/c/OP_CONST.cpp

vm/mterp/c/OP_CONST_16.cpp

diff --git a/vm/mterp/c/OP_CONST_16.c b/vm/mterp/c/OP_CONST_16.cpp
similarity index 100%
rename from vm/mterp/c/OP_CONST_16.c
rename to vm/mterp/c/OP_CONST_16.cpp

vm/mterp/c/OP_CONST_4.cpp

diff --git a/vm/mterp/c/OP_CONST_4.c b/vm/mterp/c/OP_CONST_4.cpp
similarity index 100%
rename from vm/mterp/c/OP_CONST_4.c
rename to vm/mterp/c/OP_CONST_4.cpp

vm/mterp/c/OP_CONST_CLASS.cpp

diff --git a/vm/mterp/c/OP_CONST_CLASS.c b/vm/mterp/c/OP_CONST_CLASS.cpp
similarity index 100%
rename from vm/mterp/c/OP_CONST_CLASS.c
rename to vm/mterp/c/OP_CONST_CLASS.cpp

vm/mterp/c/OP_CONST_CLASS_JUMBO.cpp

diff --git a/vm/mterp/c/OP_CONST_CLASS_JUMBO.c b/vm/mterp/c/OP_CONST_CLASS_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_CONST_CLASS_JUMBO.c
rename to vm/mterp/c/OP_CONST_CLASS_JUMBO.cpp

vm/mterp/c/OP_CONST_HIGH16.cpp

diff --git a/vm/mterp/c/OP_CONST_HIGH16.c b/vm/mterp/c/OP_CONST_HIGH16.cpp
similarity index 100%
rename from vm/mterp/c/OP_CONST_HIGH16.c
rename to vm/mterp/c/OP_CONST_HIGH16.cpp

vm/mterp/c/OP_CONST_STRING.cpp

diff --git a/vm/mterp/c/OP_CONST_STRING.c b/vm/mterp/c/OP_CONST_STRING.cpp
similarity index 100%
rename from vm/mterp/c/OP_CONST_STRING.c
rename to vm/mterp/c/OP_CONST_STRING.cpp

vm/mterp/c/OP_CONST_STRING_JUMBO.cpp

diff --git a/vm/mterp/c/OP_CONST_STRING_JUMBO.c b/vm/mterp/c/OP_CONST_STRING_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_CONST_STRING_JUMBO.c
rename to vm/mterp/c/OP_CONST_STRING_JUMBO.cpp

vm/mterp/c/OP_CONST_WIDE.cpp

diff --git a/vm/mterp/c/OP_CONST_WIDE.c b/vm/mterp/c/OP_CONST_WIDE.cpp
similarity index 100%
rename from vm/mterp/c/OP_CONST_WIDE.c
rename to vm/mterp/c/OP_CONST_WIDE.cpp

vm/mterp/c/OP_CONST_WIDE_16.cpp

diff --git a/vm/mterp/c/OP_CONST_WIDE_16.c b/vm/mterp/c/OP_CONST_WIDE_16.cpp
similarity index 100%
rename from vm/mterp/c/OP_CONST_WIDE_16.c
rename to vm/mterp/c/OP_CONST_WIDE_16.cpp

vm/mterp/c/OP_CONST_WIDE_32.cpp

diff --git a/vm/mterp/c/OP_CONST_WIDE_32.c b/vm/mterp/c/OP_CONST_WIDE_32.cpp
similarity index 100%
rename from vm/mterp/c/OP_CONST_WIDE_32.c
rename to vm/mterp/c/OP_CONST_WIDE_32.cpp

vm/mterp/c/OP_CONST_WIDE_HIGH16.cpp

diff --git a/vm/mterp/c/OP_CONST_WIDE_HIGH16.c b/vm/mterp/c/OP_CONST_WIDE_HIGH16.cpp
similarity index 100%
rename from vm/mterp/c/OP_CONST_WIDE_HIGH16.c
rename to vm/mterp/c/OP_CONST_WIDE_HIGH16.cpp

vm/mterp/c/OP_DISPATCH_FF.cpp

diff --git a/vm/mterp/c/OP_DISPATCH_FF.c b/vm/mterp/c/OP_DISPATCH_FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_DISPATCH_FF.c
rename to vm/mterp/c/OP_DISPATCH_FF.cpp

vm/mterp/c/OP_DIV_DOUBLE.cpp

diff --git a/vm/mterp/c/OP_DIV_DOUBLE.c b/vm/mterp/c/OP_DIV_DOUBLE.cpp
similarity index 100%
rename from vm/mterp/c/OP_DIV_DOUBLE.c
rename to vm/mterp/c/OP_DIV_DOUBLE.cpp

vm/mterp/c/OP_DIV_DOUBLE_2ADDR.cpp

diff --git a/vm/mterp/c/OP_DIV_DOUBLE_2ADDR.c b/vm/mterp/c/OP_DIV_DOUBLE_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_DIV_DOUBLE_2ADDR.c
rename to vm/mterp/c/OP_DIV_DOUBLE_2ADDR.cpp

vm/mterp/c/OP_DIV_FLOAT.cpp

diff --git a/vm/mterp/c/OP_DIV_FLOAT.c b/vm/mterp/c/OP_DIV_FLOAT.cpp
similarity index 100%
rename from vm/mterp/c/OP_DIV_FLOAT.c
rename to vm/mterp/c/OP_DIV_FLOAT.cpp

vm/mterp/c/OP_DIV_FLOAT_2ADDR.cpp

diff --git a/vm/mterp/c/OP_DIV_FLOAT_2ADDR.c b/vm/mterp/c/OP_DIV_FLOAT_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_DIV_FLOAT_2ADDR.c
rename to vm/mterp/c/OP_DIV_FLOAT_2ADDR.cpp

vm/mterp/c/OP_DIV_INT.cpp

diff --git a/vm/mterp/c/OP_DIV_INT.c b/vm/mterp/c/OP_DIV_INT.cpp
similarity index 100%
rename from vm/mterp/c/OP_DIV_INT.c
rename to vm/mterp/c/OP_DIV_INT.cpp

vm/mterp/c/OP_DIV_INT_2ADDR.cpp

diff --git a/vm/mterp/c/OP_DIV_INT_2ADDR.c b/vm/mterp/c/OP_DIV_INT_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_DIV_INT_2ADDR.c
rename to vm/mterp/c/OP_DIV_INT_2ADDR.cpp

vm/mterp/c/OP_DIV_INT_LIT16.cpp

diff --git a/vm/mterp/c/OP_DIV_INT_LIT16.c b/vm/mterp/c/OP_DIV_INT_LIT16.cpp
similarity index 100%
rename from vm/mterp/c/OP_DIV_INT_LIT16.c
rename to vm/mterp/c/OP_DIV_INT_LIT16.cpp

vm/mterp/c/OP_DIV_INT_LIT8.cpp

diff --git a/vm/mterp/c/OP_DIV_INT_LIT8.c b/vm/mterp/c/OP_DIV_INT_LIT8.cpp
similarity index 100%
rename from vm/mterp/c/OP_DIV_INT_LIT8.c
rename to vm/mterp/c/OP_DIV_INT_LIT8.cpp

vm/mterp/c/OP_DIV_LONG.cpp

diff --git a/vm/mterp/c/OP_DIV_LONG.c b/vm/mterp/c/OP_DIV_LONG.cpp
similarity index 100%
rename from vm/mterp/c/OP_DIV_LONG.c
rename to vm/mterp/c/OP_DIV_LONG.cpp

vm/mterp/c/OP_DIV_LONG_2ADDR.cpp

diff --git a/vm/mterp/c/OP_DIV_LONG_2ADDR.c b/vm/mterp/c/OP_DIV_LONG_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_DIV_LONG_2ADDR.c
rename to vm/mterp/c/OP_DIV_LONG_2ADDR.cpp

vm/mterp/c/OP_DOUBLE_TO_FLOAT.cpp

diff --git a/vm/mterp/c/OP_DOUBLE_TO_FLOAT.c b/vm/mterp/c/OP_DOUBLE_TO_FLOAT.cpp
similarity index 100%
rename from vm/mterp/c/OP_DOUBLE_TO_FLOAT.c
rename to vm/mterp/c/OP_DOUBLE_TO_FLOAT.cpp

vm/mterp/c/OP_DOUBLE_TO_INT.cpp

diff --git a/vm/mterp/c/OP_DOUBLE_TO_INT.c b/vm/mterp/c/OP_DOUBLE_TO_INT.cpp
similarity index 100%
rename from vm/mterp/c/OP_DOUBLE_TO_INT.c
rename to vm/mterp/c/OP_DOUBLE_TO_INT.cpp

vm/mterp/c/OP_DOUBLE_TO_LONG.cpp

diff --git a/vm/mterp/c/OP_DOUBLE_TO_LONG.c b/vm/mterp/c/OP_DOUBLE_TO_LONG.cpp
similarity index 100%
rename from vm/mterp/c/OP_DOUBLE_TO_LONG.c
rename to vm/mterp/c/OP_DOUBLE_TO_LONG.cpp

vm/mterp/c/OP_EXECUTE_INLINE.cpp

diff --git a/vm/mterp/c/OP_EXECUTE_INLINE.c b/vm/mterp/c/OP_EXECUTE_INLINE.cpp
similarity index 100%
rename from vm/mterp/c/OP_EXECUTE_INLINE.c
rename to vm/mterp/c/OP_EXECUTE_INLINE.cpp

vm/mterp/c/OP_EXECUTE_INLINE_RANGE.cpp

diff --git a/vm/mterp/c/OP_EXECUTE_INLINE_RANGE.c b/vm/mterp/c/OP_EXECUTE_INLINE_RANGE.cpp
similarity index 100%
rename from vm/mterp/c/OP_EXECUTE_INLINE_RANGE.c
rename to vm/mterp/c/OP_EXECUTE_INLINE_RANGE.cpp

vm/mterp/c/OP_FILLED_NEW_ARRAY.cpp

diff --git a/vm/mterp/c/OP_FILLED_NEW_ARRAY.c b/vm/mterp/c/OP_FILLED_NEW_ARRAY.cpp
similarity index 100%
rename from vm/mterp/c/OP_FILLED_NEW_ARRAY.c
rename to vm/mterp/c/OP_FILLED_NEW_ARRAY.cpp

vm/mterp/c/OP_FILLED_NEW_ARRAY_JUMBO.cpp

diff --git a/vm/mterp/c/OP_FILLED_NEW_ARRAY_JUMBO.c b/vm/mterp/c/OP_FILLED_NEW_ARRAY_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_FILLED_NEW_ARRAY_JUMBO.c
rename to vm/mterp/c/OP_FILLED_NEW_ARRAY_JUMBO.cpp

vm/mterp/c/OP_FILLED_NEW_ARRAY_RANGE.cpp

diff --git a/vm/mterp/c/OP_FILLED_NEW_ARRAY_RANGE.c b/vm/mterp/c/OP_FILLED_NEW_ARRAY_RANGE.cpp
similarity index 100%
rename from vm/mterp/c/OP_FILLED_NEW_ARRAY_RANGE.c
rename to vm/mterp/c/OP_FILLED_NEW_ARRAY_RANGE.cpp

vm/mterp/c/OP_FILL_ARRAY_DATA.cpp

diff --git a/vm/mterp/c/OP_FILL_ARRAY_DATA.c b/vm/mterp/c/OP_FILL_ARRAY_DATA.cpp
similarity index 100%
rename from vm/mterp/c/OP_FILL_ARRAY_DATA.c
rename to vm/mterp/c/OP_FILL_ARRAY_DATA.cpp

vm/mterp/c/OP_FLOAT_TO_DOUBLE.cpp

diff --git a/vm/mterp/c/OP_FLOAT_TO_DOUBLE.c b/vm/mterp/c/OP_FLOAT_TO_DOUBLE.cpp
similarity index 100%
rename from vm/mterp/c/OP_FLOAT_TO_DOUBLE.c
rename to vm/mterp/c/OP_FLOAT_TO_DOUBLE.cpp

vm/mterp/c/OP_FLOAT_TO_INT.cpp

diff --git a/vm/mterp/c/OP_FLOAT_TO_INT.c b/vm/mterp/c/OP_FLOAT_TO_INT.cpp
similarity index 100%
rename from vm/mterp/c/OP_FLOAT_TO_INT.c
rename to vm/mterp/c/OP_FLOAT_TO_INT.cpp

vm/mterp/c/OP_FLOAT_TO_LONG.cpp

diff --git a/vm/mterp/c/OP_FLOAT_TO_LONG.c b/vm/mterp/c/OP_FLOAT_TO_LONG.cpp
similarity index 100%
rename from vm/mterp/c/OP_FLOAT_TO_LONG.c
rename to vm/mterp/c/OP_FLOAT_TO_LONG.cpp

vm/mterp/c/OP_GOTO.cpp

diff --git a/vm/mterp/c/OP_GOTO.c b/vm/mterp/c/OP_GOTO.cpp
similarity index 100%
rename from vm/mterp/c/OP_GOTO.c
rename to vm/mterp/c/OP_GOTO.cpp

vm/mterp/c/OP_GOTO_16.cpp

diff --git a/vm/mterp/c/OP_GOTO_16.c b/vm/mterp/c/OP_GOTO_16.cpp
similarity index 100%
rename from vm/mterp/c/OP_GOTO_16.c
rename to vm/mterp/c/OP_GOTO_16.cpp

vm/mterp/c/OP_GOTO_32.cpp

diff --git a/vm/mterp/c/OP_GOTO_32.c b/vm/mterp/c/OP_GOTO_32.cpp
similarity index 100%
rename from vm/mterp/c/OP_GOTO_32.c
rename to vm/mterp/c/OP_GOTO_32.cpp

vm/mterp/c/OP_IF_EQ.cpp

diff --git a/vm/mterp/c/OP_IF_EQ.c b/vm/mterp/c/OP_IF_EQ.cpp
similarity index 100%
rename from vm/mterp/c/OP_IF_EQ.c
rename to vm/mterp/c/OP_IF_EQ.cpp

vm/mterp/c/OP_IF_EQZ.cpp

diff --git a/vm/mterp/c/OP_IF_EQZ.c b/vm/mterp/c/OP_IF_EQZ.cpp
similarity index 100%
rename from vm/mterp/c/OP_IF_EQZ.c
rename to vm/mterp/c/OP_IF_EQZ.cpp

vm/mterp/c/OP_IF_GE.cpp

diff --git a/vm/mterp/c/OP_IF_GE.c b/vm/mterp/c/OP_IF_GE.cpp
similarity index 100%
rename from vm/mterp/c/OP_IF_GE.c
rename to vm/mterp/c/OP_IF_GE.cpp

vm/mterp/c/OP_IF_GEZ.cpp

diff --git a/vm/mterp/c/OP_IF_GEZ.c b/vm/mterp/c/OP_IF_GEZ.cpp
similarity index 100%
rename from vm/mterp/c/OP_IF_GEZ.c
rename to vm/mterp/c/OP_IF_GEZ.cpp

vm/mterp/c/OP_IF_GT.cpp

diff --git a/vm/mterp/c/OP_IF_GT.c b/vm/mterp/c/OP_IF_GT.cpp
similarity index 100%
rename from vm/mterp/c/OP_IF_GT.c
rename to vm/mterp/c/OP_IF_GT.cpp

vm/mterp/c/OP_IF_GTZ.cpp

diff --git a/vm/mterp/c/OP_IF_GTZ.c b/vm/mterp/c/OP_IF_GTZ.cpp
similarity index 100%
rename from vm/mterp/c/OP_IF_GTZ.c
rename to vm/mterp/c/OP_IF_GTZ.cpp

vm/mterp/c/OP_IF_LE.cpp

diff --git a/vm/mterp/c/OP_IF_LE.c b/vm/mterp/c/OP_IF_LE.cpp
similarity index 100%
rename from vm/mterp/c/OP_IF_LE.c
rename to vm/mterp/c/OP_IF_LE.cpp

vm/mterp/c/OP_IF_LEZ.cpp

diff --git a/vm/mterp/c/OP_IF_LEZ.c b/vm/mterp/c/OP_IF_LEZ.cpp
similarity index 100%
rename from vm/mterp/c/OP_IF_LEZ.c
rename to vm/mterp/c/OP_IF_LEZ.cpp

vm/mterp/c/OP_IF_LT.cpp

diff --git a/vm/mterp/c/OP_IF_LT.c b/vm/mterp/c/OP_IF_LT.cpp
similarity index 100%
rename from vm/mterp/c/OP_IF_LT.c
rename to vm/mterp/c/OP_IF_LT.cpp

vm/mterp/c/OP_IF_LTZ.cpp

diff --git a/vm/mterp/c/OP_IF_LTZ.c b/vm/mterp/c/OP_IF_LTZ.cpp
similarity index 100%
rename from vm/mterp/c/OP_IF_LTZ.c
rename to vm/mterp/c/OP_IF_LTZ.cpp

vm/mterp/c/OP_IF_NE.cpp

diff --git a/vm/mterp/c/OP_IF_NE.c b/vm/mterp/c/OP_IF_NE.cpp
similarity index 100%
rename from vm/mterp/c/OP_IF_NE.c
rename to vm/mterp/c/OP_IF_NE.cpp

vm/mterp/c/OP_IF_NEZ.cpp

diff --git a/vm/mterp/c/OP_IF_NEZ.c b/vm/mterp/c/OP_IF_NEZ.cpp
similarity index 100%
rename from vm/mterp/c/OP_IF_NEZ.c
rename to vm/mterp/c/OP_IF_NEZ.cpp

vm/mterp/c/OP_IGET.cpp

diff --git a/vm/mterp/c/OP_IGET.c b/vm/mterp/c/OP_IGET.cpp
similarity index 100%
rename from vm/mterp/c/OP_IGET.c
rename to vm/mterp/c/OP_IGET.cpp

vm/mterp/c/OP_IGET_BOOLEAN.cpp

diff --git a/vm/mterp/c/OP_IGET_BOOLEAN.c b/vm/mterp/c/OP_IGET_BOOLEAN.cpp
similarity index 100%
rename from vm/mterp/c/OP_IGET_BOOLEAN.c
rename to vm/mterp/c/OP_IGET_BOOLEAN.cpp

vm/mterp/c/OP_IGET_BOOLEAN_JUMBO.cpp

diff --git a/vm/mterp/c/OP_IGET_BOOLEAN_JUMBO.c b/vm/mterp/c/OP_IGET_BOOLEAN_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_IGET_BOOLEAN_JUMBO.c
rename to vm/mterp/c/OP_IGET_BOOLEAN_JUMBO.cpp

vm/mterp/c/OP_IGET_BYTE.cpp

diff --git a/vm/mterp/c/OP_IGET_BYTE.c b/vm/mterp/c/OP_IGET_BYTE.cpp
similarity index 100%
rename from vm/mterp/c/OP_IGET_BYTE.c
rename to vm/mterp/c/OP_IGET_BYTE.cpp

vm/mterp/c/OP_IGET_BYTE_JUMBO.cpp

diff --git a/vm/mterp/c/OP_IGET_BYTE_JUMBO.c b/vm/mterp/c/OP_IGET_BYTE_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_IGET_BYTE_JUMBO.c
rename to vm/mterp/c/OP_IGET_BYTE_JUMBO.cpp

vm/mterp/c/OP_IGET_CHAR.cpp

diff --git a/vm/mterp/c/OP_IGET_CHAR.c b/vm/mterp/c/OP_IGET_CHAR.cpp
similarity index 100%
rename from vm/mterp/c/OP_IGET_CHAR.c
rename to vm/mterp/c/OP_IGET_CHAR.cpp

vm/mterp/c/OP_IGET_CHAR_JUMBO.cpp

diff --git a/vm/mterp/c/OP_IGET_CHAR_JUMBO.c b/vm/mterp/c/OP_IGET_CHAR_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_IGET_CHAR_JUMBO.c
rename to vm/mterp/c/OP_IGET_CHAR_JUMBO.cpp

vm/mterp/c/OP_IGET_JUMBO.cpp

diff --git a/vm/mterp/c/OP_IGET_JUMBO.c b/vm/mterp/c/OP_IGET_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_IGET_JUMBO.c
rename to vm/mterp/c/OP_IGET_JUMBO.cpp

vm/mterp/c/OP_IGET_OBJECT.cpp

diff --git a/vm/mterp/c/OP_IGET_OBJECT.c b/vm/mterp/c/OP_IGET_OBJECT.cpp
similarity index 100%
rename from vm/mterp/c/OP_IGET_OBJECT.c
rename to vm/mterp/c/OP_IGET_OBJECT.cpp

vm/mterp/c/OP_IGET_OBJECT_JUMBO.cpp

diff --git a/vm/mterp/c/OP_IGET_OBJECT_JUMBO.c b/vm/mterp/c/OP_IGET_OBJECT_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_IGET_OBJECT_JUMBO.c
rename to vm/mterp/c/OP_IGET_OBJECT_JUMBO.cpp

vm/mterp/c/OP_IGET_OBJECT_QUICK.cpp

diff --git a/vm/mterp/c/OP_IGET_OBJECT_QUICK.c b/vm/mterp/c/OP_IGET_OBJECT_QUICK.cpp
similarity index 100%
rename from vm/mterp/c/OP_IGET_OBJECT_QUICK.c
rename to vm/mterp/c/OP_IGET_OBJECT_QUICK.cpp

vm/mterp/c/OP_IGET_OBJECT_VOLATILE.cpp

diff --git a/vm/mterp/c/OP_IGET_OBJECT_VOLATILE.c b/vm/mterp/c/OP_IGET_OBJECT_VOLATILE.cpp
similarity index 100%
rename from vm/mterp/c/OP_IGET_OBJECT_VOLATILE.c
rename to vm/mterp/c/OP_IGET_OBJECT_VOLATILE.cpp

vm/mterp/c/OP_IGET_OBJECT_VOLATILE_JUMBO.cpp

diff --git a/vm/mterp/c/OP_IGET_OBJECT_VOLATILE_JUMBO.c b/vm/mterp/c/OP_IGET_OBJECT_VOLATILE_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_IGET_OBJECT_VOLATILE_JUMBO.c
rename to vm/mterp/c/OP_IGET_OBJECT_VOLATILE_JUMBO.cpp

vm/mterp/c/OP_IGET_QUICK.cpp

diff --git a/vm/mterp/c/OP_IGET_QUICK.c b/vm/mterp/c/OP_IGET_QUICK.cpp
similarity index 100%
rename from vm/mterp/c/OP_IGET_QUICK.c
rename to vm/mterp/c/OP_IGET_QUICK.cpp

vm/mterp/c/OP_IGET_SHORT.cpp

diff --git a/vm/mterp/c/OP_IGET_SHORT.c b/vm/mterp/c/OP_IGET_SHORT.cpp
similarity index 100%
rename from vm/mterp/c/OP_IGET_SHORT.c
rename to vm/mterp/c/OP_IGET_SHORT.cpp

vm/mterp/c/OP_IGET_SHORT_JUMBO.cpp

diff --git a/vm/mterp/c/OP_IGET_SHORT_JUMBO.c b/vm/mterp/c/OP_IGET_SHORT_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_IGET_SHORT_JUMBO.c
rename to vm/mterp/c/OP_IGET_SHORT_JUMBO.cpp

vm/mterp/c/OP_IGET_VOLATILE.cpp

diff --git a/vm/mterp/c/OP_IGET_VOLATILE.c b/vm/mterp/c/OP_IGET_VOLATILE.cpp
similarity index 100%
rename from vm/mterp/c/OP_IGET_VOLATILE.c
rename to vm/mterp/c/OP_IGET_VOLATILE.cpp

vm/mterp/c/OP_IGET_VOLATILE_JUMBO.cpp

diff --git a/vm/mterp/c/OP_IGET_VOLATILE_JUMBO.c b/vm/mterp/c/OP_IGET_VOLATILE_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_IGET_VOLATILE_JUMBO.c
rename to vm/mterp/c/OP_IGET_VOLATILE_JUMBO.cpp

vm/mterp/c/OP_IGET_WIDE.cpp

diff --git a/vm/mterp/c/OP_IGET_WIDE.c b/vm/mterp/c/OP_IGET_WIDE.cpp
similarity index 100%
rename from vm/mterp/c/OP_IGET_WIDE.c
rename to vm/mterp/c/OP_IGET_WIDE.cpp

vm/mterp/c/OP_IGET_WIDE_JUMBO.cpp

diff --git a/vm/mterp/c/OP_IGET_WIDE_JUMBO.c b/vm/mterp/c/OP_IGET_WIDE_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_IGET_WIDE_JUMBO.c
rename to vm/mterp/c/OP_IGET_WIDE_JUMBO.cpp

vm/mterp/c/OP_IGET_WIDE_QUICK.cpp

diff --git a/vm/mterp/c/OP_IGET_WIDE_QUICK.c b/vm/mterp/c/OP_IGET_WIDE_QUICK.cpp
similarity index 100%
rename from vm/mterp/c/OP_IGET_WIDE_QUICK.c
rename to vm/mterp/c/OP_IGET_WIDE_QUICK.cpp

vm/mterp/c/OP_IGET_WIDE_VOLATILE.cpp

diff --git a/vm/mterp/c/OP_IGET_WIDE_VOLATILE.c b/vm/mterp/c/OP_IGET_WIDE_VOLATILE.cpp
similarity index 100%
rename from vm/mterp/c/OP_IGET_WIDE_VOLATILE.c
rename to vm/mterp/c/OP_IGET_WIDE_VOLATILE.cpp

vm/mterp/c/OP_IGET_WIDE_VOLATILE_JUMBO.cpp

diff --git a/vm/mterp/c/OP_IGET_WIDE_VOLATILE_JUMBO.c b/vm/mterp/c/OP_IGET_WIDE_VOLATILE_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_IGET_WIDE_VOLATILE_JUMBO.c
rename to vm/mterp/c/OP_IGET_WIDE_VOLATILE_JUMBO.cpp

vm/mterp/c/OP_INSTANCE_OF.cpp

diff --git a/vm/mterp/c/OP_INSTANCE_OF.c b/vm/mterp/c/OP_INSTANCE_OF.cpp
similarity index 100%
rename from vm/mterp/c/OP_INSTANCE_OF.c
rename to vm/mterp/c/OP_INSTANCE_OF.cpp

vm/mterp/c/OP_INSTANCE_OF_JUMBO.cpp

diff --git a/vm/mterp/c/OP_INSTANCE_OF_JUMBO.c b/vm/mterp/c/OP_INSTANCE_OF_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_INSTANCE_OF_JUMBO.c
rename to vm/mterp/c/OP_INSTANCE_OF_JUMBO.cpp

vm/mterp/c/OP_INT_TO_BYTE.cpp

diff --git a/vm/mterp/c/OP_INT_TO_BYTE.c b/vm/mterp/c/OP_INT_TO_BYTE.cpp
similarity index 100%
rename from vm/mterp/c/OP_INT_TO_BYTE.c
rename to vm/mterp/c/OP_INT_TO_BYTE.cpp

vm/mterp/c/OP_INT_TO_CHAR.cpp

diff --git a/vm/mterp/c/OP_INT_TO_CHAR.c b/vm/mterp/c/OP_INT_TO_CHAR.cpp
similarity index 100%
rename from vm/mterp/c/OP_INT_TO_CHAR.c
rename to vm/mterp/c/OP_INT_TO_CHAR.cpp

vm/mterp/c/OP_INT_TO_DOUBLE.cpp

diff --git a/vm/mterp/c/OP_INT_TO_DOUBLE.c b/vm/mterp/c/OP_INT_TO_DOUBLE.cpp
similarity index 100%
rename from vm/mterp/c/OP_INT_TO_DOUBLE.c
rename to vm/mterp/c/OP_INT_TO_DOUBLE.cpp

vm/mterp/c/OP_INT_TO_FLOAT.cpp

diff --git a/vm/mterp/c/OP_INT_TO_FLOAT.c b/vm/mterp/c/OP_INT_TO_FLOAT.cpp
similarity index 100%
rename from vm/mterp/c/OP_INT_TO_FLOAT.c
rename to vm/mterp/c/OP_INT_TO_FLOAT.cpp

vm/mterp/c/OP_INT_TO_LONG.cpp

diff --git a/vm/mterp/c/OP_INT_TO_LONG.c b/vm/mterp/c/OP_INT_TO_LONG.cpp
similarity index 100%
rename from vm/mterp/c/OP_INT_TO_LONG.c
rename to vm/mterp/c/OP_INT_TO_LONG.cpp

vm/mterp/c/OP_INT_TO_SHORT.cpp

diff --git a/vm/mterp/c/OP_INT_TO_SHORT.c b/vm/mterp/c/OP_INT_TO_SHORT.cpp
similarity index 100%
rename from vm/mterp/c/OP_INT_TO_SHORT.c
rename to vm/mterp/c/OP_INT_TO_SHORT.cpp

vm/mterp/c/OP_INVOKE_DIRECT.cpp

diff --git a/vm/mterp/c/OP_INVOKE_DIRECT.c b/vm/mterp/c/OP_INVOKE_DIRECT.cpp
similarity index 100%
rename from vm/mterp/c/OP_INVOKE_DIRECT.c
rename to vm/mterp/c/OP_INVOKE_DIRECT.cpp

vm/mterp/c/OP_INVOKE_DIRECT_JUMBO.cpp

diff --git a/vm/mterp/c/OP_INVOKE_DIRECT_JUMBO.c b/vm/mterp/c/OP_INVOKE_DIRECT_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_INVOKE_DIRECT_JUMBO.c
rename to vm/mterp/c/OP_INVOKE_DIRECT_JUMBO.cpp

vm/mterp/c/OP_INVOKE_DIRECT_RANGE.cpp

diff --git a/vm/mterp/c/OP_INVOKE_DIRECT_RANGE.c b/vm/mterp/c/OP_INVOKE_DIRECT_RANGE.cpp
similarity index 100%
rename from vm/mterp/c/OP_INVOKE_DIRECT_RANGE.c
rename to vm/mterp/c/OP_INVOKE_DIRECT_RANGE.cpp

vm/mterp/c/OP_INVOKE_INTERFACE.cpp

diff --git a/vm/mterp/c/OP_INVOKE_INTERFACE.c b/vm/mterp/c/OP_INVOKE_INTERFACE.cpp
similarity index 100%
rename from vm/mterp/c/OP_INVOKE_INTERFACE.c
rename to vm/mterp/c/OP_INVOKE_INTERFACE.cpp

vm/mterp/c/OP_INVOKE_INTERFACE_JUMBO.cpp

diff --git a/vm/mterp/c/OP_INVOKE_INTERFACE_JUMBO.c b/vm/mterp/c/OP_INVOKE_INTERFACE_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_INVOKE_INTERFACE_JUMBO.c
rename to vm/mterp/c/OP_INVOKE_INTERFACE_JUMBO.cpp

vm/mterp/c/OP_INVOKE_INTERFACE_RANGE.cpp

diff --git a/vm/mterp/c/OP_INVOKE_INTERFACE_RANGE.c b/vm/mterp/c/OP_INVOKE_INTERFACE_RANGE.cpp
similarity index 100%
rename from vm/mterp/c/OP_INVOKE_INTERFACE_RANGE.c
rename to vm/mterp/c/OP_INVOKE_INTERFACE_RANGE.cpp

vm/mterp/c/OP_INVOKE_OBJECT_INIT_JUMBO.cpp

diff --git a/vm/mterp/c/OP_INVOKE_OBJECT_INIT_JUMBO.c b/vm/mterp/c/OP_INVOKE_OBJECT_INIT_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_INVOKE_OBJECT_INIT_JUMBO.c
rename to vm/mterp/c/OP_INVOKE_OBJECT_INIT_JUMBO.cpp

vm/mterp/c/OP_INVOKE_OBJECT_INIT_RANGE.cpp

diff --git a/vm/mterp/c/OP_INVOKE_OBJECT_INIT_RANGE.c b/vm/mterp/c/OP_INVOKE_OBJECT_INIT_RANGE.cpp
similarity index 100%
rename from vm/mterp/c/OP_INVOKE_OBJECT_INIT_RANGE.c
rename to vm/mterp/c/OP_INVOKE_OBJECT_INIT_RANGE.cpp

vm/mterp/c/OP_INVOKE_STATIC.cpp

diff --git a/vm/mterp/c/OP_INVOKE_STATIC.c b/vm/mterp/c/OP_INVOKE_STATIC.cpp
similarity index 100%
rename from vm/mterp/c/OP_INVOKE_STATIC.c
rename to vm/mterp/c/OP_INVOKE_STATIC.cpp

vm/mterp/c/OP_INVOKE_STATIC_JUMBO.cpp

diff --git a/vm/mterp/c/OP_INVOKE_STATIC_JUMBO.c b/vm/mterp/c/OP_INVOKE_STATIC_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_INVOKE_STATIC_JUMBO.c
rename to vm/mterp/c/OP_INVOKE_STATIC_JUMBO.cpp

vm/mterp/c/OP_INVOKE_STATIC_RANGE.cpp

diff --git a/vm/mterp/c/OP_INVOKE_STATIC_RANGE.c b/vm/mterp/c/OP_INVOKE_STATIC_RANGE.cpp
similarity index 100%
rename from vm/mterp/c/OP_INVOKE_STATIC_RANGE.c
rename to vm/mterp/c/OP_INVOKE_STATIC_RANGE.cpp

vm/mterp/c/OP_INVOKE_SUPER.cpp

diff --git a/vm/mterp/c/OP_INVOKE_SUPER.c b/vm/mterp/c/OP_INVOKE_SUPER.cpp
similarity index 100%
rename from vm/mterp/c/OP_INVOKE_SUPER.c
rename to vm/mterp/c/OP_INVOKE_SUPER.cpp

vm/mterp/c/OP_INVOKE_SUPER_JUMBO.cpp

diff --git a/vm/mterp/c/OP_INVOKE_SUPER_JUMBO.c b/vm/mterp/c/OP_INVOKE_SUPER_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_INVOKE_SUPER_JUMBO.c
rename to vm/mterp/c/OP_INVOKE_SUPER_JUMBO.cpp

vm/mterp/c/OP_INVOKE_SUPER_QUICK.cpp

diff --git a/vm/mterp/c/OP_INVOKE_SUPER_QUICK.c b/vm/mterp/c/OP_INVOKE_SUPER_QUICK.cpp
similarity index 100%
rename from vm/mterp/c/OP_INVOKE_SUPER_QUICK.c
rename to vm/mterp/c/OP_INVOKE_SUPER_QUICK.cpp

vm/mterp/c/OP_INVOKE_SUPER_QUICK_RANGE.cpp

diff --git a/vm/mterp/c/OP_INVOKE_SUPER_QUICK_RANGE.c b/vm/mterp/c/OP_INVOKE_SUPER_QUICK_RANGE.cpp
similarity index 100%
rename from vm/mterp/c/OP_INVOKE_SUPER_QUICK_RANGE.c
rename to vm/mterp/c/OP_INVOKE_SUPER_QUICK_RANGE.cpp

vm/mterp/c/OP_INVOKE_SUPER_RANGE.cpp

diff --git a/vm/mterp/c/OP_INVOKE_SUPER_RANGE.c b/vm/mterp/c/OP_INVOKE_SUPER_RANGE.cpp
similarity index 100%
rename from vm/mterp/c/OP_INVOKE_SUPER_RANGE.c
rename to vm/mterp/c/OP_INVOKE_SUPER_RANGE.cpp

vm/mterp/c/OP_INVOKE_VIRTUAL.cpp

diff --git a/vm/mterp/c/OP_INVOKE_VIRTUAL.c b/vm/mterp/c/OP_INVOKE_VIRTUAL.cpp
similarity index 100%
rename from vm/mterp/c/OP_INVOKE_VIRTUAL.c
rename to vm/mterp/c/OP_INVOKE_VIRTUAL.cpp

vm/mterp/c/OP_INVOKE_VIRTUAL_JUMBO.cpp

diff --git a/vm/mterp/c/OP_INVOKE_VIRTUAL_JUMBO.c b/vm/mterp/c/OP_INVOKE_VIRTUAL_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_INVOKE_VIRTUAL_JUMBO.c
rename to vm/mterp/c/OP_INVOKE_VIRTUAL_JUMBO.cpp

vm/mterp/c/OP_INVOKE_VIRTUAL_QUICK.cpp

diff --git a/vm/mterp/c/OP_INVOKE_VIRTUAL_QUICK.c b/vm/mterp/c/OP_INVOKE_VIRTUAL_QUICK.cpp
similarity index 100%
rename from vm/mterp/c/OP_INVOKE_VIRTUAL_QUICK.c
rename to vm/mterp/c/OP_INVOKE_VIRTUAL_QUICK.cpp

vm/mterp/c/OP_INVOKE_VIRTUAL_QUICK_RANGE.cpp

diff --git a/vm/mterp/c/OP_INVOKE_VIRTUAL_QUICK_RANGE.c b/vm/mterp/c/OP_INVOKE_VIRTUAL_QUICK_RANGE.cpp
similarity index 100%
rename from vm/mterp/c/OP_INVOKE_VIRTUAL_QUICK_RANGE.c
rename to vm/mterp/c/OP_INVOKE_VIRTUAL_QUICK_RANGE.cpp

vm/mterp/c/OP_INVOKE_VIRTUAL_RANGE.cpp

diff --git a/vm/mterp/c/OP_INVOKE_VIRTUAL_RANGE.c b/vm/mterp/c/OP_INVOKE_VIRTUAL_RANGE.cpp
similarity index 100%
rename from vm/mterp/c/OP_INVOKE_VIRTUAL_RANGE.c
rename to vm/mterp/c/OP_INVOKE_VIRTUAL_RANGE.cpp

vm/mterp/c/OP_IPUT.cpp

diff --git a/vm/mterp/c/OP_IPUT.c b/vm/mterp/c/OP_IPUT.cpp
similarity index 100%
rename from vm/mterp/c/OP_IPUT.c
rename to vm/mterp/c/OP_IPUT.cpp

vm/mterp/c/OP_IPUT_BOOLEAN.cpp

diff --git a/vm/mterp/c/OP_IPUT_BOOLEAN.c b/vm/mterp/c/OP_IPUT_BOOLEAN.cpp
similarity index 100%
rename from vm/mterp/c/OP_IPUT_BOOLEAN.c
rename to vm/mterp/c/OP_IPUT_BOOLEAN.cpp

vm/mterp/c/OP_IPUT_BOOLEAN_JUMBO.cpp

diff --git a/vm/mterp/c/OP_IPUT_BOOLEAN_JUMBO.c b/vm/mterp/c/OP_IPUT_BOOLEAN_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_IPUT_BOOLEAN_JUMBO.c
rename to vm/mterp/c/OP_IPUT_BOOLEAN_JUMBO.cpp

vm/mterp/c/OP_IPUT_BYTE.cpp

diff --git a/vm/mterp/c/OP_IPUT_BYTE.c b/vm/mterp/c/OP_IPUT_BYTE.cpp
similarity index 100%
rename from vm/mterp/c/OP_IPUT_BYTE.c
rename to vm/mterp/c/OP_IPUT_BYTE.cpp

vm/mterp/c/OP_IPUT_BYTE_JUMBO.cpp

diff --git a/vm/mterp/c/OP_IPUT_BYTE_JUMBO.c b/vm/mterp/c/OP_IPUT_BYTE_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_IPUT_BYTE_JUMBO.c
rename to vm/mterp/c/OP_IPUT_BYTE_JUMBO.cpp

vm/mterp/c/OP_IPUT_CHAR.cpp

diff --git a/vm/mterp/c/OP_IPUT_CHAR.c b/vm/mterp/c/OP_IPUT_CHAR.cpp
similarity index 100%
rename from vm/mterp/c/OP_IPUT_CHAR.c
rename to vm/mterp/c/OP_IPUT_CHAR.cpp

vm/mterp/c/OP_IPUT_CHAR_JUMBO.cpp

diff --git a/vm/mterp/c/OP_IPUT_CHAR_JUMBO.c b/vm/mterp/c/OP_IPUT_CHAR_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_IPUT_CHAR_JUMBO.c
rename to vm/mterp/c/OP_IPUT_CHAR_JUMBO.cpp

vm/mterp/c/OP_IPUT_JUMBO.cpp

diff --git a/vm/mterp/c/OP_IPUT_JUMBO.c b/vm/mterp/c/OP_IPUT_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_IPUT_JUMBO.c
rename to vm/mterp/c/OP_IPUT_JUMBO.cpp

vm/mterp/c/OP_IPUT_OBJECT.cpp

diff --git a/vm/mterp/c/OP_IPUT_OBJECT.c b/vm/mterp/c/OP_IPUT_OBJECT.cpp
similarity index 100%
rename from vm/mterp/c/OP_IPUT_OBJECT.c
rename to vm/mterp/c/OP_IPUT_OBJECT.cpp

vm/mterp/c/OP_IPUT_OBJECT_JUMBO.cpp

diff --git a/vm/mterp/c/OP_IPUT_OBJECT_JUMBO.c b/vm/mterp/c/OP_IPUT_OBJECT_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_IPUT_OBJECT_JUMBO.c
rename to vm/mterp/c/OP_IPUT_OBJECT_JUMBO.cpp

vm/mterp/c/OP_IPUT_OBJECT_QUICK.cpp

diff --git a/vm/mterp/c/OP_IPUT_OBJECT_QUICK.c b/vm/mterp/c/OP_IPUT_OBJECT_QUICK.cpp
similarity index 100%
rename from vm/mterp/c/OP_IPUT_OBJECT_QUICK.c
rename to vm/mterp/c/OP_IPUT_OBJECT_QUICK.cpp

vm/mterp/c/OP_IPUT_OBJECT_VOLATILE.cpp

diff --git a/vm/mterp/c/OP_IPUT_OBJECT_VOLATILE.c b/vm/mterp/c/OP_IPUT_OBJECT_VOLATILE.cpp
similarity index 100%
rename from vm/mterp/c/OP_IPUT_OBJECT_VOLATILE.c
rename to vm/mterp/c/OP_IPUT_OBJECT_VOLATILE.cpp

vm/mterp/c/OP_IPUT_OBJECT_VOLATILE_JUMBO.cpp

diff --git a/vm/mterp/c/OP_IPUT_OBJECT_VOLATILE_JUMBO.c b/vm/mterp/c/OP_IPUT_OBJECT_VOLATILE_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_IPUT_OBJECT_VOLATILE_JUMBO.c
rename to vm/mterp/c/OP_IPUT_OBJECT_VOLATILE_JUMBO.cpp

vm/mterp/c/OP_IPUT_QUICK.cpp

diff --git a/vm/mterp/c/OP_IPUT_QUICK.c b/vm/mterp/c/OP_IPUT_QUICK.cpp
similarity index 100%
rename from vm/mterp/c/OP_IPUT_QUICK.c
rename to vm/mterp/c/OP_IPUT_QUICK.cpp

vm/mterp/c/OP_IPUT_SHORT.cpp

diff --git a/vm/mterp/c/OP_IPUT_SHORT.c b/vm/mterp/c/OP_IPUT_SHORT.cpp
similarity index 100%
rename from vm/mterp/c/OP_IPUT_SHORT.c
rename to vm/mterp/c/OP_IPUT_SHORT.cpp

vm/mterp/c/OP_IPUT_SHORT_JUMBO.cpp

diff --git a/vm/mterp/c/OP_IPUT_SHORT_JUMBO.c b/vm/mterp/c/OP_IPUT_SHORT_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_IPUT_SHORT_JUMBO.c
rename to vm/mterp/c/OP_IPUT_SHORT_JUMBO.cpp

vm/mterp/c/OP_IPUT_VOLATILE.cpp

diff --git a/vm/mterp/c/OP_IPUT_VOLATILE.c b/vm/mterp/c/OP_IPUT_VOLATILE.cpp
similarity index 100%
rename from vm/mterp/c/OP_IPUT_VOLATILE.c
rename to vm/mterp/c/OP_IPUT_VOLATILE.cpp

vm/mterp/c/OP_IPUT_VOLATILE_JUMBO.cpp

diff --git a/vm/mterp/c/OP_IPUT_VOLATILE_JUMBO.c b/vm/mterp/c/OP_IPUT_VOLATILE_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_IPUT_VOLATILE_JUMBO.c
rename to vm/mterp/c/OP_IPUT_VOLATILE_JUMBO.cpp

vm/mterp/c/OP_IPUT_WIDE.cpp

diff --git a/vm/mterp/c/OP_IPUT_WIDE.c b/vm/mterp/c/OP_IPUT_WIDE.cpp
similarity index 100%
rename from vm/mterp/c/OP_IPUT_WIDE.c
rename to vm/mterp/c/OP_IPUT_WIDE.cpp

vm/mterp/c/OP_IPUT_WIDE_JUMBO.cpp

diff --git a/vm/mterp/c/OP_IPUT_WIDE_JUMBO.c b/vm/mterp/c/OP_IPUT_WIDE_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_IPUT_WIDE_JUMBO.c
rename to vm/mterp/c/OP_IPUT_WIDE_JUMBO.cpp

vm/mterp/c/OP_IPUT_WIDE_QUICK.cpp

diff --git a/vm/mterp/c/OP_IPUT_WIDE_QUICK.c b/vm/mterp/c/OP_IPUT_WIDE_QUICK.cpp
similarity index 100%
rename from vm/mterp/c/OP_IPUT_WIDE_QUICK.c
rename to vm/mterp/c/OP_IPUT_WIDE_QUICK.cpp

vm/mterp/c/OP_IPUT_WIDE_VOLATILE.cpp

diff --git a/vm/mterp/c/OP_IPUT_WIDE_VOLATILE.c b/vm/mterp/c/OP_IPUT_WIDE_VOLATILE.cpp
similarity index 100%
rename from vm/mterp/c/OP_IPUT_WIDE_VOLATILE.c
rename to vm/mterp/c/OP_IPUT_WIDE_VOLATILE.cpp

vm/mterp/c/OP_IPUT_WIDE_VOLATILE_JUMBO.cpp

diff --git a/vm/mterp/c/OP_IPUT_WIDE_VOLATILE_JUMBO.c b/vm/mterp/c/OP_IPUT_WIDE_VOLATILE_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_IPUT_WIDE_VOLATILE_JUMBO.c
rename to vm/mterp/c/OP_IPUT_WIDE_VOLATILE_JUMBO.cpp

vm/mterp/c/OP_LONG_TO_DOUBLE.cpp

diff --git a/vm/mterp/c/OP_LONG_TO_DOUBLE.c b/vm/mterp/c/OP_LONG_TO_DOUBLE.cpp
similarity index 100%
rename from vm/mterp/c/OP_LONG_TO_DOUBLE.c
rename to vm/mterp/c/OP_LONG_TO_DOUBLE.cpp

vm/mterp/c/OP_LONG_TO_FLOAT.cpp

diff --git a/vm/mterp/c/OP_LONG_TO_FLOAT.c b/vm/mterp/c/OP_LONG_TO_FLOAT.cpp
similarity index 100%
rename from vm/mterp/c/OP_LONG_TO_FLOAT.c
rename to vm/mterp/c/OP_LONG_TO_FLOAT.cpp

vm/mterp/c/OP_LONG_TO_INT.cpp

diff --git a/vm/mterp/c/OP_LONG_TO_INT.c b/vm/mterp/c/OP_LONG_TO_INT.cpp
similarity index 100%
rename from vm/mterp/c/OP_LONG_TO_INT.c
rename to vm/mterp/c/OP_LONG_TO_INT.cpp

vm/mterp/c/OP_MONITOR_ENTER.cpp

diff --git a/vm/mterp/c/OP_MONITOR_ENTER.c b/vm/mterp/c/OP_MONITOR_ENTER.cpp
similarity index 100%
rename from vm/mterp/c/OP_MONITOR_ENTER.c
rename to vm/mterp/c/OP_MONITOR_ENTER.cpp

vm/mterp/c/OP_MONITOR_EXIT.cpp

diff --git a/vm/mterp/c/OP_MONITOR_EXIT.c b/vm/mterp/c/OP_MONITOR_EXIT.cpp
similarity index 100%
rename from vm/mterp/c/OP_MONITOR_EXIT.c
rename to vm/mterp/c/OP_MONITOR_EXIT.cpp

vm/mterp/c/OP_MOVE.cpp

diff --git a/vm/mterp/c/OP_MOVE.c b/vm/mterp/c/OP_MOVE.cpp
similarity index 100%
rename from vm/mterp/c/OP_MOVE.c
rename to vm/mterp/c/OP_MOVE.cpp

vm/mterp/c/OP_MOVE_16.cpp

diff --git a/vm/mterp/c/OP_MOVE_16.c b/vm/mterp/c/OP_MOVE_16.cpp
similarity index 100%
rename from vm/mterp/c/OP_MOVE_16.c
rename to vm/mterp/c/OP_MOVE_16.cpp

vm/mterp/c/OP_MOVE_EXCEPTION.cpp

diff --git a/vm/mterp/c/OP_MOVE_EXCEPTION.c b/vm/mterp/c/OP_MOVE_EXCEPTION.cpp
similarity index 100%
rename from vm/mterp/c/OP_MOVE_EXCEPTION.c
rename to vm/mterp/c/OP_MOVE_EXCEPTION.cpp

vm/mterp/c/OP_MOVE_FROM16.cpp

diff --git a/vm/mterp/c/OP_MOVE_FROM16.c b/vm/mterp/c/OP_MOVE_FROM16.cpp
similarity index 100%
rename from vm/mterp/c/OP_MOVE_FROM16.c
rename to vm/mterp/c/OP_MOVE_FROM16.cpp

vm/mterp/c/OP_MOVE_OBJECT.c

diff --git a/vm/mterp/c/OP_MOVE_OBJECT.c b/vm/mterp/c/OP_MOVE_OBJECT.c
deleted file mode 100644
index 6ace6d9..0000000
--- a/vm/mterp/c/OP_MOVE_OBJECT.c
+++ /dev/null
@@ -1 +0,0 @@
-%include "c/OP_MOVE.c"

vm/mterp/c/OP_MOVE_OBJECT.cpp

diff --git a/vm/mterp/c/OP_MOVE_OBJECT.cpp b/vm/mterp/c/OP_MOVE_OBJECT.cpp
new file mode 100644
index 0000000..579095f
--- /dev/null
+++ b/vm/mterp/c/OP_MOVE_OBJECT.cpp
@@ -0,0 +1 @@
+%include "c/OP_MOVE.cpp"

vm/mterp/c/OP_MOVE_OBJECT_16.c

diff --git a/vm/mterp/c/OP_MOVE_OBJECT_16.c b/vm/mterp/c/OP_MOVE_OBJECT_16.c
deleted file mode 100644
index 7789ef4..0000000
--- a/vm/mterp/c/OP_MOVE_OBJECT_16.c
+++ /dev/null
@@ -1 +0,0 @@
-%include "c/OP_MOVE_16.c"

vm/mterp/c/OP_MOVE_OBJECT_16.cpp

diff --git a/vm/mterp/c/OP_MOVE_OBJECT_16.cpp b/vm/mterp/c/OP_MOVE_OBJECT_16.cpp
new file mode 100644
index 0000000..89cfb77
--- /dev/null
+++ b/vm/mterp/c/OP_MOVE_OBJECT_16.cpp
@@ -0,0 +1 @@
+%include "c/OP_MOVE_16.cpp"

vm/mterp/c/OP_MOVE_OBJECT_FROM16.c

diff --git a/vm/mterp/c/OP_MOVE_OBJECT_FROM16.c b/vm/mterp/c/OP_MOVE_OBJECT_FROM16.c
deleted file mode 100644
index 8caf995..0000000
--- a/vm/mterp/c/OP_MOVE_OBJECT_FROM16.c
+++ /dev/null
@@ -1 +0,0 @@
-%include "c/OP_MOVE_FROM16.c"

vm/mterp/c/OP_MOVE_OBJECT_FROM16.cpp

diff --git a/vm/mterp/c/OP_MOVE_OBJECT_FROM16.cpp b/vm/mterp/c/OP_MOVE_OBJECT_FROM16.cpp
new file mode 100644
index 0000000..9451b9e
--- /dev/null
+++ b/vm/mterp/c/OP_MOVE_OBJECT_FROM16.cpp
@@ -0,0 +1 @@
+%include "c/OP_MOVE_FROM16.cpp"

vm/mterp/c/OP_MOVE_RESULT.cpp

diff --git a/vm/mterp/c/OP_MOVE_RESULT.c b/vm/mterp/c/OP_MOVE_RESULT.cpp
similarity index 100%
rename from vm/mterp/c/OP_MOVE_RESULT.c
rename to vm/mterp/c/OP_MOVE_RESULT.cpp

vm/mterp/c/OP_MOVE_RESULT_OBJECT.c

diff --git a/vm/mterp/c/OP_MOVE_RESULT_OBJECT.c b/vm/mterp/c/OP_MOVE_RESULT_OBJECT.c
deleted file mode 100644
index a8358b1..0000000
--- a/vm/mterp/c/OP_MOVE_RESULT_OBJECT.c
+++ /dev/null
@@ -1 +0,0 @@
-%include "c/OP_MOVE_RESULT.c"

vm/mterp/c/OP_MOVE_RESULT_OBJECT.cpp

diff --git a/vm/mterp/c/OP_MOVE_RESULT_OBJECT.cpp b/vm/mterp/c/OP_MOVE_RESULT_OBJECT.cpp
new file mode 100644
index 0000000..08c5c02
--- /dev/null
+++ b/vm/mterp/c/OP_MOVE_RESULT_OBJECT.cpp
@@ -0,0 +1 @@
+%include "c/OP_MOVE_RESULT.cpp"

vm/mterp/c/OP_MOVE_RESULT_WIDE.cpp

diff --git a/vm/mterp/c/OP_MOVE_RESULT_WIDE.c b/vm/mterp/c/OP_MOVE_RESULT_WIDE.cpp
similarity index 100%
rename from vm/mterp/c/OP_MOVE_RESULT_WIDE.c
rename to vm/mterp/c/OP_MOVE_RESULT_WIDE.cpp

vm/mterp/c/OP_MOVE_WIDE.cpp

diff --git a/vm/mterp/c/OP_MOVE_WIDE.c b/vm/mterp/c/OP_MOVE_WIDE.cpp
similarity index 100%
rename from vm/mterp/c/OP_MOVE_WIDE.c
rename to vm/mterp/c/OP_MOVE_WIDE.cpp

vm/mterp/c/OP_MOVE_WIDE_16.cpp

diff --git a/vm/mterp/c/OP_MOVE_WIDE_16.c b/vm/mterp/c/OP_MOVE_WIDE_16.cpp
similarity index 100%
rename from vm/mterp/c/OP_MOVE_WIDE_16.c
rename to vm/mterp/c/OP_MOVE_WIDE_16.cpp

vm/mterp/c/OP_MOVE_WIDE_FROM16.cpp

diff --git a/vm/mterp/c/OP_MOVE_WIDE_FROM16.c b/vm/mterp/c/OP_MOVE_WIDE_FROM16.cpp
similarity index 100%
rename from vm/mterp/c/OP_MOVE_WIDE_FROM16.c
rename to vm/mterp/c/OP_MOVE_WIDE_FROM16.cpp

vm/mterp/c/OP_MUL_DOUBLE.cpp

diff --git a/vm/mterp/c/OP_MUL_DOUBLE.c b/vm/mterp/c/OP_MUL_DOUBLE.cpp
similarity index 100%
rename from vm/mterp/c/OP_MUL_DOUBLE.c
rename to vm/mterp/c/OP_MUL_DOUBLE.cpp

vm/mterp/c/OP_MUL_DOUBLE_2ADDR.cpp

diff --git a/vm/mterp/c/OP_MUL_DOUBLE_2ADDR.c b/vm/mterp/c/OP_MUL_DOUBLE_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_MUL_DOUBLE_2ADDR.c
rename to vm/mterp/c/OP_MUL_DOUBLE_2ADDR.cpp

vm/mterp/c/OP_MUL_FLOAT.cpp

diff --git a/vm/mterp/c/OP_MUL_FLOAT.c b/vm/mterp/c/OP_MUL_FLOAT.cpp
similarity index 100%
rename from vm/mterp/c/OP_MUL_FLOAT.c
rename to vm/mterp/c/OP_MUL_FLOAT.cpp

vm/mterp/c/OP_MUL_FLOAT_2ADDR.cpp

diff --git a/vm/mterp/c/OP_MUL_FLOAT_2ADDR.c b/vm/mterp/c/OP_MUL_FLOAT_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_MUL_FLOAT_2ADDR.c
rename to vm/mterp/c/OP_MUL_FLOAT_2ADDR.cpp

vm/mterp/c/OP_MUL_INT.cpp

diff --git a/vm/mterp/c/OP_MUL_INT.c b/vm/mterp/c/OP_MUL_INT.cpp
similarity index 100%
rename from vm/mterp/c/OP_MUL_INT.c
rename to vm/mterp/c/OP_MUL_INT.cpp

vm/mterp/c/OP_MUL_INT_2ADDR.cpp

diff --git a/vm/mterp/c/OP_MUL_INT_2ADDR.c b/vm/mterp/c/OP_MUL_INT_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_MUL_INT_2ADDR.c
rename to vm/mterp/c/OP_MUL_INT_2ADDR.cpp

vm/mterp/c/OP_MUL_INT_LIT16.cpp

diff --git a/vm/mterp/c/OP_MUL_INT_LIT16.c b/vm/mterp/c/OP_MUL_INT_LIT16.cpp
similarity index 100%
rename from vm/mterp/c/OP_MUL_INT_LIT16.c
rename to vm/mterp/c/OP_MUL_INT_LIT16.cpp

vm/mterp/c/OP_MUL_INT_LIT8.cpp

diff --git a/vm/mterp/c/OP_MUL_INT_LIT8.c b/vm/mterp/c/OP_MUL_INT_LIT8.cpp
similarity index 100%
rename from vm/mterp/c/OP_MUL_INT_LIT8.c
rename to vm/mterp/c/OP_MUL_INT_LIT8.cpp

vm/mterp/c/OP_MUL_LONG.cpp

diff --git a/vm/mterp/c/OP_MUL_LONG.c b/vm/mterp/c/OP_MUL_LONG.cpp
similarity index 100%
rename from vm/mterp/c/OP_MUL_LONG.c
rename to vm/mterp/c/OP_MUL_LONG.cpp

vm/mterp/c/OP_MUL_LONG_2ADDR.cpp

diff --git a/vm/mterp/c/OP_MUL_LONG_2ADDR.c b/vm/mterp/c/OP_MUL_LONG_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_MUL_LONG_2ADDR.c
rename to vm/mterp/c/OP_MUL_LONG_2ADDR.cpp

vm/mterp/c/OP_NEG_DOUBLE.cpp

diff --git a/vm/mterp/c/OP_NEG_DOUBLE.c b/vm/mterp/c/OP_NEG_DOUBLE.cpp
similarity index 100%
rename from vm/mterp/c/OP_NEG_DOUBLE.c
rename to vm/mterp/c/OP_NEG_DOUBLE.cpp

vm/mterp/c/OP_NEG_FLOAT.cpp

diff --git a/vm/mterp/c/OP_NEG_FLOAT.c b/vm/mterp/c/OP_NEG_FLOAT.cpp
similarity index 100%
rename from vm/mterp/c/OP_NEG_FLOAT.c
rename to vm/mterp/c/OP_NEG_FLOAT.cpp

vm/mterp/c/OP_NEG_INT.cpp

diff --git a/vm/mterp/c/OP_NEG_INT.c b/vm/mterp/c/OP_NEG_INT.cpp
similarity index 100%
rename from vm/mterp/c/OP_NEG_INT.c
rename to vm/mterp/c/OP_NEG_INT.cpp

vm/mterp/c/OP_NEG_LONG.cpp

diff --git a/vm/mterp/c/OP_NEG_LONG.c b/vm/mterp/c/OP_NEG_LONG.cpp
similarity index 100%
rename from vm/mterp/c/OP_NEG_LONG.c
rename to vm/mterp/c/OP_NEG_LONG.cpp

vm/mterp/c/OP_NEW_ARRAY.cpp

diff --git a/vm/mterp/c/OP_NEW_ARRAY.c b/vm/mterp/c/OP_NEW_ARRAY.cpp
similarity index 100%
rename from vm/mterp/c/OP_NEW_ARRAY.c
rename to vm/mterp/c/OP_NEW_ARRAY.cpp

vm/mterp/c/OP_NEW_ARRAY_JUMBO.cpp

diff --git a/vm/mterp/c/OP_NEW_ARRAY_JUMBO.c b/vm/mterp/c/OP_NEW_ARRAY_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_NEW_ARRAY_JUMBO.c
rename to vm/mterp/c/OP_NEW_ARRAY_JUMBO.cpp

vm/mterp/c/OP_NEW_INSTANCE.cpp

diff --git a/vm/mterp/c/OP_NEW_INSTANCE.c b/vm/mterp/c/OP_NEW_INSTANCE.cpp
similarity index 100%
rename from vm/mterp/c/OP_NEW_INSTANCE.c
rename to vm/mterp/c/OP_NEW_INSTANCE.cpp

vm/mterp/c/OP_NEW_INSTANCE_JUMBO.cpp

diff --git a/vm/mterp/c/OP_NEW_INSTANCE_JUMBO.c b/vm/mterp/c/OP_NEW_INSTANCE_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_NEW_INSTANCE_JUMBO.c
rename to vm/mterp/c/OP_NEW_INSTANCE_JUMBO.cpp

vm/mterp/c/OP_NOP.cpp

diff --git a/vm/mterp/c/OP_NOP.c b/vm/mterp/c/OP_NOP.cpp
similarity index 100%
rename from vm/mterp/c/OP_NOP.c
rename to vm/mterp/c/OP_NOP.cpp

vm/mterp/c/OP_NOT_INT.cpp

diff --git a/vm/mterp/c/OP_NOT_INT.c b/vm/mterp/c/OP_NOT_INT.cpp
similarity index 100%
rename from vm/mterp/c/OP_NOT_INT.c
rename to vm/mterp/c/OP_NOT_INT.cpp

vm/mterp/c/OP_NOT_LONG.cpp

diff --git a/vm/mterp/c/OP_NOT_LONG.c b/vm/mterp/c/OP_NOT_LONG.cpp
similarity index 100%
rename from vm/mterp/c/OP_NOT_LONG.c
rename to vm/mterp/c/OP_NOT_LONG.cpp

vm/mterp/c/OP_OR_INT.cpp

diff --git a/vm/mterp/c/OP_OR_INT.c b/vm/mterp/c/OP_OR_INT.cpp
similarity index 100%
rename from vm/mterp/c/OP_OR_INT.c
rename to vm/mterp/c/OP_OR_INT.cpp

vm/mterp/c/OP_OR_INT_2ADDR.cpp

diff --git a/vm/mterp/c/OP_OR_INT_2ADDR.c b/vm/mterp/c/OP_OR_INT_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_OR_INT_2ADDR.c
rename to vm/mterp/c/OP_OR_INT_2ADDR.cpp

vm/mterp/c/OP_OR_INT_LIT16.cpp

diff --git a/vm/mterp/c/OP_OR_INT_LIT16.c b/vm/mterp/c/OP_OR_INT_LIT16.cpp
similarity index 100%
rename from vm/mterp/c/OP_OR_INT_LIT16.c
rename to vm/mterp/c/OP_OR_INT_LIT16.cpp

vm/mterp/c/OP_OR_INT_LIT8.cpp

diff --git a/vm/mterp/c/OP_OR_INT_LIT8.c b/vm/mterp/c/OP_OR_INT_LIT8.cpp
similarity index 100%
rename from vm/mterp/c/OP_OR_INT_LIT8.c
rename to vm/mterp/c/OP_OR_INT_LIT8.cpp

vm/mterp/c/OP_OR_LONG.cpp

diff --git a/vm/mterp/c/OP_OR_LONG.c b/vm/mterp/c/OP_OR_LONG.cpp
similarity index 100%
rename from vm/mterp/c/OP_OR_LONG.c
rename to vm/mterp/c/OP_OR_LONG.cpp

vm/mterp/c/OP_OR_LONG_2ADDR.cpp

diff --git a/vm/mterp/c/OP_OR_LONG_2ADDR.c b/vm/mterp/c/OP_OR_LONG_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_OR_LONG_2ADDR.c
rename to vm/mterp/c/OP_OR_LONG_2ADDR.cpp

vm/mterp/c/OP_PACKED_SWITCH.cpp

diff --git a/vm/mterp/c/OP_PACKED_SWITCH.c b/vm/mterp/c/OP_PACKED_SWITCH.cpp
similarity index 100%
rename from vm/mterp/c/OP_PACKED_SWITCH.c
rename to vm/mterp/c/OP_PACKED_SWITCH.cpp

vm/mterp/c/OP_REM_DOUBLE.cpp

diff --git a/vm/mterp/c/OP_REM_DOUBLE.c b/vm/mterp/c/OP_REM_DOUBLE.cpp
similarity index 100%
rename from vm/mterp/c/OP_REM_DOUBLE.c
rename to vm/mterp/c/OP_REM_DOUBLE.cpp

vm/mterp/c/OP_REM_DOUBLE_2ADDR.cpp

diff --git a/vm/mterp/c/OP_REM_DOUBLE_2ADDR.c b/vm/mterp/c/OP_REM_DOUBLE_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_REM_DOUBLE_2ADDR.c
rename to vm/mterp/c/OP_REM_DOUBLE_2ADDR.cpp

vm/mterp/c/OP_REM_FLOAT.cpp

diff --git a/vm/mterp/c/OP_REM_FLOAT.c b/vm/mterp/c/OP_REM_FLOAT.cpp
similarity index 100%
rename from vm/mterp/c/OP_REM_FLOAT.c
rename to vm/mterp/c/OP_REM_FLOAT.cpp

vm/mterp/c/OP_REM_FLOAT_2ADDR.cpp

diff --git a/vm/mterp/c/OP_REM_FLOAT_2ADDR.c b/vm/mterp/c/OP_REM_FLOAT_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_REM_FLOAT_2ADDR.c
rename to vm/mterp/c/OP_REM_FLOAT_2ADDR.cpp

vm/mterp/c/OP_REM_INT.cpp

diff --git a/vm/mterp/c/OP_REM_INT.c b/vm/mterp/c/OP_REM_INT.cpp
similarity index 100%
rename from vm/mterp/c/OP_REM_INT.c
rename to vm/mterp/c/OP_REM_INT.cpp

vm/mterp/c/OP_REM_INT_2ADDR.cpp

diff --git a/vm/mterp/c/OP_REM_INT_2ADDR.c b/vm/mterp/c/OP_REM_INT_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_REM_INT_2ADDR.c
rename to vm/mterp/c/OP_REM_INT_2ADDR.cpp

vm/mterp/c/OP_REM_INT_LIT16.cpp

diff --git a/vm/mterp/c/OP_REM_INT_LIT16.c b/vm/mterp/c/OP_REM_INT_LIT16.cpp
similarity index 100%
rename from vm/mterp/c/OP_REM_INT_LIT16.c
rename to vm/mterp/c/OP_REM_INT_LIT16.cpp

vm/mterp/c/OP_REM_INT_LIT8.cpp

diff --git a/vm/mterp/c/OP_REM_INT_LIT8.c b/vm/mterp/c/OP_REM_INT_LIT8.cpp
similarity index 100%
rename from vm/mterp/c/OP_REM_INT_LIT8.c
rename to vm/mterp/c/OP_REM_INT_LIT8.cpp

vm/mterp/c/OP_REM_LONG.cpp

diff --git a/vm/mterp/c/OP_REM_LONG.c b/vm/mterp/c/OP_REM_LONG.cpp
similarity index 100%
rename from vm/mterp/c/OP_REM_LONG.c
rename to vm/mterp/c/OP_REM_LONG.cpp

vm/mterp/c/OP_REM_LONG_2ADDR.cpp

diff --git a/vm/mterp/c/OP_REM_LONG_2ADDR.c b/vm/mterp/c/OP_REM_LONG_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_REM_LONG_2ADDR.c
rename to vm/mterp/c/OP_REM_LONG_2ADDR.cpp

vm/mterp/c/OP_RETURN.cpp

diff --git a/vm/mterp/c/OP_RETURN.c b/vm/mterp/c/OP_RETURN.cpp
similarity index 100%
rename from vm/mterp/c/OP_RETURN.c
rename to vm/mterp/c/OP_RETURN.cpp

vm/mterp/c/OP_RETURN_OBJECT.c

diff --git a/vm/mterp/c/OP_RETURN_OBJECT.c b/vm/mterp/c/OP_RETURN_OBJECT.c
deleted file mode 100644
index 87cca39..0000000
--- a/vm/mterp/c/OP_RETURN_OBJECT.c
+++ /dev/null
@@ -1 +0,0 @@
-%include "c/OP_RETURN.c"

vm/mterp/c/OP_RETURN_OBJECT.cpp

diff --git a/vm/mterp/c/OP_RETURN_OBJECT.cpp b/vm/mterp/c/OP_RETURN_OBJECT.cpp
new file mode 100644
index 0000000..d8bae43
--- /dev/null
+++ b/vm/mterp/c/OP_RETURN_OBJECT.cpp
@@ -0,0 +1 @@
+%include "c/OP_RETURN.cpp"

vm/mterp/c/OP_RETURN_VOID.cpp

diff --git a/vm/mterp/c/OP_RETURN_VOID.c b/vm/mterp/c/OP_RETURN_VOID.cpp
similarity index 100%
rename from vm/mterp/c/OP_RETURN_VOID.c
rename to vm/mterp/c/OP_RETURN_VOID.cpp

vm/mterp/c/OP_RETURN_VOID_BARRIER.cpp

diff --git a/vm/mterp/c/OP_RETURN_VOID_BARRIER.c b/vm/mterp/c/OP_RETURN_VOID_BARRIER.cpp
similarity index 100%
rename from vm/mterp/c/OP_RETURN_VOID_BARRIER.c
rename to vm/mterp/c/OP_RETURN_VOID_BARRIER.cpp

vm/mterp/c/OP_RETURN_WIDE.cpp

diff --git a/vm/mterp/c/OP_RETURN_WIDE.c b/vm/mterp/c/OP_RETURN_WIDE.cpp
similarity index 100%
rename from vm/mterp/c/OP_RETURN_WIDE.c
rename to vm/mterp/c/OP_RETURN_WIDE.cpp

vm/mterp/c/OP_RSUB_INT.cpp

diff --git a/vm/mterp/c/OP_RSUB_INT.c b/vm/mterp/c/OP_RSUB_INT.cpp
similarity index 100%
rename from vm/mterp/c/OP_RSUB_INT.c
rename to vm/mterp/c/OP_RSUB_INT.cpp

vm/mterp/c/OP_RSUB_INT_LIT8.cpp

diff --git a/vm/mterp/c/OP_RSUB_INT_LIT8.c b/vm/mterp/c/OP_RSUB_INT_LIT8.cpp
similarity index 100%
rename from vm/mterp/c/OP_RSUB_INT_LIT8.c
rename to vm/mterp/c/OP_RSUB_INT_LIT8.cpp

vm/mterp/c/OP_SGET.cpp

diff --git a/vm/mterp/c/OP_SGET.c b/vm/mterp/c/OP_SGET.cpp
similarity index 100%
rename from vm/mterp/c/OP_SGET.c
rename to vm/mterp/c/OP_SGET.cpp

vm/mterp/c/OP_SGET_BOOLEAN.cpp

diff --git a/vm/mterp/c/OP_SGET_BOOLEAN.c b/vm/mterp/c/OP_SGET_BOOLEAN.cpp
similarity index 100%
rename from vm/mterp/c/OP_SGET_BOOLEAN.c
rename to vm/mterp/c/OP_SGET_BOOLEAN.cpp

vm/mterp/c/OP_SGET_BOOLEAN_JUMBO.cpp

diff --git a/vm/mterp/c/OP_SGET_BOOLEAN_JUMBO.c b/vm/mterp/c/OP_SGET_BOOLEAN_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_SGET_BOOLEAN_JUMBO.c
rename to vm/mterp/c/OP_SGET_BOOLEAN_JUMBO.cpp

vm/mterp/c/OP_SGET_BYTE.cpp

diff --git a/vm/mterp/c/OP_SGET_BYTE.c b/vm/mterp/c/OP_SGET_BYTE.cpp
similarity index 100%
rename from vm/mterp/c/OP_SGET_BYTE.c
rename to vm/mterp/c/OP_SGET_BYTE.cpp

vm/mterp/c/OP_SGET_BYTE_JUMBO.cpp

diff --git a/vm/mterp/c/OP_SGET_BYTE_JUMBO.c b/vm/mterp/c/OP_SGET_BYTE_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_SGET_BYTE_JUMBO.c
rename to vm/mterp/c/OP_SGET_BYTE_JUMBO.cpp

vm/mterp/c/OP_SGET_CHAR.cpp

diff --git a/vm/mterp/c/OP_SGET_CHAR.c b/vm/mterp/c/OP_SGET_CHAR.cpp
similarity index 100%
rename from vm/mterp/c/OP_SGET_CHAR.c
rename to vm/mterp/c/OP_SGET_CHAR.cpp

vm/mterp/c/OP_SGET_CHAR_JUMBO.cpp

diff --git a/vm/mterp/c/OP_SGET_CHAR_JUMBO.c b/vm/mterp/c/OP_SGET_CHAR_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_SGET_CHAR_JUMBO.c
rename to vm/mterp/c/OP_SGET_CHAR_JUMBO.cpp

vm/mterp/c/OP_SGET_JUMBO.cpp

diff --git a/vm/mterp/c/OP_SGET_JUMBO.c b/vm/mterp/c/OP_SGET_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_SGET_JUMBO.c
rename to vm/mterp/c/OP_SGET_JUMBO.cpp

vm/mterp/c/OP_SGET_OBJECT.cpp

diff --git a/vm/mterp/c/OP_SGET_OBJECT.c b/vm/mterp/c/OP_SGET_OBJECT.cpp
similarity index 100%
rename from vm/mterp/c/OP_SGET_OBJECT.c
rename to vm/mterp/c/OP_SGET_OBJECT.cpp

vm/mterp/c/OP_SGET_OBJECT_JUMBO.cpp

diff --git a/vm/mterp/c/OP_SGET_OBJECT_JUMBO.c b/vm/mterp/c/OP_SGET_OBJECT_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_SGET_OBJECT_JUMBO.c
rename to vm/mterp/c/OP_SGET_OBJECT_JUMBO.cpp

vm/mterp/c/OP_SGET_OBJECT_VOLATILE.cpp

diff --git a/vm/mterp/c/OP_SGET_OBJECT_VOLATILE.c b/vm/mterp/c/OP_SGET_OBJECT_VOLATILE.cpp
similarity index 100%
rename from vm/mterp/c/OP_SGET_OBJECT_VOLATILE.c
rename to vm/mterp/c/OP_SGET_OBJECT_VOLATILE.cpp

vm/mterp/c/OP_SGET_OBJECT_VOLATILE_JUMBO.cpp

diff --git a/vm/mterp/c/OP_SGET_OBJECT_VOLATILE_JUMBO.c b/vm/mterp/c/OP_SGET_OBJECT_VOLATILE_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_SGET_OBJECT_VOLATILE_JUMBO.c
rename to vm/mterp/c/OP_SGET_OBJECT_VOLATILE_JUMBO.cpp

vm/mterp/c/OP_SGET_SHORT.cpp

diff --git a/vm/mterp/c/OP_SGET_SHORT.c b/vm/mterp/c/OP_SGET_SHORT.cpp
similarity index 100%
rename from vm/mterp/c/OP_SGET_SHORT.c
rename to vm/mterp/c/OP_SGET_SHORT.cpp

vm/mterp/c/OP_SGET_SHORT_JUMBO.cpp

diff --git a/vm/mterp/c/OP_SGET_SHORT_JUMBO.c b/vm/mterp/c/OP_SGET_SHORT_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_SGET_SHORT_JUMBO.c
rename to vm/mterp/c/OP_SGET_SHORT_JUMBO.cpp

vm/mterp/c/OP_SGET_VOLATILE.cpp

diff --git a/vm/mterp/c/OP_SGET_VOLATILE.c b/vm/mterp/c/OP_SGET_VOLATILE.cpp
similarity index 100%
rename from vm/mterp/c/OP_SGET_VOLATILE.c
rename to vm/mterp/c/OP_SGET_VOLATILE.cpp

vm/mterp/c/OP_SGET_VOLATILE_JUMBO.cpp

diff --git a/vm/mterp/c/OP_SGET_VOLATILE_JUMBO.c b/vm/mterp/c/OP_SGET_VOLATILE_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_SGET_VOLATILE_JUMBO.c
rename to vm/mterp/c/OP_SGET_VOLATILE_JUMBO.cpp

vm/mterp/c/OP_SGET_WIDE.cpp

diff --git a/vm/mterp/c/OP_SGET_WIDE.c b/vm/mterp/c/OP_SGET_WIDE.cpp
similarity index 100%
rename from vm/mterp/c/OP_SGET_WIDE.c
rename to vm/mterp/c/OP_SGET_WIDE.cpp

vm/mterp/c/OP_SGET_WIDE_JUMBO.cpp

diff --git a/vm/mterp/c/OP_SGET_WIDE_JUMBO.c b/vm/mterp/c/OP_SGET_WIDE_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_SGET_WIDE_JUMBO.c
rename to vm/mterp/c/OP_SGET_WIDE_JUMBO.cpp

vm/mterp/c/OP_SGET_WIDE_VOLATILE.cpp

diff --git a/vm/mterp/c/OP_SGET_WIDE_VOLATILE.c b/vm/mterp/c/OP_SGET_WIDE_VOLATILE.cpp
similarity index 100%
rename from vm/mterp/c/OP_SGET_WIDE_VOLATILE.c
rename to vm/mterp/c/OP_SGET_WIDE_VOLATILE.cpp

vm/mterp/c/OP_SGET_WIDE_VOLATILE_JUMBO.cpp

diff --git a/vm/mterp/c/OP_SGET_WIDE_VOLATILE_JUMBO.c b/vm/mterp/c/OP_SGET_WIDE_VOLATILE_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_SGET_WIDE_VOLATILE_JUMBO.c
rename to vm/mterp/c/OP_SGET_WIDE_VOLATILE_JUMBO.cpp

vm/mterp/c/OP_SHL_INT.cpp

diff --git a/vm/mterp/c/OP_SHL_INT.c b/vm/mterp/c/OP_SHL_INT.cpp
similarity index 100%
rename from vm/mterp/c/OP_SHL_INT.c
rename to vm/mterp/c/OP_SHL_INT.cpp

vm/mterp/c/OP_SHL_INT_2ADDR.cpp

diff --git a/vm/mterp/c/OP_SHL_INT_2ADDR.c b/vm/mterp/c/OP_SHL_INT_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_SHL_INT_2ADDR.c
rename to vm/mterp/c/OP_SHL_INT_2ADDR.cpp

vm/mterp/c/OP_SHL_INT_LIT8.cpp

diff --git a/vm/mterp/c/OP_SHL_INT_LIT8.c b/vm/mterp/c/OP_SHL_INT_LIT8.cpp
similarity index 100%
rename from vm/mterp/c/OP_SHL_INT_LIT8.c
rename to vm/mterp/c/OP_SHL_INT_LIT8.cpp

vm/mterp/c/OP_SHL_LONG.cpp

diff --git a/vm/mterp/c/OP_SHL_LONG.c b/vm/mterp/c/OP_SHL_LONG.cpp
similarity index 100%
rename from vm/mterp/c/OP_SHL_LONG.c
rename to vm/mterp/c/OP_SHL_LONG.cpp

vm/mterp/c/OP_SHL_LONG_2ADDR.cpp

diff --git a/vm/mterp/c/OP_SHL_LONG_2ADDR.c b/vm/mterp/c/OP_SHL_LONG_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_SHL_LONG_2ADDR.c
rename to vm/mterp/c/OP_SHL_LONG_2ADDR.cpp

vm/mterp/c/OP_SHR_INT.cpp

diff --git a/vm/mterp/c/OP_SHR_INT.c b/vm/mterp/c/OP_SHR_INT.cpp
similarity index 100%
rename from vm/mterp/c/OP_SHR_INT.c
rename to vm/mterp/c/OP_SHR_INT.cpp

vm/mterp/c/OP_SHR_INT_2ADDR.cpp

diff --git a/vm/mterp/c/OP_SHR_INT_2ADDR.c b/vm/mterp/c/OP_SHR_INT_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_SHR_INT_2ADDR.c
rename to vm/mterp/c/OP_SHR_INT_2ADDR.cpp

vm/mterp/c/OP_SHR_INT_LIT8.cpp

diff --git a/vm/mterp/c/OP_SHR_INT_LIT8.c b/vm/mterp/c/OP_SHR_INT_LIT8.cpp
similarity index 100%
rename from vm/mterp/c/OP_SHR_INT_LIT8.c
rename to vm/mterp/c/OP_SHR_INT_LIT8.cpp

vm/mterp/c/OP_SHR_LONG.cpp

diff --git a/vm/mterp/c/OP_SHR_LONG.c b/vm/mterp/c/OP_SHR_LONG.cpp
similarity index 100%
rename from vm/mterp/c/OP_SHR_LONG.c
rename to vm/mterp/c/OP_SHR_LONG.cpp

vm/mterp/c/OP_SHR_LONG_2ADDR.cpp

diff --git a/vm/mterp/c/OP_SHR_LONG_2ADDR.c b/vm/mterp/c/OP_SHR_LONG_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_SHR_LONG_2ADDR.c
rename to vm/mterp/c/OP_SHR_LONG_2ADDR.cpp

vm/mterp/c/OP_SPARSE_SWITCH.cpp

diff --git a/vm/mterp/c/OP_SPARSE_SWITCH.c b/vm/mterp/c/OP_SPARSE_SWITCH.cpp
similarity index 100%
rename from vm/mterp/c/OP_SPARSE_SWITCH.c
rename to vm/mterp/c/OP_SPARSE_SWITCH.cpp

vm/mterp/c/OP_SPUT.cpp

diff --git a/vm/mterp/c/OP_SPUT.c b/vm/mterp/c/OP_SPUT.cpp
similarity index 100%
rename from vm/mterp/c/OP_SPUT.c
rename to vm/mterp/c/OP_SPUT.cpp

vm/mterp/c/OP_SPUT_BOOLEAN.cpp

diff --git a/vm/mterp/c/OP_SPUT_BOOLEAN.c b/vm/mterp/c/OP_SPUT_BOOLEAN.cpp
similarity index 100%
rename from vm/mterp/c/OP_SPUT_BOOLEAN.c
rename to vm/mterp/c/OP_SPUT_BOOLEAN.cpp

vm/mterp/c/OP_SPUT_BOOLEAN_JUMBO.cpp

diff --git a/vm/mterp/c/OP_SPUT_BOOLEAN_JUMBO.c b/vm/mterp/c/OP_SPUT_BOOLEAN_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_SPUT_BOOLEAN_JUMBO.c
rename to vm/mterp/c/OP_SPUT_BOOLEAN_JUMBO.cpp

vm/mterp/c/OP_SPUT_BYTE.cpp

diff --git a/vm/mterp/c/OP_SPUT_BYTE.c b/vm/mterp/c/OP_SPUT_BYTE.cpp
similarity index 100%
rename from vm/mterp/c/OP_SPUT_BYTE.c
rename to vm/mterp/c/OP_SPUT_BYTE.cpp

vm/mterp/c/OP_SPUT_BYTE_JUMBO.cpp

diff --git a/vm/mterp/c/OP_SPUT_BYTE_JUMBO.c b/vm/mterp/c/OP_SPUT_BYTE_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_SPUT_BYTE_JUMBO.c
rename to vm/mterp/c/OP_SPUT_BYTE_JUMBO.cpp

vm/mterp/c/OP_SPUT_CHAR.cpp

diff --git a/vm/mterp/c/OP_SPUT_CHAR.c b/vm/mterp/c/OP_SPUT_CHAR.cpp
similarity index 100%
rename from vm/mterp/c/OP_SPUT_CHAR.c
rename to vm/mterp/c/OP_SPUT_CHAR.cpp

vm/mterp/c/OP_SPUT_CHAR_JUMBO.cpp

diff --git a/vm/mterp/c/OP_SPUT_CHAR_JUMBO.c b/vm/mterp/c/OP_SPUT_CHAR_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_SPUT_CHAR_JUMBO.c
rename to vm/mterp/c/OP_SPUT_CHAR_JUMBO.cpp

vm/mterp/c/OP_SPUT_JUMBO.cpp

diff --git a/vm/mterp/c/OP_SPUT_JUMBO.c b/vm/mterp/c/OP_SPUT_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_SPUT_JUMBO.c
rename to vm/mterp/c/OP_SPUT_JUMBO.cpp

vm/mterp/c/OP_SPUT_OBJECT.cpp

diff --git a/vm/mterp/c/OP_SPUT_OBJECT.c b/vm/mterp/c/OP_SPUT_OBJECT.cpp
similarity index 100%
rename from vm/mterp/c/OP_SPUT_OBJECT.c
rename to vm/mterp/c/OP_SPUT_OBJECT.cpp

vm/mterp/c/OP_SPUT_OBJECT_JUMBO.cpp

diff --git a/vm/mterp/c/OP_SPUT_OBJECT_JUMBO.c b/vm/mterp/c/OP_SPUT_OBJECT_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_SPUT_OBJECT_JUMBO.c
rename to vm/mterp/c/OP_SPUT_OBJECT_JUMBO.cpp

vm/mterp/c/OP_SPUT_OBJECT_VOLATILE.cpp

diff --git a/vm/mterp/c/OP_SPUT_OBJECT_VOLATILE.c b/vm/mterp/c/OP_SPUT_OBJECT_VOLATILE.cpp
similarity index 100%
rename from vm/mterp/c/OP_SPUT_OBJECT_VOLATILE.c
rename to vm/mterp/c/OP_SPUT_OBJECT_VOLATILE.cpp

vm/mterp/c/OP_SPUT_OBJECT_VOLATILE_JUMBO.cpp

diff --git a/vm/mterp/c/OP_SPUT_OBJECT_VOLATILE_JUMBO.c b/vm/mterp/c/OP_SPUT_OBJECT_VOLATILE_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_SPUT_OBJECT_VOLATILE_JUMBO.c
rename to vm/mterp/c/OP_SPUT_OBJECT_VOLATILE_JUMBO.cpp

vm/mterp/c/OP_SPUT_SHORT.cpp

diff --git a/vm/mterp/c/OP_SPUT_SHORT.c b/vm/mterp/c/OP_SPUT_SHORT.cpp
similarity index 100%
rename from vm/mterp/c/OP_SPUT_SHORT.c
rename to vm/mterp/c/OP_SPUT_SHORT.cpp

vm/mterp/c/OP_SPUT_SHORT_JUMBO.cpp

diff --git a/vm/mterp/c/OP_SPUT_SHORT_JUMBO.c b/vm/mterp/c/OP_SPUT_SHORT_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_SPUT_SHORT_JUMBO.c
rename to vm/mterp/c/OP_SPUT_SHORT_JUMBO.cpp

vm/mterp/c/OP_SPUT_VOLATILE.cpp

diff --git a/vm/mterp/c/OP_SPUT_VOLATILE.c b/vm/mterp/c/OP_SPUT_VOLATILE.cpp
similarity index 100%
rename from vm/mterp/c/OP_SPUT_VOLATILE.c
rename to vm/mterp/c/OP_SPUT_VOLATILE.cpp

vm/mterp/c/OP_SPUT_VOLATILE_JUMBO.cpp

diff --git a/vm/mterp/c/OP_SPUT_VOLATILE_JUMBO.c b/vm/mterp/c/OP_SPUT_VOLATILE_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_SPUT_VOLATILE_JUMBO.c
rename to vm/mterp/c/OP_SPUT_VOLATILE_JUMBO.cpp

vm/mterp/c/OP_SPUT_WIDE.cpp

diff --git a/vm/mterp/c/OP_SPUT_WIDE.c b/vm/mterp/c/OP_SPUT_WIDE.cpp
similarity index 100%
rename from vm/mterp/c/OP_SPUT_WIDE.c
rename to vm/mterp/c/OP_SPUT_WIDE.cpp

vm/mterp/c/OP_SPUT_WIDE_JUMBO.cpp

diff --git a/vm/mterp/c/OP_SPUT_WIDE_JUMBO.c b/vm/mterp/c/OP_SPUT_WIDE_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_SPUT_WIDE_JUMBO.c
rename to vm/mterp/c/OP_SPUT_WIDE_JUMBO.cpp

vm/mterp/c/OP_SPUT_WIDE_VOLATILE.cpp

diff --git a/vm/mterp/c/OP_SPUT_WIDE_VOLATILE.c b/vm/mterp/c/OP_SPUT_WIDE_VOLATILE.cpp
similarity index 100%
rename from vm/mterp/c/OP_SPUT_WIDE_VOLATILE.c
rename to vm/mterp/c/OP_SPUT_WIDE_VOLATILE.cpp

vm/mterp/c/OP_SPUT_WIDE_VOLATILE_JUMBO.cpp

diff --git a/vm/mterp/c/OP_SPUT_WIDE_VOLATILE_JUMBO.c b/vm/mterp/c/OP_SPUT_WIDE_VOLATILE_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_SPUT_WIDE_VOLATILE_JUMBO.c
rename to vm/mterp/c/OP_SPUT_WIDE_VOLATILE_JUMBO.cpp

vm/mterp/c/OP_SUB_DOUBLE.cpp

diff --git a/vm/mterp/c/OP_SUB_DOUBLE.c b/vm/mterp/c/OP_SUB_DOUBLE.cpp
similarity index 100%
rename from vm/mterp/c/OP_SUB_DOUBLE.c
rename to vm/mterp/c/OP_SUB_DOUBLE.cpp

vm/mterp/c/OP_SUB_DOUBLE_2ADDR.cpp

diff --git a/vm/mterp/c/OP_SUB_DOUBLE_2ADDR.c b/vm/mterp/c/OP_SUB_DOUBLE_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_SUB_DOUBLE_2ADDR.c
rename to vm/mterp/c/OP_SUB_DOUBLE_2ADDR.cpp

vm/mterp/c/OP_SUB_FLOAT.cpp

diff --git a/vm/mterp/c/OP_SUB_FLOAT.c b/vm/mterp/c/OP_SUB_FLOAT.cpp
similarity index 100%
rename from vm/mterp/c/OP_SUB_FLOAT.c
rename to vm/mterp/c/OP_SUB_FLOAT.cpp

vm/mterp/c/OP_SUB_FLOAT_2ADDR.cpp

diff --git a/vm/mterp/c/OP_SUB_FLOAT_2ADDR.c b/vm/mterp/c/OP_SUB_FLOAT_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_SUB_FLOAT_2ADDR.c
rename to vm/mterp/c/OP_SUB_FLOAT_2ADDR.cpp

vm/mterp/c/OP_SUB_INT.cpp

diff --git a/vm/mterp/c/OP_SUB_INT.c b/vm/mterp/c/OP_SUB_INT.cpp
similarity index 100%
rename from vm/mterp/c/OP_SUB_INT.c
rename to vm/mterp/c/OP_SUB_INT.cpp

vm/mterp/c/OP_SUB_INT_2ADDR.cpp

diff --git a/vm/mterp/c/OP_SUB_INT_2ADDR.c b/vm/mterp/c/OP_SUB_INT_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_SUB_INT_2ADDR.c
rename to vm/mterp/c/OP_SUB_INT_2ADDR.cpp

vm/mterp/c/OP_SUB_LONG.cpp

diff --git a/vm/mterp/c/OP_SUB_LONG.c b/vm/mterp/c/OP_SUB_LONG.cpp
similarity index 100%
rename from vm/mterp/c/OP_SUB_LONG.c
rename to vm/mterp/c/OP_SUB_LONG.cpp

vm/mterp/c/OP_SUB_LONG_2ADDR.cpp

diff --git a/vm/mterp/c/OP_SUB_LONG_2ADDR.c b/vm/mterp/c/OP_SUB_LONG_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_SUB_LONG_2ADDR.c
rename to vm/mterp/c/OP_SUB_LONG_2ADDR.cpp

vm/mterp/c/OP_THROW.cpp

diff --git a/vm/mterp/c/OP_THROW.c b/vm/mterp/c/OP_THROW.cpp
similarity index 100%
rename from vm/mterp/c/OP_THROW.c
rename to vm/mterp/c/OP_THROW.cpp

vm/mterp/c/OP_THROW_VERIFICATION_ERROR.cpp

diff --git a/vm/mterp/c/OP_THROW_VERIFICATION_ERROR.c b/vm/mterp/c/OP_THROW_VERIFICATION_ERROR.cpp
similarity index 100%
rename from vm/mterp/c/OP_THROW_VERIFICATION_ERROR.c
rename to vm/mterp/c/OP_THROW_VERIFICATION_ERROR.cpp

vm/mterp/c/OP_THROW_VERIFICATION_ERROR_JUMBO.cpp

diff --git a/vm/mterp/c/OP_THROW_VERIFICATION_ERROR_JUMBO.c b/vm/mterp/c/OP_THROW_VERIFICATION_ERROR_JUMBO.cpp
similarity index 100%
rename from vm/mterp/c/OP_THROW_VERIFICATION_ERROR_JUMBO.c
rename to vm/mterp/c/OP_THROW_VERIFICATION_ERROR_JUMBO.cpp

vm/mterp/c/OP_UNUSED_27FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_27FF.c b/vm/mterp/c/OP_UNUSED_27FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_27FF.c
rename to vm/mterp/c/OP_UNUSED_27FF.cpp

vm/mterp/c/OP_UNUSED_28FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_28FF.c b/vm/mterp/c/OP_UNUSED_28FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_28FF.c
rename to vm/mterp/c/OP_UNUSED_28FF.cpp

vm/mterp/c/OP_UNUSED_29FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_29FF.c b/vm/mterp/c/OP_UNUSED_29FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_29FF.c
rename to vm/mterp/c/OP_UNUSED_29FF.cpp

vm/mterp/c/OP_UNUSED_2AFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_2AFF.c b/vm/mterp/c/OP_UNUSED_2AFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_2AFF.c
rename to vm/mterp/c/OP_UNUSED_2AFF.cpp

vm/mterp/c/OP_UNUSED_2BFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_2BFF.c b/vm/mterp/c/OP_UNUSED_2BFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_2BFF.c
rename to vm/mterp/c/OP_UNUSED_2BFF.cpp

vm/mterp/c/OP_UNUSED_2CFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_2CFF.c b/vm/mterp/c/OP_UNUSED_2CFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_2CFF.c
rename to vm/mterp/c/OP_UNUSED_2CFF.cpp

vm/mterp/c/OP_UNUSED_2DFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_2DFF.c b/vm/mterp/c/OP_UNUSED_2DFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_2DFF.c
rename to vm/mterp/c/OP_UNUSED_2DFF.cpp

vm/mterp/c/OP_UNUSED_2EFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_2EFF.c b/vm/mterp/c/OP_UNUSED_2EFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_2EFF.c
rename to vm/mterp/c/OP_UNUSED_2EFF.cpp

vm/mterp/c/OP_UNUSED_2FFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_2FFF.c b/vm/mterp/c/OP_UNUSED_2FFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_2FFF.c
rename to vm/mterp/c/OP_UNUSED_2FFF.cpp

vm/mterp/c/OP_UNUSED_30FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_30FF.c b/vm/mterp/c/OP_UNUSED_30FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_30FF.c
rename to vm/mterp/c/OP_UNUSED_30FF.cpp

vm/mterp/c/OP_UNUSED_31FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_31FF.c b/vm/mterp/c/OP_UNUSED_31FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_31FF.c
rename to vm/mterp/c/OP_UNUSED_31FF.cpp

vm/mterp/c/OP_UNUSED_32FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_32FF.c b/vm/mterp/c/OP_UNUSED_32FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_32FF.c
rename to vm/mterp/c/OP_UNUSED_32FF.cpp

vm/mterp/c/OP_UNUSED_33FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_33FF.c b/vm/mterp/c/OP_UNUSED_33FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_33FF.c
rename to vm/mterp/c/OP_UNUSED_33FF.cpp

vm/mterp/c/OP_UNUSED_34FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_34FF.c b/vm/mterp/c/OP_UNUSED_34FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_34FF.c
rename to vm/mterp/c/OP_UNUSED_34FF.cpp

vm/mterp/c/OP_UNUSED_35FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_35FF.c b/vm/mterp/c/OP_UNUSED_35FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_35FF.c
rename to vm/mterp/c/OP_UNUSED_35FF.cpp

vm/mterp/c/OP_UNUSED_36FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_36FF.c b/vm/mterp/c/OP_UNUSED_36FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_36FF.c
rename to vm/mterp/c/OP_UNUSED_36FF.cpp

vm/mterp/c/OP_UNUSED_37FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_37FF.c b/vm/mterp/c/OP_UNUSED_37FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_37FF.c
rename to vm/mterp/c/OP_UNUSED_37FF.cpp

vm/mterp/c/OP_UNUSED_38FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_38FF.c b/vm/mterp/c/OP_UNUSED_38FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_38FF.c
rename to vm/mterp/c/OP_UNUSED_38FF.cpp

vm/mterp/c/OP_UNUSED_39FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_39FF.c b/vm/mterp/c/OP_UNUSED_39FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_39FF.c
rename to vm/mterp/c/OP_UNUSED_39FF.cpp

vm/mterp/c/OP_UNUSED_3AFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_3AFF.c b/vm/mterp/c/OP_UNUSED_3AFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_3AFF.c
rename to vm/mterp/c/OP_UNUSED_3AFF.cpp

vm/mterp/c/OP_UNUSED_3BFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_3BFF.c b/vm/mterp/c/OP_UNUSED_3BFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_3BFF.c
rename to vm/mterp/c/OP_UNUSED_3BFF.cpp

vm/mterp/c/OP_UNUSED_3CFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_3CFF.c b/vm/mterp/c/OP_UNUSED_3CFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_3CFF.c
rename to vm/mterp/c/OP_UNUSED_3CFF.cpp

vm/mterp/c/OP_UNUSED_3DFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_3DFF.c b/vm/mterp/c/OP_UNUSED_3DFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_3DFF.c
rename to vm/mterp/c/OP_UNUSED_3DFF.cpp

vm/mterp/c/OP_UNUSED_3E.cpp

diff --git a/vm/mterp/c/OP_UNUSED_3E.c b/vm/mterp/c/OP_UNUSED_3E.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_3E.c
rename to vm/mterp/c/OP_UNUSED_3E.cpp

vm/mterp/c/OP_UNUSED_3EFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_3EFF.c b/vm/mterp/c/OP_UNUSED_3EFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_3EFF.c
rename to vm/mterp/c/OP_UNUSED_3EFF.cpp

vm/mterp/c/OP_UNUSED_3F.cpp

diff --git a/vm/mterp/c/OP_UNUSED_3F.c b/vm/mterp/c/OP_UNUSED_3F.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_3F.c
rename to vm/mterp/c/OP_UNUSED_3F.cpp

vm/mterp/c/OP_UNUSED_3FFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_3FFF.c b/vm/mterp/c/OP_UNUSED_3FFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_3FFF.c
rename to vm/mterp/c/OP_UNUSED_3FFF.cpp

vm/mterp/c/OP_UNUSED_40.cpp

diff --git a/vm/mterp/c/OP_UNUSED_40.c b/vm/mterp/c/OP_UNUSED_40.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_40.c
rename to vm/mterp/c/OP_UNUSED_40.cpp

vm/mterp/c/OP_UNUSED_40FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_40FF.c b/vm/mterp/c/OP_UNUSED_40FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_40FF.c
rename to vm/mterp/c/OP_UNUSED_40FF.cpp

vm/mterp/c/OP_UNUSED_41.cpp

diff --git a/vm/mterp/c/OP_UNUSED_41.c b/vm/mterp/c/OP_UNUSED_41.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_41.c
rename to vm/mterp/c/OP_UNUSED_41.cpp

vm/mterp/c/OP_UNUSED_41FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_41FF.c b/vm/mterp/c/OP_UNUSED_41FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_41FF.c
rename to vm/mterp/c/OP_UNUSED_41FF.cpp

vm/mterp/c/OP_UNUSED_42.cpp

diff --git a/vm/mterp/c/OP_UNUSED_42.c b/vm/mterp/c/OP_UNUSED_42.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_42.c
rename to vm/mterp/c/OP_UNUSED_42.cpp

vm/mterp/c/OP_UNUSED_42FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_42FF.c b/vm/mterp/c/OP_UNUSED_42FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_42FF.c
rename to vm/mterp/c/OP_UNUSED_42FF.cpp

vm/mterp/c/OP_UNUSED_43.cpp

diff --git a/vm/mterp/c/OP_UNUSED_43.c b/vm/mterp/c/OP_UNUSED_43.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_43.c
rename to vm/mterp/c/OP_UNUSED_43.cpp

vm/mterp/c/OP_UNUSED_43FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_43FF.c b/vm/mterp/c/OP_UNUSED_43FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_43FF.c
rename to vm/mterp/c/OP_UNUSED_43FF.cpp

vm/mterp/c/OP_UNUSED_44FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_44FF.c b/vm/mterp/c/OP_UNUSED_44FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_44FF.c
rename to vm/mterp/c/OP_UNUSED_44FF.cpp

vm/mterp/c/OP_UNUSED_45FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_45FF.c b/vm/mterp/c/OP_UNUSED_45FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_45FF.c
rename to vm/mterp/c/OP_UNUSED_45FF.cpp

vm/mterp/c/OP_UNUSED_46FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_46FF.c b/vm/mterp/c/OP_UNUSED_46FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_46FF.c
rename to vm/mterp/c/OP_UNUSED_46FF.cpp

vm/mterp/c/OP_UNUSED_47FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_47FF.c b/vm/mterp/c/OP_UNUSED_47FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_47FF.c
rename to vm/mterp/c/OP_UNUSED_47FF.cpp

vm/mterp/c/OP_UNUSED_48FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_48FF.c b/vm/mterp/c/OP_UNUSED_48FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_48FF.c
rename to vm/mterp/c/OP_UNUSED_48FF.cpp

vm/mterp/c/OP_UNUSED_49FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_49FF.c b/vm/mterp/c/OP_UNUSED_49FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_49FF.c
rename to vm/mterp/c/OP_UNUSED_49FF.cpp

vm/mterp/c/OP_UNUSED_4AFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_4AFF.c b/vm/mterp/c/OP_UNUSED_4AFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_4AFF.c
rename to vm/mterp/c/OP_UNUSED_4AFF.cpp

vm/mterp/c/OP_UNUSED_4BFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_4BFF.c b/vm/mterp/c/OP_UNUSED_4BFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_4BFF.c
rename to vm/mterp/c/OP_UNUSED_4BFF.cpp

vm/mterp/c/OP_UNUSED_4CFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_4CFF.c b/vm/mterp/c/OP_UNUSED_4CFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_4CFF.c
rename to vm/mterp/c/OP_UNUSED_4CFF.cpp

vm/mterp/c/OP_UNUSED_4DFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_4DFF.c b/vm/mterp/c/OP_UNUSED_4DFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_4DFF.c
rename to vm/mterp/c/OP_UNUSED_4DFF.cpp

vm/mterp/c/OP_UNUSED_4EFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_4EFF.c b/vm/mterp/c/OP_UNUSED_4EFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_4EFF.c
rename to vm/mterp/c/OP_UNUSED_4EFF.cpp

vm/mterp/c/OP_UNUSED_4FFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_4FFF.c b/vm/mterp/c/OP_UNUSED_4FFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_4FFF.c
rename to vm/mterp/c/OP_UNUSED_4FFF.cpp

vm/mterp/c/OP_UNUSED_50FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_50FF.c b/vm/mterp/c/OP_UNUSED_50FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_50FF.c
rename to vm/mterp/c/OP_UNUSED_50FF.cpp

vm/mterp/c/OP_UNUSED_51FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_51FF.c b/vm/mterp/c/OP_UNUSED_51FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_51FF.c
rename to vm/mterp/c/OP_UNUSED_51FF.cpp

vm/mterp/c/OP_UNUSED_52FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_52FF.c b/vm/mterp/c/OP_UNUSED_52FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_52FF.c
rename to vm/mterp/c/OP_UNUSED_52FF.cpp

vm/mterp/c/OP_UNUSED_53FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_53FF.c b/vm/mterp/c/OP_UNUSED_53FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_53FF.c
rename to vm/mterp/c/OP_UNUSED_53FF.cpp

vm/mterp/c/OP_UNUSED_54FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_54FF.c b/vm/mterp/c/OP_UNUSED_54FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_54FF.c
rename to vm/mterp/c/OP_UNUSED_54FF.cpp

vm/mterp/c/OP_UNUSED_55FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_55FF.c b/vm/mterp/c/OP_UNUSED_55FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_55FF.c
rename to vm/mterp/c/OP_UNUSED_55FF.cpp

vm/mterp/c/OP_UNUSED_56FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_56FF.c b/vm/mterp/c/OP_UNUSED_56FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_56FF.c
rename to vm/mterp/c/OP_UNUSED_56FF.cpp

vm/mterp/c/OP_UNUSED_57FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_57FF.c b/vm/mterp/c/OP_UNUSED_57FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_57FF.c
rename to vm/mterp/c/OP_UNUSED_57FF.cpp

vm/mterp/c/OP_UNUSED_58FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_58FF.c b/vm/mterp/c/OP_UNUSED_58FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_58FF.c
rename to vm/mterp/c/OP_UNUSED_58FF.cpp

vm/mterp/c/OP_UNUSED_59FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_59FF.c b/vm/mterp/c/OP_UNUSED_59FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_59FF.c
rename to vm/mterp/c/OP_UNUSED_59FF.cpp

vm/mterp/c/OP_UNUSED_5AFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_5AFF.c b/vm/mterp/c/OP_UNUSED_5AFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_5AFF.c
rename to vm/mterp/c/OP_UNUSED_5AFF.cpp

vm/mterp/c/OP_UNUSED_5BFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_5BFF.c b/vm/mterp/c/OP_UNUSED_5BFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_5BFF.c
rename to vm/mterp/c/OP_UNUSED_5BFF.cpp

vm/mterp/c/OP_UNUSED_5CFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_5CFF.c b/vm/mterp/c/OP_UNUSED_5CFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_5CFF.c
rename to vm/mterp/c/OP_UNUSED_5CFF.cpp

vm/mterp/c/OP_UNUSED_5DFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_5DFF.c b/vm/mterp/c/OP_UNUSED_5DFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_5DFF.c
rename to vm/mterp/c/OP_UNUSED_5DFF.cpp

vm/mterp/c/OP_UNUSED_5EFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_5EFF.c b/vm/mterp/c/OP_UNUSED_5EFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_5EFF.c
rename to vm/mterp/c/OP_UNUSED_5EFF.cpp

vm/mterp/c/OP_UNUSED_5FFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_5FFF.c b/vm/mterp/c/OP_UNUSED_5FFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_5FFF.c
rename to vm/mterp/c/OP_UNUSED_5FFF.cpp

vm/mterp/c/OP_UNUSED_60FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_60FF.c b/vm/mterp/c/OP_UNUSED_60FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_60FF.c
rename to vm/mterp/c/OP_UNUSED_60FF.cpp

vm/mterp/c/OP_UNUSED_61FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_61FF.c b/vm/mterp/c/OP_UNUSED_61FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_61FF.c
rename to vm/mterp/c/OP_UNUSED_61FF.cpp

vm/mterp/c/OP_UNUSED_62FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_62FF.c b/vm/mterp/c/OP_UNUSED_62FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_62FF.c
rename to vm/mterp/c/OP_UNUSED_62FF.cpp

vm/mterp/c/OP_UNUSED_63FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_63FF.c b/vm/mterp/c/OP_UNUSED_63FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_63FF.c
rename to vm/mterp/c/OP_UNUSED_63FF.cpp

vm/mterp/c/OP_UNUSED_64FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_64FF.c b/vm/mterp/c/OP_UNUSED_64FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_64FF.c
rename to vm/mterp/c/OP_UNUSED_64FF.cpp

vm/mterp/c/OP_UNUSED_65FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_65FF.c b/vm/mterp/c/OP_UNUSED_65FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_65FF.c
rename to vm/mterp/c/OP_UNUSED_65FF.cpp

vm/mterp/c/OP_UNUSED_66FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_66FF.c b/vm/mterp/c/OP_UNUSED_66FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_66FF.c
rename to vm/mterp/c/OP_UNUSED_66FF.cpp

vm/mterp/c/OP_UNUSED_67FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_67FF.c b/vm/mterp/c/OP_UNUSED_67FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_67FF.c
rename to vm/mterp/c/OP_UNUSED_67FF.cpp

vm/mterp/c/OP_UNUSED_68FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_68FF.c b/vm/mterp/c/OP_UNUSED_68FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_68FF.c
rename to vm/mterp/c/OP_UNUSED_68FF.cpp

vm/mterp/c/OP_UNUSED_69FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_69FF.c b/vm/mterp/c/OP_UNUSED_69FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_69FF.c
rename to vm/mterp/c/OP_UNUSED_69FF.cpp

vm/mterp/c/OP_UNUSED_6AFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_6AFF.c b/vm/mterp/c/OP_UNUSED_6AFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_6AFF.c
rename to vm/mterp/c/OP_UNUSED_6AFF.cpp

vm/mterp/c/OP_UNUSED_6BFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_6BFF.c b/vm/mterp/c/OP_UNUSED_6BFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_6BFF.c
rename to vm/mterp/c/OP_UNUSED_6BFF.cpp

vm/mterp/c/OP_UNUSED_6CFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_6CFF.c b/vm/mterp/c/OP_UNUSED_6CFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_6CFF.c
rename to vm/mterp/c/OP_UNUSED_6CFF.cpp

vm/mterp/c/OP_UNUSED_6DFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_6DFF.c b/vm/mterp/c/OP_UNUSED_6DFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_6DFF.c
rename to vm/mterp/c/OP_UNUSED_6DFF.cpp

vm/mterp/c/OP_UNUSED_6EFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_6EFF.c b/vm/mterp/c/OP_UNUSED_6EFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_6EFF.c
rename to vm/mterp/c/OP_UNUSED_6EFF.cpp

vm/mterp/c/OP_UNUSED_6FFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_6FFF.c b/vm/mterp/c/OP_UNUSED_6FFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_6FFF.c
rename to vm/mterp/c/OP_UNUSED_6FFF.cpp

vm/mterp/c/OP_UNUSED_70FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_70FF.c b/vm/mterp/c/OP_UNUSED_70FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_70FF.c
rename to vm/mterp/c/OP_UNUSED_70FF.cpp

vm/mterp/c/OP_UNUSED_71FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_71FF.c b/vm/mterp/c/OP_UNUSED_71FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_71FF.c
rename to vm/mterp/c/OP_UNUSED_71FF.cpp

vm/mterp/c/OP_UNUSED_72FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_72FF.c b/vm/mterp/c/OP_UNUSED_72FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_72FF.c
rename to vm/mterp/c/OP_UNUSED_72FF.cpp

vm/mterp/c/OP_UNUSED_73.cpp

diff --git a/vm/mterp/c/OP_UNUSED_73.c b/vm/mterp/c/OP_UNUSED_73.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_73.c
rename to vm/mterp/c/OP_UNUSED_73.cpp

vm/mterp/c/OP_UNUSED_73FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_73FF.c b/vm/mterp/c/OP_UNUSED_73FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_73FF.c
rename to vm/mterp/c/OP_UNUSED_73FF.cpp

vm/mterp/c/OP_UNUSED_74FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_74FF.c b/vm/mterp/c/OP_UNUSED_74FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_74FF.c
rename to vm/mterp/c/OP_UNUSED_74FF.cpp

vm/mterp/c/OP_UNUSED_75FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_75FF.c b/vm/mterp/c/OP_UNUSED_75FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_75FF.c
rename to vm/mterp/c/OP_UNUSED_75FF.cpp

vm/mterp/c/OP_UNUSED_76FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_76FF.c b/vm/mterp/c/OP_UNUSED_76FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_76FF.c
rename to vm/mterp/c/OP_UNUSED_76FF.cpp

vm/mterp/c/OP_UNUSED_77FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_77FF.c b/vm/mterp/c/OP_UNUSED_77FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_77FF.c
rename to vm/mterp/c/OP_UNUSED_77FF.cpp

vm/mterp/c/OP_UNUSED_78FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_78FF.c b/vm/mterp/c/OP_UNUSED_78FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_78FF.c
rename to vm/mterp/c/OP_UNUSED_78FF.cpp

vm/mterp/c/OP_UNUSED_79.cpp

diff --git a/vm/mterp/c/OP_UNUSED_79.c b/vm/mterp/c/OP_UNUSED_79.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_79.c
rename to vm/mterp/c/OP_UNUSED_79.cpp

vm/mterp/c/OP_UNUSED_79FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_79FF.c b/vm/mterp/c/OP_UNUSED_79FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_79FF.c
rename to vm/mterp/c/OP_UNUSED_79FF.cpp

vm/mterp/c/OP_UNUSED_7A.cpp

diff --git a/vm/mterp/c/OP_UNUSED_7A.c b/vm/mterp/c/OP_UNUSED_7A.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_7A.c
rename to vm/mterp/c/OP_UNUSED_7A.cpp

vm/mterp/c/OP_UNUSED_7AFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_7AFF.c b/vm/mterp/c/OP_UNUSED_7AFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_7AFF.c
rename to vm/mterp/c/OP_UNUSED_7AFF.cpp

vm/mterp/c/OP_UNUSED_7BFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_7BFF.c b/vm/mterp/c/OP_UNUSED_7BFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_7BFF.c
rename to vm/mterp/c/OP_UNUSED_7BFF.cpp

vm/mterp/c/OP_UNUSED_7CFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_7CFF.c b/vm/mterp/c/OP_UNUSED_7CFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_7CFF.c
rename to vm/mterp/c/OP_UNUSED_7CFF.cpp

vm/mterp/c/OP_UNUSED_7DFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_7DFF.c b/vm/mterp/c/OP_UNUSED_7DFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_7DFF.c
rename to vm/mterp/c/OP_UNUSED_7DFF.cpp

vm/mterp/c/OP_UNUSED_7EFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_7EFF.c b/vm/mterp/c/OP_UNUSED_7EFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_7EFF.c
rename to vm/mterp/c/OP_UNUSED_7EFF.cpp

vm/mterp/c/OP_UNUSED_7FFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_7FFF.c b/vm/mterp/c/OP_UNUSED_7FFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_7FFF.c
rename to vm/mterp/c/OP_UNUSED_7FFF.cpp

vm/mterp/c/OP_UNUSED_80FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_80FF.c b/vm/mterp/c/OP_UNUSED_80FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_80FF.c
rename to vm/mterp/c/OP_UNUSED_80FF.cpp

vm/mterp/c/OP_UNUSED_81FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_81FF.c b/vm/mterp/c/OP_UNUSED_81FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_81FF.c
rename to vm/mterp/c/OP_UNUSED_81FF.cpp

vm/mterp/c/OP_UNUSED_82FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_82FF.c b/vm/mterp/c/OP_UNUSED_82FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_82FF.c
rename to vm/mterp/c/OP_UNUSED_82FF.cpp

vm/mterp/c/OP_UNUSED_83FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_83FF.c b/vm/mterp/c/OP_UNUSED_83FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_83FF.c
rename to vm/mterp/c/OP_UNUSED_83FF.cpp

vm/mterp/c/OP_UNUSED_84FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_84FF.c b/vm/mterp/c/OP_UNUSED_84FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_84FF.c
rename to vm/mterp/c/OP_UNUSED_84FF.cpp

vm/mterp/c/OP_UNUSED_85FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_85FF.c b/vm/mterp/c/OP_UNUSED_85FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_85FF.c
rename to vm/mterp/c/OP_UNUSED_85FF.cpp

vm/mterp/c/OP_UNUSED_86FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_86FF.c b/vm/mterp/c/OP_UNUSED_86FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_86FF.c
rename to vm/mterp/c/OP_UNUSED_86FF.cpp

vm/mterp/c/OP_UNUSED_87FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_87FF.c b/vm/mterp/c/OP_UNUSED_87FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_87FF.c
rename to vm/mterp/c/OP_UNUSED_87FF.cpp

vm/mterp/c/OP_UNUSED_88FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_88FF.c b/vm/mterp/c/OP_UNUSED_88FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_88FF.c
rename to vm/mterp/c/OP_UNUSED_88FF.cpp

vm/mterp/c/OP_UNUSED_89FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_89FF.c b/vm/mterp/c/OP_UNUSED_89FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_89FF.c
rename to vm/mterp/c/OP_UNUSED_89FF.cpp

vm/mterp/c/OP_UNUSED_8AFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_8AFF.c b/vm/mterp/c/OP_UNUSED_8AFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_8AFF.c
rename to vm/mterp/c/OP_UNUSED_8AFF.cpp

vm/mterp/c/OP_UNUSED_8BFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_8BFF.c b/vm/mterp/c/OP_UNUSED_8BFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_8BFF.c
rename to vm/mterp/c/OP_UNUSED_8BFF.cpp

vm/mterp/c/OP_UNUSED_8CFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_8CFF.c b/vm/mterp/c/OP_UNUSED_8CFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_8CFF.c
rename to vm/mterp/c/OP_UNUSED_8CFF.cpp

vm/mterp/c/OP_UNUSED_8DFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_8DFF.c b/vm/mterp/c/OP_UNUSED_8DFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_8DFF.c
rename to vm/mterp/c/OP_UNUSED_8DFF.cpp

vm/mterp/c/OP_UNUSED_8EFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_8EFF.c b/vm/mterp/c/OP_UNUSED_8EFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_8EFF.c
rename to vm/mterp/c/OP_UNUSED_8EFF.cpp

vm/mterp/c/OP_UNUSED_8FFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_8FFF.c b/vm/mterp/c/OP_UNUSED_8FFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_8FFF.c
rename to vm/mterp/c/OP_UNUSED_8FFF.cpp

vm/mterp/c/OP_UNUSED_90FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_90FF.c b/vm/mterp/c/OP_UNUSED_90FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_90FF.c
rename to vm/mterp/c/OP_UNUSED_90FF.cpp

vm/mterp/c/OP_UNUSED_91FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_91FF.c b/vm/mterp/c/OP_UNUSED_91FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_91FF.c
rename to vm/mterp/c/OP_UNUSED_91FF.cpp

vm/mterp/c/OP_UNUSED_92FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_92FF.c b/vm/mterp/c/OP_UNUSED_92FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_92FF.c
rename to vm/mterp/c/OP_UNUSED_92FF.cpp

vm/mterp/c/OP_UNUSED_93FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_93FF.c b/vm/mterp/c/OP_UNUSED_93FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_93FF.c
rename to vm/mterp/c/OP_UNUSED_93FF.cpp

vm/mterp/c/OP_UNUSED_94FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_94FF.c b/vm/mterp/c/OP_UNUSED_94FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_94FF.c
rename to vm/mterp/c/OP_UNUSED_94FF.cpp

vm/mterp/c/OP_UNUSED_95FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_95FF.c b/vm/mterp/c/OP_UNUSED_95FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_95FF.c
rename to vm/mterp/c/OP_UNUSED_95FF.cpp

vm/mterp/c/OP_UNUSED_96FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_96FF.c b/vm/mterp/c/OP_UNUSED_96FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_96FF.c
rename to vm/mterp/c/OP_UNUSED_96FF.cpp

vm/mterp/c/OP_UNUSED_97FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_97FF.c b/vm/mterp/c/OP_UNUSED_97FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_97FF.c
rename to vm/mterp/c/OP_UNUSED_97FF.cpp

vm/mterp/c/OP_UNUSED_98FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_98FF.c b/vm/mterp/c/OP_UNUSED_98FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_98FF.c
rename to vm/mterp/c/OP_UNUSED_98FF.cpp

vm/mterp/c/OP_UNUSED_99FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_99FF.c b/vm/mterp/c/OP_UNUSED_99FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_99FF.c
rename to vm/mterp/c/OP_UNUSED_99FF.cpp

vm/mterp/c/OP_UNUSED_9AFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_9AFF.c b/vm/mterp/c/OP_UNUSED_9AFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_9AFF.c
rename to vm/mterp/c/OP_UNUSED_9AFF.cpp

vm/mterp/c/OP_UNUSED_9BFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_9BFF.c b/vm/mterp/c/OP_UNUSED_9BFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_9BFF.c
rename to vm/mterp/c/OP_UNUSED_9BFF.cpp

vm/mterp/c/OP_UNUSED_9CFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_9CFF.c b/vm/mterp/c/OP_UNUSED_9CFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_9CFF.c
rename to vm/mterp/c/OP_UNUSED_9CFF.cpp

vm/mterp/c/OP_UNUSED_9DFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_9DFF.c b/vm/mterp/c/OP_UNUSED_9DFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_9DFF.c
rename to vm/mterp/c/OP_UNUSED_9DFF.cpp

vm/mterp/c/OP_UNUSED_9EFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_9EFF.c b/vm/mterp/c/OP_UNUSED_9EFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_9EFF.c
rename to vm/mterp/c/OP_UNUSED_9EFF.cpp

vm/mterp/c/OP_UNUSED_9FFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_9FFF.c b/vm/mterp/c/OP_UNUSED_9FFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_9FFF.c
rename to vm/mterp/c/OP_UNUSED_9FFF.cpp

vm/mterp/c/OP_UNUSED_A0FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_A0FF.c b/vm/mterp/c/OP_UNUSED_A0FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_A0FF.c
rename to vm/mterp/c/OP_UNUSED_A0FF.cpp

vm/mterp/c/OP_UNUSED_A1FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_A1FF.c b/vm/mterp/c/OP_UNUSED_A1FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_A1FF.c
rename to vm/mterp/c/OP_UNUSED_A1FF.cpp

vm/mterp/c/OP_UNUSED_A2FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_A2FF.c b/vm/mterp/c/OP_UNUSED_A2FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_A2FF.c
rename to vm/mterp/c/OP_UNUSED_A2FF.cpp

vm/mterp/c/OP_UNUSED_A3FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_A3FF.c b/vm/mterp/c/OP_UNUSED_A3FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_A3FF.c
rename to vm/mterp/c/OP_UNUSED_A3FF.cpp

vm/mterp/c/OP_UNUSED_A4FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_A4FF.c b/vm/mterp/c/OP_UNUSED_A4FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_A4FF.c
rename to vm/mterp/c/OP_UNUSED_A4FF.cpp

vm/mterp/c/OP_UNUSED_A5FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_A5FF.c b/vm/mterp/c/OP_UNUSED_A5FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_A5FF.c
rename to vm/mterp/c/OP_UNUSED_A5FF.cpp

vm/mterp/c/OP_UNUSED_A6FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_A6FF.c b/vm/mterp/c/OP_UNUSED_A6FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_A6FF.c
rename to vm/mterp/c/OP_UNUSED_A6FF.cpp

vm/mterp/c/OP_UNUSED_A7FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_A7FF.c b/vm/mterp/c/OP_UNUSED_A7FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_A7FF.c
rename to vm/mterp/c/OP_UNUSED_A7FF.cpp

vm/mterp/c/OP_UNUSED_A8FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_A8FF.c b/vm/mterp/c/OP_UNUSED_A8FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_A8FF.c
rename to vm/mterp/c/OP_UNUSED_A8FF.cpp

vm/mterp/c/OP_UNUSED_A9FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_A9FF.c b/vm/mterp/c/OP_UNUSED_A9FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_A9FF.c
rename to vm/mterp/c/OP_UNUSED_A9FF.cpp

vm/mterp/c/OP_UNUSED_AAFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_AAFF.c b/vm/mterp/c/OP_UNUSED_AAFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_AAFF.c
rename to vm/mterp/c/OP_UNUSED_AAFF.cpp

vm/mterp/c/OP_UNUSED_ABFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_ABFF.c b/vm/mterp/c/OP_UNUSED_ABFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_ABFF.c
rename to vm/mterp/c/OP_UNUSED_ABFF.cpp

vm/mterp/c/OP_UNUSED_ACFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_ACFF.c b/vm/mterp/c/OP_UNUSED_ACFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_ACFF.c
rename to vm/mterp/c/OP_UNUSED_ACFF.cpp

vm/mterp/c/OP_UNUSED_ADFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_ADFF.c b/vm/mterp/c/OP_UNUSED_ADFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_ADFF.c
rename to vm/mterp/c/OP_UNUSED_ADFF.cpp

vm/mterp/c/OP_UNUSED_AEFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_AEFF.c b/vm/mterp/c/OP_UNUSED_AEFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_AEFF.c
rename to vm/mterp/c/OP_UNUSED_AEFF.cpp

vm/mterp/c/OP_UNUSED_AFFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_AFFF.c b/vm/mterp/c/OP_UNUSED_AFFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_AFFF.c
rename to vm/mterp/c/OP_UNUSED_AFFF.cpp

vm/mterp/c/OP_UNUSED_B0FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_B0FF.c b/vm/mterp/c/OP_UNUSED_B0FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_B0FF.c
rename to vm/mterp/c/OP_UNUSED_B0FF.cpp

vm/mterp/c/OP_UNUSED_B1FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_B1FF.c b/vm/mterp/c/OP_UNUSED_B1FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_B1FF.c
rename to vm/mterp/c/OP_UNUSED_B1FF.cpp

vm/mterp/c/OP_UNUSED_B2FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_B2FF.c b/vm/mterp/c/OP_UNUSED_B2FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_B2FF.c
rename to vm/mterp/c/OP_UNUSED_B2FF.cpp

vm/mterp/c/OP_UNUSED_B3FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_B3FF.c b/vm/mterp/c/OP_UNUSED_B3FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_B3FF.c
rename to vm/mterp/c/OP_UNUSED_B3FF.cpp

vm/mterp/c/OP_UNUSED_B4FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_B4FF.c b/vm/mterp/c/OP_UNUSED_B4FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_B4FF.c
rename to vm/mterp/c/OP_UNUSED_B4FF.cpp

vm/mterp/c/OP_UNUSED_B5FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_B5FF.c b/vm/mterp/c/OP_UNUSED_B5FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_B5FF.c
rename to vm/mterp/c/OP_UNUSED_B5FF.cpp

vm/mterp/c/OP_UNUSED_B6FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_B6FF.c b/vm/mterp/c/OP_UNUSED_B6FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_B6FF.c
rename to vm/mterp/c/OP_UNUSED_B6FF.cpp

vm/mterp/c/OP_UNUSED_B7FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_B7FF.c b/vm/mterp/c/OP_UNUSED_B7FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_B7FF.c
rename to vm/mterp/c/OP_UNUSED_B7FF.cpp

vm/mterp/c/OP_UNUSED_B8FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_B8FF.c b/vm/mterp/c/OP_UNUSED_B8FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_B8FF.c
rename to vm/mterp/c/OP_UNUSED_B8FF.cpp

vm/mterp/c/OP_UNUSED_B9FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_B9FF.c b/vm/mterp/c/OP_UNUSED_B9FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_B9FF.c
rename to vm/mterp/c/OP_UNUSED_B9FF.cpp

vm/mterp/c/OP_UNUSED_BAFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_BAFF.c b/vm/mterp/c/OP_UNUSED_BAFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_BAFF.c
rename to vm/mterp/c/OP_UNUSED_BAFF.cpp

vm/mterp/c/OP_UNUSED_BBFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_BBFF.c b/vm/mterp/c/OP_UNUSED_BBFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_BBFF.c
rename to vm/mterp/c/OP_UNUSED_BBFF.cpp

vm/mterp/c/OP_UNUSED_BCFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_BCFF.c b/vm/mterp/c/OP_UNUSED_BCFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_BCFF.c
rename to vm/mterp/c/OP_UNUSED_BCFF.cpp

vm/mterp/c/OP_UNUSED_BDFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_BDFF.c b/vm/mterp/c/OP_UNUSED_BDFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_BDFF.c
rename to vm/mterp/c/OP_UNUSED_BDFF.cpp

vm/mterp/c/OP_UNUSED_BEFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_BEFF.c b/vm/mterp/c/OP_UNUSED_BEFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_BEFF.c
rename to vm/mterp/c/OP_UNUSED_BEFF.cpp

vm/mterp/c/OP_UNUSED_BFFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_BFFF.c b/vm/mterp/c/OP_UNUSED_BFFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_BFFF.c
rename to vm/mterp/c/OP_UNUSED_BFFF.cpp

vm/mterp/c/OP_UNUSED_C0FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_C0FF.c b/vm/mterp/c/OP_UNUSED_C0FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_C0FF.c
rename to vm/mterp/c/OP_UNUSED_C0FF.cpp

vm/mterp/c/OP_UNUSED_C1FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_C1FF.c b/vm/mterp/c/OP_UNUSED_C1FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_C1FF.c
rename to vm/mterp/c/OP_UNUSED_C1FF.cpp

vm/mterp/c/OP_UNUSED_C2FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_C2FF.c b/vm/mterp/c/OP_UNUSED_C2FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_C2FF.c
rename to vm/mterp/c/OP_UNUSED_C2FF.cpp

vm/mterp/c/OP_UNUSED_C3FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_C3FF.c b/vm/mterp/c/OP_UNUSED_C3FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_C3FF.c
rename to vm/mterp/c/OP_UNUSED_C3FF.cpp

vm/mterp/c/OP_UNUSED_C4FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_C4FF.c b/vm/mterp/c/OP_UNUSED_C4FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_C4FF.c
rename to vm/mterp/c/OP_UNUSED_C4FF.cpp

vm/mterp/c/OP_UNUSED_C5FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_C5FF.c b/vm/mterp/c/OP_UNUSED_C5FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_C5FF.c
rename to vm/mterp/c/OP_UNUSED_C5FF.cpp

vm/mterp/c/OP_UNUSED_C6FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_C6FF.c b/vm/mterp/c/OP_UNUSED_C6FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_C6FF.c
rename to vm/mterp/c/OP_UNUSED_C6FF.cpp

vm/mterp/c/OP_UNUSED_C7FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_C7FF.c b/vm/mterp/c/OP_UNUSED_C7FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_C7FF.c
rename to vm/mterp/c/OP_UNUSED_C7FF.cpp

vm/mterp/c/OP_UNUSED_C8FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_C8FF.c b/vm/mterp/c/OP_UNUSED_C8FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_C8FF.c
rename to vm/mterp/c/OP_UNUSED_C8FF.cpp

vm/mterp/c/OP_UNUSED_C9FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_C9FF.c b/vm/mterp/c/OP_UNUSED_C9FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_C9FF.c
rename to vm/mterp/c/OP_UNUSED_C9FF.cpp

vm/mterp/c/OP_UNUSED_CAFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_CAFF.c b/vm/mterp/c/OP_UNUSED_CAFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_CAFF.c
rename to vm/mterp/c/OP_UNUSED_CAFF.cpp

vm/mterp/c/OP_UNUSED_CBFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_CBFF.c b/vm/mterp/c/OP_UNUSED_CBFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_CBFF.c
rename to vm/mterp/c/OP_UNUSED_CBFF.cpp

vm/mterp/c/OP_UNUSED_CCFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_CCFF.c b/vm/mterp/c/OP_UNUSED_CCFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_CCFF.c
rename to vm/mterp/c/OP_UNUSED_CCFF.cpp

vm/mterp/c/OP_UNUSED_CDFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_CDFF.c b/vm/mterp/c/OP_UNUSED_CDFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_CDFF.c
rename to vm/mterp/c/OP_UNUSED_CDFF.cpp

vm/mterp/c/OP_UNUSED_CEFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_CEFF.c b/vm/mterp/c/OP_UNUSED_CEFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_CEFF.c
rename to vm/mterp/c/OP_UNUSED_CEFF.cpp

vm/mterp/c/OP_UNUSED_CFFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_CFFF.c b/vm/mterp/c/OP_UNUSED_CFFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_CFFF.c
rename to vm/mterp/c/OP_UNUSED_CFFF.cpp

vm/mterp/c/OP_UNUSED_D0FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_D0FF.c b/vm/mterp/c/OP_UNUSED_D0FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_D0FF.c
rename to vm/mterp/c/OP_UNUSED_D0FF.cpp

vm/mterp/c/OP_UNUSED_D1FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_D1FF.c b/vm/mterp/c/OP_UNUSED_D1FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_D1FF.c
rename to vm/mterp/c/OP_UNUSED_D1FF.cpp

vm/mterp/c/OP_UNUSED_D2FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_D2FF.c b/vm/mterp/c/OP_UNUSED_D2FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_D2FF.c
rename to vm/mterp/c/OP_UNUSED_D2FF.cpp

vm/mterp/c/OP_UNUSED_D3FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_D3FF.c b/vm/mterp/c/OP_UNUSED_D3FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_D3FF.c
rename to vm/mterp/c/OP_UNUSED_D3FF.cpp

vm/mterp/c/OP_UNUSED_D4FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_D4FF.c b/vm/mterp/c/OP_UNUSED_D4FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_D4FF.c
rename to vm/mterp/c/OP_UNUSED_D4FF.cpp

vm/mterp/c/OP_UNUSED_D5FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_D5FF.c b/vm/mterp/c/OP_UNUSED_D5FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_D5FF.c
rename to vm/mterp/c/OP_UNUSED_D5FF.cpp

vm/mterp/c/OP_UNUSED_D6FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_D6FF.c b/vm/mterp/c/OP_UNUSED_D6FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_D6FF.c
rename to vm/mterp/c/OP_UNUSED_D6FF.cpp

vm/mterp/c/OP_UNUSED_D7FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_D7FF.c b/vm/mterp/c/OP_UNUSED_D7FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_D7FF.c
rename to vm/mterp/c/OP_UNUSED_D7FF.cpp

vm/mterp/c/OP_UNUSED_D8FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_D8FF.c b/vm/mterp/c/OP_UNUSED_D8FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_D8FF.c
rename to vm/mterp/c/OP_UNUSED_D8FF.cpp

vm/mterp/c/OP_UNUSED_D9FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_D9FF.c b/vm/mterp/c/OP_UNUSED_D9FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_D9FF.c
rename to vm/mterp/c/OP_UNUSED_D9FF.cpp

vm/mterp/c/OP_UNUSED_DAFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_DAFF.c b/vm/mterp/c/OP_UNUSED_DAFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_DAFF.c
rename to vm/mterp/c/OP_UNUSED_DAFF.cpp

vm/mterp/c/OP_UNUSED_DBFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_DBFF.c b/vm/mterp/c/OP_UNUSED_DBFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_DBFF.c
rename to vm/mterp/c/OP_UNUSED_DBFF.cpp

vm/mterp/c/OP_UNUSED_DCFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_DCFF.c b/vm/mterp/c/OP_UNUSED_DCFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_DCFF.c
rename to vm/mterp/c/OP_UNUSED_DCFF.cpp

vm/mterp/c/OP_UNUSED_DDFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_DDFF.c b/vm/mterp/c/OP_UNUSED_DDFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_DDFF.c
rename to vm/mterp/c/OP_UNUSED_DDFF.cpp

vm/mterp/c/OP_UNUSED_DEFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_DEFF.c b/vm/mterp/c/OP_UNUSED_DEFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_DEFF.c
rename to vm/mterp/c/OP_UNUSED_DEFF.cpp

vm/mterp/c/OP_UNUSED_DFFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_DFFF.c b/vm/mterp/c/OP_UNUSED_DFFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_DFFF.c
rename to vm/mterp/c/OP_UNUSED_DFFF.cpp

vm/mterp/c/OP_UNUSED_E0FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_E0FF.c b/vm/mterp/c/OP_UNUSED_E0FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_E0FF.c
rename to vm/mterp/c/OP_UNUSED_E0FF.cpp

vm/mterp/c/OP_UNUSED_E1FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_E1FF.c b/vm/mterp/c/OP_UNUSED_E1FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_E1FF.c
rename to vm/mterp/c/OP_UNUSED_E1FF.cpp

vm/mterp/c/OP_UNUSED_E2FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_E2FF.c b/vm/mterp/c/OP_UNUSED_E2FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_E2FF.c
rename to vm/mterp/c/OP_UNUSED_E2FF.cpp

vm/mterp/c/OP_UNUSED_E3FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_E3FF.c b/vm/mterp/c/OP_UNUSED_E3FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_E3FF.c
rename to vm/mterp/c/OP_UNUSED_E3FF.cpp

vm/mterp/c/OP_UNUSED_E4FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_E4FF.c b/vm/mterp/c/OP_UNUSED_E4FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_E4FF.c
rename to vm/mterp/c/OP_UNUSED_E4FF.cpp

vm/mterp/c/OP_UNUSED_E5FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_E5FF.c b/vm/mterp/c/OP_UNUSED_E5FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_E5FF.c
rename to vm/mterp/c/OP_UNUSED_E5FF.cpp

vm/mterp/c/OP_UNUSED_E6FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_E6FF.c b/vm/mterp/c/OP_UNUSED_E6FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_E6FF.c
rename to vm/mterp/c/OP_UNUSED_E6FF.cpp

vm/mterp/c/OP_UNUSED_E7FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_E7FF.c b/vm/mterp/c/OP_UNUSED_E7FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_E7FF.c
rename to vm/mterp/c/OP_UNUSED_E7FF.cpp

vm/mterp/c/OP_UNUSED_E8FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_E8FF.c b/vm/mterp/c/OP_UNUSED_E8FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_E8FF.c
rename to vm/mterp/c/OP_UNUSED_E8FF.cpp

vm/mterp/c/OP_UNUSED_E9FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_E9FF.c b/vm/mterp/c/OP_UNUSED_E9FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_E9FF.c
rename to vm/mterp/c/OP_UNUSED_E9FF.cpp

vm/mterp/c/OP_UNUSED_EAFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_EAFF.c b/vm/mterp/c/OP_UNUSED_EAFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_EAFF.c
rename to vm/mterp/c/OP_UNUSED_EAFF.cpp

vm/mterp/c/OP_UNUSED_EBFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_EBFF.c b/vm/mterp/c/OP_UNUSED_EBFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_EBFF.c
rename to vm/mterp/c/OP_UNUSED_EBFF.cpp

vm/mterp/c/OP_UNUSED_ECFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_ECFF.c b/vm/mterp/c/OP_UNUSED_ECFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_ECFF.c
rename to vm/mterp/c/OP_UNUSED_ECFF.cpp

vm/mterp/c/OP_UNUSED_EDFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_EDFF.c b/vm/mterp/c/OP_UNUSED_EDFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_EDFF.c
rename to vm/mterp/c/OP_UNUSED_EDFF.cpp

vm/mterp/c/OP_UNUSED_EEFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_EEFF.c b/vm/mterp/c/OP_UNUSED_EEFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_EEFF.c
rename to vm/mterp/c/OP_UNUSED_EEFF.cpp

vm/mterp/c/OP_UNUSED_EFFF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_EFFF.c b/vm/mterp/c/OP_UNUSED_EFFF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_EFFF.c
rename to vm/mterp/c/OP_UNUSED_EFFF.cpp

vm/mterp/c/OP_UNUSED_F0FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_F0FF.c b/vm/mterp/c/OP_UNUSED_F0FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_F0FF.c
rename to vm/mterp/c/OP_UNUSED_F0FF.cpp

vm/mterp/c/OP_UNUSED_F1FF.cpp

diff --git a/vm/mterp/c/OP_UNUSED_F1FF.c b/vm/mterp/c/OP_UNUSED_F1FF.cpp
similarity index 100%
rename from vm/mterp/c/OP_UNUSED_F1FF.c
rename to vm/mterp/c/OP_UNUSED_F1FF.cpp

vm/mterp/c/OP_USHR_INT.cpp

diff --git a/vm/mterp/c/OP_USHR_INT.c b/vm/mterp/c/OP_USHR_INT.cpp
similarity index 100%
rename from vm/mterp/c/OP_USHR_INT.c
rename to vm/mterp/c/OP_USHR_INT.cpp

vm/mterp/c/OP_USHR_INT_2ADDR.cpp

diff --git a/vm/mterp/c/OP_USHR_INT_2ADDR.c b/vm/mterp/c/OP_USHR_INT_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_USHR_INT_2ADDR.c
rename to vm/mterp/c/OP_USHR_INT_2ADDR.cpp

vm/mterp/c/OP_USHR_INT_LIT8.cpp

diff --git a/vm/mterp/c/OP_USHR_INT_LIT8.c b/vm/mterp/c/OP_USHR_INT_LIT8.cpp
similarity index 100%
rename from vm/mterp/c/OP_USHR_INT_LIT8.c
rename to vm/mterp/c/OP_USHR_INT_LIT8.cpp

vm/mterp/c/OP_USHR_LONG.cpp

diff --git a/vm/mterp/c/OP_USHR_LONG.c b/vm/mterp/c/OP_USHR_LONG.cpp
similarity index 100%
rename from vm/mterp/c/OP_USHR_LONG.c
rename to vm/mterp/c/OP_USHR_LONG.cpp

vm/mterp/c/OP_USHR_LONG_2ADDR.cpp

diff --git a/vm/mterp/c/OP_USHR_LONG_2ADDR.c b/vm/mterp/c/OP_USHR_LONG_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_USHR_LONG_2ADDR.c
rename to vm/mterp/c/OP_USHR_LONG_2ADDR.cpp

vm/mterp/c/OP_XOR_INT.cpp

diff --git a/vm/mterp/c/OP_XOR_INT.c b/vm/mterp/c/OP_XOR_INT.cpp
similarity index 100%
rename from vm/mterp/c/OP_XOR_INT.c
rename to vm/mterp/c/OP_XOR_INT.cpp

vm/mterp/c/OP_XOR_INT_2ADDR.cpp

diff --git a/vm/mterp/c/OP_XOR_INT_2ADDR.c b/vm/mterp/c/OP_XOR_INT_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_XOR_INT_2ADDR.c
rename to vm/mterp/c/OP_XOR_INT_2ADDR.cpp

vm/mterp/c/OP_XOR_INT_LIT16.cpp

diff --git a/vm/mterp/c/OP_XOR_INT_LIT16.c b/vm/mterp/c/OP_XOR_INT_LIT16.cpp
similarity index 100%
rename from vm/mterp/c/OP_XOR_INT_LIT16.c
rename to vm/mterp/c/OP_XOR_INT_LIT16.cpp

vm/mterp/c/OP_XOR_INT_LIT8.cpp

diff --git a/vm/mterp/c/OP_XOR_INT_LIT8.c b/vm/mterp/c/OP_XOR_INT_LIT8.cpp
similarity index 100%
rename from vm/mterp/c/OP_XOR_INT_LIT8.c
rename to vm/mterp/c/OP_XOR_INT_LIT8.cpp

vm/mterp/c/OP_XOR_LONG.cpp

diff --git a/vm/mterp/c/OP_XOR_LONG.c b/vm/mterp/c/OP_XOR_LONG.cpp
similarity index 100%
rename from vm/mterp/c/OP_XOR_LONG.c
rename to vm/mterp/c/OP_XOR_LONG.cpp

vm/mterp/c/OP_XOR_LONG_2ADDR.cpp

diff --git a/vm/mterp/c/OP_XOR_LONG_2ADDR.c b/vm/mterp/c/OP_XOR_LONG_2ADDR.cpp
similarity index 100%
rename from vm/mterp/c/OP_XOR_LONG_2ADDR.c
rename to vm/mterp/c/OP_XOR_LONG_2ADDR.cpp

vm/mterp/c/gotoTargets.cpp

diff --git a/vm/mterp/c/gotoTargets.c b/vm/mterp/c/gotoTargets.cpp
similarity index 99%
rename from vm/mterp/c/gotoTargets.c
rename to vm/mterp/c/gotoTargets.cpp
index 50ff677..cd12229 100644
--- a/vm/mterp/c/gotoTargets.c
+++ b/vm/mterp/c/gotoTargets.cpp
@@ -87,7 +87,7 @@
         /*
          * Fill in the elements.  It's legal for vsrc1 to be zero.
          */
-        contents = (u4*) newArray->contents;
+        contents = (u4*)(void*)newArray->contents;
         if (methodCallRange) {
             for (i = 0; i < vsrc1; i++)
                 contents[i] = GET_REGISTER(vdst+i);

vm/mterp/c/header.cpp

diff --git a/vm/mterp/c/header.c b/vm/mterp/c/header.cpp
similarity index 100%
rename from vm/mterp/c/header.c
rename to vm/mterp/c/header.cpp

vm/mterp/c/opcommon.cpp

diff --git a/vm/mterp/c/opcommon.c b/vm/mterp/c/opcommon.cpp
similarity index 99%
rename from vm/mterp/c/opcommon.c
rename to vm/mterp/c/opcommon.cpp
index 1957a7f..18cc575 100644
--- a/vm/mterp/c/opcommon.c
+++ b/vm/mterp/c/opcommon.cpp
@@ -457,7 +457,7 @@
             GOTO_exceptionThrown();                                         \
         }                                                                   \
         SET_REGISTER##_regsize(vdst,                                        \
-            ((_type*) arrayObj->contents)[GET_REGISTER(vsrc2)]);            \
+            ((_type*)(void*)arrayObj->contents)[GET_REGISTER(vsrc2)]);      \
         ILOGV("+ AGET[%d]=0x%x", GET_REGISTER(vsrc2), GET_REGISTER(vdst));  \
     }                                                                       \
     FINISH(2);
@@ -482,7 +482,7 @@
             GOTO_exceptionThrown();                                         \
         }                                                                   \
         ILOGV("+ APUT[%d]=0x%08x", GET_REGISTER(vsrc2), GET_REGISTER(vdst));\
-        ((_type*) arrayObj->contents)[GET_REGISTER(vsrc2)] =                \
+        ((_type*)(void*)arrayObj->contents)[GET_REGISTER(vsrc2)] =          \
             GET_REGISTER##_regsize(vdst);                                   \
     }                                                                       \
     FINISH(2);

vm/mterp/config-allstubs

diff --git a/vm/mterp/config-allstubs b/vm/mterp/config-allstubs
index a105049..9df7b12 100644
--- a/vm/mterp/config-allstubs
+++ b/vm/mterp/config-allstubs
@@ -24,13 +24,13 @@
 handler-size 64
 
 # C file header and basic definitions
-import c/header.c
+import c/header.cpp
 
 # C pre-processor defines for stub C instructions
-import cstubs/stubdefs.c
+import cstubs/stubdefs.cpp
 
 # common defs for the C opcodes
-import c/opcommon.c
+import c/opcommon.cpp
 
 # opcode list; argument to op-start is default directory
 op-start c
@@ -38,10 +38,10 @@
 op-end
 
 # arch-specific entry point to interpreter
-import cstubs/entry.c
+import cstubs/entry.cpp
 
 # "helper" code
-import c/gotoTargets.c
+import c/gotoTargets.cpp
 
 # finish
-import cstubs/enddefs.c
+import cstubs/enddefs.cpp

vm/mterp/config-armv5te

diff --git a/vm/mterp/config-armv5te b/vm/mterp/config-armv5te
index e00fea9..5861f8b 100644
--- a/vm/mterp/config-armv5te
+++ b/vm/mterp/config-armv5te
@@ -26,17 +26,17 @@
 asm-alt-stub armv5te/alt_stub.S
 
 # file header and basic definitions
-import c/header.c
+import c/header.cpp
 import armv5te/header.S
 
 # C pre-processor defines for stub C instructions
-import cstubs/stubdefs.c
+import cstubs/stubdefs.cpp
 
 # highly-platform-specific defs
 import armv5te/platform.S
 
 # common defs for the C helpers; include this before the instruction handlers
-import c/opcommon.c
+import c/opcommon.cpp
 
 # arch-specific entry point to interpreter
 import armv5te/entry.S
@@ -48,11 +48,11 @@
 
 # "helper" code for C; include if you use any of the C stubs (this generates
 # object code, so it's normally excluded)
-##import c/gotoTargets.c
+##import c/gotoTargets.cpp
 
-# end of defs; include this when cstubs/stubdefs.c is included
-import cstubs/enddefs.c
+# end of defs; include this when cstubs/stubdefs.cpp is included
+import cstubs/enddefs.cpp
 
 # common subroutines for asm
 import armv5te/footer.S
-import armv5te/debug.c
+import armv5te/debug.cpp

vm/mterp/config-armv5te-vfp

diff --git a/vm/mterp/config-armv5te-vfp b/vm/mterp/config-armv5te-vfp
index 70ce967..160913c 100644
--- a/vm/mterp/config-armv5te-vfp
+++ b/vm/mterp/config-armv5te-vfp
@@ -30,17 +30,17 @@
 asm-alt-stub armv5te/alt_stub.S
 
 # file header and basic definitions
-import c/header.c
+import c/header.cpp
 import armv5te/header.S
 
 # C pre-processor defines for stub C instructions
-import cstubs/stubdefs.c
+import cstubs/stubdefs.cpp
 
 # highly-platform-specific defs
 import armv5te/platform.S
 
 # common defs for the C helpers; include this before the instruction handlers
-import c/opcommon.c
+import c/opcommon.cpp
 
 # arch-specific entry point to interpreter
 import armv5te/entry.S
@@ -98,11 +98,11 @@
 
 # "helper" code for C; include if you use any of the C stubs (this generates
 # object code, so it's normally excluded)
-##import c/gotoTargets.c
+##import c/gotoTargets.cpp
 
-# end of defs; include this when cstubs/stubdefs.c is included
-import cstubs/enddefs.c
+# end of defs; include this when cstubs/stubdefs.cpp is included
+import cstubs/enddefs.cpp
 
 # common subroutines for asm
 import armv5te/footer.S
-import armv5te/debug.c
+import armv5te/debug.cpp

vm/mterp/config-armv7-a

diff --git a/vm/mterp/config-armv7-a b/vm/mterp/config-armv7-a
index b9b998f..eadaeca 100644
--- a/vm/mterp/config-armv7-a
+++ b/vm/mterp/config-armv7-a
@@ -31,17 +31,17 @@
 asm-alt-stub armv5te/alt_stub.S
 
 # file header and basic definitions
-import c/header.c
+import c/header.cpp
 import armv5te/header.S
 
 # C pre-processor defines for stub C instructions
-import cstubs/stubdefs.c
+import cstubs/stubdefs.cpp
 
 # highly-platform-specific defs
 import armv7-a/platform.S
 
 # common defs for the C helpers; include this before the instruction handlers
-import c/opcommon.c
+import c/opcommon.cpp
 
 # arch-specific entry point to interpreter
 import armv5te/entry.S
@@ -162,11 +162,11 @@
 # object code, so it's normally excluded)
 #
 # Add this if you see linker failures for stuff like "dvmMterp_exceptionThrown".
-##import c/gotoTargets.c
+##import c/gotoTargets.cpp
 
-# end of defs; include this when cstubs/stubdefs.c is included
-import cstubs/enddefs.c
+# end of defs; include this when cstubs/stubdefs.cpp is included
+import cstubs/enddefs.cpp
 
 # common subroutines for asm
 import armv5te/footer.S
-import armv5te/debug.c
+import armv5te/debug.cpp

vm/mterp/config-armv7-a-neon

diff --git a/vm/mterp/config-armv7-a-neon b/vm/mterp/config-armv7-a-neon
index fd18f69..5f91365 100644
--- a/vm/mterp/config-armv7-a-neon
+++ b/vm/mterp/config-armv7-a-neon
@@ -31,17 +31,17 @@
 asm-alt-stub armv5te/alt_stub.S
 
 # file header and basic definitions
-import c/header.c
+import c/header.cpp
 import armv5te/header.S
 
 # C pre-processor defines for stub C instructions
-import cstubs/stubdefs.c
+import cstubs/stubdefs.cpp
 
 # highly-platform-specific defs
 import armv7-a/platform.S
 
 # common defs for the C helpers; include this before the instruction handlers
-import c/opcommon.c
+import c/opcommon.cpp
 
 # arch-specific entry point to interpreter
 import armv5te/entry.S
@@ -160,11 +160,11 @@
 
 # "helper" code for C; include if you use any of the C stubs (this generates
 # object code, so it's normally excluded)
-##import c/gotoTargets.c
+##import c/gotoTargets.cpp
 
-# end of defs; include this when cstubs/stubdefs.c is included
-import cstubs/enddefs.c
+# end of defs; include this when cstubs/stubdefs.cpp is included
+import cstubs/enddefs.cpp
 
 # common subroutines for asm
 import armv5te/footer.S
-import armv5te/debug.c
+import armv5te/debug.cpp

vm/mterp/config-portable

diff --git a/vm/mterp/config-portable b/vm/mterp/config-portable
index d766fee..8f696b7 100644
--- a/vm/mterp/config-portable
+++ b/vm/mterp/config-portable
@@ -19,16 +19,16 @@
 handler-style all-c
 
 # C file header and basic definitions
-import c/header.c
+import c/header.cpp
 
 # C pre-processor defines for stub C instructions
-import portable/stubdefs.c
+import portable/stubdefs.cpp
 
 # common defs for the C opcodes
-import c/opcommon.c
+import c/opcommon.cpp
 
 # entry point
-import portable/entry.c
+import portable/entry.cpp
 
 # opcode list; argument to op-start is default directory
 op-start c
@@ -36,7 +36,7 @@
 op-end
 
 # "helper" code
-import c/gotoTargets.c
+import c/gotoTargets.cpp
 
 # finish
-import portable/enddefs.c
+import portable/enddefs.cpp

vm/mterp/config-x86

diff --git a/vm/mterp/config-x86 b/vm/mterp/config-x86
index a99e5a7..cf2c7cb 100644
--- a/vm/mterp/config-x86
+++ b/vm/mterp/config-x86
@@ -25,14 +25,14 @@
 asm-alt-stub x86/alt_stub.S
 
 # C file header and basic definitions
-import c/header.c
+import c/header.cpp
 import x86/header.S
 
 # C pre-processor defines for stub C instructions
-import cstubs/stubdefs.c
+import cstubs/stubdefs.cpp
 
 # common defs for the C opcodes
-import c/opcommon.c
+import c/opcommon.cpp
 
 # opcode list; argument to op-start is default directory
 op-start x86
@@ -66,10 +66,10 @@
 # "helper" code for C; include if you use any of the C stubs (this generates
 # object code, so it's normally excluded)
 # (asm code is currently calling into dvmMterp_exceptionThrown)
-import c/gotoTargets.c
+import c/gotoTargets.cpp
 
-# end of defs; include this when cstubs/stubdefs.c is included
-import cstubs/enddefs.c
+# end of defs; include this when cstubs/stubdefs.cpp is included
+import cstubs/enddefs.cpp
 
 # common subroutines for asm
 import x86/footer.S

vm/mterp/config-x86-atom

diff --git a/vm/mterp/config-x86-atom b/vm/mterp/config-x86-atom
index 4a13d7a..b99310d 100644
--- a/vm/mterp/config-x86-atom
+++ b/vm/mterp/config-x86-atom
@@ -20,12 +20,12 @@
 asm-stub x86-atom/stub.S
 
 # file header, macros and definitions
-import c/header.c
+import c/header.cpp
 import x86-atom/header.S
 
 # common defs for the C helper; include this before the instruction handlers
-import cstubs/stubdefs.c
-import c/opcommon.c
+import cstubs/stubdefs.cpp
+import c/opcommon.cpp
 
 # start of opcode list; command gives default directory location of instruction files
 op-start x86-atom
@@ -312,8 +312,8 @@
 import x86-atom/entry.S
 
 # "helper" code for C; include this after the instruction handlers
-import c/gotoTargets.c
-import cstubs/enddefs.c
+import c/gotoTargets.cpp
+import cstubs/enddefs.cpp
 
 # common subroutines for asm
 import x86-atom/footer.S

vm/mterp/cstubs/enddefs.cpp

diff --git a/vm/mterp/cstubs/enddefs.c b/vm/mterp/cstubs/enddefs.cpp
similarity index 100%
rename from vm/mterp/cstubs/enddefs.c
rename to vm/mterp/cstubs/enddefs.cpp

vm/mterp/cstubs/entry.cpp

diff --git a/vm/mterp/cstubs/entry.c b/vm/mterp/cstubs/entry.cpp
similarity index 100%
rename from vm/mterp/cstubs/entry.c
rename to vm/mterp/cstubs/entry.cpp

vm/mterp/cstubs/stubdefs.cpp

diff --git a/vm/mterp/cstubs/stubdefs.c b/vm/mterp/cstubs/stubdefs.cpp
similarity index 97%
rename from vm/mterp/cstubs/stubdefs.c
rename to vm/mterp/cstubs/stubdefs.cpp
index a894f9e..e81acdc 100644
--- a/vm/mterp/cstubs/stubdefs.c
+++ b/vm/mterp/cstubs/stubdefs.cpp
@@ -4,7 +4,7 @@
  */
 
 #define GOTO_TARGET_DECL(_target, ...)                                      \
-    void dvmMterp_##_target(Thread* self, ## __VA_ARGS__);
+    extern "C" void dvmMterp_##_target(Thread* self, ## __VA_ARGS__);
 
 /* (void)xxx to quiet unused variable compiler warnings. */
 #define GOTO_TARGET(_target, ...)                                           \
@@ -52,6 +52,7 @@
  * (void)xxx to quiet unused variable compiler warnings.
  */
 #define HANDLE_OPCODE(_op)                                                  \
+    extern "C" void dvmMterp_##_op(Thread* self);                           \
     void dvmMterp_##_op(Thread* self) {                                     \
         u4 ref;                                                             \
         u2 vsrc1, vsrc2, vdst;                                              \

vm/mterp/gen-mterp.py

diff --git a/vm/mterp/gen-mterp.py b/vm/mterp/gen-mterp.py
index cf1e4e0..e0b1b2d 100755
--- a/vm/mterp/gen-mterp.py
+++ b/vm/mterp/gen-mterp.py
@@ -98,12 +98,12 @@
     if len(tokens) != 2:
         raise DataParseError("import requires one argument")
     source = tokens[1]
-    if source.endswith(".c"):
+    if source.endswith(".cpp"):
         appendSourceFile(tokens[1], getGlobalSubDict(), c_fp, None)
     elif source.endswith(".S"):
         appendSourceFile(tokens[1], getGlobalSubDict(), asm_fp, None)
     else:
-        raise DataParseError("don't know how to import %s (expecting .c/.S)"
+        raise DataParseError("don't know how to import %s (expecting .cpp/.S)"
                 % source)
 
 #
@@ -361,9 +361,9 @@
 #
 def loadAndEmitC(location, opindex):
     op = opcodes[opindex]
-    source = "%s/%s.c" % (location, op)
+    source = "%s/%s.cpp" % (location, op)
     if verbose:
-        print " emit %s --> C" % source
+        print " emit %s --> C++" % source
     dict = getGlobalSubDict()
     dict.update({ "opcode":op, "opnum":opindex })
 
@@ -536,7 +536,7 @@
 # Open and prepare output files.
 #
 try:
-    c_fp = open("%s/InterpC-%s.c" % (output_dir, target_arch), "w")
+    c_fp = open("%s/InterpC-%s.cpp" % (output_dir, target_arch), "w")
     asm_fp = open("%s/InterpAsm-%s.S" % (output_dir, target_arch), "w")
 except:
     print "Unable to open output files"

vm/mterp/out/InterpC-allstubs.cpp

diff --git a/vm/mterp/out/InterpC-allstubs.c b/vm/mterp/out/InterpC-allstubs.cpp
similarity index 90%
rename from vm/mterp/out/InterpC-allstubs.c
rename to vm/mterp/out/InterpC-allstubs.cpp
index 8930c44..7859c2d 100644
--- a/vm/mterp/out/InterpC-allstubs.c
+++ b/vm/mterp/out/InterpC-allstubs.cpp
@@ -4,7 +4,7 @@
  * --> DO NOT EDIT <--
  */
 
-/* File: c/header.c */
+/* File: c/header.cpp */
 /*
  * Copyright (C) 2008 The Android Open Source Project
  *
@@ -379,14 +379,14 @@
     return true;
 }
 
-/* File: cstubs/stubdefs.c */
+/* File: cstubs/stubdefs.cpp */
 /*
  * In the C mterp stubs, "goto" is a function call followed immediately
  * by a return.
  */
 
 #define GOTO_TARGET_DECL(_target, ...)                                      \
-    void dvmMterp_##_target(Thread* self, ## __VA_ARGS__);
+    extern "C" void dvmMterp_##_target(Thread* self, ## __VA_ARGS__);
 
 /* (void)xxx to quiet unused variable compiler warnings. */
 #define GOTO_TARGET(_target, ...)                                           \
@@ -434,6 +434,7 @@
  * (void)xxx to quiet unused variable compiler warnings.
  */
 #define HANDLE_OPCODE(_op)                                                  \
+    extern "C" void dvmMterp_##_op(Thread* self);                           \
     void dvmMterp_##_op(Thread* self) {                                     \
         u4 ref;                                                             \
         u2 vsrc1, vsrc2, vdst;                                              \
@@ -513,7 +514,7 @@
         }                                                                   \
     }
 
-/* File: c/opcommon.c */
+/* File: c/opcommon.cpp */
 /* forward declarations of goto targets */
 GOTO_TARGET_DECL(filledNewArray, bool methodCallRange, bool jumboFormat);
 GOTO_TARGET_DECL(invokeVirtual, bool methodCallRange, bool jumboFormat);
@@ -973,7 +974,7 @@
             GOTO_exceptionThrown();                                         \
         }                                                                   \
         SET_REGISTER##_regsize(vdst,                                        \
-            ((_type*) arrayObj->contents)[GET_REGISTER(vsrc2)]);            \
+            ((_type*)(void*)arrayObj->contents)[GET_REGISTER(vsrc2)]);      \
         ILOGV("+ AGET[%d]=0x%x", GET_REGISTER(vsrc2), GET_REGISTER(vdst));  \
     }                                                                       \
     FINISH(2);
@@ -998,7 +999,7 @@
             GOTO_exceptionThrown();                                         \
         }                                                                   \
         ILOGV("+ APUT[%d]=0x%08x", GET_REGISTER(vsrc2), GET_REGISTER(vdst));\
-        ((_type*) arrayObj->contents)[GET_REGISTER(vsrc2)] =                \
+        ((_type*)(void*)arrayObj->contents)[GET_REGISTER(vsrc2)] =          \
             GET_REGISTER##_regsize(vdst);                                   \
     }                                                                       \
     FINISH(2);
@@ -1270,12 +1271,12 @@
     }                                                                       \
     FINISH(4);
 
-/* File: c/OP_NOP.c */
+/* File: c/OP_NOP.cpp */
 HANDLE_OPCODE(OP_NOP)
     FINISH(1);
 OP_END
 
-/* File: c/OP_MOVE.c */
+/* File: c/OP_MOVE.cpp */
 HANDLE_OPCODE(OP_MOVE /*vA, vB*/)
     vdst = INST_A(inst);
     vsrc1 = INST_B(inst);
@@ -1286,7 +1287,7 @@
     FINISH(1);
 OP_END
 
-/* File: c/OP_MOVE_FROM16.c */
+/* File: c/OP_MOVE_FROM16.cpp */
 HANDLE_OPCODE(OP_MOVE_FROM16 /*vAA, vBBBB*/)
     vdst = INST_AA(inst);
     vsrc1 = FETCH(1);
@@ -1297,7 +1298,7 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_MOVE_16.c */
+/* File: c/OP_MOVE_16.cpp */
 HANDLE_OPCODE(OP_MOVE_16 /*vAAAA, vBBBB*/)
     vdst = FETCH(1);
     vsrc1 = FETCH(2);
@@ -1308,7 +1309,7 @@
     FINISH(3);
 OP_END
 
-/* File: c/OP_MOVE_WIDE.c */
+/* File: c/OP_MOVE_WIDE.cpp */
 HANDLE_OPCODE(OP_MOVE_WIDE /*vA, vB*/)
     /* IMPORTANT: must correctly handle overlapping registers, e.g. both
      * "move-wide v6, v7" and "move-wide v7, v6" */
@@ -1320,7 +1321,7 @@
     FINISH(1);
 OP_END
 
-/* File: c/OP_MOVE_WIDE_FROM16.c */
+/* File: c/OP_MOVE_WIDE_FROM16.cpp */
 HANDLE_OPCODE(OP_MOVE_WIDE_FROM16 /*vAA, vBBBB*/)
     vdst = INST_AA(inst);
     vsrc1 = FETCH(1);
@@ -1330,7 +1331,7 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_MOVE_WIDE_16.c */
+/* File: c/OP_MOVE_WIDE_16.cpp */
 HANDLE_OPCODE(OP_MOVE_WIDE_16 /*vAAAA, vBBBB*/)
     vdst = FETCH(1);
     vsrc1 = FETCH(2);
@@ -1340,8 +1341,8 @@
     FINISH(3);
 OP_END
 
-/* File: c/OP_MOVE_OBJECT.c */
-/* File: c/OP_MOVE.c */
+/* File: c/OP_MOVE_OBJECT.cpp */
+/* File: c/OP_MOVE.cpp */
 HANDLE_OPCODE(OP_MOVE_OBJECT /*vA, vB*/)
     vdst = INST_A(inst);
     vsrc1 = INST_B(inst);
@@ -1353,8 +1354,8 @@
 OP_END
 
 
-/* File: c/OP_MOVE_OBJECT_FROM16.c */
-/* File: c/OP_MOVE_FROM16.c */
+/* File: c/OP_MOVE_OBJECT_FROM16.cpp */
+/* File: c/OP_MOVE_FROM16.cpp */
 HANDLE_OPCODE(OP_MOVE_OBJECT_FROM16 /*vAA, vBBBB*/)
     vdst = INST_AA(inst);
     vsrc1 = FETCH(1);
@@ -1366,8 +1367,8 @@
 OP_END
 
 
-/* File: c/OP_MOVE_OBJECT_16.c */
-/* File: c/OP_MOVE_16.c */
+/* File: c/OP_MOVE_OBJECT_16.cpp */
+/* File: c/OP_MOVE_16.cpp */
 HANDLE_OPCODE(OP_MOVE_OBJECT_16 /*vAAAA, vBBBB*/)
     vdst = FETCH(1);
     vsrc1 = FETCH(2);
@@ -1379,7 +1380,7 @@
 OP_END
 
 
-/* File: c/OP_MOVE_RESULT.c */
+/* File: c/OP_MOVE_RESULT.cpp */
 HANDLE_OPCODE(OP_MOVE_RESULT /*vAA*/)
     vdst = INST_AA(inst);
     ILOGV("|move-result%s v%d %s(v%d=0x%08x)",
@@ -1389,7 +1390,7 @@
     FINISH(1);
 OP_END
 
-/* File: c/OP_MOVE_RESULT_WIDE.c */
+/* File: c/OP_MOVE_RESULT_WIDE.cpp */
 HANDLE_OPCODE(OP_MOVE_RESULT_WIDE /*vAA*/)
     vdst = INST_AA(inst);
     ILOGV("|move-result-wide v%d %s(0x%08llx)", vdst, kSpacing, retval.j);
@@ -1397,8 +1398,8 @@
     FINISH(1);
 OP_END
 
-/* File: c/OP_MOVE_RESULT_OBJECT.c */
-/* File: c/OP_MOVE_RESULT.c */
+/* File: c/OP_MOVE_RESULT_OBJECT.cpp */
+/* File: c/OP_MOVE_RESULT.cpp */
 HANDLE_OPCODE(OP_MOVE_RESULT_OBJECT /*vAA*/)
     vdst = INST_AA(inst);
     ILOGV("|move-result%s v%d %s(v%d=0x%08x)",
@@ -1409,7 +1410,7 @@
 OP_END
 
 
-/* File: c/OP_MOVE_EXCEPTION.c */
+/* File: c/OP_MOVE_EXCEPTION.cpp */
 HANDLE_OPCODE(OP_MOVE_EXCEPTION /*vAA*/)
     vdst = INST_AA(inst);
     ILOGV("|move-exception v%d", vdst);
@@ -1419,7 +1420,7 @@
     FINISH(1);
 OP_END
 
-/* File: c/OP_RETURN_VOID.c */
+/* File: c/OP_RETURN_VOID.cpp */
 HANDLE_OPCODE(OP_RETURN_VOID /**/)
     ILOGV("|return-void");
 #ifndef NDEBUG
@@ -1428,7 +1429,7 @@
     GOTO_returnFromMethod();
 OP_END
 
-/* File: c/OP_RETURN.c */
+/* File: c/OP_RETURN.cpp */
 HANDLE_OPCODE(OP_RETURN /*vAA*/)
     vsrc1 = INST_AA(inst);
     ILOGV("|return%s v%d",
@@ -1437,7 +1438,7 @@
     GOTO_returnFromMethod();
 OP_END
 
-/* File: c/OP_RETURN_WIDE.c */
+/* File: c/OP_RETURN_WIDE.cpp */
 HANDLE_OPCODE(OP_RETURN_WIDE /*vAA*/)
     vsrc1 = INST_AA(inst);
     ILOGV("|return-wide v%d", vsrc1);
@@ -1445,8 +1446,8 @@
     GOTO_returnFromMethod();
 OP_END
 
-/* File: c/OP_RETURN_OBJECT.c */
-/* File: c/OP_RETURN.c */
+/* File: c/OP_RETURN_OBJECT.cpp */
+/* File: c/OP_RETURN.cpp */
 HANDLE_OPCODE(OP_RETURN_OBJECT /*vAA*/)
     vsrc1 = INST_AA(inst);
     ILOGV("|return%s v%d",
@@ -1456,7 +1457,7 @@
 OP_END
 
 
-/* File: c/OP_CONST_4.c */
+/* File: c/OP_CONST_4.cpp */
 HANDLE_OPCODE(OP_CONST_4 /*vA, #+B*/)
     {
         s4 tmp;
@@ -1469,7 +1470,7 @@
     FINISH(1);
 OP_END
 
-/* File: c/OP_CONST_16.c */
+/* File: c/OP_CONST_16.cpp */
 HANDLE_OPCODE(OP_CONST_16 /*vAA, #+BBBB*/)
     vdst = INST_AA(inst);
     vsrc1 = FETCH(1);
@@ -1478,7 +1479,7 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_CONST.c */
+/* File: c/OP_CONST.cpp */
 HANDLE_OPCODE(OP_CONST /*vAA, #+BBBBBBBB*/)
     {
         u4 tmp;
@@ -1492,7 +1493,7 @@
     FINISH(3);
 OP_END
 
-/* File: c/OP_CONST_HIGH16.c */
+/* File: c/OP_CONST_HIGH16.cpp */
 HANDLE_OPCODE(OP_CONST_HIGH16 /*vAA, #+BBBB0000*/)
     vdst = INST_AA(inst);
     vsrc1 = FETCH(1);
@@ -1501,7 +1502,7 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_CONST_WIDE_16.c */
+/* File: c/OP_CONST_WIDE_16.cpp */
 HANDLE_OPCODE(OP_CONST_WIDE_16 /*vAA, #+BBBB*/)
     vdst = INST_AA(inst);
     vsrc1 = FETCH(1);
@@ -1510,7 +1511,7 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_CONST_WIDE_32.c */
+/* File: c/OP_CONST_WIDE_32.cpp */
 HANDLE_OPCODE(OP_CONST_WIDE_32 /*vAA, #+BBBBBBBB*/)
     {
         u4 tmp;
@@ -1524,7 +1525,7 @@
     FINISH(3);
 OP_END
 
-/* File: c/OP_CONST_WIDE.c */
+/* File: c/OP_CONST_WIDE.cpp */
 HANDLE_OPCODE(OP_CONST_WIDE /*vAA, #+BBBBBBBBBBBBBBBB*/)
     {
         u8 tmp;
@@ -1540,7 +1541,7 @@
     FINISH(5);
 OP_END
 
-/* File: c/OP_CONST_WIDE_HIGH16.c */
+/* File: c/OP_CONST_WIDE_HIGH16.cpp */
 HANDLE_OPCODE(OP_CONST_WIDE_HIGH16 /*vAA, #+BBBB000000000000*/)
     vdst = INST_AA(inst);
     vsrc1 = FETCH(1);
@@ -1549,7 +1550,7 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_CONST_STRING.c */
+/* File: c/OP_CONST_STRING.cpp */
 HANDLE_OPCODE(OP_CONST_STRING /*vAA, string@BBBB*/)
     {
         StringObject* strObj;
@@ -1569,7 +1570,7 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_CONST_STRING_JUMBO.c */
+/* File: c/OP_CONST_STRING_JUMBO.cpp */
 HANDLE_OPCODE(OP_CONST_STRING_JUMBO /*vAA, string@BBBBBBBB*/)
     {
         StringObject* strObj;
@@ -1591,7 +1592,7 @@
     FINISH(3);
 OP_END
 
-/* File: c/OP_CONST_CLASS.c */
+/* File: c/OP_CONST_CLASS.cpp */
 HANDLE_OPCODE(OP_CONST_CLASS /*vAA, class@BBBB*/)
     {
         ClassObject* clazz;
@@ -1611,7 +1612,7 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_MONITOR_ENTER.c */
+/* File: c/OP_MONITOR_ENTER.cpp */
 HANDLE_OPCODE(OP_MONITOR_ENTER /*vAA*/)
     {
         Object* obj;
@@ -1629,7 +1630,7 @@
     FINISH(1);
 OP_END
 
-/* File: c/OP_MONITOR_EXIT.c */
+/* File: c/OP_MONITOR_EXIT.cpp */
 HANDLE_OPCODE(OP_MONITOR_EXIT /*vAA*/)
     {
         Object* obj;
@@ -1661,7 +1662,7 @@
     FINISH(1);
 OP_END
 
-/* File: c/OP_CHECK_CAST.c */
+/* File: c/OP_CHECK_CAST.cpp */
 HANDLE_OPCODE(OP_CHECK_CAST /*vAA, class@BBBB*/)
     {
         ClassObject* clazz;
@@ -1694,7 +1695,7 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_INSTANCE_OF.c */
+/* File: c/OP_INSTANCE_OF.cpp */
 HANDLE_OPCODE(OP_INSTANCE_OF /*vA, vB, class@CCCC*/)
     {
         ClassObject* clazz;
@@ -1726,7 +1727,7 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_ARRAY_LENGTH.c */
+/* File: c/OP_ARRAY_LENGTH.cpp */
 HANDLE_OPCODE(OP_ARRAY_LENGTH /*vA, vB*/)
     {
         ArrayObject* arrayObj;
@@ -1743,7 +1744,7 @@
     FINISH(1);
 OP_END
 
-/* File: c/OP_NEW_INSTANCE.c */
+/* File: c/OP_NEW_INSTANCE.cpp */
 HANDLE_OPCODE(OP_NEW_INSTANCE /*vAA, class@BBBB*/)
     {
         ClassObject* clazz;
@@ -1793,7 +1794,7 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_NEW_ARRAY.c */
+/* File: c/OP_NEW_ARRAY.cpp */
 HANDLE_OPCODE(OP_NEW_ARRAY /*vA, vB, class@CCCC*/)
     {
         ClassObject* arrayClass;
@@ -1830,17 +1831,17 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_FILLED_NEW_ARRAY.c */
+/* File: c/OP_FILLED_NEW_ARRAY.cpp */
 HANDLE_OPCODE(OP_FILLED_NEW_ARRAY /*vB, {vD, vE, vF, vG, vA}, class@CCCC*/)
     GOTO_invoke(filledNewArray, false, false);
 OP_END
 
-/* File: c/OP_FILLED_NEW_ARRAY_RANGE.c */
+/* File: c/OP_FILLED_NEW_ARRAY_RANGE.cpp */
 HANDLE_OPCODE(OP_FILLED_NEW_ARRAY_RANGE /*{vCCCC..v(CCCC+AA-1)}, class@BBBB*/)
     GOTO_invoke(filledNewArray, true, false);
 OP_END
 
-/* File: c/OP_FILL_ARRAY_DATA.c */
+/* File: c/OP_FILL_ARRAY_DATA.cpp */
 HANDLE_OPCODE(OP_FILL_ARRAY_DATA)   /*vAA, +BBBBBBBB*/
     {
         const u2* arrayData;
@@ -1869,7 +1870,7 @@
     }
 OP_END
 
-/* File: c/OP_THROW.c */
+/* File: c/OP_THROW.cpp */
 HANDLE_OPCODE(OP_THROW /*vAA*/)
     {
         Object* obj;
@@ -1895,7 +1896,7 @@
     }
 OP_END
 
-/* File: c/OP_GOTO.c */
+/* File: c/OP_GOTO.cpp */
 HANDLE_OPCODE(OP_GOTO /*+AA*/)
     vdst = INST_AA(inst);
     if ((s1)vdst < 0)
@@ -1908,7 +1909,7 @@
     FINISH((s1)vdst);
 OP_END
 
-/* File: c/OP_GOTO_16.c */
+/* File: c/OP_GOTO_16.cpp */
 HANDLE_OPCODE(OP_GOTO_16 /*+AAAA*/)
     {
         s4 offset = (s2) FETCH(1);          /* sign-extend next code unit */
@@ -1924,7 +1925,7 @@
     }
 OP_END
 
-/* File: c/OP_GOTO_32.c */
+/* File: c/OP_GOTO_32.cpp */
 HANDLE_OPCODE(OP_GOTO_32 /*+AAAAAAAA*/)
     {
         s4 offset = FETCH(1);               /* low-order 16 bits */
@@ -1941,7 +1942,7 @@
     }
 OP_END
 
-/* File: c/OP_PACKED_SWITCH.c */
+/* File: c/OP_PACKED_SWITCH.cpp */
 HANDLE_OPCODE(OP_PACKED_SWITCH /*vAA, +BBBB*/)
     {
         const u2* switchData;
@@ -1972,7 +1973,7 @@
     }
 OP_END
 
-/* File: c/OP_SPARSE_SWITCH.c */
+/* File: c/OP_SPARSE_SWITCH.cpp */
 HANDLE_OPCODE(OP_SPARSE_SWITCH /*vAA, +BBBB*/)
     {
         const u2* switchData;
@@ -2003,135 +2004,135 @@
     }
 OP_END
 
-/* File: c/OP_CMPL_FLOAT.c */
+/* File: c/OP_CMPL_FLOAT.cpp */
 HANDLE_OP_CMPX(OP_CMPL_FLOAT, "l-float", float, _FLOAT, -1)
 OP_END
 
-/* File: c/OP_CMPG_FLOAT.c */
+/* File: c/OP_CMPG_FLOAT.cpp */
 HANDLE_OP_CMPX(OP_CMPG_FLOAT, "g-float", float, _FLOAT, 1)
 OP_END
 
-/* File: c/OP_CMPL_DOUBLE.c */
+/* File: c/OP_CMPL_DOUBLE.cpp */
 HANDLE_OP_CMPX(OP_CMPL_DOUBLE, "l-double", double, _DOUBLE, -1)
 OP_END
 
-/* File: c/OP_CMPG_DOUBLE.c */
+/* File: c/OP_CMPG_DOUBLE.cpp */
 HANDLE_OP_CMPX(OP_CMPG_DOUBLE, "g-double", double, _DOUBLE, 1)
 OP_END
 
-/* File: c/OP_CMP_LONG.c */
+/* File: c/OP_CMP_LONG.cpp */
 HANDLE_OP_CMPX(OP_CMP_LONG, "-long", s8, _WIDE, 0)
 OP_END
 
-/* File: c/OP_IF_EQ.c */
+/* File: c/OP_IF_EQ.cpp */
 HANDLE_OP_IF_XX(OP_IF_EQ, "eq", ==)
 OP_END
 
-/* File: c/OP_IF_NE.c */
+/* File: c/OP_IF_NE.cpp */
 HANDLE_OP_IF_XX(OP_IF_NE, "ne", !=)
 OP_END
 
-/* File: c/OP_IF_LT.c */
+/* File: c/OP_IF_LT.cpp */
 HANDLE_OP_IF_XX(OP_IF_LT, "lt", <)
 OP_END
 
-/* File: c/OP_IF_GE.c */
+/* File: c/OP_IF_GE.cpp */
 HANDLE_OP_IF_XX(OP_IF_GE, "ge", >=)
 OP_END
 
-/* File: c/OP_IF_GT.c */
+/* File: c/OP_IF_GT.cpp */
 HANDLE_OP_IF_XX(OP_IF_GT, "gt", >)
 OP_END
 
-/* File: c/OP_IF_LE.c */
+/* File: c/OP_IF_LE.cpp */
 HANDLE_OP_IF_XX(OP_IF_LE, "le", <=)
 OP_END
 
-/* File: c/OP_IF_EQZ.c */
+/* File: c/OP_IF_EQZ.cpp */
 HANDLE_OP_IF_XXZ(OP_IF_EQZ, "eqz", ==)
 OP_END
 
-/* File: c/OP_IF_NEZ.c */
+/* File: c/OP_IF_NEZ.cpp */
 HANDLE_OP_IF_XXZ(OP_IF_NEZ, "nez", !=)
 OP_END
 
-/* File: c/OP_IF_LTZ.c */
+/* File: c/OP_IF_LTZ.cpp */
 HANDLE_OP_IF_XXZ(OP_IF_LTZ, "ltz", <)
 OP_END
 
-/* File: c/OP_IF_GEZ.c */
+/* File: c/OP_IF_GEZ.cpp */
 HANDLE_OP_IF_XXZ(OP_IF_GEZ, "gez", >=)
 OP_END
 
-/* File: c/OP_IF_GTZ.c */
+/* File: c/OP_IF_GTZ.cpp */
 HANDLE_OP_IF_XXZ(OP_IF_GTZ, "gtz", >)
 OP_END
 
-/* File: c/OP_IF_LEZ.c */
+/* File: c/OP_IF_LEZ.cpp */
 HANDLE_OP_IF_XXZ(OP_IF_LEZ, "lez", <=)
 OP_END
 
-/* File: c/OP_UNUSED_3E.c */
+/* File: c/OP_UNUSED_3E.cpp */
 HANDLE_OPCODE(OP_UNUSED_3E)
 OP_END
 
-/* File: c/OP_UNUSED_3F.c */
+/* File: c/OP_UNUSED_3F.cpp */
 HANDLE_OPCODE(OP_UNUSED_3F)
 OP_END
 
-/* File: c/OP_UNUSED_40.c */
+/* File: c/OP_UNUSED_40.cpp */
 HANDLE_OPCODE(OP_UNUSED_40)
 OP_END
 
-/* File: c/OP_UNUSED_41.c */
+/* File: c/OP_UNUSED_41.cpp */
 HANDLE_OPCODE(OP_UNUSED_41)
 OP_END
 
-/* File: c/OP_UNUSED_42.c */
+/* File: c/OP_UNUSED_42.cpp */
 HANDLE_OPCODE(OP_UNUSED_42)
 OP_END
 
-/* File: c/OP_UNUSED_43.c */
+/* File: c/OP_UNUSED_43.cpp */
 HANDLE_OPCODE(OP_UNUSED_43)
 OP_END
 
-/* File: c/OP_AGET.c */
+/* File: c/OP_AGET.cpp */
 HANDLE_OP_AGET(OP_AGET, "", u4, )
 OP_END
 
-/* File: c/OP_AGET_WIDE.c */
+/* File: c/OP_AGET_WIDE.cpp */
 HANDLE_OP_AGET(OP_AGET_WIDE, "-wide", s8, _WIDE)
 OP_END
 
-/* File: c/OP_AGET_OBJECT.c */
+/* File: c/OP_AGET_OBJECT.cpp */
 HANDLE_OP_AGET(OP_AGET_OBJECT, "-object", u4, )
 OP_END
 
-/* File: c/OP_AGET_BOOLEAN.c */
+/* File: c/OP_AGET_BOOLEAN.cpp */
 HANDLE_OP_AGET(OP_AGET_BOOLEAN, "-boolean", u1, )
 OP_END
 
-/* File: c/OP_AGET_BYTE.c */
+/* File: c/OP_AGET_BYTE.cpp */
 HANDLE_OP_AGET(OP_AGET_BYTE, "-byte", s1, )
 OP_END
 
-/* File: c/OP_AGET_CHAR.c */
+/* File: c/OP_AGET_CHAR.cpp */
 HANDLE_OP_AGET(OP_AGET_CHAR, "-char", u2, )
 OP_END
 
-/* File: c/OP_AGET_SHORT.c */
+/* File: c/OP_AGET_SHORT.cpp */
 HANDLE_OP_AGET(OP_AGET_SHORT, "-short", s2, )
 OP_END
 
-/* File: c/OP_APUT.c */
+/* File: c/OP_APUT.cpp */
 HANDLE_OP_APUT(OP_APUT, "", u4, )
 OP_END
 
-/* File: c/OP_APUT_WIDE.c */
+/* File: c/OP_APUT_WIDE.cpp */
 HANDLE_OP_APUT(OP_APUT_WIDE, "-wide", s8, _WIDE)
 OP_END
 
-/* File: c/OP_APUT_OBJECT.c */
+/* File: c/OP_APUT_OBJECT.cpp */
 HANDLE_OPCODE(OP_APUT_OBJECT /*vAA, vBB, vCC*/)
     {
         ArrayObject* arrayObj;
@@ -2171,59 +2172,59 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_APUT_BOOLEAN.c */
+/* File: c/OP_APUT_BOOLEAN.cpp */
 HANDLE_OP_APUT(OP_APUT_BOOLEAN, "-boolean", u1, )
 OP_END
 
-/* File: c/OP_APUT_BYTE.c */
+/* File: c/OP_APUT_BYTE.cpp */
 HANDLE_OP_APUT(OP_APUT_BYTE, "-byte", s1, )
 OP_END
 
-/* File: c/OP_APUT_CHAR.c */
+/* File: c/OP_APUT_CHAR.cpp */
 HANDLE_OP_APUT(OP_APUT_CHAR, "-char", u2, )
 OP_END
 
-/* File: c/OP_APUT_SHORT.c */
+/* File: c/OP_APUT_SHORT.cpp */
 HANDLE_OP_APUT(OP_APUT_SHORT, "-short", s2, )
 OP_END
 
-/* File: c/OP_IGET.c */
+/* File: c/OP_IGET.cpp */
 HANDLE_IGET_X(OP_IGET,                  "", Int, )
 OP_END
 
-/* File: c/OP_IGET_WIDE.c */
+/* File: c/OP_IGET_WIDE.cpp */
 HANDLE_IGET_X(OP_IGET_WIDE,             "-wide", Long, _WIDE)
 OP_END
 
-/* File: c/OP_IGET_OBJECT.c */
+/* File: c/OP_IGET_OBJECT.cpp */
 HANDLE_IGET_X(OP_IGET_OBJECT,           "-object", Object, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_IGET_BOOLEAN.c */
+/* File: c/OP_IGET_BOOLEAN.cpp */
 HANDLE_IGET_X(OP_IGET_BOOLEAN,          "", Int, )
 OP_END
 
-/* File: c/OP_IGET_BYTE.c */
+/* File: c/OP_IGET_BYTE.cpp */
 HANDLE_IGET_X(OP_IGET_BYTE,             "", Int, )
 OP_END
 
-/* File: c/OP_IGET_CHAR.c */
+/* File: c/OP_IGET_CHAR.cpp */
 HANDLE_IGET_X(OP_IGET_CHAR,             "", Int, )
 OP_END
 
-/* File: c/OP_IGET_SHORT.c */
+/* File: c/OP_IGET_SHORT.cpp */
 HANDLE_IGET_X(OP_IGET_SHORT,            "", Int, )
 OP_END
 
-/* File: c/OP_IPUT.c */
+/* File: c/OP_IPUT.cpp */
 HANDLE_IPUT_X(OP_IPUT,                  "", Int, )
 OP_END
 
-/* File: c/OP_IPUT_WIDE.c */
+/* File: c/OP_IPUT_WIDE.cpp */
 HANDLE_IPUT_X(OP_IPUT_WIDE,             "-wide", Long, _WIDE)
 OP_END
 
-/* File: c/OP_IPUT_OBJECT.c */
+/* File: c/OP_IPUT_OBJECT.cpp */
 /*
  * The VM spec says we should verify that the reference being stored into
  * the field is assignment compatible.  In practice, many popular VMs don't
@@ -2238,333 +2239,333 @@
 HANDLE_IPUT_X(OP_IPUT_OBJECT,           "-object", Object, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_IPUT_BOOLEAN.c */
+/* File: c/OP_IPUT_BOOLEAN.cpp */
 HANDLE_IPUT_X(OP_IPUT_BOOLEAN,          "", Int, )
 OP_END
 
-/* File: c/OP_IPUT_BYTE.c */
+/* File: c/OP_IPUT_BYTE.cpp */
 HANDLE_IPUT_X(OP_IPUT_BYTE,             "", Int, )
 OP_END
 
-/* File: c/OP_IPUT_CHAR.c */
+/* File: c/OP_IPUT_CHAR.cpp */
 HANDLE_IPUT_X(OP_IPUT_CHAR,             "", Int, )
 OP_END
 
-/* File: c/OP_IPUT_SHORT.c */
+/* File: c/OP_IPUT_SHORT.cpp */
 HANDLE_IPUT_X(OP_IPUT_SHORT,            "", Int, )
 OP_END
 
-/* File: c/OP_SGET.c */
+/* File: c/OP_SGET.cpp */
 HANDLE_SGET_X(OP_SGET,                  "", Int, )
 OP_END
 
-/* File: c/OP_SGET_WIDE.c */
+/* File: c/OP_SGET_WIDE.cpp */
 HANDLE_SGET_X(OP_SGET_WIDE,             "-wide", Long, _WIDE)
 OP_END
 
-/* File: c/OP_SGET_OBJECT.c */
+/* File: c/OP_SGET_OBJECT.cpp */
 HANDLE_SGET_X(OP_SGET_OBJECT,           "-object", Object, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_SGET_BOOLEAN.c */
+/* File: c/OP_SGET_BOOLEAN.cpp */
 HANDLE_SGET_X(OP_SGET_BOOLEAN,          "", Int, )
 OP_END
 
-/* File: c/OP_SGET_BYTE.c */
+/* File: c/OP_SGET_BYTE.cpp */
 HANDLE_SGET_X(OP_SGET_BYTE,             "", Int, )
 OP_END
 
-/* File: c/OP_SGET_CHAR.c */
+/* File: c/OP_SGET_CHAR.cpp */
 HANDLE_SGET_X(OP_SGET_CHAR,             "", Int, )
 OP_END
 
-/* File: c/OP_SGET_SHORT.c */
+/* File: c/OP_SGET_SHORT.cpp */
 HANDLE_SGET_X(OP_SGET_SHORT,            "", Int, )
 OP_END
 
-/* File: c/OP_SPUT.c */
+/* File: c/OP_SPUT.cpp */
 HANDLE_SPUT_X(OP_SPUT,                  "", Int, )
 OP_END
 
-/* File: c/OP_SPUT_WIDE.c */
+/* File: c/OP_SPUT_WIDE.cpp */
 HANDLE_SPUT_X(OP_SPUT_WIDE,             "-wide", Long, _WIDE)
 OP_END
 
-/* File: c/OP_SPUT_OBJECT.c */
+/* File: c/OP_SPUT_OBJECT.cpp */
 HANDLE_SPUT_X(OP_SPUT_OBJECT,           "-object", Object, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_SPUT_BOOLEAN.c */
+/* File: c/OP_SPUT_BOOLEAN.cpp */
 HANDLE_SPUT_X(OP_SPUT_BOOLEAN,          "", Int, )
 OP_END
 
-/* File: c/OP_SPUT_BYTE.c */
+/* File: c/OP_SPUT_BYTE.cpp */
 HANDLE_SPUT_X(OP_SPUT_BYTE,             "", Int, )
 OP_END
 
-/* File: c/OP_SPUT_CHAR.c */
+/* File: c/OP_SPUT_CHAR.cpp */
 HANDLE_SPUT_X(OP_SPUT_CHAR,             "", Int, )
 OP_END
 
-/* File: c/OP_SPUT_SHORT.c */
+/* File: c/OP_SPUT_SHORT.cpp */
 HANDLE_SPUT_X(OP_SPUT_SHORT,            "", Int, )
 OP_END
 
-/* File: c/OP_INVOKE_VIRTUAL.c */
+/* File: c/OP_INVOKE_VIRTUAL.cpp */
 HANDLE_OPCODE(OP_INVOKE_VIRTUAL /*vB, {vD, vE, vF, vG, vA}, meth@CCCC*/)
     GOTO_invoke(invokeVirtual, false, false);
 OP_END
 
-/* File: c/OP_INVOKE_SUPER.c */
+/* File: c/OP_INVOKE_SUPER.cpp */
 HANDLE_OPCODE(OP_INVOKE_SUPER /*vB, {vD, vE, vF, vG, vA}, meth@CCCC*/)
     GOTO_invoke(invokeSuper, false, false);
 OP_END
 
-/* File: c/OP_INVOKE_DIRECT.c */
+/* File: c/OP_INVOKE_DIRECT.cpp */
 HANDLE_OPCODE(OP_INVOKE_DIRECT /*vB, {vD, vE, vF, vG, vA}, meth@CCCC*/)
     GOTO_invoke(invokeDirect, false, false);
 OP_END
 
-/* File: c/OP_INVOKE_STATIC.c */
+/* File: c/OP_INVOKE_STATIC.cpp */
 HANDLE_OPCODE(OP_INVOKE_STATIC /*vB, {vD, vE, vF, vG, vA}, meth@CCCC*/)
     GOTO_invoke(invokeStatic, false, false);
 OP_END
 
-/* File: c/OP_INVOKE_INTERFACE.c */
+/* File: c/OP_INVOKE_INTERFACE.cpp */
 HANDLE_OPCODE(OP_INVOKE_INTERFACE /*vB, {vD, vE, vF, vG, vA}, meth@CCCC*/)
     GOTO_invoke(invokeInterface, false, false);
 OP_END
 
-/* File: c/OP_UNUSED_73.c */
+/* File: c/OP_UNUSED_73.cpp */
 HANDLE_OPCODE(OP_UNUSED_73)
 OP_END
 
-/* File: c/OP_INVOKE_VIRTUAL_RANGE.c */
+/* File: c/OP_INVOKE_VIRTUAL_RANGE.cpp */
 HANDLE_OPCODE(OP_INVOKE_VIRTUAL_RANGE /*{vCCCC..v(CCCC+AA-1)}, meth@BBBB*/)
     GOTO_invoke(invokeVirtual, true, false);
 OP_END
 
-/* File: c/OP_INVOKE_SUPER_RANGE.c */
+/* File: c/OP_INVOKE_SUPER_RANGE.cpp */
 HANDLE_OPCODE(OP_INVOKE_SUPER_RANGE /*{vCCCC..v(CCCC+AA-1)}, meth@BBBB*/)
     GOTO_invoke(invokeSuper, true, false);
 OP_END
 
-/* File: c/OP_INVOKE_DIRECT_RANGE.c */
+/* File: c/OP_INVOKE_DIRECT_RANGE.cpp */
 HANDLE_OPCODE(OP_INVOKE_DIRECT_RANGE /*{vCCCC..v(CCCC+AA-1)}, meth@BBBB*/)
     GOTO_invoke(invokeDirect, true, false);
 OP_END
 
-/* File: c/OP_INVOKE_STATIC_RANGE.c */
+/* File: c/OP_INVOKE_STATIC_RANGE.cpp */
 HANDLE_OPCODE(OP_INVOKE_STATIC_RANGE /*{vCCCC..v(CCCC+AA-1)}, meth@BBBB*/)
     GOTO_invoke(invokeStatic, true, false);
 OP_END
 
-/* File: c/OP_INVOKE_INTERFACE_RANGE.c */
+/* File: c/OP_INVOKE_INTERFACE_RANGE.cpp */
 HANDLE_OPCODE(OP_INVOKE_INTERFACE_RANGE /*{vCCCC..v(CCCC+AA-1)}, meth@BBBB*/)
     GOTO_invoke(invokeInterface, true, false);
 OP_END
 
-/* File: c/OP_UNUSED_79.c */
+/* File: c/OP_UNUSED_79.cpp */
 HANDLE_OPCODE(OP_UNUSED_79)
 OP_END
 
-/* File: c/OP_UNUSED_7A.c */
+/* File: c/OP_UNUSED_7A.cpp */
 HANDLE_OPCODE(OP_UNUSED_7A)
 OP_END
 
-/* File: c/OP_NEG_INT.c */
+/* File: c/OP_NEG_INT.cpp */
 HANDLE_UNOP(OP_NEG_INT, "neg-int", -, , )
 OP_END
 
-/* File: c/OP_NOT_INT.c */
+/* File: c/OP_NOT_INT.cpp */
 HANDLE_UNOP(OP_NOT_INT, "not-int", , ^ 0xffffffff, )
 OP_END
 
-/* File: c/OP_NEG_LONG.c */
+/* File: c/OP_NEG_LONG.cpp */
 HANDLE_UNOP(OP_NEG_LONG, "neg-long", -, , _WIDE)
 OP_END
 
-/* File: c/OP_NOT_LONG.c */
+/* File: c/OP_NOT_LONG.cpp */
 HANDLE_UNOP(OP_NOT_LONG, "not-long", , ^ 0xffffffffffffffffULL, _WIDE)
 OP_END
 
-/* File: c/OP_NEG_FLOAT.c */
+/* File: c/OP_NEG_FLOAT.cpp */
 HANDLE_UNOP(OP_NEG_FLOAT, "neg-float", -, , _FLOAT)
 OP_END
 
-/* File: c/OP_NEG_DOUBLE.c */
+/* File: c/OP_NEG_DOUBLE.cpp */
 HANDLE_UNOP(OP_NEG_DOUBLE, "neg-double", -, , _DOUBLE)
 OP_END
 
-/* File: c/OP_INT_TO_LONG.c */
+/* File: c/OP_INT_TO_LONG.cpp */
 HANDLE_NUMCONV(OP_INT_TO_LONG,          "int-to-long", _INT, _WIDE)
 OP_END
 
-/* File: c/OP_INT_TO_FLOAT.c */
+/* File: c/OP_INT_TO_FLOAT.cpp */
 HANDLE_NUMCONV(OP_INT_TO_FLOAT,         "int-to-float", _INT, _FLOAT)
 OP_END
 
-/* File: c/OP_INT_TO_DOUBLE.c */
+/* File: c/OP_INT_TO_DOUBLE.cpp */
 HANDLE_NUMCONV(OP_INT_TO_DOUBLE,        "int-to-double", _INT, _DOUBLE)
 OP_END
 
-/* File: c/OP_LONG_TO_INT.c */
+/* File: c/OP_LONG_TO_INT.cpp */
 HANDLE_NUMCONV(OP_LONG_TO_INT,          "long-to-int", _WIDE, _INT)
 OP_END
 
-/* File: c/OP_LONG_TO_FLOAT.c */
+/* File: c/OP_LONG_TO_FLOAT.cpp */
 HANDLE_NUMCONV(OP_LONG_TO_FLOAT,        "long-to-float", _WIDE, _FLOAT)
 OP_END
 
-/* File: c/OP_LONG_TO_DOUBLE.c */
+/* File: c/OP_LONG_TO_DOUBLE.cpp */
 HANDLE_NUMCONV(OP_LONG_TO_DOUBLE,       "long-to-double", _WIDE, _DOUBLE)
 OP_END
 
-/* File: c/OP_FLOAT_TO_INT.c */
+/* File: c/OP_FLOAT_TO_INT.cpp */
 HANDLE_FLOAT_TO_INT(OP_FLOAT_TO_INT,    "float-to-int",
     float, _FLOAT, s4, _INT)
 OP_END
 
-/* File: c/OP_FLOAT_TO_LONG.c */
+/* File: c/OP_FLOAT_TO_LONG.cpp */
 HANDLE_FLOAT_TO_INT(OP_FLOAT_TO_LONG,   "float-to-long",
     float, _FLOAT, s8, _WIDE)
 OP_END
 
-/* File: c/OP_FLOAT_TO_DOUBLE.c */
+/* File: c/OP_FLOAT_TO_DOUBLE.cpp */
 HANDLE_NUMCONV(OP_FLOAT_TO_DOUBLE,      "float-to-double", _FLOAT, _DOUBLE)
 OP_END
 
-/* File: c/OP_DOUBLE_TO_INT.c */
+/* File: c/OP_DOUBLE_TO_INT.cpp */
 HANDLE_FLOAT_TO_INT(OP_DOUBLE_TO_INT,   "double-to-int",
     double, _DOUBLE, s4, _INT)
 OP_END
 
-/* File: c/OP_DOUBLE_TO_LONG.c */
+/* File: c/OP_DOUBLE_TO_LONG.cpp */
 HANDLE_FLOAT_TO_INT(OP_DOUBLE_TO_LONG,  "double-to-long",
     double, _DOUBLE, s8, _WIDE)
 OP_END
 
-/* File: c/OP_DOUBLE_TO_FLOAT.c */
+/* File: c/OP_DOUBLE_TO_FLOAT.cpp */
 HANDLE_NUMCONV(OP_DOUBLE_TO_FLOAT,      "double-to-float", _DOUBLE, _FLOAT)
 OP_END
 
-/* File: c/OP_INT_TO_BYTE.c */
+/* File: c/OP_INT_TO_BYTE.cpp */
 HANDLE_INT_TO_SMALL(OP_INT_TO_BYTE,     "byte", s1)
 OP_END
 
-/* File: c/OP_INT_TO_CHAR.c */
+/* File: c/OP_INT_TO_CHAR.cpp */
 HANDLE_INT_TO_SMALL(OP_INT_TO_CHAR,     "char", u2)
 OP_END
 
-/* File: c/OP_INT_TO_SHORT.c */
+/* File: c/OP_INT_TO_SHORT.cpp */
 HANDLE_INT_TO_SMALL(OP_INT_TO_SHORT,    "short", s2)    /* want sign bit */
 OP_END
 
-/* File: c/OP_ADD_INT.c */
+/* File: c/OP_ADD_INT.cpp */
 HANDLE_OP_X_INT(OP_ADD_INT, "add", +, 0)
 OP_END
 
-/* File: c/OP_SUB_INT.c */
+/* File: c/OP_SUB_INT.cpp */
 HANDLE_OP_X_INT(OP_SUB_INT, "sub", -, 0)
 OP_END
 
-/* File: c/OP_MUL_INT.c */
+/* File: c/OP_MUL_INT.cpp */
 HANDLE_OP_X_INT(OP_MUL_INT, "mul", *, 0)
 OP_END
 
-/* File: c/OP_DIV_INT.c */
+/* File: c/OP_DIV_INT.cpp */
 HANDLE_OP_X_INT(OP_DIV_INT, "div", /, 1)
 OP_END
 
-/* File: c/OP_REM_INT.c */
+/* File: c/OP_REM_INT.cpp */
 HANDLE_OP_X_INT(OP_REM_INT, "rem", %, 2)
 OP_END
 
-/* File: c/OP_AND_INT.c */
+/* File: c/OP_AND_INT.cpp */
 HANDLE_OP_X_INT(OP_AND_INT, "and", &, 0)
 OP_END
 
-/* File: c/OP_OR_INT.c */
+/* File: c/OP_OR_INT.cpp */
 HANDLE_OP_X_INT(OP_OR_INT,  "or",  |, 0)
 OP_END
 
-/* File: c/OP_XOR_INT.c */
+/* File: c/OP_XOR_INT.cpp */
 HANDLE_OP_X_INT(OP_XOR_INT, "xor", ^, 0)
 OP_END
 
-/* File: c/OP_SHL_INT.c */
+/* File: c/OP_SHL_INT.cpp */
 HANDLE_OP_SHX_INT(OP_SHL_INT, "shl", (s4), <<)
 OP_END
 
-/* File: c/OP_SHR_INT.c */
+/* File: c/OP_SHR_INT.cpp */
 HANDLE_OP_SHX_INT(OP_SHR_INT, "shr", (s4), >>)
 OP_END
 
-/* File: c/OP_USHR_INT.c */
+/* File: c/OP_USHR_INT.cpp */
 HANDLE_OP_SHX_INT(OP_USHR_INT, "ushr", (u4), >>)
 OP_END
 
-/* File: c/OP_ADD_LONG.c */
+/* File: c/OP_ADD_LONG.cpp */
 HANDLE_OP_X_LONG(OP_ADD_LONG, "add", +, 0)
 OP_END
 
-/* File: c/OP_SUB_LONG.c */
+/* File: c/OP_SUB_LONG.cpp */
 HANDLE_OP_X_LONG(OP_SUB_LONG, "sub", -, 0)
 OP_END
 
-/* File: c/OP_MUL_LONG.c */
+/* File: c/OP_MUL_LONG.cpp */
 HANDLE_OP_X_LONG(OP_MUL_LONG, "mul", *, 0)
 OP_END
 
-/* File: c/OP_DIV_LONG.c */
+/* File: c/OP_DIV_LONG.cpp */
 HANDLE_OP_X_LONG(OP_DIV_LONG, "div", /, 1)
 OP_END
 
-/* File: c/OP_REM_LONG.c */
+/* File: c/OP_REM_LONG.cpp */
 HANDLE_OP_X_LONG(OP_REM_LONG, "rem", %, 2)
 OP_END
 
-/* File: c/OP_AND_LONG.c */
+/* File: c/OP_AND_LONG.cpp */
 HANDLE_OP_X_LONG(OP_AND_LONG, "and", &, 0)
 OP_END
 
-/* File: c/OP_OR_LONG.c */
+/* File: c/OP_OR_LONG.cpp */
 HANDLE_OP_X_LONG(OP_OR_LONG,  "or", |, 0)
 OP_END
 
-/* File: c/OP_XOR_LONG.c */
+/* File: c/OP_XOR_LONG.cpp */
 HANDLE_OP_X_LONG(OP_XOR_LONG, "xor", ^, 0)
 OP_END
 
-/* File: c/OP_SHL_LONG.c */
+/* File: c/OP_SHL_LONG.cpp */
 HANDLE_OP_SHX_LONG(OP_SHL_LONG, "shl", (s8), <<)
 OP_END
 
-/* File: c/OP_SHR_LONG.c */
+/* File: c/OP_SHR_LONG.cpp */
 HANDLE_OP_SHX_LONG(OP_SHR_LONG, "shr", (s8), >>)
 OP_END
 
-/* File: c/OP_USHR_LONG.c */
+/* File: c/OP_USHR_LONG.cpp */
 HANDLE_OP_SHX_LONG(OP_USHR_LONG, "ushr", (u8), >>)
 OP_END
 
-/* File: c/OP_ADD_FLOAT.c */
+/* File: c/OP_ADD_FLOAT.cpp */
 HANDLE_OP_X_FLOAT(OP_ADD_FLOAT, "add", +)
 OP_END
 
-/* File: c/OP_SUB_FLOAT.c */
+/* File: c/OP_SUB_FLOAT.cpp */
 HANDLE_OP_X_FLOAT(OP_SUB_FLOAT, "sub", -)
 OP_END
 
-/* File: c/OP_MUL_FLOAT.c */
+/* File: c/OP_MUL_FLOAT.cpp */
 HANDLE_OP_X_FLOAT(OP_MUL_FLOAT, "mul", *)
 OP_END
 
-/* File: c/OP_DIV_FLOAT.c */
+/* File: c/OP_DIV_FLOAT.cpp */
 HANDLE_OP_X_FLOAT(OP_DIV_FLOAT, "div", /)
 OP_END
 
-/* File: c/OP_REM_FLOAT.c */
+/* File: c/OP_REM_FLOAT.cpp */
 HANDLE_OPCODE(OP_REM_FLOAT /*vAA, vBB, vCC*/)
     {
         u2 srcRegs;
@@ -2579,23 +2580,23 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_ADD_DOUBLE.c */
+/* File: c/OP_ADD_DOUBLE.cpp */
 HANDLE_OP_X_DOUBLE(OP_ADD_DOUBLE, "add", +)
 OP_END
 
-/* File: c/OP_SUB_DOUBLE.c */
+/* File: c/OP_SUB_DOUBLE.cpp */
 HANDLE_OP_X_DOUBLE(OP_SUB_DOUBLE, "sub", -)
 OP_END
 
-/* File: c/OP_MUL_DOUBLE.c */
+/* File: c/OP_MUL_DOUBLE.cpp */
 HANDLE_OP_X_DOUBLE(OP_MUL_DOUBLE, "mul", *)
 OP_END
 
-/* File: c/OP_DIV_DOUBLE.c */
+/* File: c/OP_DIV_DOUBLE.cpp */
 HANDLE_OP_X_DOUBLE(OP_DIV_DOUBLE, "div", /)
 OP_END
 
-/* File: c/OP_REM_DOUBLE.c */
+/* File: c/OP_REM_DOUBLE.cpp */
 HANDLE_OPCODE(OP_REM_DOUBLE /*vAA, vBB, vCC*/)
     {
         u2 srcRegs;
@@ -2610,111 +2611,111 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_ADD_INT_2ADDR.c */
+/* File: c/OP_ADD_INT_2ADDR.cpp */
 HANDLE_OP_X_INT_2ADDR(OP_ADD_INT_2ADDR, "add", +, 0)
 OP_END
 
-/* File: c/OP_SUB_INT_2ADDR.c */
+/* File: c/OP_SUB_INT_2ADDR.cpp */
 HANDLE_OP_X_INT_2ADDR(OP_SUB_INT_2ADDR, "sub", -, 0)
 OP_END
 
-/* File: c/OP_MUL_INT_2ADDR.c */
+/* File: c/OP_MUL_INT_2ADDR.cpp */
 HANDLE_OP_X_INT_2ADDR(OP_MUL_INT_2ADDR, "mul", *, 0)
 OP_END
 
-/* File: c/OP_DIV_INT_2ADDR.c */
+/* File: c/OP_DIV_INT_2ADDR.cpp */
 HANDLE_OP_X_INT_2ADDR(OP_DIV_INT_2ADDR, "div", /, 1)
 OP_END
 
-/* File: c/OP_REM_INT_2ADDR.c */
+/* File: c/OP_REM_INT_2ADDR.cpp */
 HANDLE_OP_X_INT_2ADDR(OP_REM_INT_2ADDR, "rem", %, 2)
 OP_END
 
-/* File: c/OP_AND_INT_2ADDR.c */
+/* File: c/OP_AND_INT_2ADDR.cpp */
 HANDLE_OP_X_INT_2ADDR(OP_AND_INT_2ADDR, "and", &, 0)
 OP_END
 
-/* File: c/OP_OR_INT_2ADDR.c */
+/* File: c/OP_OR_INT_2ADDR.cpp */
 HANDLE_OP_X_INT_2ADDR(OP_OR_INT_2ADDR,  "or", |, 0)
 OP_END
 
-/* File: c/OP_XOR_INT_2ADDR.c */
+/* File: c/OP_XOR_INT_2ADDR.cpp */
 HANDLE_OP_X_INT_2ADDR(OP_XOR_INT_2ADDR, "xor", ^, 0)
 OP_END
 
-/* File: c/OP_SHL_INT_2ADDR.c */
+/* File: c/OP_SHL_INT_2ADDR.cpp */
 HANDLE_OP_SHX_INT_2ADDR(OP_SHL_INT_2ADDR, "shl", (s4), <<)
 OP_END
 
-/* File: c/OP_SHR_INT_2ADDR.c */
+/* File: c/OP_SHR_INT_2ADDR.cpp */
 HANDLE_OP_SHX_INT_2ADDR(OP_SHR_INT_2ADDR, "shr", (s4), >>)
 OP_END
 
-/* File: c/OP_USHR_INT_2ADDR.c */
+/* File: c/OP_USHR_INT_2ADDR.cpp */
 HANDLE_OP_SHX_INT_2ADDR(OP_USHR_INT_2ADDR, "ushr", (u4), >>)
 OP_END
 
-/* File: c/OP_ADD_LONG_2ADDR.c */
+/* File: c/OP_ADD_LONG_2ADDR.cpp */
 HANDLE_OP_X_LONG_2ADDR(OP_ADD_LONG_2ADDR, "add", +, 0)
 OP_END
 
-/* File: c/OP_SUB_LONG_2ADDR.c */
+/* File: c/OP_SUB_LONG_2ADDR.cpp */
 HANDLE_OP_X_LONG_2ADDR(OP_SUB_LONG_2ADDR, "sub", -, 0)
 OP_END
 
-/* File: c/OP_MUL_LONG_2ADDR.c */
+/* File: c/OP_MUL_LONG_2ADDR.cpp */
 HANDLE_OP_X_LONG_2ADDR(OP_MUL_LONG_2ADDR, "mul", *, 0)
 OP_END
 
-/* File: c/OP_DIV_LONG_2ADDR.c */
+/* File: c/OP_DIV_LONG_2ADDR.cpp */
 HANDLE_OP_X_LONG_2ADDR(OP_DIV_LONG_2ADDR, "div", /, 1)
 OP_END
 
-/* File: c/OP_REM_LONG_2ADDR.c */
+/* File: c/OP_REM_LONG_2ADDR.cpp */
 HANDLE_OP_X_LONG_2ADDR(OP_REM_LONG_2ADDR, "rem", %, 2)
 OP_END
 
-/* File: c/OP_AND_LONG_2ADDR.c */
+/* File: c/OP_AND_LONG_2ADDR.cpp */
 HANDLE_OP_X_LONG_2ADDR(OP_AND_LONG_2ADDR, "and", &, 0)
 OP_END
 
-/* File: c/OP_OR_LONG_2ADDR.c */
+/* File: c/OP_OR_LONG_2ADDR.cpp */
 HANDLE_OP_X_LONG_2ADDR(OP_OR_LONG_2ADDR,  "or", |, 0)
 OP_END
 
-/* File: c/OP_XOR_LONG_2ADDR.c */
+/* File: c/OP_XOR_LONG_2ADDR.cpp */
 HANDLE_OP_X_LONG_2ADDR(OP_XOR_LONG_2ADDR, "xor", ^, 0)
 OP_END
 
-/* File: c/OP_SHL_LONG_2ADDR.c */
+/* File: c/OP_SHL_LONG_2ADDR.cpp */
 HANDLE_OP_SHX_LONG_2ADDR(OP_SHL_LONG_2ADDR, "shl", (s8), <<)
 OP_END
 
-/* File: c/OP_SHR_LONG_2ADDR.c */
+/* File: c/OP_SHR_LONG_2ADDR.cpp */
 HANDLE_OP_SHX_LONG_2ADDR(OP_SHR_LONG_2ADDR, "shr", (s8), >>)
 OP_END
 
-/* File: c/OP_USHR_LONG_2ADDR.c */
+/* File: c/OP_USHR_LONG_2ADDR.cpp */
 HANDLE_OP_SHX_LONG_2ADDR(OP_USHR_LONG_2ADDR, "ushr", (u8), >>)
 OP_END
 
-/* File: c/OP_ADD_FLOAT_2ADDR.c */
+/* File: c/OP_ADD_FLOAT_2ADDR.cpp */
 HANDLE_OP_X_FLOAT_2ADDR(OP_ADD_FLOAT_2ADDR, "add", +)
 OP_END
 
-/* File: c/OP_SUB_FLOAT_2ADDR.c */
+/* File: c/OP_SUB_FLOAT_2ADDR.cpp */
 HANDLE_OP_X_FLOAT_2ADDR(OP_SUB_FLOAT_2ADDR, "sub", -)
 OP_END
 
-/* File: c/OP_MUL_FLOAT_2ADDR.c */
+/* File: c/OP_MUL_FLOAT_2ADDR.cpp */
 HANDLE_OP_X_FLOAT_2ADDR(OP_MUL_FLOAT_2ADDR, "mul", *)
 OP_END
 
-/* File: c/OP_DIV_FLOAT_2ADDR.c */
+/* File: c/OP_DIV_FLOAT_2ADDR.cpp */
 HANDLE_OP_X_FLOAT_2ADDR(OP_DIV_FLOAT_2ADDR, "div", /)
 OP_END
 
-/* File: c/OP_REM_FLOAT_2ADDR.c */
+/* File: c/OP_REM_FLOAT_2ADDR.cpp */
 HANDLE_OPCODE(OP_REM_FLOAT_2ADDR /*vA, vB*/)
     vdst = INST_A(inst);
     vsrc1 = INST_B(inst);
@@ -2724,23 +2725,23 @@
     FINISH(1);
 OP_END
 
-/* File: c/OP_ADD_DOUBLE_2ADDR.c */
+/* File: c/OP_ADD_DOUBLE_2ADDR.cpp */
 HANDLE_OP_X_DOUBLE_2ADDR(OP_ADD_DOUBLE_2ADDR, "add", +)
 OP_END
 
-/* File: c/OP_SUB_DOUBLE_2ADDR.c */
+/* File: c/OP_SUB_DOUBLE_2ADDR.cpp */
 HANDLE_OP_X_DOUBLE_2ADDR(OP_SUB_DOUBLE_2ADDR, "sub", -)
 OP_END
 
-/* File: c/OP_MUL_DOUBLE_2ADDR.c */
+/* File: c/OP_MUL_DOUBLE_2ADDR.cpp */
 HANDLE_OP_X_DOUBLE_2ADDR(OP_MUL_DOUBLE_2ADDR, "mul", *)
 OP_END
 
-/* File: c/OP_DIV_DOUBLE_2ADDR.c */
+/* File: c/OP_DIV_DOUBLE_2ADDR.cpp */
 HANDLE_OP_X_DOUBLE_2ADDR(OP_DIV_DOUBLE_2ADDR, "div", /)
 OP_END
 
-/* File: c/OP_REM_DOUBLE_2ADDR.c */
+/* File: c/OP_REM_DOUBLE_2ADDR.cpp */
 HANDLE_OPCODE(OP_REM_DOUBLE_2ADDR /*vA, vB*/)
     vdst = INST_A(inst);
     vsrc1 = INST_B(inst);
@@ -2750,11 +2751,11 @@
     FINISH(1);
 OP_END
 
-/* File: c/OP_ADD_INT_LIT16.c */
+/* File: c/OP_ADD_INT_LIT16.cpp */
 HANDLE_OP_X_INT_LIT16(OP_ADD_INT_LIT16, "add", +, 0)
 OP_END
 
-/* File: c/OP_RSUB_INT.c */
+/* File: c/OP_RSUB_INT.cpp */
 HANDLE_OPCODE(OP_RSUB_INT /*vA, vB, #+CCCC*/)
     {
         vdst = INST_A(inst);
@@ -2766,35 +2767,35 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_MUL_INT_LIT16.c */
+/* File: c/OP_MUL_INT_LIT16.cpp */
 HANDLE_OP_X_INT_LIT16(OP_MUL_INT_LIT16, "mul", *, 0)
 OP_END
 
-/* File: c/OP_DIV_INT_LIT16.c */
+/* File: c/OP_DIV_INT_LIT16.cpp */
 HANDLE_OP_X_INT_LIT16(OP_DIV_INT_LIT16, "div", /, 1)
 OP_END
 
-/* File: c/OP_REM_INT_LIT16.c */
+/* File: c/OP_REM_INT_LIT16.cpp */
 HANDLE_OP_X_INT_LIT16(OP_REM_INT_LIT16, "rem", %, 2)
 OP_END
 
-/* File: c/OP_AND_INT_LIT16.c */
+/* File: c/OP_AND_INT_LIT16.cpp */
 HANDLE_OP_X_INT_LIT16(OP_AND_INT_LIT16, "and", &, 0)
 OP_END
 
-/* File: c/OP_OR_INT_LIT16.c */
+/* File: c/OP_OR_INT_LIT16.cpp */
 HANDLE_OP_X_INT_LIT16(OP_OR_INT_LIT16,  "or",  |, 0)
 OP_END
 
-/* File: c/OP_XOR_INT_LIT16.c */
+/* File: c/OP_XOR_INT_LIT16.cpp */
 HANDLE_OP_X_INT_LIT16(OP_XOR_INT_LIT16, "xor", ^, 0)
 OP_END
 
-/* File: c/OP_ADD_INT_LIT8.c */
+/* File: c/OP_ADD_INT_LIT8.cpp */
 HANDLE_OP_X_INT_LIT8(OP_ADD_INT_LIT8,   "add", +, 0)
 OP_END
 
-/* File: c/OP_RSUB_INT_LIT8.c */
+/* File: c/OP_RSUB_INT_LIT8.cpp */
 HANDLE_OPCODE(OP_RSUB_INT_LIT8 /*vAA, vBB, #+CC*/)
     {
         u2 litInfo;
@@ -2808,79 +2809,79 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_MUL_INT_LIT8.c */
+/* File: c/OP_MUL_INT_LIT8.cpp */
 HANDLE_OP_X_INT_LIT8(OP_MUL_INT_LIT8,   "mul", *, 0)
 OP_END
 
-/* File: c/OP_DIV_INT_LIT8.c */
+/* File: c/OP_DIV_INT_LIT8.cpp */
 HANDLE_OP_X_INT_LIT8(OP_DIV_INT_LIT8,   "div", /, 1)
 OP_END
 
-/* File: c/OP_REM_INT_LIT8.c */
+/* File: c/OP_REM_INT_LIT8.cpp */
 HANDLE_OP_X_INT_LIT8(OP_REM_INT_LIT8,   "rem", %, 2)
 OP_END
 
-/* File: c/OP_AND_INT_LIT8.c */
+/* File: c/OP_AND_INT_LIT8.cpp */
 HANDLE_OP_X_INT_LIT8(OP_AND_INT_LIT8,   "and", &, 0)
 OP_END
 
-/* File: c/OP_OR_INT_LIT8.c */
+/* File: c/OP_OR_INT_LIT8.cpp */
 HANDLE_OP_X_INT_LIT8(OP_OR_INT_LIT8,    "or",  |, 0)
 OP_END
 
-/* File: c/OP_XOR_INT_LIT8.c */
+/* File: c/OP_XOR_INT_LIT8.cpp */
 HANDLE_OP_X_INT_LIT8(OP_XOR_INT_LIT8,   "xor", ^, 0)
 OP_END
 
-/* File: c/OP_SHL_INT_LIT8.c */
+/* File: c/OP_SHL_INT_LIT8.cpp */
 HANDLE_OP_SHX_INT_LIT8(OP_SHL_INT_LIT8,   "shl", (s4), <<)
 OP_END
 
-/* File: c/OP_SHR_INT_LIT8.c */
+/* File: c/OP_SHR_INT_LIT8.cpp */
 HANDLE_OP_SHX_INT_LIT8(OP_SHR_INT_LIT8,   "shr", (s4), >>)
 OP_END
 
-/* File: c/OP_USHR_INT_LIT8.c */
+/* File: c/OP_USHR_INT_LIT8.cpp */
 HANDLE_OP_SHX_INT_LIT8(OP_USHR_INT_LIT8,  "ushr", (u4), >>)
 OP_END
 
-/* File: c/OP_IGET_VOLATILE.c */
+/* File: c/OP_IGET_VOLATILE.cpp */
 HANDLE_IGET_X(OP_IGET_VOLATILE,         "-volatile", IntVolatile, )
 OP_END
 
-/* File: c/OP_IPUT_VOLATILE.c */
+/* File: c/OP_IPUT_VOLATILE.cpp */
 HANDLE_IPUT_X(OP_IPUT_VOLATILE,         "-volatile", IntVolatile, )
 OP_END
 
-/* File: c/OP_SGET_VOLATILE.c */
+/* File: c/OP_SGET_VOLATILE.cpp */
 HANDLE_SGET_X(OP_SGET_VOLATILE,         "-volatile", IntVolatile, )
 OP_END
 
-/* File: c/OP_SPUT_VOLATILE.c */
+/* File: c/OP_SPUT_VOLATILE.cpp */
 HANDLE_SPUT_X(OP_SPUT_VOLATILE,         "-volatile", IntVolatile, )
 OP_END
 
-/* File: c/OP_IGET_OBJECT_VOLATILE.c */
+/* File: c/OP_IGET_OBJECT_VOLATILE.cpp */
 HANDLE_IGET_X(OP_IGET_OBJECT_VOLATILE,  "-object-volatile", ObjectVolatile, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_IGET_WIDE_VOLATILE.c */
+/* File: c/OP_IGET_WIDE_VOLATILE.cpp */
 HANDLE_IGET_X(OP_IGET_WIDE_VOLATILE,    "-wide-volatile", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_IPUT_WIDE_VOLATILE.c */
+/* File: c/OP_IPUT_WIDE_VOLATILE.cpp */
 HANDLE_IPUT_X(OP_IPUT_WIDE_VOLATILE,    "-wide-volatile", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_SGET_WIDE_VOLATILE.c */
+/* File: c/OP_SGET_WIDE_VOLATILE.cpp */
 HANDLE_SGET_X(OP_SGET_WIDE_VOLATILE,    "-wide-volatile", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_SPUT_WIDE_VOLATILE.c */
+/* File: c/OP_SPUT_WIDE_VOLATILE.cpp */
 HANDLE_SPUT_X(OP_SPUT_WIDE_VOLATILE,    "-wide-volatile", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_BREAKPOINT.c */
+/* File: c/OP_BREAKPOINT.cpp */
 HANDLE_OPCODE(OP_BREAKPOINT)
     {
         /*
@@ -2906,7 +2907,7 @@
     }
 OP_END
 
-/* File: c/OP_THROW_VERIFICATION_ERROR.c */
+/* File: c/OP_THROW_VERIFICATION_ERROR.cpp */
 HANDLE_OPCODE(OP_THROW_VERIFICATION_ERROR)
     EXPORT_PC();
     vsrc1 = INST_AA(inst);
@@ -2915,7 +2916,7 @@
     GOTO_exceptionThrown();
 OP_END
 
-/* File: c/OP_EXECUTE_INLINE.c */
+/* File: c/OP_EXECUTE_INLINE.cpp */
 HANDLE_OPCODE(OP_EXECUTE_INLINE /*vB, {vD, vE, vF, vG}, inline@CCCC*/)
     {
         /*
@@ -2976,7 +2977,7 @@
     FINISH(3);
 OP_END
 
-/* File: c/OP_EXECUTE_INLINE_RANGE.c */
+/* File: c/OP_EXECUTE_INLINE_RANGE.cpp */
 HANDLE_OPCODE(OP_EXECUTE_INLINE_RANGE /*{vCCCC..v(CCCC+AA-1)}, inline@BBBB*/)
     {
         u4 arg0, arg1, arg2, arg3;
@@ -3021,7 +3022,7 @@
     FINISH(3);
 OP_END
 
-/* File: c/OP_INVOKE_OBJECT_INIT_RANGE.c */
+/* File: c/OP_INVOKE_OBJECT_INIT_RANGE.cpp */
 HANDLE_OPCODE(OP_INVOKE_OBJECT_INIT_RANGE /*{vCCCC..v(CCCC+AA-1)}, meth@BBBB*/)
     {
         Object* obj;
@@ -3052,7 +3053,7 @@
     }
 OP_END
 
-/* File: c/OP_RETURN_VOID_BARRIER.c */
+/* File: c/OP_RETURN_VOID_BARRIER.cpp */
 HANDLE_OPCODE(OP_RETURN_VOID_BARRIER /**/)
     ILOGV("|return-void");
 #ifndef NDEBUG
@@ -3062,63 +3063,63 @@
     GOTO_returnFromMethod();
 OP_END
 
-/* File: c/OP_IGET_QUICK.c */
+/* File: c/OP_IGET_QUICK.cpp */
 HANDLE_IGET_X_QUICK(OP_IGET_QUICK,          "", Int, )
 OP_END
 
-/* File: c/OP_IGET_WIDE_QUICK.c */
+/* File: c/OP_IGET_WIDE_QUICK.cpp */
 HANDLE_IGET_X_QUICK(OP_IGET_WIDE_QUICK,     "-wide", Long, _WIDE)
 OP_END
 
-/* File: c/OP_IGET_OBJECT_QUICK.c */
+/* File: c/OP_IGET_OBJECT_QUICK.cpp */
 HANDLE_IGET_X_QUICK(OP_IGET_OBJECT_QUICK,   "-object", Object, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_IPUT_QUICK.c */
+/* File: c/OP_IPUT_QUICK.cpp */
 HANDLE_IPUT_X_QUICK(OP_IPUT_QUICK,          "", Int, )
 OP_END
 
-/* File: c/OP_IPUT_WIDE_QUICK.c */
+/* File: c/OP_IPUT_WIDE_QUICK.cpp */
 HANDLE_IPUT_X_QUICK(OP_IPUT_WIDE_QUICK,     "-wide", Long, _WIDE)
 OP_END
 
-/* File: c/OP_IPUT_OBJECT_QUICK.c */
+/* File: c/OP_IPUT_OBJECT_QUICK.cpp */
 HANDLE_IPUT_X_QUICK(OP_IPUT_OBJECT_QUICK,   "-object", Object, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_INVOKE_VIRTUAL_QUICK.c */
+/* File: c/OP_INVOKE_VIRTUAL_QUICK.cpp */
 HANDLE_OPCODE(OP_INVOKE_VIRTUAL_QUICK /*vB, {vD, vE, vF, vG, vA}, meth@CCCC*/)
     GOTO_invoke(invokeVirtualQuick, false, false);
 OP_END
 
-/* File: c/OP_INVOKE_VIRTUAL_QUICK_RANGE.c */
+/* File: c/OP_INVOKE_VIRTUAL_QUICK_RANGE.cpp */
 HANDLE_OPCODE(OP_INVOKE_VIRTUAL_QUICK_RANGE/*{vCCCC..v(CCCC+AA-1)}, meth@BBBB*/)
     GOTO_invoke(invokeVirtualQuick, true, false);
 OP_END
 
-/* File: c/OP_INVOKE_SUPER_QUICK.c */
+/* File: c/OP_INVOKE_SUPER_QUICK.cpp */
 HANDLE_OPCODE(OP_INVOKE_SUPER_QUICK /*vB, {vD, vE, vF, vG, vA}, meth@CCCC*/)
     GOTO_invoke(invokeSuperQuick, false, false);
 OP_END
 
-/* File: c/OP_INVOKE_SUPER_QUICK_RANGE.c */
+/* File: c/OP_INVOKE_SUPER_QUICK_RANGE.cpp */
 HANDLE_OPCODE(OP_INVOKE_SUPER_QUICK_RANGE /*{vCCCC..v(CCCC+AA-1)}, meth@BBBB*/)
     GOTO_invoke(invokeSuperQuick, true, false);
 OP_END
 
-/* File: c/OP_IPUT_OBJECT_VOLATILE.c */
+/* File: c/OP_IPUT_OBJECT_VOLATILE.cpp */
 HANDLE_IPUT_X(OP_IPUT_OBJECT_VOLATILE,  "-object-volatile", ObjectVolatile, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_SGET_OBJECT_VOLATILE.c */
+/* File: c/OP_SGET_OBJECT_VOLATILE.cpp */
 HANDLE_SGET_X(OP_SGET_OBJECT_VOLATILE,  "-object-volatile", ObjectVolatile, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_SPUT_OBJECT_VOLATILE.c */
+/* File: c/OP_SPUT_OBJECT_VOLATILE.cpp */
 HANDLE_SPUT_X(OP_SPUT_OBJECT_VOLATILE,  "-object-volatile", ObjectVolatile, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_DISPATCH_FF.c */
+/* File: c/OP_DISPATCH_FF.cpp */
 HANDLE_OPCODE(OP_DISPATCH_FF)
     /*
      * Indicates extended opcode.  Use next 8 bits to choose where to branch.
@@ -3126,7 +3127,7 @@
     DISPATCH_EXTENDED(INST_AA(inst));
 OP_END
 
-/* File: c/OP_CONST_CLASS_JUMBO.c */
+/* File: c/OP_CONST_CLASS_JUMBO.cpp */
 HANDLE_OPCODE(OP_CONST_CLASS_JUMBO /*vBBBB, class@AAAAAAAA*/)
     {
         ClassObject* clazz;
@@ -3146,7 +3147,7 @@
     FINISH(4);
 OP_END
 
-/* File: c/OP_CHECK_CAST_JUMBO.c */
+/* File: c/OP_CHECK_CAST_JUMBO.cpp */
 HANDLE_OPCODE(OP_CHECK_CAST_JUMBO /*vBBBB, class@AAAAAAAA*/)
     {
         ClassObject* clazz;
@@ -3179,7 +3180,7 @@
     FINISH(4);
 OP_END
 
-/* File: c/OP_INSTANCE_OF_JUMBO.c */
+/* File: c/OP_INSTANCE_OF_JUMBO.cpp */
 HANDLE_OPCODE(OP_INSTANCE_OF_JUMBO /*vBBBB, vCCCC, class@AAAAAAAA*/)
     {
         ClassObject* clazz;
@@ -3211,7 +3212,7 @@
     FINISH(5);
 OP_END
 
-/* File: c/OP_NEW_INSTANCE_JUMBO.c */
+/* File: c/OP_NEW_INSTANCE_JUMBO.cpp */
 HANDLE_OPCODE(OP_NEW_INSTANCE_JUMBO /*vBBBB, class@AAAAAAAA*/)
     {
         ClassObject* clazz;
@@ -3261,7 +3262,7 @@
     FINISH(4);
 OP_END
 
-/* File: c/OP_NEW_ARRAY_JUMBO.c */
+/* File: c/OP_NEW_ARRAY_JUMBO.cpp */
 HANDLE_OPCODE(OP_NEW_ARRAY_JUMBO /*vBBBB, vCCCC, class@AAAAAAAA*/)
     {
         ClassObject* arrayClass;
@@ -3298,48 +3299,48 @@
     FINISH(5);
 OP_END
 
-/* File: c/OP_FILLED_NEW_ARRAY_JUMBO.c */
+/* File: c/OP_FILLED_NEW_ARRAY_JUMBO.cpp */
 HANDLE_OPCODE(OP_FILLED_NEW_ARRAY_JUMBO /*{vCCCC..v(CCCC+BBBB-1)}, class@AAAAAAAA*/)
     GOTO_invoke(filledNewArray, true, true);
 OP_END
 
-/* File: c/OP_IGET_JUMBO.c */
+/* File: c/OP_IGET_JUMBO.cpp */
 HANDLE_IGET_X_JUMBO(OP_IGET_JUMBO,          "", Int, )
 OP_END
 
-/* File: c/OP_IGET_WIDE_JUMBO.c */
+/* File: c/OP_IGET_WIDE_JUMBO.cpp */
 HANDLE_IGET_X_JUMBO(OP_IGET_WIDE_JUMBO,     "-wide", Long, _WIDE)
 OP_END
 
-/* File: c/OP_IGET_OBJECT_JUMBO.c */
+/* File: c/OP_IGET_OBJECT_JUMBO.cpp */
 HANDLE_IGET_X_JUMBO(OP_IGET_OBJECT_JUMBO,   "-object", Object, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_IGET_BOOLEAN_JUMBO.c */
+/* File: c/OP_IGET_BOOLEAN_JUMBO.cpp */
 HANDLE_IGET_X_JUMBO(OP_IGET_BOOLEAN_JUMBO,  "", Int, )
 OP_END
 
-/* File: c/OP_IGET_BYTE_JUMBO.c */
+/* File: c/OP_IGET_BYTE_JUMBO.cpp */
 HANDLE_IGET_X_JUMBO(OP_IGET_BYTE_JUMBO,     "", Int, )
 OP_END
 
-/* File: c/OP_IGET_CHAR_JUMBO.c */
+/* File: c/OP_IGET_CHAR_JUMBO.cpp */
 HANDLE_IGET_X_JUMBO(OP_IGET_CHAR_JUMBO,     "", Int, )
 OP_END
 
-/* File: c/OP_IGET_SHORT_JUMBO.c */
+/* File: c/OP_IGET_SHORT_JUMBO.cpp */
 HANDLE_IGET_X_JUMBO(OP_IGET_SHORT_JUMBO,    "", Int, )
 OP_END
 
-/* File: c/OP_IPUT_JUMBO.c */
+/* File: c/OP_IPUT_JUMBO.cpp */
 HANDLE_IPUT_X_JUMBO(OP_IPUT_JUMBO,          "", Int, )
 OP_END
 
-/* File: c/OP_IPUT_WIDE_JUMBO.c */
+/* File: c/OP_IPUT_WIDE_JUMBO.cpp */
 HANDLE_IPUT_X_JUMBO(OP_IPUT_WIDE_JUMBO,     "-wide", Long, _WIDE)
 OP_END
 
-/* File: c/OP_IPUT_OBJECT_JUMBO.c */
+/* File: c/OP_IPUT_OBJECT_JUMBO.cpp */
 /*
  * The VM spec says we should verify that the reference being stored into
  * the field is assignment compatible.  In practice, many popular VMs don't
@@ -3354,912 +3355,912 @@
 HANDLE_IPUT_X_JUMBO(OP_IPUT_OBJECT_JUMBO,   "-object", Object, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_IPUT_BOOLEAN_JUMBO.c */
+/* File: c/OP_IPUT_BOOLEAN_JUMBO.cpp */
 HANDLE_IPUT_X_JUMBO(OP_IPUT_BOOLEAN_JUMBO,  "", Int, )
 OP_END
 
-/* File: c/OP_IPUT_BYTE_JUMBO.c */
+/* File: c/OP_IPUT_BYTE_JUMBO.cpp */
 HANDLE_IPUT_X_JUMBO(OP_IPUT_BYTE_JUMBO,     "", Int, )
 OP_END
 
-/* File: c/OP_IPUT_CHAR_JUMBO.c */
+/* File: c/OP_IPUT_CHAR_JUMBO.cpp */
 HANDLE_IPUT_X_JUMBO(OP_IPUT_CHAR_JUMBO,     "", Int, )
 OP_END
 
-/* File: c/OP_IPUT_SHORT_JUMBO.c */
+/* File: c/OP_IPUT_SHORT_JUMBO.cpp */
 HANDLE_IPUT_X_JUMBO(OP_IPUT_SHORT_JUMBO,    "", Int, )
 OP_END
 
-/* File: c/OP_SGET_JUMBO.c */
+/* File: c/OP_SGET_JUMBO.cpp */
 HANDLE_SGET_X_JUMBO(OP_SGET_JUMBO,          "", Int, )
 OP_END
 
-/* File: c/OP_SGET_WIDE_JUMBO.c */
+/* File: c/OP_SGET_WIDE_JUMBO.cpp */
 HANDLE_SGET_X_JUMBO(OP_SGET_WIDE_JUMBO,     "-wide", Long, _WIDE)
 OP_END
 
-/* File: c/OP_SGET_OBJECT_JUMBO.c */
+/* File: c/OP_SGET_OBJECT_JUMBO.cpp */
 HANDLE_SGET_X_JUMBO(OP_SGET_OBJECT_JUMBO,   "-object", Object, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_SGET_BOOLEAN_JUMBO.c */
+/* File: c/OP_SGET_BOOLEAN_JUMBO.cpp */
 HANDLE_SGET_X_JUMBO(OP_SGET_BOOLEAN_JUMBO,  "", Int, )
 OP_END
 
-/* File: c/OP_SGET_BYTE_JUMBO.c */
+/* File: c/OP_SGET_BYTE_JUMBO.cpp */
 HANDLE_SGET_X_JUMBO(OP_SGET_BYTE_JUMBO,     "", Int, )
 OP_END
 
-/* File: c/OP_SGET_CHAR_JUMBO.c */
+/* File: c/OP_SGET_CHAR_JUMBO.cpp */
 HANDLE_SGET_X_JUMBO(OP_SGET_CHAR_JUMBO,     "", Int, )
 OP_END
 
-/* File: c/OP_SGET_SHORT_JUMBO.c */
+/* File: c/OP_SGET_SHORT_JUMBO.cpp */
 HANDLE_SGET_X_JUMBO(OP_SGET_SHORT_JUMBO,    "", Int, )
 OP_END
 
-/* File: c/OP_SPUT_JUMBO.c */
+/* File: c/OP_SPUT_JUMBO.cpp */
 HANDLE_SPUT_X_JUMBO(OP_SPUT_JUMBO,          "", Int, )
 OP_END
 
-/* File: c/OP_SPUT_WIDE_JUMBO.c */
+/* File: c/OP_SPUT_WIDE_JUMBO.cpp */
 HANDLE_SPUT_X_JUMBO(OP_SPUT_WIDE_JUMBO,     "-wide", Long, _WIDE)
 OP_END
 
-/* File: c/OP_SPUT_OBJECT_JUMBO.c */
+/* File: c/OP_SPUT_OBJECT_JUMBO.cpp */
 HANDLE_SPUT_X_JUMBO(OP_SPUT_OBJECT_JUMBO,   "-object", Object, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_SPUT_BOOLEAN_JUMBO.c */
+/* File: c/OP_SPUT_BOOLEAN_JUMBO.cpp */
 HANDLE_SPUT_X_JUMBO(OP_SPUT_BOOLEAN_JUMBO,          "", Int, )
 OP_END
 
-/* File: c/OP_SPUT_BYTE_JUMBO.c */
+/* File: c/OP_SPUT_BYTE_JUMBO.cpp */
 HANDLE_SPUT_X_JUMBO(OP_SPUT_BYTE_JUMBO,     "", Int, )
 OP_END
 
-/* File: c/OP_SPUT_CHAR_JUMBO.c */
+/* File: c/OP_SPUT_CHAR_JUMBO.cpp */
 HANDLE_SPUT_X_JUMBO(OP_SPUT_CHAR_JUMBO,     "", Int, )
 OP_END
 
-/* File: c/OP_SPUT_SHORT_JUMBO.c */
+/* File: c/OP_SPUT_SHORT_JUMBO.cpp */
 HANDLE_SPUT_X_JUMBO(OP_SPUT_SHORT_JUMBO,    "", Int, )
 OP_END
 
-/* File: c/OP_INVOKE_VIRTUAL_JUMBO.c */
+/* File: c/OP_INVOKE_VIRTUAL_JUMBO.cpp */
 HANDLE_OPCODE(OP_INVOKE_VIRTUAL_JUMBO /*{vCCCC..v(CCCC+BBBB-1)}, meth@AAAAAAAA*/)
     GOTO_invoke(invokeVirtual, true, true);
 OP_END
 
-/* File: c/OP_INVOKE_SUPER_JUMBO.c */
+/* File: c/OP_INVOKE_SUPER_JUMBO.cpp */
 HANDLE_OPCODE(OP_INVOKE_SUPER_JUMBO /*{vCCCC..v(CCCC+BBBB-1)}, meth@AAAAAAAA*/)
     GOTO_invoke(invokeSuper, true, true);
 OP_END
 
-/* File: c/OP_INVOKE_DIRECT_JUMBO.c */
+/* File: c/OP_INVOKE_DIRECT_JUMBO.cpp */
 HANDLE_OPCODE(OP_INVOKE_DIRECT_JUMBO /*{vCCCC..v(CCCC+BBBB-1)}, meth@AAAAAAAA*/)
     GOTO_invoke(invokeDirect, true, true);
 OP_END
 
-/* File: c/OP_INVOKE_STATIC_JUMBO.c */
+/* File: c/OP_INVOKE_STATIC_JUMBO.cpp */
 HANDLE_OPCODE(OP_INVOKE_STATIC_JUMBO /*{vCCCC..v(CCCC+BBBB-1)}, meth@AAAAAAAA*/)
     GOTO_invoke(invokeStatic, true, true);
 OP_END
 
-/* File: c/OP_INVOKE_INTERFACE_JUMBO.c */
+/* File: c/OP_INVOKE_INTERFACE_JUMBO.cpp */
 HANDLE_OPCODE(OP_INVOKE_INTERFACE_JUMBO /*{vCCCC..v(CCCC+BBBB-1)}, meth@AAAAAAAA*/)
     GOTO_invoke(invokeInterface, true, true);
 OP_END
 
-/* File: c/OP_UNUSED_27FF.c */
+/* File: c/OP_UNUSED_27FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_27FF)
 OP_END
 
-/* File: c/OP_UNUSED_28FF.c */
+/* File: c/OP_UNUSED_28FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_28FF)
 OP_END
 
-/* File: c/OP_UNUSED_29FF.c */
+/* File: c/OP_UNUSED_29FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_29FF)
 OP_END
 
-/* File: c/OP_UNUSED_2AFF.c */
+/* File: c/OP_UNUSED_2AFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_2AFF)
 OP_END
 
-/* File: c/OP_UNUSED_2BFF.c */
+/* File: c/OP_UNUSED_2BFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_2BFF)
 OP_END
 
-/* File: c/OP_UNUSED_2CFF.c */
+/* File: c/OP_UNUSED_2CFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_2CFF)
 OP_END
 
-/* File: c/OP_UNUSED_2DFF.c */
+/* File: c/OP_UNUSED_2DFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_2DFF)
 OP_END
 
-/* File: c/OP_UNUSED_2EFF.c */
+/* File: c/OP_UNUSED_2EFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_2EFF)
 OP_END
 
-/* File: c/OP_UNUSED_2FFF.c */
+/* File: c/OP_UNUSED_2FFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_2FFF)
 OP_END
 
-/* File: c/OP_UNUSED_30FF.c */
+/* File: c/OP_UNUSED_30FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_30FF)
 OP_END
 
-/* File: c/OP_UNUSED_31FF.c */
+/* File: c/OP_UNUSED_31FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_31FF)
 OP_END
 
-/* File: c/OP_UNUSED_32FF.c */
+/* File: c/OP_UNUSED_32FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_32FF)
 OP_END
 
-/* File: c/OP_UNUSED_33FF.c */
+/* File: c/OP_UNUSED_33FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_33FF)
 OP_END
 
-/* File: c/OP_UNUSED_34FF.c */
+/* File: c/OP_UNUSED_34FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_34FF)
 OP_END
 
-/* File: c/OP_UNUSED_35FF.c */
+/* File: c/OP_UNUSED_35FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_35FF)
 OP_END
 
-/* File: c/OP_UNUSED_36FF.c */
+/* File: c/OP_UNUSED_36FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_36FF)
 OP_END
 
-/* File: c/OP_UNUSED_37FF.c */
+/* File: c/OP_UNUSED_37FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_37FF)
 OP_END
 
-/* File: c/OP_UNUSED_38FF.c */
+/* File: c/OP_UNUSED_38FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_38FF)
 OP_END
 
-/* File: c/OP_UNUSED_39FF.c */
+/* File: c/OP_UNUSED_39FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_39FF)
 OP_END
 
-/* File: c/OP_UNUSED_3AFF.c */
+/* File: c/OP_UNUSED_3AFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_3AFF)
 OP_END
 
-/* File: c/OP_UNUSED_3BFF.c */
+/* File: c/OP_UNUSED_3BFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_3BFF)
 OP_END
 
-/* File: c/OP_UNUSED_3CFF.c */
+/* File: c/OP_UNUSED_3CFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_3CFF)
 OP_END
 
-/* File: c/OP_UNUSED_3DFF.c */
+/* File: c/OP_UNUSED_3DFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_3DFF)
 OP_END
 
-/* File: c/OP_UNUSED_3EFF.c */
+/* File: c/OP_UNUSED_3EFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_3EFF)
 OP_END
 
-/* File: c/OP_UNUSED_3FFF.c */
+/* File: c/OP_UNUSED_3FFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_3FFF)
 OP_END
 
-/* File: c/OP_UNUSED_40FF.c */
+/* File: c/OP_UNUSED_40FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_40FF)
 OP_END
 
-/* File: c/OP_UNUSED_41FF.c */
+/* File: c/OP_UNUSED_41FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_41FF)
 OP_END
 
-/* File: c/OP_UNUSED_42FF.c */
+/* File: c/OP_UNUSED_42FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_42FF)
 OP_END
 
-/* File: c/OP_UNUSED_43FF.c */
+/* File: c/OP_UNUSED_43FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_43FF)
 OP_END
 
-/* File: c/OP_UNUSED_44FF.c */
+/* File: c/OP_UNUSED_44FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_44FF)
 OP_END
 
-/* File: c/OP_UNUSED_45FF.c */
+/* File: c/OP_UNUSED_45FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_45FF)
 OP_END
 
-/* File: c/OP_UNUSED_46FF.c */
+/* File: c/OP_UNUSED_46FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_46FF)
 OP_END
 
-/* File: c/OP_UNUSED_47FF.c */
+/* File: c/OP_UNUSED_47FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_47FF)
 OP_END
 
-/* File: c/OP_UNUSED_48FF.c */
+/* File: c/OP_UNUSED_48FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_48FF)
 OP_END
 
-/* File: c/OP_UNUSED_49FF.c */
+/* File: c/OP_UNUSED_49FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_49FF)
 OP_END
 
-/* File: c/OP_UNUSED_4AFF.c */
+/* File: c/OP_UNUSED_4AFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_4AFF)
 OP_END
 
-/* File: c/OP_UNUSED_4BFF.c */
+/* File: c/OP_UNUSED_4BFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_4BFF)
 OP_END
 
-/* File: c/OP_UNUSED_4CFF.c */
+/* File: c/OP_UNUSED_4CFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_4CFF)
 OP_END
 
-/* File: c/OP_UNUSED_4DFF.c */
+/* File: c/OP_UNUSED_4DFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_4DFF)
 OP_END
 
-/* File: c/OP_UNUSED_4EFF.c */
+/* File: c/OP_UNUSED_4EFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_4EFF)
 OP_END
 
-/* File: c/OP_UNUSED_4FFF.c */
+/* File: c/OP_UNUSED_4FFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_4FFF)
 OP_END
 
-/* File: c/OP_UNUSED_50FF.c */
+/* File: c/OP_UNUSED_50FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_50FF)
 OP_END
 
-/* File: c/OP_UNUSED_51FF.c */
+/* File: c/OP_UNUSED_51FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_51FF)
 OP_END
 
-/* File: c/OP_UNUSED_52FF.c */
+/* File: c/OP_UNUSED_52FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_52FF)
 OP_END
 
-/* File: c/OP_UNUSED_53FF.c */
+/* File: c/OP_UNUSED_53FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_53FF)
 OP_END
 
-/* File: c/OP_UNUSED_54FF.c */
+/* File: c/OP_UNUSED_54FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_54FF)
 OP_END
 
-/* File: c/OP_UNUSED_55FF.c */
+/* File: c/OP_UNUSED_55FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_55FF)
 OP_END
 
-/* File: c/OP_UNUSED_56FF.c */
+/* File: c/OP_UNUSED_56FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_56FF)
 OP_END
 
-/* File: c/OP_UNUSED_57FF.c */
+/* File: c/OP_UNUSED_57FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_57FF)
 OP_END
 
-/* File: c/OP_UNUSED_58FF.c */
+/* File: c/OP_UNUSED_58FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_58FF)
 OP_END
 
-/* File: c/OP_UNUSED_59FF.c */
+/* File: c/OP_UNUSED_59FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_59FF)
 OP_END
 
-/* File: c/OP_UNUSED_5AFF.c */
+/* File: c/OP_UNUSED_5AFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_5AFF)
 OP_END
 
-/* File: c/OP_UNUSED_5BFF.c */
+/* File: c/OP_UNUSED_5BFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_5BFF)
 OP_END
 
-/* File: c/OP_UNUSED_5CFF.c */
+/* File: c/OP_UNUSED_5CFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_5CFF)
 OP_END
 
-/* File: c/OP_UNUSED_5DFF.c */
+/* File: c/OP_UNUSED_5DFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_5DFF)
 OP_END
 
-/* File: c/OP_UNUSED_5EFF.c */
+/* File: c/OP_UNUSED_5EFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_5EFF)
 OP_END
 
-/* File: c/OP_UNUSED_5FFF.c */
+/* File: c/OP_UNUSED_5FFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_5FFF)
 OP_END
 
-/* File: c/OP_UNUSED_60FF.c */
+/* File: c/OP_UNUSED_60FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_60FF)
 OP_END
 
-/* File: c/OP_UNUSED_61FF.c */
+/* File: c/OP_UNUSED_61FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_61FF)
 OP_END
 
-/* File: c/OP_UNUSED_62FF.c */
+/* File: c/OP_UNUSED_62FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_62FF)
 OP_END
 
-/* File: c/OP_UNUSED_63FF.c */
+/* File: c/OP_UNUSED_63FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_63FF)
 OP_END
 
-/* File: c/OP_UNUSED_64FF.c */
+/* File: c/OP_UNUSED_64FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_64FF)
 OP_END
 
-/* File: c/OP_UNUSED_65FF.c */
+/* File: c/OP_UNUSED_65FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_65FF)
 OP_END
 
-/* File: c/OP_UNUSED_66FF.c */
+/* File: c/OP_UNUSED_66FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_66FF)
 OP_END
 
-/* File: c/OP_UNUSED_67FF.c */
+/* File: c/OP_UNUSED_67FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_67FF)
 OP_END
 
-/* File: c/OP_UNUSED_68FF.c */
+/* File: c/OP_UNUSED_68FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_68FF)
 OP_END
 
-/* File: c/OP_UNUSED_69FF.c */
+/* File: c/OP_UNUSED_69FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_69FF)
 OP_END
 
-/* File: c/OP_UNUSED_6AFF.c */
+/* File: c/OP_UNUSED_6AFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_6AFF)
 OP_END
 
-/* File: c/OP_UNUSED_6BFF.c */
+/* File: c/OP_UNUSED_6BFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_6BFF)
 OP_END
 
-/* File: c/OP_UNUSED_6CFF.c */
+/* File: c/OP_UNUSED_6CFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_6CFF)
 OP_END
 
-/* File: c/OP_UNUSED_6DFF.c */
+/* File: c/OP_UNUSED_6DFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_6DFF)
 OP_END
 
-/* File: c/OP_UNUSED_6EFF.c */
+/* File: c/OP_UNUSED_6EFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_6EFF)
 OP_END
 
-/* File: c/OP_UNUSED_6FFF.c */
+/* File: c/OP_UNUSED_6FFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_6FFF)
 OP_END
 
-/* File: c/OP_UNUSED_70FF.c */
+/* File: c/OP_UNUSED_70FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_70FF)
 OP_END
 
-/* File: c/OP_UNUSED_71FF.c */
+/* File: c/OP_UNUSED_71FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_71FF)
 OP_END
 
-/* File: c/OP_UNUSED_72FF.c */
+/* File: c/OP_UNUSED_72FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_72FF)
 OP_END
 
-/* File: c/OP_UNUSED_73FF.c */
+/* File: c/OP_UNUSED_73FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_73FF)
 OP_END
 
-/* File: c/OP_UNUSED_74FF.c */
+/* File: c/OP_UNUSED_74FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_74FF)
 OP_END
 
-/* File: c/OP_UNUSED_75FF.c */
+/* File: c/OP_UNUSED_75FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_75FF)
 OP_END
 
-/* File: c/OP_UNUSED_76FF.c */
+/* File: c/OP_UNUSED_76FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_76FF)
 OP_END
 
-/* File: c/OP_UNUSED_77FF.c */
+/* File: c/OP_UNUSED_77FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_77FF)
 OP_END
 
-/* File: c/OP_UNUSED_78FF.c */
+/* File: c/OP_UNUSED_78FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_78FF)
 OP_END
 
-/* File: c/OP_UNUSED_79FF.c */
+/* File: c/OP_UNUSED_79FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_79FF)
 OP_END
 
-/* File: c/OP_UNUSED_7AFF.c */
+/* File: c/OP_UNUSED_7AFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_7AFF)
 OP_END
 
-/* File: c/OP_UNUSED_7BFF.c */
+/* File: c/OP_UNUSED_7BFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_7BFF)
 OP_END
 
-/* File: c/OP_UNUSED_7CFF.c */
+/* File: c/OP_UNUSED_7CFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_7CFF)
 OP_END
 
-/* File: c/OP_UNUSED_7DFF.c */
+/* File: c/OP_UNUSED_7DFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_7DFF)
 OP_END
 
-/* File: c/OP_UNUSED_7EFF.c */
+/* File: c/OP_UNUSED_7EFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_7EFF)
 OP_END
 
-/* File: c/OP_UNUSED_7FFF.c */
+/* File: c/OP_UNUSED_7FFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_7FFF)
 OP_END
 
-/* File: c/OP_UNUSED_80FF.c */
+/* File: c/OP_UNUSED_80FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_80FF)
 OP_END
 
-/* File: c/OP_UNUSED_81FF.c */
+/* File: c/OP_UNUSED_81FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_81FF)
 OP_END
 
-/* File: c/OP_UNUSED_82FF.c */
+/* File: c/OP_UNUSED_82FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_82FF)
 OP_END
 
-/* File: c/OP_UNUSED_83FF.c */
+/* File: c/OP_UNUSED_83FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_83FF)
 OP_END
 
-/* File: c/OP_UNUSED_84FF.c */
+/* File: c/OP_UNUSED_84FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_84FF)
 OP_END
 
-/* File: c/OP_UNUSED_85FF.c */
+/* File: c/OP_UNUSED_85FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_85FF)
 OP_END
 
-/* File: c/OP_UNUSED_86FF.c */
+/* File: c/OP_UNUSED_86FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_86FF)
 OP_END
 
-/* File: c/OP_UNUSED_87FF.c */
+/* File: c/OP_UNUSED_87FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_87FF)
 OP_END
 
-/* File: c/OP_UNUSED_88FF.c */
+/* File: c/OP_UNUSED_88FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_88FF)
 OP_END
 
-/* File: c/OP_UNUSED_89FF.c */
+/* File: c/OP_UNUSED_89FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_89FF)
 OP_END
 
-/* File: c/OP_UNUSED_8AFF.c */
+/* File: c/OP_UNUSED_8AFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_8AFF)
 OP_END
 
-/* File: c/OP_UNUSED_8BFF.c */
+/* File: c/OP_UNUSED_8BFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_8BFF)
 OP_END
 
-/* File: c/OP_UNUSED_8CFF.c */
+/* File: c/OP_UNUSED_8CFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_8CFF)
 OP_END
 
-/* File: c/OP_UNUSED_8DFF.c */
+/* File: c/OP_UNUSED_8DFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_8DFF)
 OP_END
 
-/* File: c/OP_UNUSED_8EFF.c */
+/* File: c/OP_UNUSED_8EFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_8EFF)
 OP_END
 
-/* File: c/OP_UNUSED_8FFF.c */
+/* File: c/OP_UNUSED_8FFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_8FFF)
 OP_END
 
-/* File: c/OP_UNUSED_90FF.c */
+/* File: c/OP_UNUSED_90FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_90FF)
 OP_END
 
-/* File: c/OP_UNUSED_91FF.c */
+/* File: c/OP_UNUSED_91FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_91FF)
 OP_END
 
-/* File: c/OP_UNUSED_92FF.c */
+/* File: c/OP_UNUSED_92FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_92FF)
 OP_END
 
-/* File: c/OP_UNUSED_93FF.c */
+/* File: c/OP_UNUSED_93FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_93FF)
 OP_END
 
-/* File: c/OP_UNUSED_94FF.c */
+/* File: c/OP_UNUSED_94FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_94FF)
 OP_END
 
-/* File: c/OP_UNUSED_95FF.c */
+/* File: c/OP_UNUSED_95FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_95FF)
 OP_END
 
-/* File: c/OP_UNUSED_96FF.c */
+/* File: c/OP_UNUSED_96FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_96FF)
 OP_END
 
-/* File: c/OP_UNUSED_97FF.c */
+/* File: c/OP_UNUSED_97FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_97FF)
 OP_END
 
-/* File: c/OP_UNUSED_98FF.c */
+/* File: c/OP_UNUSED_98FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_98FF)
 OP_END
 
-/* File: c/OP_UNUSED_99FF.c */
+/* File: c/OP_UNUSED_99FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_99FF)
 OP_END
 
-/* File: c/OP_UNUSED_9AFF.c */
+/* File: c/OP_UNUSED_9AFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_9AFF)
 OP_END
 
-/* File: c/OP_UNUSED_9BFF.c */
+/* File: c/OP_UNUSED_9BFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_9BFF)
 OP_END
 
-/* File: c/OP_UNUSED_9CFF.c */
+/* File: c/OP_UNUSED_9CFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_9CFF)
 OP_END
 
-/* File: c/OP_UNUSED_9DFF.c */
+/* File: c/OP_UNUSED_9DFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_9DFF)
 OP_END
 
-/* File: c/OP_UNUSED_9EFF.c */
+/* File: c/OP_UNUSED_9EFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_9EFF)
 OP_END
 
-/* File: c/OP_UNUSED_9FFF.c */
+/* File: c/OP_UNUSED_9FFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_9FFF)
 OP_END
 
-/* File: c/OP_UNUSED_A0FF.c */
+/* File: c/OP_UNUSED_A0FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_A0FF)
 OP_END
 
-/* File: c/OP_UNUSED_A1FF.c */
+/* File: c/OP_UNUSED_A1FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_A1FF)
 OP_END
 
-/* File: c/OP_UNUSED_A2FF.c */
+/* File: c/OP_UNUSED_A2FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_A2FF)
 OP_END
 
-/* File: c/OP_UNUSED_A3FF.c */
+/* File: c/OP_UNUSED_A3FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_A3FF)
 OP_END
 
-/* File: c/OP_UNUSED_A4FF.c */
+/* File: c/OP_UNUSED_A4FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_A4FF)
 OP_END
 
-/* File: c/OP_UNUSED_A5FF.c */
+/* File: c/OP_UNUSED_A5FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_A5FF)
 OP_END
 
-/* File: c/OP_UNUSED_A6FF.c */
+/* File: c/OP_UNUSED_A6FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_A6FF)
 OP_END
 
-/* File: c/OP_UNUSED_A7FF.c */
+/* File: c/OP_UNUSED_A7FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_A7FF)
 OP_END
 
-/* File: c/OP_UNUSED_A8FF.c */
+/* File: c/OP_UNUSED_A8FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_A8FF)
 OP_END
 
-/* File: c/OP_UNUSED_A9FF.c */
+/* File: c/OP_UNUSED_A9FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_A9FF)
 OP_END
 
-/* File: c/OP_UNUSED_AAFF.c */
+/* File: c/OP_UNUSED_AAFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_AAFF)
 OP_END
 
-/* File: c/OP_UNUSED_ABFF.c */
+/* File: c/OP_UNUSED_ABFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_ABFF)
 OP_END
 
-/* File: c/OP_UNUSED_ACFF.c */
+/* File: c/OP_UNUSED_ACFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_ACFF)
 OP_END
 
-/* File: c/OP_UNUSED_ADFF.c */
+/* File: c/OP_UNUSED_ADFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_ADFF)
 OP_END
 
-/* File: c/OP_UNUSED_AEFF.c */
+/* File: c/OP_UNUSED_AEFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_AEFF)
 OP_END
 
-/* File: c/OP_UNUSED_AFFF.c */
+/* File: c/OP_UNUSED_AFFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_AFFF)
 OP_END
 
-/* File: c/OP_UNUSED_B0FF.c */
+/* File: c/OP_UNUSED_B0FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_B0FF)
 OP_END
 
-/* File: c/OP_UNUSED_B1FF.c */
+/* File: c/OP_UNUSED_B1FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_B1FF)
 OP_END
 
-/* File: c/OP_UNUSED_B2FF.c */
+/* File: c/OP_UNUSED_B2FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_B2FF)
 OP_END
 
-/* File: c/OP_UNUSED_B3FF.c */
+/* File: c/OP_UNUSED_B3FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_B3FF)
 OP_END
 
-/* File: c/OP_UNUSED_B4FF.c */
+/* File: c/OP_UNUSED_B4FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_B4FF)
 OP_END
 
-/* File: c/OP_UNUSED_B5FF.c */
+/* File: c/OP_UNUSED_B5FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_B5FF)
 OP_END
 
-/* File: c/OP_UNUSED_B6FF.c */
+/* File: c/OP_UNUSED_B6FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_B6FF)
 OP_END
 
-/* File: c/OP_UNUSED_B7FF.c */
+/* File: c/OP_UNUSED_B7FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_B7FF)
 OP_END
 
-/* File: c/OP_UNUSED_B8FF.c */
+/* File: c/OP_UNUSED_B8FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_B8FF)
 OP_END
 
-/* File: c/OP_UNUSED_B9FF.c */
+/* File: c/OP_UNUSED_B9FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_B9FF)
 OP_END
 
-/* File: c/OP_UNUSED_BAFF.c */
+/* File: c/OP_UNUSED_BAFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_BAFF)
 OP_END
 
-/* File: c/OP_UNUSED_BBFF.c */
+/* File: c/OP_UNUSED_BBFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_BBFF)
 OP_END
 
-/* File: c/OP_UNUSED_BCFF.c */
+/* File: c/OP_UNUSED_BCFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_BCFF)
 OP_END
 
-/* File: c/OP_UNUSED_BDFF.c */
+/* File: c/OP_UNUSED_BDFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_BDFF)
 OP_END
 
-/* File: c/OP_UNUSED_BEFF.c */
+/* File: c/OP_UNUSED_BEFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_BEFF)
 OP_END
 
-/* File: c/OP_UNUSED_BFFF.c */
+/* File: c/OP_UNUSED_BFFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_BFFF)
 OP_END
 
-/* File: c/OP_UNUSED_C0FF.c */
+/* File: c/OP_UNUSED_C0FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_C0FF)
 OP_END
 
-/* File: c/OP_UNUSED_C1FF.c */
+/* File: c/OP_UNUSED_C1FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_C1FF)
 OP_END
 
-/* File: c/OP_UNUSED_C2FF.c */
+/* File: c/OP_UNUSED_C2FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_C2FF)
 OP_END
 
-/* File: c/OP_UNUSED_C3FF.c */
+/* File: c/OP_UNUSED_C3FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_C3FF)
 OP_END
 
-/* File: c/OP_UNUSED_C4FF.c */
+/* File: c/OP_UNUSED_C4FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_C4FF)
 OP_END
 
-/* File: c/OP_UNUSED_C5FF.c */
+/* File: c/OP_UNUSED_C5FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_C5FF)
 OP_END
 
-/* File: c/OP_UNUSED_C6FF.c */
+/* File: c/OP_UNUSED_C6FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_C6FF)
 OP_END
 
-/* File: c/OP_UNUSED_C7FF.c */
+/* File: c/OP_UNUSED_C7FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_C7FF)
 OP_END
 
-/* File: c/OP_UNUSED_C8FF.c */
+/* File: c/OP_UNUSED_C8FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_C8FF)
 OP_END
 
-/* File: c/OP_UNUSED_C9FF.c */
+/* File: c/OP_UNUSED_C9FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_C9FF)
 OP_END
 
-/* File: c/OP_UNUSED_CAFF.c */
+/* File: c/OP_UNUSED_CAFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_CAFF)
 OP_END
 
-/* File: c/OP_UNUSED_CBFF.c */
+/* File: c/OP_UNUSED_CBFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_CBFF)
 OP_END
 
-/* File: c/OP_UNUSED_CCFF.c */
+/* File: c/OP_UNUSED_CCFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_CCFF)
 OP_END
 
-/* File: c/OP_UNUSED_CDFF.c */
+/* File: c/OP_UNUSED_CDFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_CDFF)
 OP_END
 
-/* File: c/OP_UNUSED_CEFF.c */
+/* File: c/OP_UNUSED_CEFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_CEFF)
 OP_END
 
-/* File: c/OP_UNUSED_CFFF.c */
+/* File: c/OP_UNUSED_CFFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_CFFF)
 OP_END
 
-/* File: c/OP_UNUSED_D0FF.c */
+/* File: c/OP_UNUSED_D0FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_D0FF)
 OP_END
 
-/* File: c/OP_UNUSED_D1FF.c */
+/* File: c/OP_UNUSED_D1FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_D1FF)
 OP_END
 
-/* File: c/OP_UNUSED_D2FF.c */
+/* File: c/OP_UNUSED_D2FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_D2FF)
 OP_END
 
-/* File: c/OP_UNUSED_D3FF.c */
+/* File: c/OP_UNUSED_D3FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_D3FF)
 OP_END
 
-/* File: c/OP_UNUSED_D4FF.c */
+/* File: c/OP_UNUSED_D4FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_D4FF)
 OP_END
 
-/* File: c/OP_UNUSED_D5FF.c */
+/* File: c/OP_UNUSED_D5FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_D5FF)
 OP_END
 
-/* File: c/OP_UNUSED_D6FF.c */
+/* File: c/OP_UNUSED_D6FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_D6FF)
 OP_END
 
-/* File: c/OP_UNUSED_D7FF.c */
+/* File: c/OP_UNUSED_D7FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_D7FF)
 OP_END
 
-/* File: c/OP_UNUSED_D8FF.c */
+/* File: c/OP_UNUSED_D8FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_D8FF)
 OP_END
 
-/* File: c/OP_UNUSED_D9FF.c */
+/* File: c/OP_UNUSED_D9FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_D9FF)
 OP_END
 
-/* File: c/OP_UNUSED_DAFF.c */
+/* File: c/OP_UNUSED_DAFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_DAFF)
 OP_END
 
-/* File: c/OP_UNUSED_DBFF.c */
+/* File: c/OP_UNUSED_DBFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_DBFF)
 OP_END
 
-/* File: c/OP_UNUSED_DCFF.c */
+/* File: c/OP_UNUSED_DCFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_DCFF)
 OP_END
 
-/* File: c/OP_UNUSED_DDFF.c */
+/* File: c/OP_UNUSED_DDFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_DDFF)
 OP_END
 
-/* File: c/OP_UNUSED_DEFF.c */
+/* File: c/OP_UNUSED_DEFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_DEFF)
 OP_END
 
-/* File: c/OP_UNUSED_DFFF.c */
+/* File: c/OP_UNUSED_DFFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_DFFF)
 OP_END
 
-/* File: c/OP_UNUSED_E0FF.c */
+/* File: c/OP_UNUSED_E0FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_E0FF)
 OP_END
 
-/* File: c/OP_UNUSED_E1FF.c */
+/* File: c/OP_UNUSED_E1FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_E1FF)
 OP_END
 
-/* File: c/OP_UNUSED_E2FF.c */
+/* File: c/OP_UNUSED_E2FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_E2FF)
 OP_END
 
-/* File: c/OP_UNUSED_E3FF.c */
+/* File: c/OP_UNUSED_E3FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_E3FF)
 OP_END
 
-/* File: c/OP_UNUSED_E4FF.c */
+/* File: c/OP_UNUSED_E4FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_E4FF)
 OP_END
 
-/* File: c/OP_UNUSED_E5FF.c */
+/* File: c/OP_UNUSED_E5FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_E5FF)
 OP_END
 
-/* File: c/OP_UNUSED_E6FF.c */
+/* File: c/OP_UNUSED_E6FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_E6FF)
 OP_END
 
-/* File: c/OP_UNUSED_E7FF.c */
+/* File: c/OP_UNUSED_E7FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_E7FF)
 OP_END
 
-/* File: c/OP_UNUSED_E8FF.c */
+/* File: c/OP_UNUSED_E8FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_E8FF)
 OP_END
 
-/* File: c/OP_UNUSED_E9FF.c */
+/* File: c/OP_UNUSED_E9FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_E9FF)
 OP_END
 
-/* File: c/OP_UNUSED_EAFF.c */
+/* File: c/OP_UNUSED_EAFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_EAFF)
 OP_END
 
-/* File: c/OP_UNUSED_EBFF.c */
+/* File: c/OP_UNUSED_EBFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_EBFF)
 OP_END
 
-/* File: c/OP_UNUSED_ECFF.c */
+/* File: c/OP_UNUSED_ECFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_ECFF)
 OP_END
 
-/* File: c/OP_UNUSED_EDFF.c */
+/* File: c/OP_UNUSED_EDFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_EDFF)
 OP_END
 
-/* File: c/OP_UNUSED_EEFF.c */
+/* File: c/OP_UNUSED_EEFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_EEFF)
 OP_END
 
-/* File: c/OP_UNUSED_EFFF.c */
+/* File: c/OP_UNUSED_EFFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_EFFF)
 OP_END
 
-/* File: c/OP_UNUSED_F0FF.c */
+/* File: c/OP_UNUSED_F0FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_F0FF)
 OP_END
 
-/* File: c/OP_UNUSED_F1FF.c */
+/* File: c/OP_UNUSED_F1FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_F1FF)
     /*
      * In portable interp, most unused opcodes will fall through to here.
@@ -4269,7 +4270,7 @@
     FINISH(1);
 OP_END
 
-/* File: c/OP_INVOKE_OBJECT_INIT_JUMBO.c */
+/* File: c/OP_INVOKE_OBJECT_INIT_JUMBO.cpp */
 HANDLE_OPCODE(OP_INVOKE_OBJECT_INIT_JUMBO /*{vCCCC..vNNNN}, meth@AAAAAAAA*/)
     {
         Object* obj;
@@ -4300,55 +4301,55 @@
     }
 OP_END
 
-/* File: c/OP_IGET_VOLATILE_JUMBO.c */
+/* File: c/OP_IGET_VOLATILE_JUMBO.cpp */
 HANDLE_IGET_X_JUMBO(OP_IGET_VOLATILE_JUMBO, "-volatile/jumbo", IntVolatile, )
 OP_END
 
-/* File: c/OP_IGET_WIDE_VOLATILE_JUMBO.c */
+/* File: c/OP_IGET_WIDE_VOLATILE_JUMBO.cpp */
 HANDLE_IGET_X_JUMBO(OP_IGET_WIDE_VOLATILE_JUMBO, "-wide-volatile/jumbo", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_IGET_OBJECT_VOLATILE_JUMBO.c */
+/* File: c/OP_IGET_OBJECT_VOLATILE_JUMBO.cpp */
 HANDLE_IGET_X_JUMBO(OP_IGET_OBJECT_VOLATILE_JUMBO, "-object-volatile/jumbo", ObjectVolatile, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_IPUT_VOLATILE_JUMBO.c */
+/* File: c/OP_IPUT_VOLATILE_JUMBO.cpp */
 HANDLE_IPUT_X_JUMBO(OP_IPUT_VOLATILE_JUMBO, "-volatile/jumbo", IntVolatile, )
 OP_END
 
-/* File: c/OP_IPUT_WIDE_VOLATILE_JUMBO.c */
+/* File: c/OP_IPUT_WIDE_VOLATILE_JUMBO.cpp */
 HANDLE_IPUT_X_JUMBO(OP_IPUT_WIDE_VOLATILE_JUMBO, "-wide-volatile/jumbo", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_IPUT_OBJECT_VOLATILE_JUMBO.c */
+/* File: c/OP_IPUT_OBJECT_VOLATILE_JUMBO.cpp */
 HANDLE_IPUT_X_JUMBO(OP_IPUT_OBJECT_VOLATILE_JUMBO, "-object-volatile/jumbo", ObjectVolatile, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_SGET_VOLATILE_JUMBO.c */
+/* File: c/OP_SGET_VOLATILE_JUMBO.cpp */
 HANDLE_SGET_X_JUMBO(OP_SGET_VOLATILE_JUMBO, "-volatile/jumbo", IntVolatile, )
 OP_END
 
-/* File: c/OP_SGET_WIDE_VOLATILE_JUMBO.c */
+/* File: c/OP_SGET_WIDE_VOLATILE_JUMBO.cpp */
 HANDLE_SGET_X_JUMBO(OP_SGET_WIDE_VOLATILE_JUMBO, "-wide-volatile/jumbo", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_SGET_OBJECT_VOLATILE_JUMBO.c */
+/* File: c/OP_SGET_OBJECT_VOLATILE_JUMBO.cpp */
 HANDLE_SGET_X_JUMBO(OP_SGET_OBJECT_VOLATILE_JUMBO, "-object-volatile/jumbo", ObjectVolatile, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_SPUT_VOLATILE_JUMBO.c */
+/* File: c/OP_SPUT_VOLATILE_JUMBO.cpp */
 HANDLE_SPUT_X_JUMBO(OP_SPUT_VOLATILE_JUMBO, "-volatile", IntVolatile, )
 OP_END
 
-/* File: c/OP_SPUT_WIDE_VOLATILE_JUMBO.c */
+/* File: c/OP_SPUT_WIDE_VOLATILE_JUMBO.cpp */
 HANDLE_SPUT_X_JUMBO(OP_SPUT_WIDE_VOLATILE_JUMBO, "-wide-volatile/jumbo", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_SPUT_OBJECT_VOLATILE_JUMBO.c */
+/* File: c/OP_SPUT_OBJECT_VOLATILE_JUMBO.cpp */
 HANDLE_SPUT_X_JUMBO(OP_SPUT_OBJECT_VOLATILE_JUMBO, "-object-volatile/jumbo", ObjectVolatile, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_THROW_VERIFICATION_ERROR_JUMBO.c */
+/* File: c/OP_THROW_VERIFICATION_ERROR_JUMBO.cpp */
 HANDLE_OPCODE(OP_THROW_VERIFICATION_ERROR_JUMBO)
     EXPORT_PC();
     vsrc1 = FETCH(3);
@@ -4357,7 +4358,7 @@
     GOTO_exceptionThrown();
 OP_END
 
-/* File: cstubs/entry.c */
+/* File: cstubs/entry.cpp */
 /*
  * Handler function table, one entry per opcode.
  */
@@ -4420,7 +4421,7 @@
     longjmp(*pJmpBuf, 1);
 }
 
-/* File: c/gotoTargets.c */
+/* File: c/gotoTargets.cpp */
 /*
  * C footer.  This has some common code shared by the various targets.
  */
@@ -4510,7 +4511,7 @@
         /*
          * Fill in the elements.  It's legal for vsrc1 to be zero.
          */
-        contents = (u4*) newArray->contents;
+        contents = (u4*)(void*)newArray->contents;
         if (methodCallRange) {
             for (i = 0; i < vsrc1; i++)
                 contents[i] = GET_REGISTER(vdst+i);
@@ -5456,7 +5457,7 @@
     assert(false);      // should not get here
 GOTO_TARGET_END
 
-/* File: cstubs/enddefs.c */
+/* File: cstubs/enddefs.cpp */
 
 /* undefine "magic" name remapping */
 #undef retval

vm/mterp/out/InterpC-armv5te-vfp.cpp

diff --git a/vm/mterp/out/InterpC-armv5te-vfp.c b/vm/mterp/out/InterpC-armv5te-vfp.cpp
similarity index 98%
rename from vm/mterp/out/InterpC-armv5te-vfp.c
rename to vm/mterp/out/InterpC-armv5te-vfp.cpp
index bcf03c1..8c3a4c0 100644
--- a/vm/mterp/out/InterpC-armv5te-vfp.c
+++ b/vm/mterp/out/InterpC-armv5te-vfp.cpp
@@ -4,7 +4,7 @@
  * --> DO NOT EDIT <--
  */
 
-/* File: c/header.c */
+/* File: c/header.cpp */
 /*
  * Copyright (C) 2008 The Android Open Source Project
  *
@@ -379,14 +379,14 @@
     return true;
 }
 
-/* File: cstubs/stubdefs.c */
+/* File: cstubs/stubdefs.cpp */
 /*
  * In the C mterp stubs, "goto" is a function call followed immediately
  * by a return.
  */
 
 #define GOTO_TARGET_DECL(_target, ...)                                      \
-    void dvmMterp_##_target(Thread* self, ## __VA_ARGS__);
+    extern "C" void dvmMterp_##_target(Thread* self, ## __VA_ARGS__);
 
 /* (void)xxx to quiet unused variable compiler warnings. */
 #define GOTO_TARGET(_target, ...)                                           \
@@ -434,6 +434,7 @@
  * (void)xxx to quiet unused variable compiler warnings.
  */
 #define HANDLE_OPCODE(_op)                                                  \
+    extern "C" void dvmMterp_##_op(Thread* self);                           \
     void dvmMterp_##_op(Thread* self) {                                     \
         u4 ref;                                                             \
         u2 vsrc1, vsrc2, vdst;                                              \
@@ -513,7 +514,7 @@
         }                                                                   \
     }
 
-/* File: c/opcommon.c */
+/* File: c/opcommon.cpp */
 /* forward declarations of goto targets */
 GOTO_TARGET_DECL(filledNewArray, bool methodCallRange, bool jumboFormat);
 GOTO_TARGET_DECL(invokeVirtual, bool methodCallRange, bool jumboFormat);
@@ -973,7 +974,7 @@
             GOTO_exceptionThrown();                                         \
         }                                                                   \
         SET_REGISTER##_regsize(vdst,                                        \
-            ((_type*) arrayObj->contents)[GET_REGISTER(vsrc2)]);            \
+            ((_type*)(void*)arrayObj->contents)[GET_REGISTER(vsrc2)]);      \
         ILOGV("+ AGET[%d]=0x%x", GET_REGISTER(vsrc2), GET_REGISTER(vdst));  \
     }                                                                       \
     FINISH(2);
@@ -998,7 +999,7 @@
             GOTO_exceptionThrown();                                         \
         }                                                                   \
         ILOGV("+ APUT[%d]=0x%08x", GET_REGISTER(vsrc2), GET_REGISTER(vdst));\
-        ((_type*) arrayObj->contents)[GET_REGISTER(vsrc2)] =                \
+        ((_type*)(void*)arrayObj->contents)[GET_REGISTER(vsrc2)] =          \
             GET_REGISTER##_regsize(vdst);                                   \
     }                                                                       \
     FINISH(2);
@@ -1270,7 +1271,7 @@
     }                                                                       \
     FINISH(4);
 
-/* File: cstubs/enddefs.c */
+/* File: cstubs/enddefs.cpp */
 
 /* undefine "magic" name remapping */
 #undef retval
@@ -1281,7 +1282,7 @@
 #undef self
 #undef debugTrackedRefStart
 
-/* File: armv5te/debug.c */
+/* File: armv5te/debug.cpp */
 #include <inttypes.h>
 
 /*

vm/mterp/out/InterpC-armv5te.c

diff --git a/vm/mterp/out/InterpC-armv5te.c b/vm/mterp/out/InterpC-armv5te.c
deleted file mode 100644
index 9d6e486..0000000
--- a/vm/mterp/out/InterpC-armv5te.c
+++ /dev/null
@@ -1,1364 +0,0 @@
-/*
- * This file was generated automatically by gen-mterp.py for 'armv5te'.
- *
- * --> DO NOT EDIT <--
- */
-
-/* File: c/header.c */
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* common includes */
-#include "Dalvik.h"
-#include "interp/InterpDefs.h"
-#include "mterp/Mterp.h"
-#include <math.h>                   // needed for fmod, fmodf
-#include "mterp/common/FindInterface.h"
-
-/*
- * Configuration defines.  These affect the C implementations, i.e. the
- * portable interpreter(s) and C stubs.
- *
- * Some defines are controlled by the Makefile, e.g.:
- *   WITH_INSTR_CHECKS
- *   WITH_TRACKREF_CHECKS
- *   EASY_GDB
- *   NDEBUG
- */
-
-#ifdef WITH_INSTR_CHECKS            /* instruction-level paranoia (slow!) */
-# define CHECK_BRANCH_OFFSETS
-# define CHECK_REGISTER_INDICES
-#endif
-
-/*
- * Some architectures require 64-bit alignment for access to 64-bit data
- * types.  We can't just use pointers to copy 64-bit values out of our
- * interpreted register set, because gcc may assume the pointer target is
- * aligned and generate invalid code.
- *
- * There are two common approaches:
- *  (1) Use a union that defines a 32-bit pair and a 64-bit value.
- *  (2) Call memcpy().
- *
- * Depending upon what compiler you're using and what options are specified,
- * one may be faster than the other.  For example, the compiler might
- * convert a memcpy() of 8 bytes into a series of instructions and omit
- * the call.  The union version could cause some strange side-effects,
- * e.g. for a while ARM gcc thought it needed separate storage for each
- * inlined instance, and generated instructions to zero out ~700 bytes of
- * stack space at the top of the interpreter.
- *
- * The default is to use memcpy().  The current gcc for ARM seems to do
- * better with the union.
- */
-#if defined(__ARM_EABI__)
-# define NO_UNALIGN_64__UNION
-#endif
-
-
-//#define LOG_INSTR                   /* verbose debugging */
-/* set and adjust ANDROID_LOG_TAGS='*:i jdwp:i dalvikvm:i dalvikvmi:i' */
-
-/*
- * Keep a tally of accesses to fields.  Currently only works if full DEX
- * optimization is disabled.
- */
-#ifdef PROFILE_FIELD_ACCESS
-# define UPDATE_FIELD_GET(_field) { (_field)->gets++; }
-# define UPDATE_FIELD_PUT(_field) { (_field)->puts++; }
-#else
-# define UPDATE_FIELD_GET(_field) ((void)0)
-# define UPDATE_FIELD_PUT(_field) ((void)0)
-#endif
-
-/*
- * Export another copy of the PC on every instruction; this is largely
- * redundant with EXPORT_PC and the debugger code.  This value can be
- * compared against what we have stored on the stack with EXPORT_PC to
- * help ensure that we aren't missing any export calls.
- */
-#if WITH_EXTRA_GC_CHECKS > 1
-# define EXPORT_EXTRA_PC() (self->currentPc2 = pc)
-#else
-# define EXPORT_EXTRA_PC()
-#endif
-
-/*
- * Adjust the program counter.  "_offset" is a signed int, in 16-bit units.
- *
- * Assumes the existence of "const u2* pc" and "const u2* curMethod->insns".
- *
- * We don't advance the program counter until we finish an instruction or
- * branch, because we do want to have to unroll the PC if there's an
- * exception.
- */
-#ifdef CHECK_BRANCH_OFFSETS
-# define ADJUST_PC(_offset) do {                                            \
-        int myoff = _offset;        /* deref only once */                   \
-        if (pc + myoff < curMethod->insns ||                                \
-            pc + myoff >= curMethod->insns + dvmGetMethodInsnsSize(curMethod)) \
-        {                                                                   \
-            char* desc;                                                     \
-            desc = dexProtoCopyMethodDescriptor(&curMethod->prototype);     \
-            LOGE("Invalid branch %d at 0x%04x in %s.%s %s\n",               \
-                myoff, (int) (pc - curMethod->insns),                       \
-                curMethod->clazz->descriptor, curMethod->name, desc);       \
-            free(desc);                                                     \
-            dvmAbort();                                                     \
-        }                                                                   \
-        pc += myoff;                                                        \
-        EXPORT_EXTRA_PC();                                                  \
-    } while (false)
-#else
-# define ADJUST_PC(_offset) do {                                            \
-        pc += _offset;                                                      \
-        EXPORT_EXTRA_PC();                                                  \
-    } while (false)
-#endif
-
-/*
- * If enabled, log instructions as we execute them.
- */
-#ifdef LOG_INSTR
-# define ILOGD(...) ILOG(LOG_DEBUG, __VA_ARGS__)
-# define ILOGV(...) ILOG(LOG_VERBOSE, __VA_ARGS__)
-# define ILOG(_level, ...) do {                                             \
-        char debugStrBuf[128];                                              \
-        snprintf(debugStrBuf, sizeof(debugStrBuf), __VA_ARGS__);            \
-        if (curMethod != NULL)                                                 \
-            LOG(_level, LOG_TAG"i", "%-2d|%04x%s\n",                        \
-                self->threadId, (int)(pc - curMethod->insns), debugStrBuf); \
-        else                                                                \
-            LOG(_level, LOG_TAG"i", "%-2d|####%s\n",                        \
-                self->threadId, debugStrBuf);                               \
-    } while(false)
-void dvmDumpRegs(const Method* method, const u4* framePtr, bool inOnly);
-# define DUMP_REGS(_meth, _frame, _inOnly) dvmDumpRegs(_meth, _frame, _inOnly)
-static const char kSpacing[] = "            ";
-#else
-# define ILOGD(...) ((void)0)
-# define ILOGV(...) ((void)0)
-# define DUMP_REGS(_meth, _frame, _inOnly) ((void)0)
-#endif
-
-/* get a long from an array of u4 */
-static inline s8 getLongFromArray(const u4* ptr, int idx)
-{
-#if defined(NO_UNALIGN_64__UNION)
-    union { s8 ll; u4 parts[2]; } conv;
-
-    ptr += idx;
-    conv.parts[0] = ptr[0];
-    conv.parts[1] = ptr[1];
-    return conv.ll;
-#else
-    s8 val;
-    memcpy(&val, &ptr[idx], 8);
-    return val;
-#endif
-}
-
-/* store a long into an array of u4 */
-static inline void putLongToArray(u4* ptr, int idx, s8 val)
-{
-#if defined(NO_UNALIGN_64__UNION)
-    union { s8 ll; u4 parts[2]; } conv;
-
-    ptr += idx;
-    conv.ll = val;
-    ptr[0] = conv.parts[0];
-    ptr[1] = conv.parts[1];
-#else
-    memcpy(&ptr[idx], &val, 8);
-#endif
-}
-
-/* get a double from an array of u4 */
-static inline double getDoubleFromArray(const u4* ptr, int idx)
-{
-#if defined(NO_UNALIGN_64__UNION)
-    union { double d; u4 parts[2]; } conv;
-
-    ptr += idx;
-    conv.parts[0] = ptr[0];
-    conv.parts[1] = ptr[1];
-    return conv.d;
-#else
-    double dval;
-    memcpy(&dval, &ptr[idx], 8);
-    return dval;
-#endif
-}
-
-/* store a double into an array of u4 */
-static inline void putDoubleToArray(u4* ptr, int idx, double dval)
-{
-#if defined(NO_UNALIGN_64__UNION)
-    union { double d; u4 parts[2]; } conv;
-
-    ptr += idx;
-    conv.d = dval;
-    ptr[0] = conv.parts[0];
-    ptr[1] = conv.parts[1];
-#else
-    memcpy(&ptr[idx], &dval, 8);
-#endif
-}
-
-/*
- * If enabled, validate the register number on every access.  Otherwise,
- * just do an array access.
- *
- * Assumes the existence of "u4* fp".
- *
- * "_idx" may be referenced more than once.
- */
-#ifdef CHECK_REGISTER_INDICES
-# define GET_REGISTER(_idx) \
-    ( (_idx) < curMethod->registersSize ? \
-        (fp[(_idx)]) : (assert(!"bad reg"),1969) )
-# define SET_REGISTER(_idx, _val) \
-    ( (_idx) < curMethod->registersSize ? \
-        (fp[(_idx)] = (u4)(_val)) : (assert(!"bad reg"),1969) )
-# define GET_REGISTER_AS_OBJECT(_idx)       ((Object *)GET_REGISTER(_idx))
-# define SET_REGISTER_AS_OBJECT(_idx, _val) SET_REGISTER(_idx, (s4)_val)
-# define GET_REGISTER_INT(_idx) ((s4) GET_REGISTER(_idx))
-# define SET_REGISTER_INT(_idx, _val) SET_REGISTER(_idx, (s4)_val)
-# define GET_REGISTER_WIDE(_idx) \
-    ( (_idx) < curMethod->registersSize-1 ? \
-        getLongFromArray(fp, (_idx)) : (assert(!"bad reg"),1969) )
-# define SET_REGISTER_WIDE(_idx, _val) \
-    ( (_idx) < curMethod->registersSize-1 ? \
-        putLongToArray(fp, (_idx), (_val)) : (assert(!"bad reg"),1969) )
-# define GET_REGISTER_FLOAT(_idx) \
-    ( (_idx) < curMethod->registersSize ? \
-        (*((float*) &fp[(_idx)])) : (assert(!"bad reg"),1969.0f) )
-# define SET_REGISTER_FLOAT(_idx, _val) \
-    ( (_idx) < curMethod->registersSize ? \
-        (*((float*) &fp[(_idx)]) = (_val)) : (assert(!"bad reg"),1969.0f) )
-# define GET_REGISTER_DOUBLE(_idx) \
-    ( (_idx) < curMethod->registersSize-1 ? \
-        getDoubleFromArray(fp, (_idx)) : (assert(!"bad reg"),1969.0) )
-# define SET_REGISTER_DOUBLE(_idx, _val) \
-    ( (_idx) < curMethod->registersSize-1 ? \
-        putDoubleToArray(fp, (_idx), (_val)) : (assert(!"bad reg"),1969.0) )
-#else
-# define GET_REGISTER(_idx)                 (fp[(_idx)])
-# define SET_REGISTER(_idx, _val)           (fp[(_idx)] = (_val))
-# define GET_REGISTER_AS_OBJECT(_idx)       ((Object*) fp[(_idx)])
-# define SET_REGISTER_AS_OBJECT(_idx, _val) (fp[(_idx)] = (u4)(_val))
-# define GET_REGISTER_INT(_idx)             ((s4)GET_REGISTER(_idx))
-# define SET_REGISTER_INT(_idx, _val)       SET_REGISTER(_idx, (s4)_val)
-# define GET_REGISTER_WIDE(_idx)            getLongFromArray(fp, (_idx))
-# define SET_REGISTER_WIDE(_idx, _val)      putLongToArray(fp, (_idx), (_val))
-# define GET_REGISTER_FLOAT(_idx)           (*((float*) &fp[(_idx)]))
-# define SET_REGISTER_FLOAT(_idx, _val)     (*((float*) &fp[(_idx)]) = (_val))
-# define GET_REGISTER_DOUBLE(_idx)          getDoubleFromArray(fp, (_idx))
-# define SET_REGISTER_DOUBLE(_idx, _val)    putDoubleToArray(fp, (_idx), (_val))
-#endif
-
-/*
- * Get 16 bits from the specified offset of the program counter.  We always
- * want to load 16 bits at a time from the instruction stream -- it's more
- * efficient than 8 and won't have the alignment problems that 32 might.
- *
- * Assumes existence of "const u2* pc".
- */
-#define FETCH(_offset)     (pc[(_offset)])
-
-/*
- * Extract instruction byte from 16-bit fetch (_inst is a u2).
- */
-#define INST_INST(_inst)    ((_inst) & 0xff)
-
-/*
- * Replace the opcode (used when handling breakpoints).  _opcode is a u1.
- */
-#define INST_REPLACE_OP(_inst, _opcode) (((_inst) & 0xff00) | _opcode)
-
-/*
- * Extract the "vA, vB" 4-bit registers from the instruction word (_inst is u2).
- */
-#define INST_A(_inst)       (((_inst) >> 8) & 0x0f)
-#define INST_B(_inst)       ((_inst) >> 12)
-
-/*
- * Get the 8-bit "vAA" 8-bit register index from the instruction word.
- * (_inst is u2)
- */
-#define INST_AA(_inst)      ((_inst) >> 8)
-
-/*
- * The current PC must be available to Throwable constructors, e.g.
- * those created by the various exception throw routines, so that the
- * exception stack trace can be generated correctly.  If we don't do this,
- * the offset within the current method won't be shown correctly.  See the
- * notes in Exception.c.
- *
- * This is also used to determine the address for precise GC.
- *
- * Assumes existence of "u4* fp" and "const u2* pc".
- */
-#define EXPORT_PC()         (SAVEAREA_FROM_FP(fp)->xtra.currentPc = pc)
-
-/*
- * Check to see if "obj" is NULL.  If so, throw an exception.  Assumes the
- * pc has already been exported to the stack.
- *
- * Perform additional checks on debug builds.
- *
- * Use this to check for NULL when the instruction handler calls into
- * something that could throw an exception (so we have already called
- * EXPORT_PC at the top).
- */
-static inline bool checkForNull(Object* obj)
-{
-    if (obj == NULL) {
-        dvmThrowNullPointerException(NULL);
-        return false;
-    }
-#ifdef WITH_EXTRA_OBJECT_VALIDATION
-    if (!dvmIsValidObject(obj)) {
-        LOGE("Invalid object %p\n", obj);
-        dvmAbort();
-    }
-#endif
-#ifndef NDEBUG
-    if (obj->clazz == NULL || ((u4) obj->clazz) <= 65536) {
-        /* probable heap corruption */
-        LOGE("Invalid object class %p (in %p)\n", obj->clazz, obj);
-        dvmAbort();
-    }
-#endif
-    return true;
-}
-
-/*
- * Check to see if "obj" is NULL.  If so, export the PC into the stack
- * frame and throw an exception.
- *
- * Perform additional checks on debug builds.
- *
- * Use this to check for NULL when the instruction handler doesn't do
- * anything else that can throw an exception.
- */
-static inline bool checkForNullExportPC(Object* obj, u4* fp, const u2* pc)
-{
-    if (obj == NULL) {
-        EXPORT_PC();
-        dvmThrowNullPointerException(NULL);
-        return false;
-    }
-#ifdef WITH_EXTRA_OBJECT_VALIDATION
-    if (!dvmIsValidObject(obj)) {
-        LOGE("Invalid object %p\n", obj);
-        dvmAbort();
-    }
-#endif
-#ifndef NDEBUG
-    if (obj->clazz == NULL || ((u4) obj->clazz) <= 65536) {
-        /* probable heap corruption */
-        LOGE("Invalid object class %p (in %p)\n", obj->clazz, obj);
-        dvmAbort();
-    }
-#endif
-    return true;
-}
-
-/* File: cstubs/stubdefs.c */
-/*
- * In the C mterp stubs, "goto" is a function call followed immediately
- * by a return.
- */
-
-#define GOTO_TARGET_DECL(_target, ...)                                      \
-    void dvmMterp_##_target(Thread* self, ## __VA_ARGS__);
-
-/* (void)xxx to quiet unused variable compiler warnings. */
-#define GOTO_TARGET(_target, ...)                                           \
-    void dvmMterp_##_target(Thread* self, ## __VA_ARGS__) {                 \
-        u2 ref, vsrc1, vsrc2, vdst;                                         \
-        u2 inst = FETCH(0);                                                 \
-        const Method* methodToCall;                                         \
-        StackSaveArea* debugSaveArea;                                       \
-        (void)ref; (void)vsrc1; (void)vsrc2; (void)vdst; (void)inst;        \
-        (void)methodToCall; (void)debugSaveArea;
-
-#define GOTO_TARGET_END }
-
-/*
- * Redefine what used to be local variable accesses into Thread struct
- * references.  (These are undefined down in "footer.c".)
- */
-#define retval                  self->retval
-#define pc                      self->interpSave.pc
-#define fp                      self->interpSave.fp
-#define curMethod               self->interpSave.method
-#define methodClassDex          self->interpSave.methodClassDex
-#define debugTrackedRefStart    self->interpSave.debugTrackedRefStart
-
-/* ugh */
-#define STUB_HACK(x) x
-#if defined(WITH_JIT)
-#define JIT_STUB_HACK(x) x
-#else
-#define JIT_STUB_HACK(x)
-#endif
-
-/*
- * InterpSave's pc and fp must be valid when breaking out to a
- * "Reportxxx" routine.  Because the portable interpreter uses local
- * variables for these, we must flush prior.  Stubs, however, use
- * the interpSave vars directly, so this is a nop for stubs.
- */
-#define PC_FP_TO_SELF()
-
-/*
- * Opcode handler framing macros.  Here, each opcode is a separate function
- * that takes a "self" argument and returns void.  We can't declare
- * these "static" because they may be called from an assembly stub.
- * (void)xxx to quiet unused variable compiler warnings.
- */
-#define HANDLE_OPCODE(_op)                                                  \
-    void dvmMterp_##_op(Thread* self) {                                     \
-        u4 ref;                                                             \
-        u2 vsrc1, vsrc2, vdst;                                              \
-        u2 inst = FETCH(0);                                                 \
-        (void)ref; (void)vsrc1; (void)vsrc2; (void)vdst; (void)inst;
-
-#define OP_END }
-
-/*
- * Like the "portable" FINISH, but don't reload "inst", and return to caller
- * when done.  Further, debugger/profiler checks are handled
- * before handler execution in mterp, so we don't do them here either.
- */
-#if defined(WITH_JIT)
-#define FINISH(_offset) {                                                   \
-        ADJUST_PC(_offset);                                                 \
-        if (self->interpBreak.ctl.subMode & kSubModeJitTraceBuild) {        \
-            dvmCheckJit(pc, self);                                          \
-        }                                                                   \
-        return;                                                             \
-    }
-#else
-#define FINISH(_offset) {                                                   \
-        ADJUST_PC(_offset);                                                 \
-        return;                                                             \
-    }
-#endif
-
-
-/*
- * The "goto label" statements turn into function calls followed by
- * return statements.  Some of the functions take arguments, which in the
- * portable interpreter are handled by assigning values to globals.
- */
-
-#define GOTO_exceptionThrown()                                              \
-    do {                                                                    \
-        dvmMterp_exceptionThrown(self);                                     \
-        return;                                                             \
-    } while(false)
-
-#define GOTO_returnFromMethod()                                             \
-    do {                                                                    \
-        dvmMterp_returnFromMethod(self);                                    \
-        return;                                                             \
-    } while(false)
-
-#define GOTO_invoke(_target, _methodCallRange, _jumboFormat)                \
-    do {                                                                    \
-        dvmMterp_##_target(self, _methodCallRange, _jumboFormat);           \
-        return;                                                             \
-    } while(false)
-
-#define GOTO_invokeMethod(_methodCallRange, _methodToCall, _vsrc1, _vdst)   \
-    do {                                                                    \
-        dvmMterp_invokeMethod(self, _methodCallRange, _methodToCall,        \
-            _vsrc1, _vdst);                                                 \
-        return;                                                             \
-    } while(false)
-
-/*
- * As a special case, "goto bail" turns into a longjmp.
- */
-#define GOTO_bail()                                                         \
-    dvmMterpStdBail(self, false);
-
-/*
- * Periodically check for thread suspension.
- *
- * While we're at it, see if a debugger has attached or the profiler has
- * started.
- */
-#define PERIODIC_CHECKS(_pcadj) {                              \
-        if (dvmCheckSuspendQuick(self)) {                                   \
-            EXPORT_PC();  /* need for precise GC */                         \
-            dvmCheckSuspendPending(self);                                   \
-        }                                                                   \
-    }
-
-/* File: c/opcommon.c */
-/* forward declarations of goto targets */
-GOTO_TARGET_DECL(filledNewArray, bool methodCallRange, bool jumboFormat);
-GOTO_TARGET_DECL(invokeVirtual, bool methodCallRange, bool jumboFormat);
-GOTO_TARGET_DECL(invokeSuper, bool methodCallRange, bool jumboFormat);
-GOTO_TARGET_DECL(invokeInterface, bool methodCallRange, bool jumboFormat);
-GOTO_TARGET_DECL(invokeDirect, bool methodCallRange, bool jumboFormat);
-GOTO_TARGET_DECL(invokeStatic, bool methodCallRange, bool jumboFormat);
-GOTO_TARGET_DECL(invokeVirtualQuick, bool methodCallRange, bool jumboFormat);
-GOTO_TARGET_DECL(invokeSuperQuick, bool methodCallRange, bool jumboFormat);
-GOTO_TARGET_DECL(invokeMethod, bool methodCallRange, const Method* methodToCall,
-    u2 count, u2 regs);
-GOTO_TARGET_DECL(returnFromMethod);
-GOTO_TARGET_DECL(exceptionThrown);
-
-/*
- * ===========================================================================
- *
- * What follows are opcode definitions shared between multiple opcodes with
- * minor substitutions handled by the C pre-processor.  These should probably
- * use the mterp substitution mechanism instead, with the code here moved
- * into common fragment files (like the asm "binop.S"), although it's hard
- * to give up the C preprocessor in favor of the much simpler text subst.
- *
- * ===========================================================================
- */
-
-#define HANDLE_NUMCONV(_opcode, _opname, _fromtype, _totype)                \
-    HANDLE_OPCODE(_opcode /*vA, vB*/)                                       \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        ILOGV("|%s v%d,v%d", (_opname), vdst, vsrc1);                       \
-        SET_REGISTER##_totype(vdst,                                         \
-            GET_REGISTER##_fromtype(vsrc1));                                \
-        FINISH(1);
-
-#define HANDLE_FLOAT_TO_INT(_opcode, _opname, _fromvtype, _fromrtype,       \
-        _tovtype, _tortype)                                                 \
-    HANDLE_OPCODE(_opcode /*vA, vB*/)                                       \
-    {                                                                       \
-        /* spec defines specific handling for +/- inf and NaN values */     \
-        _fromvtype val;                                                     \
-        _tovtype intMin, intMax, result;                                    \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        ILOGV("|%s v%d,v%d", (_opname), vdst, vsrc1);                       \
-        val = GET_REGISTER##_fromrtype(vsrc1);                              \
-        intMin = (_tovtype) 1 << (sizeof(_tovtype) * 8 -1);                 \
-        intMax = ~intMin;                                                   \
-        result = (_tovtype) val;                                            \
-        if (val >= intMax)          /* +inf */                              \
-            result = intMax;                                                \
-        else if (val <= intMin)     /* -inf */                              \
-            result = intMin;                                                \
-        else if (val != val)        /* NaN */                               \
-            result = 0;                                                     \
-        else                                                                \
-            result = (_tovtype) val;                                        \
-        SET_REGISTER##_tortype(vdst, result);                               \
-    }                                                                       \
-    FINISH(1);
-
-#define HANDLE_INT_TO_SMALL(_opcode, _opname, _type)                        \
-    HANDLE_OPCODE(_opcode /*vA, vB*/)                                       \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        ILOGV("|int-to-%s v%d,v%d", (_opname), vdst, vsrc1);                \
-        SET_REGISTER(vdst, (_type) GET_REGISTER(vsrc1));                    \
-        FINISH(1);
-
-/* NOTE: the comparison result is always a signed 4-byte integer */
-#define HANDLE_OP_CMPX(_opcode, _opname, _varType, _type, _nanVal)          \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, vCC*/)                                \
-    {                                                                       \
-        int result;                                                         \
-        u2 regs;                                                            \
-        _varType val1, val2;                                                \
-        vdst = INST_AA(inst);                                               \
-        regs = FETCH(1);                                                    \
-        vsrc1 = regs & 0xff;                                                \
-        vsrc2 = regs >> 8;                                                  \
-        ILOGV("|cmp%s v%d,v%d,v%d", (_opname), vdst, vsrc1, vsrc2);         \
-        val1 = GET_REGISTER##_type(vsrc1);                                  \
-        val2 = GET_REGISTER##_type(vsrc2);                                  \
-        if (val1 == val2)                                                   \
-            result = 0;                                                     \
-        else if (val1 < val2)                                               \
-            result = -1;                                                    \
-        else if (val1 > val2)                                               \
-            result = 1;                                                     \
-        else                                                                \
-            result = (_nanVal);                                             \
-        ILOGV("+ result=%d\n", result);                                     \
-        SET_REGISTER(vdst, result);                                         \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_OP_IF_XX(_opcode, _opname, _cmp)                             \
-    HANDLE_OPCODE(_opcode /*vA, vB, +CCCC*/)                                \
-        vsrc1 = INST_A(inst);                                               \
-        vsrc2 = INST_B(inst);                                               \
-        if ((s4) GET_REGISTER(vsrc1) _cmp (s4) GET_REGISTER(vsrc2)) {       \
-            int branchOffset = (s2)FETCH(1);    /* sign-extended */         \
-            ILOGV("|if-%s v%d,v%d,+0x%04x", (_opname), vsrc1, vsrc2,        \
-                branchOffset);                                              \
-            ILOGV("> branch taken");                                        \
-            if (branchOffset < 0)                                           \
-                PERIODIC_CHECKS(branchOffset);                              \
-            FINISH(branchOffset);                                           \
-        } else {                                                            \
-            ILOGV("|if-%s v%d,v%d,-", (_opname), vsrc1, vsrc2);             \
-            FINISH(2);                                                      \
-        }
-
-#define HANDLE_OP_IF_XXZ(_opcode, _opname, _cmp)                            \
-    HANDLE_OPCODE(_opcode /*vAA, +BBBB*/)                                   \
-        vsrc1 = INST_AA(inst);                                              \
-        if ((s4) GET_REGISTER(vsrc1) _cmp 0) {                              \
-            int branchOffset = (s2)FETCH(1);    /* sign-extended */         \
-            ILOGV("|if-%s v%d,+0x%04x", (_opname), vsrc1, branchOffset);    \
-            ILOGV("> branch taken");                                        \
-            if (branchOffset < 0)                                           \
-                PERIODIC_CHECKS(branchOffset);                              \
-            FINISH(branchOffset);                                           \
-        } else {                                                            \
-            ILOGV("|if-%s v%d,-", (_opname), vsrc1);                        \
-            FINISH(2);                                                      \
-        }
-
-#define HANDLE_UNOP(_opcode, _opname, _pfx, _sfx, _type)                    \
-    HANDLE_OPCODE(_opcode /*vA, vB*/)                                       \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        ILOGV("|%s v%d,v%d", (_opname), vdst, vsrc1);                       \
-        SET_REGISTER##_type(vdst, _pfx GET_REGISTER##_type(vsrc1) _sfx);    \
-        FINISH(1);
-
-#define HANDLE_OP_X_INT(_opcode, _opname, _op, _chkdiv)                     \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, vCC*/)                                \
-    {                                                                       \
-        u2 srcRegs;                                                         \
-        vdst = INST_AA(inst);                                               \
-        srcRegs = FETCH(1);                                                 \
-        vsrc1 = srcRegs & 0xff;                                             \
-        vsrc2 = srcRegs >> 8;                                               \
-        ILOGV("|%s-int v%d,v%d", (_opname), vdst, vsrc1);                   \
-        if (_chkdiv != 0) {                                                 \
-            s4 firstVal, secondVal, result;                                 \
-            firstVal = GET_REGISTER(vsrc1);                                 \
-            secondVal = GET_REGISTER(vsrc2);                                \
-            if (secondVal == 0) {                                           \
-                EXPORT_PC();                                                \
-                dvmThrowArithmeticException("divide by zero");              \
-                GOTO_exceptionThrown();                                     \
-            }                                                               \
-            if ((u4)firstVal == 0x80000000 && secondVal == -1) {            \
-                if (_chkdiv == 1)                                           \
-                    result = firstVal;  /* division */                      \
-                else                                                        \
-                    result = 0;         /* remainder */                     \
-            } else {                                                        \
-                result = firstVal _op secondVal;                            \
-            }                                                               \
-            SET_REGISTER(vdst, result);                                     \
-        } else {                                                            \
-            /* non-div/rem case */                                          \
-            SET_REGISTER(vdst,                                              \
-                (s4) GET_REGISTER(vsrc1) _op (s4) GET_REGISTER(vsrc2));     \
-        }                                                                   \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_OP_SHX_INT(_opcode, _opname, _cast, _op)                     \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, vCC*/)                                \
-    {                                                                       \
-        u2 srcRegs;                                                         \
-        vdst = INST_AA(inst);                                               \
-        srcRegs = FETCH(1);                                                 \
-        vsrc1 = srcRegs & 0xff;                                             \
-        vsrc2 = srcRegs >> 8;                                               \
-        ILOGV("|%s-int v%d,v%d", (_opname), vdst, vsrc1);                   \
-        SET_REGISTER(vdst,                                                  \
-            _cast GET_REGISTER(vsrc1) _op (GET_REGISTER(vsrc2) & 0x1f));    \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_OP_X_INT_LIT16(_opcode, _opname, _op, _chkdiv)               \
-    HANDLE_OPCODE(_opcode /*vA, vB, #+CCCC*/)                               \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        vsrc2 = FETCH(1);                                                   \
-        ILOGV("|%s-int/lit16 v%d,v%d,#+0x%04x",                             \
-            (_opname), vdst, vsrc1, vsrc2);                                 \
-        if (_chkdiv != 0) {                                                 \
-            s4 firstVal, result;                                            \
-            firstVal = GET_REGISTER(vsrc1);                                 \
-            if ((s2) vsrc2 == 0) {                                          \
-                EXPORT_PC();                                                \
-                dvmThrowArithmeticException("divide by zero");              \
-                GOTO_exceptionThrown();                                     \
-            }                                                               \
-            if ((u4)firstVal == 0x80000000 && ((s2) vsrc2) == -1) {         \
-                /* won't generate /lit16 instr for this; check anyway */    \
-                if (_chkdiv == 1)                                           \
-                    result = firstVal;  /* division */                      \
-                else                                                        \
-                    result = 0;         /* remainder */                     \
-            } else {                                                        \
-                result = firstVal _op (s2) vsrc2;                           \
-            }                                                               \
-            SET_REGISTER(vdst, result);                                     \
-        } else {                                                            \
-            /* non-div/rem case */                                          \
-            SET_REGISTER(vdst, GET_REGISTER(vsrc1) _op (s2) vsrc2);         \
-        }                                                                   \
-        FINISH(2);
-
-#define HANDLE_OP_X_INT_LIT8(_opcode, _opname, _op, _chkdiv)                \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, #+CC*/)                               \
-    {                                                                       \
-        u2 litInfo;                                                         \
-        vdst = INST_AA(inst);                                               \
-        litInfo = FETCH(1);                                                 \
-        vsrc1 = litInfo & 0xff;                                             \
-        vsrc2 = litInfo >> 8;       /* constant */                          \
-        ILOGV("|%s-int/lit8 v%d,v%d,#+0x%02x",                              \
-            (_opname), vdst, vsrc1, vsrc2);                                 \
-        if (_chkdiv != 0) {                                                 \
-            s4 firstVal, result;                                            \
-            firstVal = GET_REGISTER(vsrc1);                                 \
-            if ((s1) vsrc2 == 0) {                                          \
-                EXPORT_PC();                                                \
-                dvmThrowArithmeticException("divide by zero");              \
-                GOTO_exceptionThrown();                                     \
-            }                                                               \
-            if ((u4)firstVal == 0x80000000 && ((s1) vsrc2) == -1) {         \
-                if (_chkdiv == 1)                                           \
-                    result = firstVal;  /* division */                      \
-                else                                                        \
-                    result = 0;         /* remainder */                     \
-            } else {                                                        \
-                result = firstVal _op ((s1) vsrc2);                         \
-            }                                                               \
-            SET_REGISTER(vdst, result);                                     \
-        } else {                                                            \
-            SET_REGISTER(vdst,                                              \
-                (s4) GET_REGISTER(vsrc1) _op (s1) vsrc2);                   \
-        }                                                                   \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_OP_SHX_INT_LIT8(_opcode, _opname, _cast, _op)                \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, #+CC*/)                               \
-    {                                                                       \
-        u2 litInfo;                                                         \
-        vdst = INST_AA(inst);                                               \
-        litInfo = FETCH(1);                                                 \
-        vsrc1 = litInfo & 0xff;                                             \
-        vsrc2 = litInfo >> 8;       /* constant */                          \
-        ILOGV("|%s-int/lit8 v%d,v%d,#+0x%02x",                              \
-            (_opname), vdst, vsrc1, vsrc2);                                 \
-        SET_REGISTER(vdst,                                                  \
-            _cast GET_REGISTER(vsrc1) _op (vsrc2 & 0x1f));                  \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_OP_X_INT_2ADDR(_opcode, _opname, _op, _chkdiv)               \
-    HANDLE_OPCODE(_opcode /*vA, vB*/)                                       \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        ILOGV("|%s-int-2addr v%d,v%d", (_opname), vdst, vsrc1);             \
-        if (_chkdiv != 0) {                                                 \
-            s4 firstVal, secondVal, result;                                 \
-            firstVal = GET_REGISTER(vdst);                                  \
-            secondVal = GET_REGISTER(vsrc1);                                \
-            if (secondVal == 0) {                                           \
-                EXPORT_PC();                                                \
-                dvmThrowArithmeticException("divide by zero");              \
-                GOTO_exceptionThrown();                                     \
-            }                                                               \
-            if ((u4)firstVal == 0x80000000 && secondVal == -1) {            \
-                if (_chkdiv == 1)                                           \
-                    result = firstVal;  /* division */                      \
-                else                                                        \
-                    result = 0;         /* remainder */                     \
-            } else {                                                        \
-                result = firstVal _op secondVal;                            \
-            }                                                               \
-            SET_REGISTER(vdst, result);                                     \
-        } else {                                                            \
-            SET_REGISTER(vdst,                                              \
-                (s4) GET_REGISTER(vdst) _op (s4) GET_REGISTER(vsrc1));      \
-        }                                                                   \
-        FINISH(1);
-
-#define HANDLE_OP_SHX_INT_2ADDR(_opcode, _opname, _cast, _op)               \
-    HANDLE_OPCODE(_opcode /*vA, vB*/)                                       \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        ILOGV("|%s-int-2addr v%d,v%d", (_opname), vdst, vsrc1);             \
-        SET_REGISTER(vdst,                                                  \
-            _cast GET_REGISTER(vdst) _op (GET_REGISTER(vsrc1) & 0x1f));     \
-        FINISH(1);
-
-#define HANDLE_OP_X_LONG(_opcode, _opname, _op, _chkdiv)                    \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, vCC*/)                                \
-    {                                                                       \
-        u2 srcRegs;                                                         \
-        vdst = INST_AA(inst);                                               \
-        srcRegs = FETCH(1);                                                 \
-        vsrc1 = srcRegs & 0xff;                                             \
-        vsrc2 = srcRegs >> 8;                                               \
-        ILOGV("|%s-long v%d,v%d,v%d", (_opname), vdst, vsrc1, vsrc2);       \
-        if (_chkdiv != 0) {                                                 \
-            s8 firstVal, secondVal, result;                                 \
-            firstVal = GET_REGISTER_WIDE(vsrc1);                            \
-            secondVal = GET_REGISTER_WIDE(vsrc2);                           \
-            if (secondVal == 0LL) {                                         \
-                EXPORT_PC();                                                \
-                dvmThrowArithmeticException("divide by zero");              \
-                GOTO_exceptionThrown();                                     \
-            }                                                               \
-            if ((u8)firstVal == 0x8000000000000000ULL &&                    \
-                secondVal == -1LL)                                          \
-            {                                                               \
-                if (_chkdiv == 1)                                           \
-                    result = firstVal;  /* division */                      \
-                else                                                        \
-                    result = 0;         /* remainder */                     \
-            } else {                                                        \
-                result = firstVal _op secondVal;                            \
-            }                                                               \
-            SET_REGISTER_WIDE(vdst, result);                                \
-        } else {                                                            \
-            SET_REGISTER_WIDE(vdst,                                         \
-                (s8) GET_REGISTER_WIDE(vsrc1) _op (s8) GET_REGISTER_WIDE(vsrc2)); \
-        }                                                                   \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_OP_SHX_LONG(_opcode, _opname, _cast, _op)                    \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, vCC*/)                                \
-    {                                                                       \
-        u2 srcRegs;                                                         \
-        vdst = INST_AA(inst);                                               \
-        srcRegs = FETCH(1);                                                 \
-        vsrc1 = srcRegs & 0xff;                                             \
-        vsrc2 = srcRegs >> 8;                                               \
-        ILOGV("|%s-long v%d,v%d,v%d", (_opname), vdst, vsrc1, vsrc2);       \
-        SET_REGISTER_WIDE(vdst,                                             \
-            _cast GET_REGISTER_WIDE(vsrc1) _op (GET_REGISTER(vsrc2) & 0x3f)); \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_OP_X_LONG_2ADDR(_opcode, _opname, _op, _chkdiv)              \
-    HANDLE_OPCODE(_opcode /*vA, vB*/)                                       \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        ILOGV("|%s-long-2addr v%d,v%d", (_opname), vdst, vsrc1);            \
-        if (_chkdiv != 0) {                                                 \
-            s8 firstVal, secondVal, result;                                 \
-            firstVal = GET_REGISTER_WIDE(vdst);                             \
-            secondVal = GET_REGISTER_WIDE(vsrc1);                           \
-            if (secondVal == 0LL) {                                         \
-                EXPORT_PC();                                                \
-                dvmThrowArithmeticException("divide by zero");              \
-                GOTO_exceptionThrown();                                     \
-            }                                                               \
-            if ((u8)firstVal == 0x8000000000000000ULL &&                    \
-                secondVal == -1LL)                                          \
-            {                                                               \
-                if (_chkdiv == 1)                                           \
-                    result = firstVal;  /* division */                      \
-                else                                                        \
-                    result = 0;         /* remainder */                     \
-            } else {                                                        \
-                result = firstVal _op secondVal;                            \
-            }                                                               \
-            SET_REGISTER_WIDE(vdst, result);                                \
-        } else {                                                            \
-            SET_REGISTER_WIDE(vdst,                                         \
-                (s8) GET_REGISTER_WIDE(vdst) _op (s8)GET_REGISTER_WIDE(vsrc1));\
-        }                                                                   \
-        FINISH(1);
-
-#define HANDLE_OP_SHX_LONG_2ADDR(_opcode, _opname, _cast, _op)              \
-    HANDLE_OPCODE(_opcode /*vA, vB*/)                                       \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        ILOGV("|%s-long-2addr v%d,v%d", (_opname), vdst, vsrc1);            \
-        SET_REGISTER_WIDE(vdst,                                             \
-            _cast GET_REGISTER_WIDE(vdst) _op (GET_REGISTER(vsrc1) & 0x3f)); \
-        FINISH(1);
-
-#define HANDLE_OP_X_FLOAT(_opcode, _opname, _op)                            \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, vCC*/)                                \
-    {                                                                       \
-        u2 srcRegs;                                                         \
-        vdst = INST_AA(inst);                                               \
-        srcRegs = FETCH(1);                                                 \
-        vsrc1 = srcRegs & 0xff;                                             \
-        vsrc2 = srcRegs >> 8;                                               \
-        ILOGV("|%s-float v%d,v%d,v%d", (_opname), vdst, vsrc1, vsrc2);      \
-        SET_REGISTER_FLOAT(vdst,                                            \
-            GET_REGISTER_FLOAT(vsrc1) _op GET_REGISTER_FLOAT(vsrc2));       \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_OP_X_DOUBLE(_opcode, _opname, _op)                           \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, vCC*/)                                \
-    {                                                                       \
-        u2 srcRegs;                                                         \
-        vdst = INST_AA(inst);                                               \
-        srcRegs = FETCH(1);                                                 \
-        vsrc1 = srcRegs & 0xff;                                             \
-        vsrc2 = srcRegs >> 8;                                               \
-        ILOGV("|%s-double v%d,v%d,v%d", (_opname), vdst, vsrc1, vsrc2);     \
-        SET_REGISTER_DOUBLE(vdst,                                           \
-            GET_REGISTER_DOUBLE(vsrc1) _op GET_REGISTER_DOUBLE(vsrc2));     \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_OP_X_FLOAT_2ADDR(_opcode, _opname, _op)                      \
-    HANDLE_OPCODE(_opcode /*vA, vB*/)                                       \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        ILOGV("|%s-float-2addr v%d,v%d", (_opname), vdst, vsrc1);           \
-        SET_REGISTER_FLOAT(vdst,                                            \
-            GET_REGISTER_FLOAT(vdst) _op GET_REGISTER_FLOAT(vsrc1));        \
-        FINISH(1);
-
-#define HANDLE_OP_X_DOUBLE_2ADDR(_opcode, _opname, _op)                     \
-    HANDLE_OPCODE(_opcode /*vA, vB*/)                                       \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        ILOGV("|%s-double-2addr v%d,v%d", (_opname), vdst, vsrc1);          \
-        SET_REGISTER_DOUBLE(vdst,                                           \
-            GET_REGISTER_DOUBLE(vdst) _op GET_REGISTER_DOUBLE(vsrc1));      \
-        FINISH(1);
-
-#define HANDLE_OP_AGET(_opcode, _opname, _type, _regsize)                   \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, vCC*/)                                \
-    {                                                                       \
-        ArrayObject* arrayObj;                                              \
-        u2 arrayInfo;                                                       \
-        EXPORT_PC();                                                        \
-        vdst = INST_AA(inst);                                               \
-        arrayInfo = FETCH(1);                                               \
-        vsrc1 = arrayInfo & 0xff;    /* array ptr */                        \
-        vsrc2 = arrayInfo >> 8;      /* index */                            \
-        ILOGV("|aget%s v%d,v%d,v%d", (_opname), vdst, vsrc1, vsrc2);        \
-        arrayObj = (ArrayObject*) GET_REGISTER(vsrc1);                      \
-        if (!checkForNull((Object*) arrayObj))                              \
-            GOTO_exceptionThrown();                                         \
-        if (GET_REGISTER(vsrc2) >= arrayObj->length) {                      \
-            dvmThrowArrayIndexOutOfBoundsException(                         \
-                arrayObj->length, GET_REGISTER(vsrc2));                     \
-            GOTO_exceptionThrown();                                         \
-        }                                                                   \
-        SET_REGISTER##_regsize(vdst,                                        \
-            ((_type*) arrayObj->contents)[GET_REGISTER(vsrc2)]);            \
-        ILOGV("+ AGET[%d]=0x%x", GET_REGISTER(vsrc2), GET_REGISTER(vdst));  \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_OP_APUT(_opcode, _opname, _type, _regsize)                   \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, vCC*/)                                \
-    {                                                                       \
-        ArrayObject* arrayObj;                                              \
-        u2 arrayInfo;                                                       \
-        EXPORT_PC();                                                        \
-        vdst = INST_AA(inst);       /* AA: source value */                  \
-        arrayInfo = FETCH(1);                                               \
-        vsrc1 = arrayInfo & 0xff;   /* BB: array ptr */                     \
-        vsrc2 = arrayInfo >> 8;     /* CC: index */                         \
-        ILOGV("|aput%s v%d,v%d,v%d", (_opname), vdst, vsrc1, vsrc2);        \
-        arrayObj = (ArrayObject*) GET_REGISTER(vsrc1);                      \
-        if (!checkForNull((Object*) arrayObj))                              \
-            GOTO_exceptionThrown();                                         \
-        if (GET_REGISTER(vsrc2) >= arrayObj->length) {                      \
-            dvmThrowArrayIndexOutOfBoundsException(                         \
-                arrayObj->length, GET_REGISTER(vsrc2));                     \
-            GOTO_exceptionThrown();                                         \
-        }                                                                   \
-        ILOGV("+ APUT[%d]=0x%08x", GET_REGISTER(vsrc2), GET_REGISTER(vdst));\
-        ((_type*) arrayObj->contents)[GET_REGISTER(vsrc2)] =                \
-            GET_REGISTER##_regsize(vdst);                                   \
-    }                                                                       \
-    FINISH(2);
-
-/*
- * It's possible to get a bad value out of a field with sub-32-bit stores
- * because the -quick versions always operate on 32 bits.  Consider:
- *   short foo = -1  (sets a 32-bit register to 0xffffffff)
- *   iput-quick foo  (writes all 32 bits to the field)
- *   short bar = 1   (sets a 32-bit register to 0x00000001)
- *   iput-short      (writes the low 16 bits to the field)
- *   iget-quick foo  (reads all 32 bits from the field, yielding 0xffff0001)
- * This can only happen when optimized and non-optimized code has interleaved
- * access to the same field.  This is unlikely but possible.
- *
- * The easiest way to fix this is to always read/write 32 bits at a time.  On
- * a device with a 16-bit data bus this is sub-optimal.  (The alternative
- * approach is to have sub-int versions of iget-quick, but now we're wasting
- * Dalvik instruction space and making it less likely that handler code will
- * already be in the CPU i-cache.)
- */
-#define HANDLE_IGET_X(_opcode, _opname, _ftype, _regsize)                   \
-    HANDLE_OPCODE(_opcode /*vA, vB, field@CCCC*/)                           \
-    {                                                                       \
-        InstField* ifield;                                                  \
-        Object* obj;                                                        \
-        EXPORT_PC();                                                        \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);   /* object ptr */                            \
-        ref = FETCH(1);         /* field ref */                             \
-        ILOGV("|iget%s v%d,v%d,field@0x%04x", (_opname), vdst, vsrc1, ref); \
-        obj = (Object*) GET_REGISTER(vsrc1);                                \
-        if (!checkForNull(obj))                                             \
-            GOTO_exceptionThrown();                                         \
-        ifield = (InstField*) dvmDexGetResolvedField(methodClassDex, ref);  \
-        if (ifield == NULL) {                                               \
-            ifield = dvmResolveInstField(curMethod->clazz, ref);            \
-            if (ifield == NULL)                                             \
-                GOTO_exceptionThrown();                                     \
-        }                                                                   \
-        SET_REGISTER##_regsize(vdst,                                        \
-            dvmGetField##_ftype(obj, ifield->byteOffset));                  \
-        ILOGV("+ IGET '%s'=0x%08llx", ifield->field.name,                   \
-            (u8) GET_REGISTER##_regsize(vdst));                             \
-        UPDATE_FIELD_GET(&ifield->field);                                   \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_IGET_X_JUMBO(_opcode, _opname, _ftype, _regsize)             \
-    HANDLE_OPCODE(_opcode /*vBBBB, vCCCC, class@AAAAAAAA*/)                 \
-    {                                                                       \
-        InstField* ifield;                                                  \
-        Object* obj;                                                        \
-        EXPORT_PC();                                                        \
-        ref = FETCH(1) | (u4)FETCH(2) << 16;   /* field ref */              \
-        vdst = FETCH(3);                                                    \
-        vsrc1 = FETCH(4);                      /* object ptr */             \
-        ILOGV("|iget%s/jumbo v%d,v%d,field@0x%08x",                         \
-            (_opname), vdst, vsrc1, ref);                                   \
-        obj = (Object*) GET_REGISTER(vsrc1);                                \
-        if (!checkForNull(obj))                                             \
-            GOTO_exceptionThrown();                                         \
-        ifield = (InstField*) dvmDexGetResolvedField(methodClassDex, ref);  \
-        if (ifield == NULL) {                                               \
-            ifield = dvmResolveInstField(curMethod->clazz, ref);            \
-            if (ifield == NULL)                                             \
-                GOTO_exceptionThrown();                                     \
-        }                                                                   \
-        SET_REGISTER##_regsize(vdst,                                        \
-            dvmGetField##_ftype(obj, ifield->byteOffset));                  \
-        ILOGV("+ IGET '%s'=0x%08llx", ifield->field.name,                   \
-            (u8) GET_REGISTER##_regsize(vdst));                             \
-        UPDATE_FIELD_GET(&ifield->field);                                   \
-    }                                                                       \
-    FINISH(5);
-
-#define HANDLE_IGET_X_QUICK(_opcode, _opname, _ftype, _regsize)             \
-    HANDLE_OPCODE(_opcode /*vA, vB, field@CCCC*/)                           \
-    {                                                                       \
-        Object* obj;                                                        \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);   /* object ptr */                            \
-        ref = FETCH(1);         /* field offset */                          \
-        ILOGV("|iget%s-quick v%d,v%d,field@+%u",                            \
-            (_opname), vdst, vsrc1, ref);                                   \
-        obj = (Object*) GET_REGISTER(vsrc1);                                \
-        if (!checkForNullExportPC(obj, fp, pc))                             \
-            GOTO_exceptionThrown();                                         \
-        SET_REGISTER##_regsize(vdst, dvmGetField##_ftype(obj, ref));        \
-        ILOGV("+ IGETQ %d=0x%08llx", ref,                                   \
-            (u8) GET_REGISTER##_regsize(vdst));                             \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_IPUT_X(_opcode, _opname, _ftype, _regsize)                   \
-    HANDLE_OPCODE(_opcode /*vA, vB, field@CCCC*/)                           \
-    {                                                                       \
-        InstField* ifield;                                                  \
-        Object* obj;                                                        \
-        EXPORT_PC();                                                        \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);   /* object ptr */                            \
-        ref = FETCH(1);         /* field ref */                             \
-        ILOGV("|iput%s v%d,v%d,field@0x%04x", (_opname), vdst, vsrc1, ref); \
-        obj = (Object*) GET_REGISTER(vsrc1);                                \
-        if (!checkForNull(obj))                                             \
-            GOTO_exceptionThrown();                                         \
-        ifield = (InstField*) dvmDexGetResolvedField(methodClassDex, ref);  \
-        if (ifield == NULL) {                                               \
-            ifield = dvmResolveInstField(curMethod->clazz, ref);            \
-            if (ifield == NULL)                                             \
-                GOTO_exceptionThrown();                                     \
-        }                                                                   \
-        dvmSetField##_ftype(obj, ifield->byteOffset,                        \
-            GET_REGISTER##_regsize(vdst));                                  \
-        ILOGV("+ IPUT '%s'=0x%08llx", ifield->field.name,                   \
-            (u8) GET_REGISTER##_regsize(vdst));                             \
-        UPDATE_FIELD_PUT(&ifield->field);                                   \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_IPUT_X_JUMBO(_opcode, _opname, _ftype, _regsize)             \
-    HANDLE_OPCODE(_opcode /*vBBBB, vCCCC, class@AAAAAAAA*/)                 \
-    {                                                                       \
-        InstField* ifield;                                                  \
-        Object* obj;                                                        \
-        EXPORT_PC();                                                        \
-        ref = FETCH(1) | (u4)FETCH(2) << 16;   /* field ref */              \
-        vdst = FETCH(3);                                                    \
-        vsrc1 = FETCH(4);                      /* object ptr */             \
-        ILOGV("|iput%s/jumbo v%d,v%d,field@0x%08x",                         \
-            (_opname), vdst, vsrc1, ref);                                   \
-        obj = (Object*) GET_REGISTER(vsrc1);                                \
-        if (!checkForNull(obj))                                             \
-            GOTO_exceptionThrown();                                         \
-        ifield = (InstField*) dvmDexGetResolvedField(methodClassDex, ref);  \
-        if (ifield == NULL) {                                               \
-            ifield = dvmResolveInstField(curMethod->clazz, ref);            \
-            if (ifield == NULL)                                             \
-                GOTO_exceptionThrown();                                     \
-        }                                                                   \
-        dvmSetField##_ftype(obj, ifield->byteOffset,                        \
-            GET_REGISTER##_regsize(vdst));                                  \
-        ILOGV("+ IPUT '%s'=0x%08llx", ifield->field.name,                   \
-            (u8) GET_REGISTER##_regsize(vdst));                             \
-        UPDATE_FIELD_PUT(&ifield->field);                                   \
-    }                                                                       \
-    FINISH(5);
-
-#define HANDLE_IPUT_X_QUICK(_opcode, _opname, _ftype, _regsize)             \
-    HANDLE_OPCODE(_opcode /*vA, vB, field@CCCC*/)                           \
-    {                                                                       \
-        Object* obj;                                                        \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);   /* object ptr */                            \
-        ref = FETCH(1);         /* field offset */                          \
-        ILOGV("|iput%s-quick v%d,v%d,field@0x%04x",                         \
-            (_opname), vdst, vsrc1, ref);                                   \
-        obj = (Object*) GET_REGISTER(vsrc1);                                \
-        if (!checkForNullExportPC(obj, fp, pc))                             \
-            GOTO_exceptionThrown();                                         \
-        dvmSetField##_ftype(obj, ref, GET_REGISTER##_regsize(vdst));        \
-        ILOGV("+ IPUTQ %d=0x%08llx", ref,                                   \
-            (u8) GET_REGISTER##_regsize(vdst));                             \
-    }                                                                       \
-    FINISH(2);
-
-/*
- * The JIT needs dvmDexGetResolvedField() to return non-null.
- * Because the portable interpreter is not involved with the JIT
- * and trace building, we only need the extra check here when this
- * code is massaged into a stub called from an assembly interpreter.
- * This is controlled by the JIT_STUB_HACK maco.
- */
-
-#define HANDLE_SGET_X(_opcode, _opname, _ftype, _regsize)                   \
-    HANDLE_OPCODE(_opcode /*vAA, field@BBBB*/)                              \
-    {                                                                       \
-        StaticField* sfield;                                                \
-        vdst = INST_AA(inst);                                               \
-        ref = FETCH(1);         /* field ref */                             \
-        ILOGV("|sget%s v%d,sfield@0x%04x", (_opname), vdst, ref);           \
-        sfield = (StaticField*)dvmDexGetResolvedField(methodClassDex, ref); \
-        if (sfield == NULL) {                                               \
-            EXPORT_PC();                                                    \
-            sfield = dvmResolveStaticField(curMethod->clazz, ref);          \
-            if (sfield == NULL)                                             \
-                GOTO_exceptionThrown();                                     \
-            if (dvmDexGetResolvedField(methodClassDex, ref) == NULL) {      \
-                JIT_STUB_HACK(dvmJitEndTraceSelect(self,pc));                  \
-            }                                                               \
-        }                                                                   \
-        SET_REGISTER##_regsize(vdst, dvmGetStaticField##_ftype(sfield));    \
-        ILOGV("+ SGET '%s'=0x%08llx",                                       \
-            sfield->field.name, (u8)GET_REGISTER##_regsize(vdst));          \
-        UPDATE_FIELD_GET(&sfield->field);                                   \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_SGET_X_JUMBO(_opcode, _opname, _ftype, _regsize)             \
-    HANDLE_OPCODE(_opcode /*vBBBB, class@AAAAAAAA*/)                        \
-    {                                                                       \
-        StaticField* sfield;                                                \
-        ref = FETCH(1) | (u4)FETCH(2) << 16;   /* field ref */              \
-        vdst = FETCH(3);                                                    \
-        ILOGV("|sget%s/jumbo v%d,sfield@0x%08x", (_opname), vdst, ref);     \
-        sfield = (StaticField*)dvmDexGetResolvedField(methodClassDex, ref); \
-        if (sfield == NULL) {                                               \
-            EXPORT_PC();                                                    \
-            sfield = dvmResolveStaticField(curMethod->clazz, ref);          \
-            if (sfield == NULL)                                             \
-                GOTO_exceptionThrown();                                     \
-            if (dvmDexGetResolvedField(methodClassDex, ref) == NULL) {      \
-                JIT_STUB_HACK(dvmJitEndTraceSelect(self,pc));                  \
-            }                                                               \
-        }                                                                   \
-        SET_REGISTER##_regsize(vdst, dvmGetStaticField##_ftype(sfield));    \
-        ILOGV("+ SGET '%s'=0x%08llx",                                       \
-            sfield->field.name, (u8)GET_REGISTER##_regsize(vdst));          \
-        UPDATE_FIELD_GET(&sfield->field);                                   \
-    }                                                                       \
-    FINISH(4);
-
-#define HANDLE_SPUT_X(_opcode, _opname, _ftype, _regsize)                   \
-    HANDLE_OPCODE(_opcode /*vAA, field@BBBB*/)                              \
-    {                                                                       \
-        StaticField* sfield;                                                \
-        vdst = INST_AA(inst);                                               \
-        ref = FETCH(1);         /* field ref */                             \
-        ILOGV("|sput%s v%d,sfield@0x%04x", (_opname), vdst, ref);           \
-        sfield = (StaticField*)dvmDexGetResolvedField(methodClassDex, ref); \
-        if (sfield == NULL) {                                               \
-            EXPORT_PC();                                                    \
-            sfield = dvmResolveStaticField(curMethod->clazz, ref);          \
-            if (sfield == NULL)                                             \
-                GOTO_exceptionThrown();                                     \
-            if (dvmDexGetResolvedField(methodClassDex, ref) == NULL) {      \
-                JIT_STUB_HACK(dvmJitEndTraceSelect(self,pc));                  \
-            }                                                               \
-        }                                                                   \
-        dvmSetStaticField##_ftype(sfield, GET_REGISTER##_regsize(vdst));    \
-        ILOGV("+ SPUT '%s'=0x%08llx",                                       \
-            sfield->field.name, (u8)GET_REGISTER##_regsize(vdst));          \
-        UPDATE_FIELD_PUT(&sfield->field);                                   \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_SPUT_X_JUMBO(_opcode, _opname, _ftype, _regsize)             \
-    HANDLE_OPCODE(_opcode /*vBBBB, class@AAAAAAAA*/)                        \
-    {                                                                       \
-        StaticField* sfield;                                                \
-        ref = FETCH(1) | (u4)FETCH(2) << 16;   /* field ref */              \
-        vdst = FETCH(3);                                                    \
-        ILOGV("|sput%s/jumbo v%d,sfield@0x%08x", (_opname), vdst, ref);     \
-        sfield = (StaticField*)dvmDexGetResolvedField(methodClassDex, ref); \
-        if (sfield == NULL) {                                               \
-            EXPORT_PC();                                                    \
-            sfield = dvmResolveStaticField(curMethod->clazz, ref);          \
-            if (sfield == NULL)                                             \
-                GOTO_exceptionThrown();                                     \
-            if (dvmDexGetResolvedField(methodClassDex, ref) == NULL) {      \
-                JIT_STUB_HACK(dvmJitEndTraceSelect(self,pc));                  \
-            }                                                               \
-        }                                                                   \
-        dvmSetStaticField##_ftype(sfield, GET_REGISTER##_regsize(vdst));    \
-        ILOGV("+ SPUT '%s'=0x%08llx",                                       \
-            sfield->field.name, (u8)GET_REGISTER##_regsize(vdst));          \
-        UPDATE_FIELD_PUT(&sfield->field);                                   \
-    }                                                                       \
-    FINISH(4);
-
-/* File: cstubs/enddefs.c */
-
-/* undefine "magic" name remapping */
-#undef retval
-#undef pc
-#undef fp
-#undef curMethod
-#undef methodClassDex
-#undef self
-#undef debugTrackedRefStart
-
-/* File: armv5te/debug.c */
-#include <inttypes.h>
-
-/*
- * Dump the fixed-purpose ARM registers, along with some other info.
- *
- * This function MUST be compiled in ARM mode -- THUMB will yield bogus
- * results.
- *
- * This will NOT preserve r0-r3/ip.
- */
-void dvmMterpDumpArmRegs(uint32_t r0, uint32_t r1, uint32_t r2, uint32_t r3)
-{
-    register uint32_t rPC       asm("r4");
-    register uint32_t rFP       asm("r5");
-    register uint32_t rSELF     asm("r6");
-    register uint32_t rINST     asm("r7");
-    register uint32_t rIBASE    asm("r8");
-    register uint32_t r9        asm("r9");
-    register uint32_t r10       asm("r10");
-
-    //extern char dvmAsmInstructionStart[];
-
-    printf("REGS: r0=%08x r1=%08x r2=%08x r3=%08x\n", r0, r1, r2, r3);
-    printf("    : rPC=%08x rFP=%08x rSELF=%08x rINST=%08x\n",
-        rPC, rFP, rSELF, rINST);
-    printf("    : rIBASE=%08x r9=%08x r10=%08x\n", rIBASE, r9, r10);
-
-    //Thread* self = (Thread*) rSELF;
-    //const Method* method = self->method;
-    printf("    + self is %p\n", dvmThreadSelf());
-    //printf("    + currently in %s.%s %s\n",
-    //    method->clazz->descriptor, method->name, method->shorty);
-    //printf("    + dvmAsmInstructionStart = %p\n", dvmAsmInstructionStart);
-    //printf("    + next handler for 0x%02x = %p\n",
-    //    rINST & 0xff, dvmAsmInstructionStart + (rINST & 0xff) * 64);
-}
-
-/*
- * Dump the StackSaveArea for the specified frame pointer.
- */
-void dvmDumpFp(void* fp, StackSaveArea* otherSaveArea)
-{
-    StackSaveArea* saveArea = SAVEAREA_FROM_FP(fp);
-    printf("StackSaveArea for fp %p [%p/%p]:\n", fp, saveArea, otherSaveArea);
-#ifdef EASY_GDB
-    printf("  prevSave=%p, prevFrame=%p savedPc=%p meth=%p curPc=%p\n",
-        saveArea->prevSave, saveArea->prevFrame, saveArea->savedPc,
-        saveArea->method, saveArea->xtra.currentPc);
-#else
-    printf("  prevFrame=%p savedPc=%p meth=%p curPc=%p fp[0]=0x%08x\n",
-        saveArea->prevFrame, saveArea->savedPc,
-        saveArea->method, saveArea->xtra.currentPc,
-        *(u4*)fp);
-#endif
-}
-
-/*
- * Does the bulk of the work for common_printMethod().
- */
-void dvmMterpPrintMethod(Method* method)
-{
-    /*
-     * It is a direct (non-virtual) method if it is static, private,
-     * or a constructor.
-     */
-    bool isDirect =
-        ((method->accessFlags & (ACC_STATIC|ACC_PRIVATE)) != 0) ||
-        (method->name[0] == '<');
-
-    char* desc = dexProtoCopyMethodDescriptor(&method->prototype);
-
-    printf("<%c:%s.%s %s> ",
-            isDirect ? 'D' : 'V',
-            method->clazz->descriptor,
-            method->name,
-            desc);
-
-    free(desc);
-}
-

vm/mterp/out/InterpC-armv5te.cpp

diff --git a/vm/mterp/out/InterpC-armv5te-vfp.c b/vm/mterp/out/InterpC-armv5te.cpp
similarity index 98%
copy from vm/mterp/out/InterpC-armv5te-vfp.c
copy to vm/mterp/out/InterpC-armv5te.cpp
index bcf03c1..7503ddc 100644
--- a/vm/mterp/out/InterpC-armv5te-vfp.c
+++ b/vm/mterp/out/InterpC-armv5te.cpp
@@ -1,10 +1,10 @@
 /*
- * This file was generated automatically by gen-mterp.py for 'armv5te-vfp'.
+ * This file was generated automatically by gen-mterp.py for 'armv5te'.
  *
  * --> DO NOT EDIT <--
  */
 
-/* File: c/header.c */
+/* File: c/header.cpp */
 /*
  * Copyright (C) 2008 The Android Open Source Project
  *
@@ -379,14 +379,14 @@
     return true;
 }
 
-/* File: cstubs/stubdefs.c */
+/* File: cstubs/stubdefs.cpp */
 /*
  * In the C mterp stubs, "goto" is a function call followed immediately
  * by a return.
  */
 
 #define GOTO_TARGET_DECL(_target, ...)                                      \
-    void dvmMterp_##_target(Thread* self, ## __VA_ARGS__);
+    extern "C" void dvmMterp_##_target(Thread* self, ## __VA_ARGS__);
 
 /* (void)xxx to quiet unused variable compiler warnings. */
 #define GOTO_TARGET(_target, ...)                                           \
@@ -434,6 +434,7 @@
  * (void)xxx to quiet unused variable compiler warnings.
  */
 #define HANDLE_OPCODE(_op)                                                  \
+    extern "C" void dvmMterp_##_op(Thread* self);                           \
     void dvmMterp_##_op(Thread* self) {                                     \
         u4 ref;                                                             \
         u2 vsrc1, vsrc2, vdst;                                              \
@@ -513,7 +514,7 @@
         }                                                                   \
     }
 
-/* File: c/opcommon.c */
+/* File: c/opcommon.cpp */
 /* forward declarations of goto targets */
 GOTO_TARGET_DECL(filledNewArray, bool methodCallRange, bool jumboFormat);
 GOTO_TARGET_DECL(invokeVirtual, bool methodCallRange, bool jumboFormat);
@@ -973,7 +974,7 @@
             GOTO_exceptionThrown();                                         \
         }                                                                   \
         SET_REGISTER##_regsize(vdst,                                        \
-            ((_type*) arrayObj->contents)[GET_REGISTER(vsrc2)]);            \
+            ((_type*)(void*)arrayObj->contents)[GET_REGISTER(vsrc2)]);      \
         ILOGV("+ AGET[%d]=0x%x", GET_REGISTER(vsrc2), GET_REGISTER(vdst));  \
     }                                                                       \
     FINISH(2);
@@ -998,7 +999,7 @@
             GOTO_exceptionThrown();                                         \
         }                                                                   \
         ILOGV("+ APUT[%d]=0x%08x", GET_REGISTER(vsrc2), GET_REGISTER(vdst));\
-        ((_type*) arrayObj->contents)[GET_REGISTER(vsrc2)] =                \
+        ((_type*)(void*)arrayObj->contents)[GET_REGISTER(vsrc2)] =          \
             GET_REGISTER##_regsize(vdst);                                   \
     }                                                                       \
     FINISH(2);
@@ -1270,7 +1271,7 @@
     }                                                                       \
     FINISH(4);
 
-/* File: cstubs/enddefs.c */
+/* File: cstubs/enddefs.cpp */
 
 /* undefine "magic" name remapping */
 #undef retval
@@ -1281,7 +1282,7 @@
 #undef self
 #undef debugTrackedRefStart
 
-/* File: armv5te/debug.c */
+/* File: armv5te/debug.cpp */
 #include <inttypes.h>
 
 /*

vm/mterp/out/InterpC-armv7-a-neon.c

diff --git a/vm/mterp/out/InterpC-armv7-a-neon.c b/vm/mterp/out/InterpC-armv7-a-neon.c
deleted file mode 100644
index c83d470..0000000
--- a/vm/mterp/out/InterpC-armv7-a-neon.c
+++ /dev/null
@@ -1,1364 +0,0 @@
-/*
- * This file was generated automatically by gen-mterp.py for 'armv7-a-neon'.
- *
- * --> DO NOT EDIT <--
- */
-
-/* File: c/header.c */
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* common includes */
-#include "Dalvik.h"
-#include "interp/InterpDefs.h"
-#include "mterp/Mterp.h"
-#include <math.h>                   // needed for fmod, fmodf
-#include "mterp/common/FindInterface.h"
-
-/*
- * Configuration defines.  These affect the C implementations, i.e. the
- * portable interpreter(s) and C stubs.
- *
- * Some defines are controlled by the Makefile, e.g.:
- *   WITH_INSTR_CHECKS
- *   WITH_TRACKREF_CHECKS
- *   EASY_GDB
- *   NDEBUG
- */
-
-#ifdef WITH_INSTR_CHECKS            /* instruction-level paranoia (slow!) */
-# define CHECK_BRANCH_OFFSETS
-# define CHECK_REGISTER_INDICES
-#endif
-
-/*
- * Some architectures require 64-bit alignment for access to 64-bit data
- * types.  We can't just use pointers to copy 64-bit values out of our
- * interpreted register set, because gcc may assume the pointer target is
- * aligned and generate invalid code.
- *
- * There are two common approaches:
- *  (1) Use a union that defines a 32-bit pair and a 64-bit value.
- *  (2) Call memcpy().
- *
- * Depending upon what compiler you're using and what options are specified,
- * one may be faster than the other.  For example, the compiler might
- * convert a memcpy() of 8 bytes into a series of instructions and omit
- * the call.  The union version could cause some strange side-effects,
- * e.g. for a while ARM gcc thought it needed separate storage for each
- * inlined instance, and generated instructions to zero out ~700 bytes of
- * stack space at the top of the interpreter.
- *
- * The default is to use memcpy().  The current gcc for ARM seems to do
- * better with the union.
- */
-#if defined(__ARM_EABI__)
-# define NO_UNALIGN_64__UNION
-#endif
-
-
-//#define LOG_INSTR                   /* verbose debugging */
-/* set and adjust ANDROID_LOG_TAGS='*:i jdwp:i dalvikvm:i dalvikvmi:i' */
-
-/*
- * Keep a tally of accesses to fields.  Currently only works if full DEX
- * optimization is disabled.
- */
-#ifdef PROFILE_FIELD_ACCESS
-# define UPDATE_FIELD_GET(_field) { (_field)->gets++; }
-# define UPDATE_FIELD_PUT(_field) { (_field)->puts++; }
-#else
-# define UPDATE_FIELD_GET(_field) ((void)0)
-# define UPDATE_FIELD_PUT(_field) ((void)0)
-#endif
-
-/*
- * Export another copy of the PC on every instruction; this is largely
- * redundant with EXPORT_PC and the debugger code.  This value can be
- * compared against what we have stored on the stack with EXPORT_PC to
- * help ensure that we aren't missing any export calls.
- */
-#if WITH_EXTRA_GC_CHECKS > 1
-# define EXPORT_EXTRA_PC() (self->currentPc2 = pc)
-#else
-# define EXPORT_EXTRA_PC()
-#endif
-
-/*
- * Adjust the program counter.  "_offset" is a signed int, in 16-bit units.
- *
- * Assumes the existence of "const u2* pc" and "const u2* curMethod->insns".
- *
- * We don't advance the program counter until we finish an instruction or
- * branch, because we do want to have to unroll the PC if there's an
- * exception.
- */
-#ifdef CHECK_BRANCH_OFFSETS
-# define ADJUST_PC(_offset) do {                                            \
-        int myoff = _offset;        /* deref only once */                   \
-        if (pc + myoff < curMethod->insns ||                                \
-            pc + myoff >= curMethod->insns + dvmGetMethodInsnsSize(curMethod)) \
-        {                                                                   \
-            char* desc;                                                     \
-            desc = dexProtoCopyMethodDescriptor(&curMethod->prototype);     \
-            LOGE("Invalid branch %d at 0x%04x in %s.%s %s\n",               \
-                myoff, (int) (pc - curMethod->insns),                       \
-                curMethod->clazz->descriptor, curMethod->name, desc);       \
-            free(desc);                                                     \
-            dvmAbort();                                                     \
-        }                                                                   \
-        pc += myoff;                                                        \
-        EXPORT_EXTRA_PC();                                                  \
-    } while (false)
-#else
-# define ADJUST_PC(_offset) do {                                            \
-        pc += _offset;                                                      \
-        EXPORT_EXTRA_PC();                                                  \
-    } while (false)
-#endif
-
-/*
- * If enabled, log instructions as we execute them.
- */
-#ifdef LOG_INSTR
-# define ILOGD(...) ILOG(LOG_DEBUG, __VA_ARGS__)
-# define ILOGV(...) ILOG(LOG_VERBOSE, __VA_ARGS__)
-# define ILOG(_level, ...) do {                                             \
-        char debugStrBuf[128];                                              \
-        snprintf(debugStrBuf, sizeof(debugStrBuf), __VA_ARGS__);            \
-        if (curMethod != NULL)                                                 \
-            LOG(_level, LOG_TAG"i", "%-2d|%04x%s\n",                        \
-                self->threadId, (int)(pc - curMethod->insns), debugStrBuf); \
-        else                                                                \
-            LOG(_level, LOG_TAG"i", "%-2d|####%s\n",                        \
-                self->threadId, debugStrBuf);                               \
-    } while(false)
-void dvmDumpRegs(const Method* method, const u4* framePtr, bool inOnly);
-# define DUMP_REGS(_meth, _frame, _inOnly) dvmDumpRegs(_meth, _frame, _inOnly)
-static const char kSpacing[] = "            ";
-#else
-# define ILOGD(...) ((void)0)
-# define ILOGV(...) ((void)0)
-# define DUMP_REGS(_meth, _frame, _inOnly) ((void)0)
-#endif
-
-/* get a long from an array of u4 */
-static inline s8 getLongFromArray(const u4* ptr, int idx)
-{
-#if defined(NO_UNALIGN_64__UNION)
-    union { s8 ll; u4 parts[2]; } conv;
-
-    ptr += idx;
-    conv.parts[0] = ptr[0];
-    conv.parts[1] = ptr[1];
-    return conv.ll;
-#else
-    s8 val;
-    memcpy(&val, &ptr[idx], 8);
-    return val;
-#endif
-}
-
-/* store a long into an array of u4 */
-static inline void putLongToArray(u4* ptr, int idx, s8 val)
-{
-#if defined(NO_UNALIGN_64__UNION)
-    union { s8 ll; u4 parts[2]; } conv;
-
-    ptr += idx;
-    conv.ll = val;
-    ptr[0] = conv.parts[0];
-    ptr[1] = conv.parts[1];
-#else
-    memcpy(&ptr[idx], &val, 8);
-#endif
-}
-
-/* get a double from an array of u4 */
-static inline double getDoubleFromArray(const u4* ptr, int idx)
-{
-#if defined(NO_UNALIGN_64__UNION)
-    union { double d; u4 parts[2]; } conv;
-
-    ptr += idx;
-    conv.parts[0] = ptr[0];
-    conv.parts[1] = ptr[1];
-    return conv.d;
-#else
-    double dval;
-    memcpy(&dval, &ptr[idx], 8);
-    return dval;
-#endif
-}
-
-/* store a double into an array of u4 */
-static inline void putDoubleToArray(u4* ptr, int idx, double dval)
-{
-#if defined(NO_UNALIGN_64__UNION)
-    union { double d; u4 parts[2]; } conv;
-
-    ptr += idx;
-    conv.d = dval;
-    ptr[0] = conv.parts[0];
-    ptr[1] = conv.parts[1];
-#else
-    memcpy(&ptr[idx], &dval, 8);
-#endif
-}
-
-/*
- * If enabled, validate the register number on every access.  Otherwise,
- * just do an array access.
- *
- * Assumes the existence of "u4* fp".
- *
- * "_idx" may be referenced more than once.
- */
-#ifdef CHECK_REGISTER_INDICES
-# define GET_REGISTER(_idx) \
-    ( (_idx) < curMethod->registersSize ? \
-        (fp[(_idx)]) : (assert(!"bad reg"),1969) )
-# define SET_REGISTER(_idx, _val) \
-    ( (_idx) < curMethod->registersSize ? \
-        (fp[(_idx)] = (u4)(_val)) : (assert(!"bad reg"),1969) )
-# define GET_REGISTER_AS_OBJECT(_idx)       ((Object *)GET_REGISTER(_idx))
-# define SET_REGISTER_AS_OBJECT(_idx, _val) SET_REGISTER(_idx, (s4)_val)
-# define GET_REGISTER_INT(_idx) ((s4) GET_REGISTER(_idx))
-# define SET_REGISTER_INT(_idx, _val) SET_REGISTER(_idx, (s4)_val)
-# define GET_REGISTER_WIDE(_idx) \
-    ( (_idx) < curMethod->registersSize-1 ? \
-        getLongFromArray(fp, (_idx)) : (assert(!"bad reg"),1969) )
-# define SET_REGISTER_WIDE(_idx, _val) \
-    ( (_idx) < curMethod->registersSize-1 ? \
-        putLongToArray(fp, (_idx), (_val)) : (assert(!"bad reg"),1969) )
-# define GET_REGISTER_FLOAT(_idx) \
-    ( (_idx) < curMethod->registersSize ? \
-        (*((float*) &fp[(_idx)])) : (assert(!"bad reg"),1969.0f) )
-# define SET_REGISTER_FLOAT(_idx, _val) \
-    ( (_idx) < curMethod->registersSize ? \
-        (*((float*) &fp[(_idx)]) = (_val)) : (assert(!"bad reg"),1969.0f) )
-# define GET_REGISTER_DOUBLE(_idx) \
-    ( (_idx) < curMethod->registersSize-1 ? \
-        getDoubleFromArray(fp, (_idx)) : (assert(!"bad reg"),1969.0) )
-# define SET_REGISTER_DOUBLE(_idx, _val) \
-    ( (_idx) < curMethod->registersSize-1 ? \
-        putDoubleToArray(fp, (_idx), (_val)) : (assert(!"bad reg"),1969.0) )
-#else
-# define GET_REGISTER(_idx)                 (fp[(_idx)])
-# define SET_REGISTER(_idx, _val)           (fp[(_idx)] = (_val))
-# define GET_REGISTER_AS_OBJECT(_idx)       ((Object*) fp[(_idx)])
-# define SET_REGISTER_AS_OBJECT(_idx, _val) (fp[(_idx)] = (u4)(_val))
-# define GET_REGISTER_INT(_idx)             ((s4)GET_REGISTER(_idx))
-# define SET_REGISTER_INT(_idx, _val)       SET_REGISTER(_idx, (s4)_val)
-# define GET_REGISTER_WIDE(_idx)            getLongFromArray(fp, (_idx))
-# define SET_REGISTER_WIDE(_idx, _val)      putLongToArray(fp, (_idx), (_val))
-# define GET_REGISTER_FLOAT(_idx)           (*((float*) &fp[(_idx)]))
-# define SET_REGISTER_FLOAT(_idx, _val)     (*((float*) &fp[(_idx)]) = (_val))
-# define GET_REGISTER_DOUBLE(_idx)          getDoubleFromArray(fp, (_idx))
-# define SET_REGISTER_DOUBLE(_idx, _val)    putDoubleToArray(fp, (_idx), (_val))
-#endif
-
-/*
- * Get 16 bits from the specified offset of the program counter.  We always
- * want to load 16 bits at a time from the instruction stream -- it's more
- * efficient than 8 and won't have the alignment problems that 32 might.
- *
- * Assumes existence of "const u2* pc".
- */
-#define FETCH(_offset)     (pc[(_offset)])
-
-/*
- * Extract instruction byte from 16-bit fetch (_inst is a u2).
- */
-#define INST_INST(_inst)    ((_inst) & 0xff)
-
-/*
- * Replace the opcode (used when handling breakpoints).  _opcode is a u1.
- */
-#define INST_REPLACE_OP(_inst, _opcode) (((_inst) & 0xff00) | _opcode)
-
-/*
- * Extract the "vA, vB" 4-bit registers from the instruction word (_inst is u2).
- */
-#define INST_A(_inst)       (((_inst) >> 8) & 0x0f)
-#define INST_B(_inst)       ((_inst) >> 12)
-
-/*
- * Get the 8-bit "vAA" 8-bit register index from the instruction word.
- * (_inst is u2)
- */
-#define INST_AA(_inst)      ((_inst) >> 8)
-
-/*
- * The current PC must be available to Throwable constructors, e.g.
- * those created by the various exception throw routines, so that the
- * exception stack trace can be generated correctly.  If we don't do this,
- * the offset within the current method won't be shown correctly.  See the
- * notes in Exception.c.
- *
- * This is also used to determine the address for precise GC.
- *
- * Assumes existence of "u4* fp" and "const u2* pc".
- */
-#define EXPORT_PC()         (SAVEAREA_FROM_FP(fp)->xtra.currentPc = pc)
-
-/*
- * Check to see if "obj" is NULL.  If so, throw an exception.  Assumes the
- * pc has already been exported to the stack.
- *
- * Perform additional checks on debug builds.
- *
- * Use this to check for NULL when the instruction handler calls into
- * something that could throw an exception (so we have already called
- * EXPORT_PC at the top).
- */
-static inline bool checkForNull(Object* obj)
-{
-    if (obj == NULL) {
-        dvmThrowNullPointerException(NULL);
-        return false;
-    }
-#ifdef WITH_EXTRA_OBJECT_VALIDATION
-    if (!dvmIsValidObject(obj)) {
-        LOGE("Invalid object %p\n", obj);
-        dvmAbort();
-    }
-#endif
-#ifndef NDEBUG
-    if (obj->clazz == NULL || ((u4) obj->clazz) <= 65536) {
-        /* probable heap corruption */
-        LOGE("Invalid object class %p (in %p)\n", obj->clazz, obj);
-        dvmAbort();
-    }
-#endif
-    return true;
-}
-
-/*
- * Check to see if "obj" is NULL.  If so, export the PC into the stack
- * frame and throw an exception.
- *
- * Perform additional checks on debug builds.
- *
- * Use this to check for NULL when the instruction handler doesn't do
- * anything else that can throw an exception.
- */
-static inline bool checkForNullExportPC(Object* obj, u4* fp, const u2* pc)
-{
-    if (obj == NULL) {
-        EXPORT_PC();
-        dvmThrowNullPointerException(NULL);
-        return false;
-    }
-#ifdef WITH_EXTRA_OBJECT_VALIDATION
-    if (!dvmIsValidObject(obj)) {
-        LOGE("Invalid object %p\n", obj);
-        dvmAbort();
-    }
-#endif
-#ifndef NDEBUG
-    if (obj->clazz == NULL || ((u4) obj->clazz) <= 65536) {
-        /* probable heap corruption */
-        LOGE("Invalid object class %p (in %p)\n", obj->clazz, obj);
-        dvmAbort();
-    }
-#endif
-    return true;
-}
-
-/* File: cstubs/stubdefs.c */
-/*
- * In the C mterp stubs, "goto" is a function call followed immediately
- * by a return.
- */
-
-#define GOTO_TARGET_DECL(_target, ...)                                      \
-    void dvmMterp_##_target(Thread* self, ## __VA_ARGS__);
-
-/* (void)xxx to quiet unused variable compiler warnings. */
-#define GOTO_TARGET(_target, ...)                                           \
-    void dvmMterp_##_target(Thread* self, ## __VA_ARGS__) {                 \
-        u2 ref, vsrc1, vsrc2, vdst;                                         \
-        u2 inst = FETCH(0);                                                 \
-        const Method* methodToCall;                                         \
-        StackSaveArea* debugSaveArea;                                       \
-        (void)ref; (void)vsrc1; (void)vsrc2; (void)vdst; (void)inst;        \
-        (void)methodToCall; (void)debugSaveArea;
-
-#define GOTO_TARGET_END }
-
-/*
- * Redefine what used to be local variable accesses into Thread struct
- * references.  (These are undefined down in "footer.c".)
- */
-#define retval                  self->retval
-#define pc                      self->interpSave.pc
-#define fp                      self->interpSave.fp
-#define curMethod               self->interpSave.method
-#define methodClassDex          self->interpSave.methodClassDex
-#define debugTrackedRefStart    self->interpSave.debugTrackedRefStart
-
-/* ugh */
-#define STUB_HACK(x) x
-#if defined(WITH_JIT)
-#define JIT_STUB_HACK(x) x
-#else
-#define JIT_STUB_HACK(x)
-#endif
-
-/*
- * InterpSave's pc and fp must be valid when breaking out to a
- * "Reportxxx" routine.  Because the portable interpreter uses local
- * variables for these, we must flush prior.  Stubs, however, use
- * the interpSave vars directly, so this is a nop for stubs.
- */
-#define PC_FP_TO_SELF()
-
-/*
- * Opcode handler framing macros.  Here, each opcode is a separate function
- * that takes a "self" argument and returns void.  We can't declare
- * these "static" because they may be called from an assembly stub.
- * (void)xxx to quiet unused variable compiler warnings.
- */
-#define HANDLE_OPCODE(_op)                                                  \
-    void dvmMterp_##_op(Thread* self) {                                     \
-        u4 ref;                                                             \
-        u2 vsrc1, vsrc2, vdst;                                              \
-        u2 inst = FETCH(0);                                                 \
-        (void)ref; (void)vsrc1; (void)vsrc2; (void)vdst; (void)inst;
-
-#define OP_END }
-
-/*
- * Like the "portable" FINISH, but don't reload "inst", and return to caller
- * when done.  Further, debugger/profiler checks are handled
- * before handler execution in mterp, so we don't do them here either.
- */
-#if defined(WITH_JIT)
-#define FINISH(_offset) {                                                   \
-        ADJUST_PC(_offset);                                                 \
-        if (self->interpBreak.ctl.subMode & kSubModeJitTraceBuild) {        \
-            dvmCheckJit(pc, self);                                          \
-        }                                                                   \
-        return;                                                             \
-    }
-#else
-#define FINISH(_offset) {                                                   \
-        ADJUST_PC(_offset);                                                 \
-        return;                                                             \
-    }
-#endif
-
-
-/*
- * The "goto label" statements turn into function calls followed by
- * return statements.  Some of the functions take arguments, which in the
- * portable interpreter are handled by assigning values to globals.
- */
-
-#define GOTO_exceptionThrown()                                              \
-    do {                                                                    \
-        dvmMterp_exceptionThrown(self);                                     \
-        return;                                                             \
-    } while(false)
-
-#define GOTO_returnFromMethod()                                             \
-    do {                                                                    \
-        dvmMterp_returnFromMethod(self);                                    \
-        return;                                                             \
-    } while(false)
-
-#define GOTO_invoke(_target, _methodCallRange, _jumboFormat)                \
-    do {                                                                    \
-        dvmMterp_##_target(self, _methodCallRange, _jumboFormat);           \
-        return;                                                             \
-    } while(false)
-
-#define GOTO_invokeMethod(_methodCallRange, _methodToCall, _vsrc1, _vdst)   \
-    do {                                                                    \
-        dvmMterp_invokeMethod(self, _methodCallRange, _methodToCall,        \
-            _vsrc1, _vdst);                                                 \
-        return;                                                             \
-    } while(false)
-
-/*
- * As a special case, "goto bail" turns into a longjmp.
- */
-#define GOTO_bail()                                                         \
-    dvmMterpStdBail(self, false);
-
-/*
- * Periodically check for thread suspension.
- *
- * While we're at it, see if a debugger has attached or the profiler has
- * started.
- */
-#define PERIODIC_CHECKS(_pcadj) {                              \
-        if (dvmCheckSuspendQuick(self)) {                                   \
-            EXPORT_PC();  /* need for precise GC */                         \
-            dvmCheckSuspendPending(self);                                   \
-        }                                                                   \
-    }
-
-/* File: c/opcommon.c */
-/* forward declarations of goto targets */
-GOTO_TARGET_DECL(filledNewArray, bool methodCallRange, bool jumboFormat);
-GOTO_TARGET_DECL(invokeVirtual, bool methodCallRange, bool jumboFormat);
-GOTO_TARGET_DECL(invokeSuper, bool methodCallRange, bool jumboFormat);
-GOTO_TARGET_DECL(invokeInterface, bool methodCallRange, bool jumboFormat);
-GOTO_TARGET_DECL(invokeDirect, bool methodCallRange, bool jumboFormat);
-GOTO_TARGET_DECL(invokeStatic, bool methodCallRange, bool jumboFormat);
-GOTO_TARGET_DECL(invokeVirtualQuick, bool methodCallRange, bool jumboFormat);
-GOTO_TARGET_DECL(invokeSuperQuick, bool methodCallRange, bool jumboFormat);
-GOTO_TARGET_DECL(invokeMethod, bool methodCallRange, const Method* methodToCall,
-    u2 count, u2 regs);
-GOTO_TARGET_DECL(returnFromMethod);
-GOTO_TARGET_DECL(exceptionThrown);
-
-/*
- * ===========================================================================
- *
- * What follows are opcode definitions shared between multiple opcodes with
- * minor substitutions handled by the C pre-processor.  These should probably
- * use the mterp substitution mechanism instead, with the code here moved
- * into common fragment files (like the asm "binop.S"), although it's hard
- * to give up the C preprocessor in favor of the much simpler text subst.
- *
- * ===========================================================================
- */
-
-#define HANDLE_NUMCONV(_opcode, _opname, _fromtype, _totype)                \
-    HANDLE_OPCODE(_opcode /*vA, vB*/)                                       \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        ILOGV("|%s v%d,v%d", (_opname), vdst, vsrc1);                       \
-        SET_REGISTER##_totype(vdst,                                         \
-            GET_REGISTER##_fromtype(vsrc1));                                \
-        FINISH(1);
-
-#define HANDLE_FLOAT_TO_INT(_opcode, _opname, _fromvtype, _fromrtype,       \
-        _tovtype, _tortype)                                                 \
-    HANDLE_OPCODE(_opcode /*vA, vB*/)                                       \
-    {                                                                       \
-        /* spec defines specific handling for +/- inf and NaN values */     \
-        _fromvtype val;                                                     \
-        _tovtype intMin, intMax, result;                                    \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        ILOGV("|%s v%d,v%d", (_opname), vdst, vsrc1);                       \
-        val = GET_REGISTER##_fromrtype(vsrc1);                              \
-        intMin = (_tovtype) 1 << (sizeof(_tovtype) * 8 -1);                 \
-        intMax = ~intMin;                                                   \
-        result = (_tovtype) val;                                            \
-        if (val >= intMax)          /* +inf */                              \
-            result = intMax;                                                \
-        else if (val <= intMin)     /* -inf */                              \
-            result = intMin;                                                \
-        else if (val != val)        /* NaN */                               \
-            result = 0;                                                     \
-        else                                                                \
-            result = (_tovtype) val;                                        \
-        SET_REGISTER##_tortype(vdst, result);                               \
-    }                                                                       \
-    FINISH(1);
-
-#define HANDLE_INT_TO_SMALL(_opcode, _opname, _type)                        \
-    HANDLE_OPCODE(_opcode /*vA, vB*/)                                       \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        ILOGV("|int-to-%s v%d,v%d", (_opname), vdst, vsrc1);                \
-        SET_REGISTER(vdst, (_type) GET_REGISTER(vsrc1));                    \
-        FINISH(1);
-
-/* NOTE: the comparison result is always a signed 4-byte integer */
-#define HANDLE_OP_CMPX(_opcode, _opname, _varType, _type, _nanVal)          \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, vCC*/)                                \
-    {                                                                       \
-        int result;                                                         \
-        u2 regs;                                                            \
-        _varType val1, val2;                                                \
-        vdst = INST_AA(inst);                                               \
-        regs = FETCH(1);                                                    \
-        vsrc1 = regs & 0xff;                                                \
-        vsrc2 = regs >> 8;                                                  \
-        ILOGV("|cmp%s v%d,v%d,v%d", (_opname), vdst, vsrc1, vsrc2);         \
-        val1 = GET_REGISTER##_type(vsrc1);                                  \
-        val2 = GET_REGISTER##_type(vsrc2);                                  \
-        if (val1 == val2)                                                   \
-            result = 0;                                                     \
-        else if (val1 < val2)                                               \
-            result = -1;                                                    \
-        else if (val1 > val2)                                               \
-            result = 1;                                                     \
-        else                                                                \
-            result = (_nanVal);                                             \
-        ILOGV("+ result=%d\n", result);                                     \
-        SET_REGISTER(vdst, result);                                         \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_OP_IF_XX(_opcode, _opname, _cmp)                             \
-    HANDLE_OPCODE(_opcode /*vA, vB, +CCCC*/)                                \
-        vsrc1 = INST_A(inst);                                               \
-        vsrc2 = INST_B(inst);                                               \
-        if ((s4) GET_REGISTER(vsrc1) _cmp (s4) GET_REGISTER(vsrc2)) {       \
-            int branchOffset = (s2)FETCH(1);    /* sign-extended */         \
-            ILOGV("|if-%s v%d,v%d,+0x%04x", (_opname), vsrc1, vsrc2,        \
-                branchOffset);                                              \
-            ILOGV("> branch taken");                                        \
-            if (branchOffset < 0)                                           \
-                PERIODIC_CHECKS(branchOffset);                              \
-            FINISH(branchOffset);                                           \
-        } else {                                                            \
-            ILOGV("|if-%s v%d,v%d,-", (_opname), vsrc1, vsrc2);             \
-            FINISH(2);                                                      \
-        }
-
-#define HANDLE_OP_IF_XXZ(_opcode, _opname, _cmp)                            \
-    HANDLE_OPCODE(_opcode /*vAA, +BBBB*/)                                   \
-        vsrc1 = INST_AA(inst);                                              \
-        if ((s4) GET_REGISTER(vsrc1) _cmp 0) {                              \
-            int branchOffset = (s2)FETCH(1);    /* sign-extended */         \
-            ILOGV("|if-%s v%d,+0x%04x", (_opname), vsrc1, branchOffset);    \
-            ILOGV("> branch taken");                                        \
-            if (branchOffset < 0)                                           \
-                PERIODIC_CHECKS(branchOffset);                              \
-            FINISH(branchOffset);                                           \
-        } else {                                                            \
-            ILOGV("|if-%s v%d,-", (_opname), vsrc1);                        \
-            FINISH(2);                                                      \
-        }
-
-#define HANDLE_UNOP(_opcode, _opname, _pfx, _sfx, _type)                    \
-    HANDLE_OPCODE(_opcode /*vA, vB*/)                                       \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        ILOGV("|%s v%d,v%d", (_opname), vdst, vsrc1);                       \
-        SET_REGISTER##_type(vdst, _pfx GET_REGISTER##_type(vsrc1) _sfx);    \
-        FINISH(1);
-
-#define HANDLE_OP_X_INT(_opcode, _opname, _op, _chkdiv)                     \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, vCC*/)                                \
-    {                                                                       \
-        u2 srcRegs;                                                         \
-        vdst = INST_AA(inst);                                               \
-        srcRegs = FETCH(1);                                                 \
-        vsrc1 = srcRegs & 0xff;                                             \
-        vsrc2 = srcRegs >> 8;                                               \
-        ILOGV("|%s-int v%d,v%d", (_opname), vdst, vsrc1);                   \
-        if (_chkdiv != 0) {                                                 \
-            s4 firstVal, secondVal, result;                                 \
-            firstVal = GET_REGISTER(vsrc1);                                 \
-            secondVal = GET_REGISTER(vsrc2);                                \
-            if (secondVal == 0) {                                           \
-                EXPORT_PC();                                                \
-                dvmThrowArithmeticException("divide by zero");              \
-                GOTO_exceptionThrown();                                     \
-            }                                                               \
-            if ((u4)firstVal == 0x80000000 && secondVal == -1) {            \
-                if (_chkdiv == 1)                                           \
-                    result = firstVal;  /* division */                      \
-                else                                                        \
-                    result = 0;         /* remainder */                     \
-            } else {                                                        \
-                result = firstVal _op secondVal;                            \
-            }                                                               \
-            SET_REGISTER(vdst, result);                                     \
-        } else {                                                            \
-            /* non-div/rem case */                                          \
-            SET_REGISTER(vdst,                                              \
-                (s4) GET_REGISTER(vsrc1) _op (s4) GET_REGISTER(vsrc2));     \
-        }                                                                   \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_OP_SHX_INT(_opcode, _opname, _cast, _op)                     \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, vCC*/)                                \
-    {                                                                       \
-        u2 srcRegs;                                                         \
-        vdst = INST_AA(inst);                                               \
-        srcRegs = FETCH(1);                                                 \
-        vsrc1 = srcRegs & 0xff;                                             \
-        vsrc2 = srcRegs >> 8;                                               \
-        ILOGV("|%s-int v%d,v%d", (_opname), vdst, vsrc1);                   \
-        SET_REGISTER(vdst,                                                  \
-            _cast GET_REGISTER(vsrc1) _op (GET_REGISTER(vsrc2) & 0x1f));    \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_OP_X_INT_LIT16(_opcode, _opname, _op, _chkdiv)               \
-    HANDLE_OPCODE(_opcode /*vA, vB, #+CCCC*/)                               \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        vsrc2 = FETCH(1);                                                   \
-        ILOGV("|%s-int/lit16 v%d,v%d,#+0x%04x",                             \
-            (_opname), vdst, vsrc1, vsrc2);                                 \
-        if (_chkdiv != 0) {                                                 \
-            s4 firstVal, result;                                            \
-            firstVal = GET_REGISTER(vsrc1);                                 \
-            if ((s2) vsrc2 == 0) {                                          \
-                EXPORT_PC();                                                \
-                dvmThrowArithmeticException("divide by zero");              \
-                GOTO_exceptionThrown();                                     \
-            }                                                               \
-            if ((u4)firstVal == 0x80000000 && ((s2) vsrc2) == -1) {         \
-                /* won't generate /lit16 instr for this; check anyway */    \
-                if (_chkdiv == 1)                                           \
-                    result = firstVal;  /* division */                      \
-                else                                                        \
-                    result = 0;         /* remainder */                     \
-            } else {                                                        \
-                result = firstVal _op (s2) vsrc2;                           \
-            }                                                               \
-            SET_REGISTER(vdst, result);                                     \
-        } else {                                                            \
-            /* non-div/rem case */                                          \
-            SET_REGISTER(vdst, GET_REGISTER(vsrc1) _op (s2) vsrc2);         \
-        }                                                                   \
-        FINISH(2);
-
-#define HANDLE_OP_X_INT_LIT8(_opcode, _opname, _op, _chkdiv)                \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, #+CC*/)                               \
-    {                                                                       \
-        u2 litInfo;                                                         \
-        vdst = INST_AA(inst);                                               \
-        litInfo = FETCH(1);                                                 \
-        vsrc1 = litInfo & 0xff;                                             \
-        vsrc2 = litInfo >> 8;       /* constant */                          \
-        ILOGV("|%s-int/lit8 v%d,v%d,#+0x%02x",                              \
-            (_opname), vdst, vsrc1, vsrc2);                                 \
-        if (_chkdiv != 0) {                                                 \
-            s4 firstVal, result;                                            \
-            firstVal = GET_REGISTER(vsrc1);                                 \
-            if ((s1) vsrc2 == 0) {                                          \
-                EXPORT_PC();                                                \
-                dvmThrowArithmeticException("divide by zero");              \
-                GOTO_exceptionThrown();                                     \
-            }                                                               \
-            if ((u4)firstVal == 0x80000000 && ((s1) vsrc2) == -1) {         \
-                if (_chkdiv == 1)                                           \
-                    result = firstVal;  /* division */                      \
-                else                                                        \
-                    result = 0;         /* remainder */                     \
-            } else {                                                        \
-                result = firstVal _op ((s1) vsrc2);                         \
-            }                                                               \
-            SET_REGISTER(vdst, result);                                     \
-        } else {                                                            \
-            SET_REGISTER(vdst,                                              \
-                (s4) GET_REGISTER(vsrc1) _op (s1) vsrc2);                   \
-        }                                                                   \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_OP_SHX_INT_LIT8(_opcode, _opname, _cast, _op)                \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, #+CC*/)                               \
-    {                                                                       \
-        u2 litInfo;                                                         \
-        vdst = INST_AA(inst);                                               \
-        litInfo = FETCH(1);                                                 \
-        vsrc1 = litInfo & 0xff;                                             \
-        vsrc2 = litInfo >> 8;       /* constant */                          \
-        ILOGV("|%s-int/lit8 v%d,v%d,#+0x%02x",                              \
-            (_opname), vdst, vsrc1, vsrc2);                                 \
-        SET_REGISTER(vdst,                                                  \
-            _cast GET_REGISTER(vsrc1) _op (vsrc2 & 0x1f));                  \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_OP_X_INT_2ADDR(_opcode, _opname, _op, _chkdiv)               \
-    HANDLE_OPCODE(_opcode /*vA, vB*/)                                       \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        ILOGV("|%s-int-2addr v%d,v%d", (_opname), vdst, vsrc1);             \
-        if (_chkdiv != 0) {                                                 \
-            s4 firstVal, secondVal, result;                                 \
-            firstVal = GET_REGISTER(vdst);                                  \
-            secondVal = GET_REGISTER(vsrc1);                                \
-            if (secondVal == 0) {                                           \
-                EXPORT_PC();                                                \
-                dvmThrowArithmeticException("divide by zero");              \
-                GOTO_exceptionThrown();                                     \
-            }                                                               \
-            if ((u4)firstVal == 0x80000000 && secondVal == -1) {            \
-                if (_chkdiv == 1)                                           \
-                    result = firstVal;  /* division */                      \
-                else                                                        \
-                    result = 0;         /* remainder */                     \
-            } else {                                                        \
-                result = firstVal _op secondVal;                            \
-            }                                                               \
-            SET_REGISTER(vdst, result);                                     \
-        } else {                                                            \
-            SET_REGISTER(vdst,                                              \
-                (s4) GET_REGISTER(vdst) _op (s4) GET_REGISTER(vsrc1));      \
-        }                                                                   \
-        FINISH(1);
-
-#define HANDLE_OP_SHX_INT_2ADDR(_opcode, _opname, _cast, _op)               \
-    HANDLE_OPCODE(_opcode /*vA, vB*/)                                       \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        ILOGV("|%s-int-2addr v%d,v%d", (_opname), vdst, vsrc1);             \
-        SET_REGISTER(vdst,                                                  \
-            _cast GET_REGISTER(vdst) _op (GET_REGISTER(vsrc1) & 0x1f));     \
-        FINISH(1);
-
-#define HANDLE_OP_X_LONG(_opcode, _opname, _op, _chkdiv)                    \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, vCC*/)                                \
-    {                                                                       \
-        u2 srcRegs;                                                         \
-        vdst = INST_AA(inst);                                               \
-        srcRegs = FETCH(1);                                                 \
-        vsrc1 = srcRegs & 0xff;                                             \
-        vsrc2 = srcRegs >> 8;                                               \
-        ILOGV("|%s-long v%d,v%d,v%d", (_opname), vdst, vsrc1, vsrc2);       \
-        if (_chkdiv != 0) {                                                 \
-            s8 firstVal, secondVal, result;                                 \
-            firstVal = GET_REGISTER_WIDE(vsrc1);                            \
-            secondVal = GET_REGISTER_WIDE(vsrc2);                           \
-            if (secondVal == 0LL) {                                         \
-                EXPORT_PC();                                                \
-                dvmThrowArithmeticException("divide by zero");              \
-                GOTO_exceptionThrown();                                     \
-            }                                                               \
-            if ((u8)firstVal == 0x8000000000000000ULL &&                    \
-                secondVal == -1LL)                                          \
-            {                                                               \
-                if (_chkdiv == 1)                                           \
-                    result = firstVal;  /* division */                      \
-                else                                                        \
-                    result = 0;         /* remainder */                     \
-            } else {                                                        \
-                result = firstVal _op secondVal;                            \
-            }                                                               \
-            SET_REGISTER_WIDE(vdst, result);                                \
-        } else {                                                            \
-            SET_REGISTER_WIDE(vdst,                                         \
-                (s8) GET_REGISTER_WIDE(vsrc1) _op (s8) GET_REGISTER_WIDE(vsrc2)); \
-        }                                                                   \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_OP_SHX_LONG(_opcode, _opname, _cast, _op)                    \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, vCC*/)                                \
-    {                                                                       \
-        u2 srcRegs;                                                         \
-        vdst = INST_AA(inst);                                               \
-        srcRegs = FETCH(1);                                                 \
-        vsrc1 = srcRegs & 0xff;                                             \
-        vsrc2 = srcRegs >> 8;                                               \
-        ILOGV("|%s-long v%d,v%d,v%d", (_opname), vdst, vsrc1, vsrc2);       \
-        SET_REGISTER_WIDE(vdst,                                             \
-            _cast GET_REGISTER_WIDE(vsrc1) _op (GET_REGISTER(vsrc2) & 0x3f)); \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_OP_X_LONG_2ADDR(_opcode, _opname, _op, _chkdiv)              \
-    HANDLE_OPCODE(_opcode /*vA, vB*/)                                       \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        ILOGV("|%s-long-2addr v%d,v%d", (_opname), vdst, vsrc1);            \
-        if (_chkdiv != 0) {                                                 \
-            s8 firstVal, secondVal, result;                                 \
-            firstVal = GET_REGISTER_WIDE(vdst);                             \
-            secondVal = GET_REGISTER_WIDE(vsrc1);                           \
-            if (secondVal == 0LL) {                                         \
-                EXPORT_PC();                                                \
-                dvmThrowArithmeticException("divide by zero");              \
-                GOTO_exceptionThrown();                                     \
-            }                                                               \
-            if ((u8)firstVal == 0x8000000000000000ULL &&                    \
-                secondVal == -1LL)                                          \
-            {                                                               \
-                if (_chkdiv == 1)                                           \
-                    result = firstVal;  /* division */                      \
-                else                                                        \
-                    result = 0;         /* remainder */                     \
-            } else {                                                        \
-                result = firstVal _op secondVal;                            \
-            }                                                               \
-            SET_REGISTER_WIDE(vdst, result);                                \
-        } else {                                                            \
-            SET_REGISTER_WIDE(vdst,                                         \
-                (s8) GET_REGISTER_WIDE(vdst) _op (s8)GET_REGISTER_WIDE(vsrc1));\
-        }                                                                   \
-        FINISH(1);
-
-#define HANDLE_OP_SHX_LONG_2ADDR(_opcode, _opname, _cast, _op)              \
-    HANDLE_OPCODE(_opcode /*vA, vB*/)                                       \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        ILOGV("|%s-long-2addr v%d,v%d", (_opname), vdst, vsrc1);            \
-        SET_REGISTER_WIDE(vdst,                                             \
-            _cast GET_REGISTER_WIDE(vdst) _op (GET_REGISTER(vsrc1) & 0x3f)); \
-        FINISH(1);
-
-#define HANDLE_OP_X_FLOAT(_opcode, _opname, _op)                            \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, vCC*/)                                \
-    {                                                                       \
-        u2 srcRegs;                                                         \
-        vdst = INST_AA(inst);                                               \
-        srcRegs = FETCH(1);                                                 \
-        vsrc1 = srcRegs & 0xff;                                             \
-        vsrc2 = srcRegs >> 8;                                               \
-        ILOGV("|%s-float v%d,v%d,v%d", (_opname), vdst, vsrc1, vsrc2);      \
-        SET_REGISTER_FLOAT(vdst,                                            \
-            GET_REGISTER_FLOAT(vsrc1) _op GET_REGISTER_FLOAT(vsrc2));       \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_OP_X_DOUBLE(_opcode, _opname, _op)                           \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, vCC*/)                                \
-    {                                                                       \
-        u2 srcRegs;                                                         \
-        vdst = INST_AA(inst);                                               \
-        srcRegs = FETCH(1);                                                 \
-        vsrc1 = srcRegs & 0xff;                                             \
-        vsrc2 = srcRegs >> 8;                                               \
-        ILOGV("|%s-double v%d,v%d,v%d", (_opname), vdst, vsrc1, vsrc2);     \
-        SET_REGISTER_DOUBLE(vdst,                                           \
-            GET_REGISTER_DOUBLE(vsrc1) _op GET_REGISTER_DOUBLE(vsrc2));     \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_OP_X_FLOAT_2ADDR(_opcode, _opname, _op)                      \
-    HANDLE_OPCODE(_opcode /*vA, vB*/)                                       \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        ILOGV("|%s-float-2addr v%d,v%d", (_opname), vdst, vsrc1);           \
-        SET_REGISTER_FLOAT(vdst,                                            \
-            GET_REGISTER_FLOAT(vdst) _op GET_REGISTER_FLOAT(vsrc1));        \
-        FINISH(1);
-
-#define HANDLE_OP_X_DOUBLE_2ADDR(_opcode, _opname, _op)                     \
-    HANDLE_OPCODE(_opcode /*vA, vB*/)                                       \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        ILOGV("|%s-double-2addr v%d,v%d", (_opname), vdst, vsrc1);          \
-        SET_REGISTER_DOUBLE(vdst,                                           \
-            GET_REGISTER_DOUBLE(vdst) _op GET_REGISTER_DOUBLE(vsrc1));      \
-        FINISH(1);
-
-#define HANDLE_OP_AGET(_opcode, _opname, _type, _regsize)                   \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, vCC*/)                                \
-    {                                                                       \
-        ArrayObject* arrayObj;                                              \
-        u2 arrayInfo;                                                       \
-        EXPORT_PC();                                                        \
-        vdst = INST_AA(inst);                                               \
-        arrayInfo = FETCH(1);                                               \
-        vsrc1 = arrayInfo & 0xff;    /* array ptr */                        \
-        vsrc2 = arrayInfo >> 8;      /* index */                            \
-        ILOGV("|aget%s v%d,v%d,v%d", (_opname), vdst, vsrc1, vsrc2);        \
-        arrayObj = (ArrayObject*) GET_REGISTER(vsrc1);                      \
-        if (!checkForNull((Object*) arrayObj))                              \
-            GOTO_exceptionThrown();                                         \
-        if (GET_REGISTER(vsrc2) >= arrayObj->length) {                      \
-            dvmThrowArrayIndexOutOfBoundsException(                         \
-                arrayObj->length, GET_REGISTER(vsrc2));                     \
-            GOTO_exceptionThrown();                                         \
-        }                                                                   \
-        SET_REGISTER##_regsize(vdst,                                        \
-            ((_type*) arrayObj->contents)[GET_REGISTER(vsrc2)]);            \
-        ILOGV("+ AGET[%d]=0x%x", GET_REGISTER(vsrc2), GET_REGISTER(vdst));  \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_OP_APUT(_opcode, _opname, _type, _regsize)                   \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, vCC*/)                                \
-    {                                                                       \
-        ArrayObject* arrayObj;                                              \
-        u2 arrayInfo;                                                       \
-        EXPORT_PC();                                                        \
-        vdst = INST_AA(inst);       /* AA: source value */                  \
-        arrayInfo = FETCH(1);                                               \
-        vsrc1 = arrayInfo & 0xff;   /* BB: array ptr */                     \
-        vsrc2 = arrayInfo >> 8;     /* CC: index */                         \
-        ILOGV("|aput%s v%d,v%d,v%d", (_opname), vdst, vsrc1, vsrc2);        \
-        arrayObj = (ArrayObject*) GET_REGISTER(vsrc1);                      \
-        if (!checkForNull((Object*) arrayObj))                              \
-            GOTO_exceptionThrown();                                         \
-        if (GET_REGISTER(vsrc2) >= arrayObj->length) {                      \
-            dvmThrowArrayIndexOutOfBoundsException(                         \
-                arrayObj->length, GET_REGISTER(vsrc2));                     \
-            GOTO_exceptionThrown();                                         \
-        }                                                                   \
-        ILOGV("+ APUT[%d]=0x%08x", GET_REGISTER(vsrc2), GET_REGISTER(vdst));\
-        ((_type*) arrayObj->contents)[GET_REGISTER(vsrc2)] =                \
-            GET_REGISTER##_regsize(vdst);                                   \
-    }                                                                       \
-    FINISH(2);
-
-/*
- * It's possible to get a bad value out of a field with sub-32-bit stores
- * because the -quick versions always operate on 32 bits.  Consider:
- *   short foo = -1  (sets a 32-bit register to 0xffffffff)
- *   iput-quick foo  (writes all 32 bits to the field)
- *   short bar = 1   (sets a 32-bit register to 0x00000001)
- *   iput-short      (writes the low 16 bits to the field)
- *   iget-quick foo  (reads all 32 bits from the field, yielding 0xffff0001)
- * This can only happen when optimized and non-optimized code has interleaved
- * access to the same field.  This is unlikely but possible.
- *
- * The easiest way to fix this is to always read/write 32 bits at a time.  On
- * a device with a 16-bit data bus this is sub-optimal.  (The alternative
- * approach is to have sub-int versions of iget-quick, but now we're wasting
- * Dalvik instruction space and making it less likely that handler code will
- * already be in the CPU i-cache.)
- */
-#define HANDLE_IGET_X(_opcode, _opname, _ftype, _regsize)                   \
-    HANDLE_OPCODE(_opcode /*vA, vB, field@CCCC*/)                           \
-    {                                                                       \
-        InstField* ifield;                                                  \
-        Object* obj;                                                        \
-        EXPORT_PC();                                                        \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);   /* object ptr */                            \
-        ref = FETCH(1);         /* field ref */                             \
-        ILOGV("|iget%s v%d,v%d,field@0x%04x", (_opname), vdst, vsrc1, ref); \
-        obj = (Object*) GET_REGISTER(vsrc1);                                \
-        if (!checkForNull(obj))                                             \
-            GOTO_exceptionThrown();                                         \
-        ifield = (InstField*) dvmDexGetResolvedField(methodClassDex, ref);  \
-        if (ifield == NULL) {                                               \
-            ifield = dvmResolveInstField(curMethod->clazz, ref);            \
-            if (ifield == NULL)                                             \
-                GOTO_exceptionThrown();                                     \
-        }                                                                   \
-        SET_REGISTER##_regsize(vdst,                                        \
-            dvmGetField##_ftype(obj, ifield->byteOffset));                  \
-        ILOGV("+ IGET '%s'=0x%08llx", ifield->field.name,                   \
-            (u8) GET_REGISTER##_regsize(vdst));                             \
-        UPDATE_FIELD_GET(&ifield->field);                                   \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_IGET_X_JUMBO(_opcode, _opname, _ftype, _regsize)             \
-    HANDLE_OPCODE(_opcode /*vBBBB, vCCCC, class@AAAAAAAA*/)                 \
-    {                                                                       \
-        InstField* ifield;                                                  \
-        Object* obj;                                                        \
-        EXPORT_PC();                                                        \
-        ref = FETCH(1) | (u4)FETCH(2) << 16;   /* field ref */              \
-        vdst = FETCH(3);                                                    \
-        vsrc1 = FETCH(4);                      /* object ptr */             \
-        ILOGV("|iget%s/jumbo v%d,v%d,field@0x%08x",                         \
-            (_opname), vdst, vsrc1, ref);                                   \
-        obj = (Object*) GET_REGISTER(vsrc1);                                \
-        if (!checkForNull(obj))                                             \
-            GOTO_exceptionThrown();                                         \
-        ifield = (InstField*) dvmDexGetResolvedField(methodClassDex, ref);  \
-        if (ifield == NULL) {                                               \
-            ifield = dvmResolveInstField(curMethod->clazz, ref);            \
-            if (ifield == NULL)                                             \
-                GOTO_exceptionThrown();                                     \
-        }                                                                   \
-        SET_REGISTER##_regsize(vdst,                                        \
-            dvmGetField##_ftype(obj, ifield->byteOffset));                  \
-        ILOGV("+ IGET '%s'=0x%08llx", ifield->field.name,                   \
-            (u8) GET_REGISTER##_regsize(vdst));                             \
-        UPDATE_FIELD_GET(&ifield->field);                                   \
-    }                                                                       \
-    FINISH(5);
-
-#define HANDLE_IGET_X_QUICK(_opcode, _opname, _ftype, _regsize)             \
-    HANDLE_OPCODE(_opcode /*vA, vB, field@CCCC*/)                           \
-    {                                                                       \
-        Object* obj;                                                        \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);   /* object ptr */                            \
-        ref = FETCH(1);         /* field offset */                          \
-        ILOGV("|iget%s-quick v%d,v%d,field@+%u",                            \
-            (_opname), vdst, vsrc1, ref);                                   \
-        obj = (Object*) GET_REGISTER(vsrc1);                                \
-        if (!checkForNullExportPC(obj, fp, pc))                             \
-            GOTO_exceptionThrown();                                         \
-        SET_REGISTER##_regsize(vdst, dvmGetField##_ftype(obj, ref));        \
-        ILOGV("+ IGETQ %d=0x%08llx", ref,                                   \
-            (u8) GET_REGISTER##_regsize(vdst));                             \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_IPUT_X(_opcode, _opname, _ftype, _regsize)                   \
-    HANDLE_OPCODE(_opcode /*vA, vB, field@CCCC*/)                           \
-    {                                                                       \
-        InstField* ifield;                                                  \
-        Object* obj;                                                        \
-        EXPORT_PC();                                                        \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);   /* object ptr */                            \
-        ref = FETCH(1);         /* field ref */                             \
-        ILOGV("|iput%s v%d,v%d,field@0x%04x", (_opname), vdst, vsrc1, ref); \
-        obj = (Object*) GET_REGISTER(vsrc1);                                \
-        if (!checkForNull(obj))                                             \
-            GOTO_exceptionThrown();                                         \
-        ifield = (InstField*) dvmDexGetResolvedField(methodClassDex, ref);  \
-        if (ifield == NULL) {                                               \
-            ifield = dvmResolveInstField(curMethod->clazz, ref);            \
-            if (ifield == NULL)                                             \
-                GOTO_exceptionThrown();                                     \
-        }                                                                   \
-        dvmSetField##_ftype(obj, ifield->byteOffset,                        \
-            GET_REGISTER##_regsize(vdst));                                  \
-        ILOGV("+ IPUT '%s'=0x%08llx", ifield->field.name,                   \
-            (u8) GET_REGISTER##_regsize(vdst));                             \
-        UPDATE_FIELD_PUT(&ifield->field);                                   \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_IPUT_X_JUMBO(_opcode, _opname, _ftype, _regsize)             \
-    HANDLE_OPCODE(_opcode /*vBBBB, vCCCC, class@AAAAAAAA*/)                 \
-    {                                                                       \
-        InstField* ifield;                                                  \
-        Object* obj;                                                        \
-        EXPORT_PC();                                                        \
-        ref = FETCH(1) | (u4)FETCH(2) << 16;   /* field ref */              \
-        vdst = FETCH(3);                                                    \
-        vsrc1 = FETCH(4);                      /* object ptr */             \
-        ILOGV("|iput%s/jumbo v%d,v%d,field@0x%08x",                         \
-            (_opname), vdst, vsrc1, ref);                                   \
-        obj = (Object*) GET_REGISTER(vsrc1);                                \
-        if (!checkForNull(obj))                                             \
-            GOTO_exceptionThrown();                                         \
-        ifield = (InstField*) dvmDexGetResolvedField(methodClassDex, ref);  \
-        if (ifield == NULL) {                                               \
-            ifield = dvmResolveInstField(curMethod->clazz, ref);            \
-            if (ifield == NULL)                                             \
-                GOTO_exceptionThrown();                                     \
-        }                                                                   \
-        dvmSetField##_ftype(obj, ifield->byteOffset,                        \
-            GET_REGISTER##_regsize(vdst));                                  \
-        ILOGV("+ IPUT '%s'=0x%08llx", ifield->field.name,                   \
-            (u8) GET_REGISTER##_regsize(vdst));                             \
-        UPDATE_FIELD_PUT(&ifield->field);                                   \
-    }                                                                       \
-    FINISH(5);
-
-#define HANDLE_IPUT_X_QUICK(_opcode, _opname, _ftype, _regsize)             \
-    HANDLE_OPCODE(_opcode /*vA, vB, field@CCCC*/)                           \
-    {                                                                       \
-        Object* obj;                                                        \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);   /* object ptr */                            \
-        ref = FETCH(1);         /* field offset */                          \
-        ILOGV("|iput%s-quick v%d,v%d,field@0x%04x",                         \
-            (_opname), vdst, vsrc1, ref);                                   \
-        obj = (Object*) GET_REGISTER(vsrc1);                                \
-        if (!checkForNullExportPC(obj, fp, pc))                             \
-            GOTO_exceptionThrown();                                         \
-        dvmSetField##_ftype(obj, ref, GET_REGISTER##_regsize(vdst));        \
-        ILOGV("+ IPUTQ %d=0x%08llx", ref,                                   \
-            (u8) GET_REGISTER##_regsize(vdst));                             \
-    }                                                                       \
-    FINISH(2);
-
-/*
- * The JIT needs dvmDexGetResolvedField() to return non-null.
- * Because the portable interpreter is not involved with the JIT
- * and trace building, we only need the extra check here when this
- * code is massaged into a stub called from an assembly interpreter.
- * This is controlled by the JIT_STUB_HACK maco.
- */
-
-#define HANDLE_SGET_X(_opcode, _opname, _ftype, _regsize)                   \
-    HANDLE_OPCODE(_opcode /*vAA, field@BBBB*/)                              \
-    {                                                                       \
-        StaticField* sfield;                                                \
-        vdst = INST_AA(inst);                                               \
-        ref = FETCH(1);         /* field ref */                             \
-        ILOGV("|sget%s v%d,sfield@0x%04x", (_opname), vdst, ref);           \
-        sfield = (StaticField*)dvmDexGetResolvedField(methodClassDex, ref); \
-        if (sfield == NULL) {                                               \
-            EXPORT_PC();                                                    \
-            sfield = dvmResolveStaticField(curMethod->clazz, ref);          \
-            if (sfield == NULL)                                             \
-                GOTO_exceptionThrown();                                     \
-            if (dvmDexGetResolvedField(methodClassDex, ref) == NULL) {      \
-                JIT_STUB_HACK(dvmJitEndTraceSelect(self,pc));                  \
-            }                                                               \
-        }                                                                   \
-        SET_REGISTER##_regsize(vdst, dvmGetStaticField##_ftype(sfield));    \
-        ILOGV("+ SGET '%s'=0x%08llx",                                       \
-            sfield->field.name, (u8)GET_REGISTER##_regsize(vdst));          \
-        UPDATE_FIELD_GET(&sfield->field);                                   \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_SGET_X_JUMBO(_opcode, _opname, _ftype, _regsize)             \
-    HANDLE_OPCODE(_opcode /*vBBBB, class@AAAAAAAA*/)                        \
-    {                                                                       \
-        StaticField* sfield;                                                \
-        ref = FETCH(1) | (u4)FETCH(2) << 16;   /* field ref */              \
-        vdst = FETCH(3);                                                    \
-        ILOGV("|sget%s/jumbo v%d,sfield@0x%08x", (_opname), vdst, ref);     \
-        sfield = (StaticField*)dvmDexGetResolvedField(methodClassDex, ref); \
-        if (sfield == NULL) {                                               \
-            EXPORT_PC();                                                    \
-            sfield = dvmResolveStaticField(curMethod->clazz, ref);          \
-            if (sfield == NULL)                                             \
-                GOTO_exceptionThrown();                                     \
-            if (dvmDexGetResolvedField(methodClassDex, ref) == NULL) {      \
-                JIT_STUB_HACK(dvmJitEndTraceSelect(self,pc));                  \
-            }                                                               \
-        }                                                                   \
-        SET_REGISTER##_regsize(vdst, dvmGetStaticField##_ftype(sfield));    \
-        ILOGV("+ SGET '%s'=0x%08llx",                                       \
-            sfield->field.name, (u8)GET_REGISTER##_regsize(vdst));          \
-        UPDATE_FIELD_GET(&sfield->field);                                   \
-    }                                                                       \
-    FINISH(4);
-
-#define HANDLE_SPUT_X(_opcode, _opname, _ftype, _regsize)                   \
-    HANDLE_OPCODE(_opcode /*vAA, field@BBBB*/)                              \
-    {                                                                       \
-        StaticField* sfield;                                                \
-        vdst = INST_AA(inst);                                               \
-        ref = FETCH(1);         /* field ref */                             \
-        ILOGV("|sput%s v%d,sfield@0x%04x", (_opname), vdst, ref);           \
-        sfield = (StaticField*)dvmDexGetResolvedField(methodClassDex, ref); \
-        if (sfield == NULL) {                                               \
-            EXPORT_PC();                                                    \
-            sfield = dvmResolveStaticField(curMethod->clazz, ref);          \
-            if (sfield == NULL)                                             \
-                GOTO_exceptionThrown();                                     \
-            if (dvmDexGetResolvedField(methodClassDex, ref) == NULL) {      \
-                JIT_STUB_HACK(dvmJitEndTraceSelect(self,pc));                  \
-            }                                                               \
-        }                                                                   \
-        dvmSetStaticField##_ftype(sfield, GET_REGISTER##_regsize(vdst));    \
-        ILOGV("+ SPUT '%s'=0x%08llx",                                       \
-            sfield->field.name, (u8)GET_REGISTER##_regsize(vdst));          \
-        UPDATE_FIELD_PUT(&sfield->field);                                   \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_SPUT_X_JUMBO(_opcode, _opname, _ftype, _regsize)             \
-    HANDLE_OPCODE(_opcode /*vBBBB, class@AAAAAAAA*/)                        \
-    {                                                                       \
-        StaticField* sfield;                                                \
-        ref = FETCH(1) | (u4)FETCH(2) << 16;   /* field ref */              \
-        vdst = FETCH(3);                                                    \
-        ILOGV("|sput%s/jumbo v%d,sfield@0x%08x", (_opname), vdst, ref);     \
-        sfield = (StaticField*)dvmDexGetResolvedField(methodClassDex, ref); \
-        if (sfield == NULL) {                                               \
-            EXPORT_PC();                                                    \
-            sfield = dvmResolveStaticField(curMethod->clazz, ref);          \
-            if (sfield == NULL)                                             \
-                GOTO_exceptionThrown();                                     \
-            if (dvmDexGetResolvedField(methodClassDex, ref) == NULL) {      \
-                JIT_STUB_HACK(dvmJitEndTraceSelect(self,pc));                  \
-            }                                                               \
-        }                                                                   \
-        dvmSetStaticField##_ftype(sfield, GET_REGISTER##_regsize(vdst));    \
-        ILOGV("+ SPUT '%s'=0x%08llx",                                       \
-            sfield->field.name, (u8)GET_REGISTER##_regsize(vdst));          \
-        UPDATE_FIELD_PUT(&sfield->field);                                   \
-    }                                                                       \
-    FINISH(4);
-
-/* File: cstubs/enddefs.c */
-
-/* undefine "magic" name remapping */
-#undef retval
-#undef pc
-#undef fp
-#undef curMethod
-#undef methodClassDex
-#undef self
-#undef debugTrackedRefStart
-
-/* File: armv5te/debug.c */
-#include <inttypes.h>
-
-/*
- * Dump the fixed-purpose ARM registers, along with some other info.
- *
- * This function MUST be compiled in ARM mode -- THUMB will yield bogus
- * results.
- *
- * This will NOT preserve r0-r3/ip.
- */
-void dvmMterpDumpArmRegs(uint32_t r0, uint32_t r1, uint32_t r2, uint32_t r3)
-{
-    register uint32_t rPC       asm("r4");
-    register uint32_t rFP       asm("r5");
-    register uint32_t rSELF     asm("r6");
-    register uint32_t rINST     asm("r7");
-    register uint32_t rIBASE    asm("r8");
-    register uint32_t r9        asm("r9");
-    register uint32_t r10       asm("r10");
-
-    //extern char dvmAsmInstructionStart[];
-
-    printf("REGS: r0=%08x r1=%08x r2=%08x r3=%08x\n", r0, r1, r2, r3);
-    printf("    : rPC=%08x rFP=%08x rSELF=%08x rINST=%08x\n",
-        rPC, rFP, rSELF, rINST);
-    printf("    : rIBASE=%08x r9=%08x r10=%08x\n", rIBASE, r9, r10);
-
-    //Thread* self = (Thread*) rSELF;
-    //const Method* method = self->method;
-    printf("    + self is %p\n", dvmThreadSelf());
-    //printf("    + currently in %s.%s %s\n",
-    //    method->clazz->descriptor, method->name, method->shorty);
-    //printf("    + dvmAsmInstructionStart = %p\n", dvmAsmInstructionStart);
-    //printf("    + next handler for 0x%02x = %p\n",
-    //    rINST & 0xff, dvmAsmInstructionStart + (rINST & 0xff) * 64);
-}
-
-/*
- * Dump the StackSaveArea for the specified frame pointer.
- */
-void dvmDumpFp(void* fp, StackSaveArea* otherSaveArea)
-{
-    StackSaveArea* saveArea = SAVEAREA_FROM_FP(fp);
-    printf("StackSaveArea for fp %p [%p/%p]:\n", fp, saveArea, otherSaveArea);
-#ifdef EASY_GDB
-    printf("  prevSave=%p, prevFrame=%p savedPc=%p meth=%p curPc=%p\n",
-        saveArea->prevSave, saveArea->prevFrame, saveArea->savedPc,
-        saveArea->method, saveArea->xtra.currentPc);
-#else
-    printf("  prevFrame=%p savedPc=%p meth=%p curPc=%p fp[0]=0x%08x\n",
-        saveArea->prevFrame, saveArea->savedPc,
-        saveArea->method, saveArea->xtra.currentPc,
-        *(u4*)fp);
-#endif
-}
-
-/*
- * Does the bulk of the work for common_printMethod().
- */
-void dvmMterpPrintMethod(Method* method)
-{
-    /*
-     * It is a direct (non-virtual) method if it is static, private,
-     * or a constructor.
-     */
-    bool isDirect =
-        ((method->accessFlags & (ACC_STATIC|ACC_PRIVATE)) != 0) ||
-        (method->name[0] == '<');
-
-    char* desc = dexProtoCopyMethodDescriptor(&method->prototype);
-
-    printf("<%c:%s.%s %s> ",
-            isDirect ? 'D' : 'V',
-            method->clazz->descriptor,
-            method->name,
-            desc);
-
-    free(desc);
-}
-

vm/mterp/out/InterpC-armv7-a-neon.cpp

diff --git a/vm/mterp/out/InterpC-armv5te-vfp.c b/vm/mterp/out/InterpC-armv7-a-neon.cpp
similarity index 98%
copy from vm/mterp/out/InterpC-armv5te-vfp.c
copy to vm/mterp/out/InterpC-armv7-a-neon.cpp
index bcf03c1..ba9f8a2 100644
--- a/vm/mterp/out/InterpC-armv5te-vfp.c
+++ b/vm/mterp/out/InterpC-armv7-a-neon.cpp
@@ -1,10 +1,10 @@
 /*
- * This file was generated automatically by gen-mterp.py for 'armv5te-vfp'.
+ * This file was generated automatically by gen-mterp.py for 'armv7-a-neon'.
  *
  * --> DO NOT EDIT <--
  */
 
-/* File: c/header.c */
+/* File: c/header.cpp */
 /*
  * Copyright (C) 2008 The Android Open Source Project
  *
@@ -379,14 +379,14 @@
     return true;
 }
 
-/* File: cstubs/stubdefs.c */
+/* File: cstubs/stubdefs.cpp */
 /*
  * In the C mterp stubs, "goto" is a function call followed immediately
  * by a return.
  */
 
 #define GOTO_TARGET_DECL(_target, ...)                                      \
-    void dvmMterp_##_target(Thread* self, ## __VA_ARGS__);
+    extern "C" void dvmMterp_##_target(Thread* self, ## __VA_ARGS__);
 
 /* (void)xxx to quiet unused variable compiler warnings. */
 #define GOTO_TARGET(_target, ...)                                           \
@@ -434,6 +434,7 @@
  * (void)xxx to quiet unused variable compiler warnings.
  */
 #define HANDLE_OPCODE(_op)                                                  \
+    extern "C" void dvmMterp_##_op(Thread* self);                           \
     void dvmMterp_##_op(Thread* self) {                                     \
         u4 ref;                                                             \
         u2 vsrc1, vsrc2, vdst;                                              \
@@ -513,7 +514,7 @@
         }                                                                   \
     }
 
-/* File: c/opcommon.c */
+/* File: c/opcommon.cpp */
 /* forward declarations of goto targets */
 GOTO_TARGET_DECL(filledNewArray, bool methodCallRange, bool jumboFormat);
 GOTO_TARGET_DECL(invokeVirtual, bool methodCallRange, bool jumboFormat);
@@ -973,7 +974,7 @@
             GOTO_exceptionThrown();                                         \
         }                                                                   \
         SET_REGISTER##_regsize(vdst,                                        \
-            ((_type*) arrayObj->contents)[GET_REGISTER(vsrc2)]);            \
+            ((_type*)(void*)arrayObj->contents)[GET_REGISTER(vsrc2)]);      \
         ILOGV("+ AGET[%d]=0x%x", GET_REGISTER(vsrc2), GET_REGISTER(vdst));  \
     }                                                                       \
     FINISH(2);
@@ -998,7 +999,7 @@
             GOTO_exceptionThrown();                                         \
         }                                                                   \
         ILOGV("+ APUT[%d]=0x%08x", GET_REGISTER(vsrc2), GET_REGISTER(vdst));\
-        ((_type*) arrayObj->contents)[GET_REGISTER(vsrc2)] =                \
+        ((_type*)(void*)arrayObj->contents)[GET_REGISTER(vsrc2)] =          \
             GET_REGISTER##_regsize(vdst);                                   \
     }                                                                       \
     FINISH(2);
@@ -1270,7 +1271,7 @@
     }                                                                       \
     FINISH(4);
 
-/* File: cstubs/enddefs.c */
+/* File: cstubs/enddefs.cpp */
 
 /* undefine "magic" name remapping */
 #undef retval
@@ -1281,7 +1282,7 @@
 #undef self
 #undef debugTrackedRefStart
 
-/* File: armv5te/debug.c */
+/* File: armv5te/debug.cpp */
 #include <inttypes.h>
 
 /*

vm/mterp/out/InterpC-armv7-a.c

diff --git a/vm/mterp/out/InterpC-armv7-a.c b/vm/mterp/out/InterpC-armv7-a.c
deleted file mode 100644
index 98b8a7d..0000000
--- a/vm/mterp/out/InterpC-armv7-a.c
+++ /dev/null
@@ -1,1364 +0,0 @@
-/*
- * This file was generated automatically by gen-mterp.py for 'armv7-a'.
- *
- * --> DO NOT EDIT <--
- */
-
-/* File: c/header.c */
-/*
- * Copyright (C) 2008 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* common includes */
-#include "Dalvik.h"
-#include "interp/InterpDefs.h"
-#include "mterp/Mterp.h"
-#include <math.h>                   // needed for fmod, fmodf
-#include "mterp/common/FindInterface.h"
-
-/*
- * Configuration defines.  These affect the C implementations, i.e. the
- * portable interpreter(s) and C stubs.
- *
- * Some defines are controlled by the Makefile, e.g.:
- *   WITH_INSTR_CHECKS
- *   WITH_TRACKREF_CHECKS
- *   EASY_GDB
- *   NDEBUG
- */
-
-#ifdef WITH_INSTR_CHECKS            /* instruction-level paranoia (slow!) */
-# define CHECK_BRANCH_OFFSETS
-# define CHECK_REGISTER_INDICES
-#endif
-
-/*
- * Some architectures require 64-bit alignment for access to 64-bit data
- * types.  We can't just use pointers to copy 64-bit values out of our
- * interpreted register set, because gcc may assume the pointer target is
- * aligned and generate invalid code.
- *
- * There are two common approaches:
- *  (1) Use a union that defines a 32-bit pair and a 64-bit value.
- *  (2) Call memcpy().
- *
- * Depending upon what compiler you're using and what options are specified,
- * one may be faster than the other.  For example, the compiler might
- * convert a memcpy() of 8 bytes into a series of instructions and omit
- * the call.  The union version could cause some strange side-effects,
- * e.g. for a while ARM gcc thought it needed separate storage for each
- * inlined instance, and generated instructions to zero out ~700 bytes of
- * stack space at the top of the interpreter.
- *
- * The default is to use memcpy().  The current gcc for ARM seems to do
- * better with the union.
- */
-#if defined(__ARM_EABI__)
-# define NO_UNALIGN_64__UNION
-#endif
-
-
-//#define LOG_INSTR                   /* verbose debugging */
-/* set and adjust ANDROID_LOG_TAGS='*:i jdwp:i dalvikvm:i dalvikvmi:i' */
-
-/*
- * Keep a tally of accesses to fields.  Currently only works if full DEX
- * optimization is disabled.
- */
-#ifdef PROFILE_FIELD_ACCESS
-# define UPDATE_FIELD_GET(_field) { (_field)->gets++; }
-# define UPDATE_FIELD_PUT(_field) { (_field)->puts++; }
-#else
-# define UPDATE_FIELD_GET(_field) ((void)0)
-# define UPDATE_FIELD_PUT(_field) ((void)0)
-#endif
-
-/*
- * Export another copy of the PC on every instruction; this is largely
- * redundant with EXPORT_PC and the debugger code.  This value can be
- * compared against what we have stored on the stack with EXPORT_PC to
- * help ensure that we aren't missing any export calls.
- */
-#if WITH_EXTRA_GC_CHECKS > 1
-# define EXPORT_EXTRA_PC() (self->currentPc2 = pc)
-#else
-# define EXPORT_EXTRA_PC()
-#endif
-
-/*
- * Adjust the program counter.  "_offset" is a signed int, in 16-bit units.
- *
- * Assumes the existence of "const u2* pc" and "const u2* curMethod->insns".
- *
- * We don't advance the program counter until we finish an instruction or
- * branch, because we do want to have to unroll the PC if there's an
- * exception.
- */
-#ifdef CHECK_BRANCH_OFFSETS
-# define ADJUST_PC(_offset) do {                                            \
-        int myoff = _offset;        /* deref only once */                   \
-        if (pc + myoff < curMethod->insns ||                                \
-            pc + myoff >= curMethod->insns + dvmGetMethodInsnsSize(curMethod)) \
-        {                                                                   \
-            char* desc;                                                     \
-            desc = dexProtoCopyMethodDescriptor(&curMethod->prototype);     \
-            LOGE("Invalid branch %d at 0x%04x in %s.%s %s\n",               \
-                myoff, (int) (pc - curMethod->insns),                       \
-                curMethod->clazz->descriptor, curMethod->name, desc);       \
-            free(desc);                                                     \
-            dvmAbort();                                                     \
-        }                                                                   \
-        pc += myoff;                                                        \
-        EXPORT_EXTRA_PC();                                                  \
-    } while (false)
-#else
-# define ADJUST_PC(_offset) do {                                            \
-        pc += _offset;                                                      \
-        EXPORT_EXTRA_PC();                                                  \
-    } while (false)
-#endif
-
-/*
- * If enabled, log instructions as we execute them.
- */
-#ifdef LOG_INSTR
-# define ILOGD(...) ILOG(LOG_DEBUG, __VA_ARGS__)
-# define ILOGV(...) ILOG(LOG_VERBOSE, __VA_ARGS__)
-# define ILOG(_level, ...) do {                                             \
-        char debugStrBuf[128];                                              \
-        snprintf(debugStrBuf, sizeof(debugStrBuf), __VA_ARGS__);            \
-        if (curMethod != NULL)                                                 \
-            LOG(_level, LOG_TAG"i", "%-2d|%04x%s\n",                        \
-                self->threadId, (int)(pc - curMethod->insns), debugStrBuf); \
-        else                                                                \
-            LOG(_level, LOG_TAG"i", "%-2d|####%s\n",                        \
-                self->threadId, debugStrBuf);                               \
-    } while(false)
-void dvmDumpRegs(const Method* method, const u4* framePtr, bool inOnly);
-# define DUMP_REGS(_meth, _frame, _inOnly) dvmDumpRegs(_meth, _frame, _inOnly)
-static const char kSpacing[] = "            ";
-#else
-# define ILOGD(...) ((void)0)
-# define ILOGV(...) ((void)0)
-# define DUMP_REGS(_meth, _frame, _inOnly) ((void)0)
-#endif
-
-/* get a long from an array of u4 */
-static inline s8 getLongFromArray(const u4* ptr, int idx)
-{
-#if defined(NO_UNALIGN_64__UNION)
-    union { s8 ll; u4 parts[2]; } conv;
-
-    ptr += idx;
-    conv.parts[0] = ptr[0];
-    conv.parts[1] = ptr[1];
-    return conv.ll;
-#else
-    s8 val;
-    memcpy(&val, &ptr[idx], 8);
-    return val;
-#endif
-}
-
-/* store a long into an array of u4 */
-static inline void putLongToArray(u4* ptr, int idx, s8 val)
-{
-#if defined(NO_UNALIGN_64__UNION)
-    union { s8 ll; u4 parts[2]; } conv;
-
-    ptr += idx;
-    conv.ll = val;
-    ptr[0] = conv.parts[0];
-    ptr[1] = conv.parts[1];
-#else
-    memcpy(&ptr[idx], &val, 8);
-#endif
-}
-
-/* get a double from an array of u4 */
-static inline double getDoubleFromArray(const u4* ptr, int idx)
-{
-#if defined(NO_UNALIGN_64__UNION)
-    union { double d; u4 parts[2]; } conv;
-
-    ptr += idx;
-    conv.parts[0] = ptr[0];
-    conv.parts[1] = ptr[1];
-    return conv.d;
-#else
-    double dval;
-    memcpy(&dval, &ptr[idx], 8);
-    return dval;
-#endif
-}
-
-/* store a double into an array of u4 */
-static inline void putDoubleToArray(u4* ptr, int idx, double dval)
-{
-#if defined(NO_UNALIGN_64__UNION)
-    union { double d; u4 parts[2]; } conv;
-
-    ptr += idx;
-    conv.d = dval;
-    ptr[0] = conv.parts[0];
-    ptr[1] = conv.parts[1];
-#else
-    memcpy(&ptr[idx], &dval, 8);
-#endif
-}
-
-/*
- * If enabled, validate the register number on every access.  Otherwise,
- * just do an array access.
- *
- * Assumes the existence of "u4* fp".
- *
- * "_idx" may be referenced more than once.
- */
-#ifdef CHECK_REGISTER_INDICES
-# define GET_REGISTER(_idx) \
-    ( (_idx) < curMethod->registersSize ? \
-        (fp[(_idx)]) : (assert(!"bad reg"),1969) )
-# define SET_REGISTER(_idx, _val) \
-    ( (_idx) < curMethod->registersSize ? \
-        (fp[(_idx)] = (u4)(_val)) : (assert(!"bad reg"),1969) )
-# define GET_REGISTER_AS_OBJECT(_idx)       ((Object *)GET_REGISTER(_idx))
-# define SET_REGISTER_AS_OBJECT(_idx, _val) SET_REGISTER(_idx, (s4)_val)
-# define GET_REGISTER_INT(_idx) ((s4) GET_REGISTER(_idx))
-# define SET_REGISTER_INT(_idx, _val) SET_REGISTER(_idx, (s4)_val)
-# define GET_REGISTER_WIDE(_idx) \
-    ( (_idx) < curMethod->registersSize-1 ? \
-        getLongFromArray(fp, (_idx)) : (assert(!"bad reg"),1969) )
-# define SET_REGISTER_WIDE(_idx, _val) \
-    ( (_idx) < curMethod->registersSize-1 ? \
-        putLongToArray(fp, (_idx), (_val)) : (assert(!"bad reg"),1969) )
-# define GET_REGISTER_FLOAT(_idx) \
-    ( (_idx) < curMethod->registersSize ? \
-        (*((float*) &fp[(_idx)])) : (assert(!"bad reg"),1969.0f) )
-# define SET_REGISTER_FLOAT(_idx, _val) \
-    ( (_idx) < curMethod->registersSize ? \
-        (*((float*) &fp[(_idx)]) = (_val)) : (assert(!"bad reg"),1969.0f) )
-# define GET_REGISTER_DOUBLE(_idx) \
-    ( (_idx) < curMethod->registersSize-1 ? \
-        getDoubleFromArray(fp, (_idx)) : (assert(!"bad reg"),1969.0) )
-# define SET_REGISTER_DOUBLE(_idx, _val) \
-    ( (_idx) < curMethod->registersSize-1 ? \
-        putDoubleToArray(fp, (_idx), (_val)) : (assert(!"bad reg"),1969.0) )
-#else
-# define GET_REGISTER(_idx)                 (fp[(_idx)])
-# define SET_REGISTER(_idx, _val)           (fp[(_idx)] = (_val))
-# define GET_REGISTER_AS_OBJECT(_idx)       ((Object*) fp[(_idx)])
-# define SET_REGISTER_AS_OBJECT(_idx, _val) (fp[(_idx)] = (u4)(_val))
-# define GET_REGISTER_INT(_idx)             ((s4)GET_REGISTER(_idx))
-# define SET_REGISTER_INT(_idx, _val)       SET_REGISTER(_idx, (s4)_val)
-# define GET_REGISTER_WIDE(_idx)            getLongFromArray(fp, (_idx))
-# define SET_REGISTER_WIDE(_idx, _val)      putLongToArray(fp, (_idx), (_val))
-# define GET_REGISTER_FLOAT(_idx)           (*((float*) &fp[(_idx)]))
-# define SET_REGISTER_FLOAT(_idx, _val)     (*((float*) &fp[(_idx)]) = (_val))
-# define GET_REGISTER_DOUBLE(_idx)          getDoubleFromArray(fp, (_idx))
-# define SET_REGISTER_DOUBLE(_idx, _val)    putDoubleToArray(fp, (_idx), (_val))
-#endif
-
-/*
- * Get 16 bits from the specified offset of the program counter.  We always
- * want to load 16 bits at a time from the instruction stream -- it's more
- * efficient than 8 and won't have the alignment problems that 32 might.
- *
- * Assumes existence of "const u2* pc".
- */
-#define FETCH(_offset)     (pc[(_offset)])
-
-/*
- * Extract instruction byte from 16-bit fetch (_inst is a u2).
- */
-#define INST_INST(_inst)    ((_inst) & 0xff)
-
-/*
- * Replace the opcode (used when handling breakpoints).  _opcode is a u1.
- */
-#define INST_REPLACE_OP(_inst, _opcode) (((_inst) & 0xff00) | _opcode)
-
-/*
- * Extract the "vA, vB" 4-bit registers from the instruction word (_inst is u2).
- */
-#define INST_A(_inst)       (((_inst) >> 8) & 0x0f)
-#define INST_B(_inst)       ((_inst) >> 12)
-
-/*
- * Get the 8-bit "vAA" 8-bit register index from the instruction word.
- * (_inst is u2)
- */
-#define INST_AA(_inst)      ((_inst) >> 8)
-
-/*
- * The current PC must be available to Throwable constructors, e.g.
- * those created by the various exception throw routines, so that the
- * exception stack trace can be generated correctly.  If we don't do this,
- * the offset within the current method won't be shown correctly.  See the
- * notes in Exception.c.
- *
- * This is also used to determine the address for precise GC.
- *
- * Assumes existence of "u4* fp" and "const u2* pc".
- */
-#define EXPORT_PC()         (SAVEAREA_FROM_FP(fp)->xtra.currentPc = pc)
-
-/*
- * Check to see if "obj" is NULL.  If so, throw an exception.  Assumes the
- * pc has already been exported to the stack.
- *
- * Perform additional checks on debug builds.
- *
- * Use this to check for NULL when the instruction handler calls into
- * something that could throw an exception (so we have already called
- * EXPORT_PC at the top).
- */
-static inline bool checkForNull(Object* obj)
-{
-    if (obj == NULL) {
-        dvmThrowNullPointerException(NULL);
-        return false;
-    }
-#ifdef WITH_EXTRA_OBJECT_VALIDATION
-    if (!dvmIsValidObject(obj)) {
-        LOGE("Invalid object %p\n", obj);
-        dvmAbort();
-    }
-#endif
-#ifndef NDEBUG
-    if (obj->clazz == NULL || ((u4) obj->clazz) <= 65536) {
-        /* probable heap corruption */
-        LOGE("Invalid object class %p (in %p)\n", obj->clazz, obj);
-        dvmAbort();
-    }
-#endif
-    return true;
-}
-
-/*
- * Check to see if "obj" is NULL.  If so, export the PC into the stack
- * frame and throw an exception.
- *
- * Perform additional checks on debug builds.
- *
- * Use this to check for NULL when the instruction handler doesn't do
- * anything else that can throw an exception.
- */
-static inline bool checkForNullExportPC(Object* obj, u4* fp, const u2* pc)
-{
-    if (obj == NULL) {
-        EXPORT_PC();
-        dvmThrowNullPointerException(NULL);
-        return false;
-    }
-#ifdef WITH_EXTRA_OBJECT_VALIDATION
-    if (!dvmIsValidObject(obj)) {
-        LOGE("Invalid object %p\n", obj);
-        dvmAbort();
-    }
-#endif
-#ifndef NDEBUG
-    if (obj->clazz == NULL || ((u4) obj->clazz) <= 65536) {
-        /* probable heap corruption */
-        LOGE("Invalid object class %p (in %p)\n", obj->clazz, obj);
-        dvmAbort();
-    }
-#endif
-    return true;
-}
-
-/* File: cstubs/stubdefs.c */
-/*
- * In the C mterp stubs, "goto" is a function call followed immediately
- * by a return.
- */
-
-#define GOTO_TARGET_DECL(_target, ...)                                      \
-    void dvmMterp_##_target(Thread* self, ## __VA_ARGS__);
-
-/* (void)xxx to quiet unused variable compiler warnings. */
-#define GOTO_TARGET(_target, ...)                                           \
-    void dvmMterp_##_target(Thread* self, ## __VA_ARGS__) {                 \
-        u2 ref, vsrc1, vsrc2, vdst;                                         \
-        u2 inst = FETCH(0);                                                 \
-        const Method* methodToCall;                                         \
-        StackSaveArea* debugSaveArea;                                       \
-        (void)ref; (void)vsrc1; (void)vsrc2; (void)vdst; (void)inst;        \
-        (void)methodToCall; (void)debugSaveArea;
-
-#define GOTO_TARGET_END }
-
-/*
- * Redefine what used to be local variable accesses into Thread struct
- * references.  (These are undefined down in "footer.c".)
- */
-#define retval                  self->retval
-#define pc                      self->interpSave.pc
-#define fp                      self->interpSave.fp
-#define curMethod               self->interpSave.method
-#define methodClassDex          self->interpSave.methodClassDex
-#define debugTrackedRefStart    self->interpSave.debugTrackedRefStart
-
-/* ugh */
-#define STUB_HACK(x) x
-#if defined(WITH_JIT)
-#define JIT_STUB_HACK(x) x
-#else
-#define JIT_STUB_HACK(x)
-#endif
-
-/*
- * InterpSave's pc and fp must be valid when breaking out to a
- * "Reportxxx" routine.  Because the portable interpreter uses local
- * variables for these, we must flush prior.  Stubs, however, use
- * the interpSave vars directly, so this is a nop for stubs.
- */
-#define PC_FP_TO_SELF()
-
-/*
- * Opcode handler framing macros.  Here, each opcode is a separate function
- * that takes a "self" argument and returns void.  We can't declare
- * these "static" because they may be called from an assembly stub.
- * (void)xxx to quiet unused variable compiler warnings.
- */
-#define HANDLE_OPCODE(_op)                                                  \
-    void dvmMterp_##_op(Thread* self) {                                     \
-        u4 ref;                                                             \
-        u2 vsrc1, vsrc2, vdst;                                              \
-        u2 inst = FETCH(0);                                                 \
-        (void)ref; (void)vsrc1; (void)vsrc2; (void)vdst; (void)inst;
-
-#define OP_END }
-
-/*
- * Like the "portable" FINISH, but don't reload "inst", and return to caller
- * when done.  Further, debugger/profiler checks are handled
- * before handler execution in mterp, so we don't do them here either.
- */
-#if defined(WITH_JIT)
-#define FINISH(_offset) {                                                   \
-        ADJUST_PC(_offset);                                                 \
-        if (self->interpBreak.ctl.subMode & kSubModeJitTraceBuild) {        \
-            dvmCheckJit(pc, self);                                          \
-        }                                                                   \
-        return;                                                             \
-    }
-#else
-#define FINISH(_offset) {                                                   \
-        ADJUST_PC(_offset);                                                 \
-        return;                                                             \
-    }
-#endif
-
-
-/*
- * The "goto label" statements turn into function calls followed by
- * return statements.  Some of the functions take arguments, which in the
- * portable interpreter are handled by assigning values to globals.
- */
-
-#define GOTO_exceptionThrown()                                              \
-    do {                                                                    \
-        dvmMterp_exceptionThrown(self);                                     \
-        return;                                                             \
-    } while(false)
-
-#define GOTO_returnFromMethod()                                             \
-    do {                                                                    \
-        dvmMterp_returnFromMethod(self);                                    \
-        return;                                                             \
-    } while(false)
-
-#define GOTO_invoke(_target, _methodCallRange, _jumboFormat)                \
-    do {                                                                    \
-        dvmMterp_##_target(self, _methodCallRange, _jumboFormat);           \
-        return;                                                             \
-    } while(false)
-
-#define GOTO_invokeMethod(_methodCallRange, _methodToCall, _vsrc1, _vdst)   \
-    do {                                                                    \
-        dvmMterp_invokeMethod(self, _methodCallRange, _methodToCall,        \
-            _vsrc1, _vdst);                                                 \
-        return;                                                             \
-    } while(false)
-
-/*
- * As a special case, "goto bail" turns into a longjmp.
- */
-#define GOTO_bail()                                                         \
-    dvmMterpStdBail(self, false);
-
-/*
- * Periodically check for thread suspension.
- *
- * While we're at it, see if a debugger has attached or the profiler has
- * started.
- */
-#define PERIODIC_CHECKS(_pcadj) {                              \
-        if (dvmCheckSuspendQuick(self)) {                                   \
-            EXPORT_PC();  /* need for precise GC */                         \
-            dvmCheckSuspendPending(self);                                   \
-        }                                                                   \
-    }
-
-/* File: c/opcommon.c */
-/* forward declarations of goto targets */
-GOTO_TARGET_DECL(filledNewArray, bool methodCallRange, bool jumboFormat);
-GOTO_TARGET_DECL(invokeVirtual, bool methodCallRange, bool jumboFormat);
-GOTO_TARGET_DECL(invokeSuper, bool methodCallRange, bool jumboFormat);
-GOTO_TARGET_DECL(invokeInterface, bool methodCallRange, bool jumboFormat);
-GOTO_TARGET_DECL(invokeDirect, bool methodCallRange, bool jumboFormat);
-GOTO_TARGET_DECL(invokeStatic, bool methodCallRange, bool jumboFormat);
-GOTO_TARGET_DECL(invokeVirtualQuick, bool methodCallRange, bool jumboFormat);
-GOTO_TARGET_DECL(invokeSuperQuick, bool methodCallRange, bool jumboFormat);
-GOTO_TARGET_DECL(invokeMethod, bool methodCallRange, const Method* methodToCall,
-    u2 count, u2 regs);
-GOTO_TARGET_DECL(returnFromMethod);
-GOTO_TARGET_DECL(exceptionThrown);
-
-/*
- * ===========================================================================
- *
- * What follows are opcode definitions shared between multiple opcodes with
- * minor substitutions handled by the C pre-processor.  These should probably
- * use the mterp substitution mechanism instead, with the code here moved
- * into common fragment files (like the asm "binop.S"), although it's hard
- * to give up the C preprocessor in favor of the much simpler text subst.
- *
- * ===========================================================================
- */
-
-#define HANDLE_NUMCONV(_opcode, _opname, _fromtype, _totype)                \
-    HANDLE_OPCODE(_opcode /*vA, vB*/)                                       \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        ILOGV("|%s v%d,v%d", (_opname), vdst, vsrc1);                       \
-        SET_REGISTER##_totype(vdst,                                         \
-            GET_REGISTER##_fromtype(vsrc1));                                \
-        FINISH(1);
-
-#define HANDLE_FLOAT_TO_INT(_opcode, _opname, _fromvtype, _fromrtype,       \
-        _tovtype, _tortype)                                                 \
-    HANDLE_OPCODE(_opcode /*vA, vB*/)                                       \
-    {                                                                       \
-        /* spec defines specific handling for +/- inf and NaN values */     \
-        _fromvtype val;                                                     \
-        _tovtype intMin, intMax, result;                                    \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        ILOGV("|%s v%d,v%d", (_opname), vdst, vsrc1);                       \
-        val = GET_REGISTER##_fromrtype(vsrc1);                              \
-        intMin = (_tovtype) 1 << (sizeof(_tovtype) * 8 -1);                 \
-        intMax = ~intMin;                                                   \
-        result = (_tovtype) val;                                            \
-        if (val >= intMax)          /* +inf */                              \
-            result = intMax;                                                \
-        else if (val <= intMin)     /* -inf */                              \
-            result = intMin;                                                \
-        else if (val != val)        /* NaN */                               \
-            result = 0;                                                     \
-        else                                                                \
-            result = (_tovtype) val;                                        \
-        SET_REGISTER##_tortype(vdst, result);                               \
-    }                                                                       \
-    FINISH(1);
-
-#define HANDLE_INT_TO_SMALL(_opcode, _opname, _type)                        \
-    HANDLE_OPCODE(_opcode /*vA, vB*/)                                       \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        ILOGV("|int-to-%s v%d,v%d", (_opname), vdst, vsrc1);                \
-        SET_REGISTER(vdst, (_type) GET_REGISTER(vsrc1));                    \
-        FINISH(1);
-
-/* NOTE: the comparison result is always a signed 4-byte integer */
-#define HANDLE_OP_CMPX(_opcode, _opname, _varType, _type, _nanVal)          \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, vCC*/)                                \
-    {                                                                       \
-        int result;                                                         \
-        u2 regs;                                                            \
-        _varType val1, val2;                                                \
-        vdst = INST_AA(inst);                                               \
-        regs = FETCH(1);                                                    \
-        vsrc1 = regs & 0xff;                                                \
-        vsrc2 = regs >> 8;                                                  \
-        ILOGV("|cmp%s v%d,v%d,v%d", (_opname), vdst, vsrc1, vsrc2);         \
-        val1 = GET_REGISTER##_type(vsrc1);                                  \
-        val2 = GET_REGISTER##_type(vsrc2);                                  \
-        if (val1 == val2)                                                   \
-            result = 0;                                                     \
-        else if (val1 < val2)                                               \
-            result = -1;                                                    \
-        else if (val1 > val2)                                               \
-            result = 1;                                                     \
-        else                                                                \
-            result = (_nanVal);                                             \
-        ILOGV("+ result=%d\n", result);                                     \
-        SET_REGISTER(vdst, result);                                         \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_OP_IF_XX(_opcode, _opname, _cmp)                             \
-    HANDLE_OPCODE(_opcode /*vA, vB, +CCCC*/)                                \
-        vsrc1 = INST_A(inst);                                               \
-        vsrc2 = INST_B(inst);                                               \
-        if ((s4) GET_REGISTER(vsrc1) _cmp (s4) GET_REGISTER(vsrc2)) {       \
-            int branchOffset = (s2)FETCH(1);    /* sign-extended */         \
-            ILOGV("|if-%s v%d,v%d,+0x%04x", (_opname), vsrc1, vsrc2,        \
-                branchOffset);                                              \
-            ILOGV("> branch taken");                                        \
-            if (branchOffset < 0)                                           \
-                PERIODIC_CHECKS(branchOffset);                              \
-            FINISH(branchOffset);                                           \
-        } else {                                                            \
-            ILOGV("|if-%s v%d,v%d,-", (_opname), vsrc1, vsrc2);             \
-            FINISH(2);                                                      \
-        }
-
-#define HANDLE_OP_IF_XXZ(_opcode, _opname, _cmp)                            \
-    HANDLE_OPCODE(_opcode /*vAA, +BBBB*/)                                   \
-        vsrc1 = INST_AA(inst);                                              \
-        if ((s4) GET_REGISTER(vsrc1) _cmp 0) {                              \
-            int branchOffset = (s2)FETCH(1);    /* sign-extended */         \
-            ILOGV("|if-%s v%d,+0x%04x", (_opname), vsrc1, branchOffset);    \
-            ILOGV("> branch taken");                                        \
-            if (branchOffset < 0)                                           \
-                PERIODIC_CHECKS(branchOffset);                              \
-            FINISH(branchOffset);                                           \
-        } else {                                                            \
-            ILOGV("|if-%s v%d,-", (_opname), vsrc1);                        \
-            FINISH(2);                                                      \
-        }
-
-#define HANDLE_UNOP(_opcode, _opname, _pfx, _sfx, _type)                    \
-    HANDLE_OPCODE(_opcode /*vA, vB*/)                                       \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        ILOGV("|%s v%d,v%d", (_opname), vdst, vsrc1);                       \
-        SET_REGISTER##_type(vdst, _pfx GET_REGISTER##_type(vsrc1) _sfx);    \
-        FINISH(1);
-
-#define HANDLE_OP_X_INT(_opcode, _opname, _op, _chkdiv)                     \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, vCC*/)                                \
-    {                                                                       \
-        u2 srcRegs;                                                         \
-        vdst = INST_AA(inst);                                               \
-        srcRegs = FETCH(1);                                                 \
-        vsrc1 = srcRegs & 0xff;                                             \
-        vsrc2 = srcRegs >> 8;                                               \
-        ILOGV("|%s-int v%d,v%d", (_opname), vdst, vsrc1);                   \
-        if (_chkdiv != 0) {                                                 \
-            s4 firstVal, secondVal, result;                                 \
-            firstVal = GET_REGISTER(vsrc1);                                 \
-            secondVal = GET_REGISTER(vsrc2);                                \
-            if (secondVal == 0) {                                           \
-                EXPORT_PC();                                                \
-                dvmThrowArithmeticException("divide by zero");              \
-                GOTO_exceptionThrown();                                     \
-            }                                                               \
-            if ((u4)firstVal == 0x80000000 && secondVal == -1) {            \
-                if (_chkdiv == 1)                                           \
-                    result = firstVal;  /* division */                      \
-                else                                                        \
-                    result = 0;         /* remainder */                     \
-            } else {                                                        \
-                result = firstVal _op secondVal;                            \
-            }                                                               \
-            SET_REGISTER(vdst, result);                                     \
-        } else {                                                            \
-            /* non-div/rem case */                                          \
-            SET_REGISTER(vdst,                                              \
-                (s4) GET_REGISTER(vsrc1) _op (s4) GET_REGISTER(vsrc2));     \
-        }                                                                   \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_OP_SHX_INT(_opcode, _opname, _cast, _op)                     \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, vCC*/)                                \
-    {                                                                       \
-        u2 srcRegs;                                                         \
-        vdst = INST_AA(inst);                                               \
-        srcRegs = FETCH(1);                                                 \
-        vsrc1 = srcRegs & 0xff;                                             \
-        vsrc2 = srcRegs >> 8;                                               \
-        ILOGV("|%s-int v%d,v%d", (_opname), vdst, vsrc1);                   \
-        SET_REGISTER(vdst,                                                  \
-            _cast GET_REGISTER(vsrc1) _op (GET_REGISTER(vsrc2) & 0x1f));    \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_OP_X_INT_LIT16(_opcode, _opname, _op, _chkdiv)               \
-    HANDLE_OPCODE(_opcode /*vA, vB, #+CCCC*/)                               \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        vsrc2 = FETCH(1);                                                   \
-        ILOGV("|%s-int/lit16 v%d,v%d,#+0x%04x",                             \
-            (_opname), vdst, vsrc1, vsrc2);                                 \
-        if (_chkdiv != 0) {                                                 \
-            s4 firstVal, result;                                            \
-            firstVal = GET_REGISTER(vsrc1);                                 \
-            if ((s2) vsrc2 == 0) {                                          \
-                EXPORT_PC();                                                \
-                dvmThrowArithmeticException("divide by zero");              \
-                GOTO_exceptionThrown();                                     \
-            }                                                               \
-            if ((u4)firstVal == 0x80000000 && ((s2) vsrc2) == -1) {         \
-                /* won't generate /lit16 instr for this; check anyway */    \
-                if (_chkdiv == 1)                                           \
-                    result = firstVal;  /* division */                      \
-                else                                                        \
-                    result = 0;         /* remainder */                     \
-            } else {                                                        \
-                result = firstVal _op (s2) vsrc2;                           \
-            }                                                               \
-            SET_REGISTER(vdst, result);                                     \
-        } else {                                                            \
-            /* non-div/rem case */                                          \
-            SET_REGISTER(vdst, GET_REGISTER(vsrc1) _op (s2) vsrc2);         \
-        }                                                                   \
-        FINISH(2);
-
-#define HANDLE_OP_X_INT_LIT8(_opcode, _opname, _op, _chkdiv)                \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, #+CC*/)                               \
-    {                                                                       \
-        u2 litInfo;                                                         \
-        vdst = INST_AA(inst);                                               \
-        litInfo = FETCH(1);                                                 \
-        vsrc1 = litInfo & 0xff;                                             \
-        vsrc2 = litInfo >> 8;       /* constant */                          \
-        ILOGV("|%s-int/lit8 v%d,v%d,#+0x%02x",                              \
-            (_opname), vdst, vsrc1, vsrc2);                                 \
-        if (_chkdiv != 0) {                                                 \
-            s4 firstVal, result;                                            \
-            firstVal = GET_REGISTER(vsrc1);                                 \
-            if ((s1) vsrc2 == 0) {                                          \
-                EXPORT_PC();                                                \
-                dvmThrowArithmeticException("divide by zero");              \
-                GOTO_exceptionThrown();                                     \
-            }                                                               \
-            if ((u4)firstVal == 0x80000000 && ((s1) vsrc2) == -1) {         \
-                if (_chkdiv == 1)                                           \
-                    result = firstVal;  /* division */                      \
-                else                                                        \
-                    result = 0;         /* remainder */                     \
-            } else {                                                        \
-                result = firstVal _op ((s1) vsrc2);                         \
-            }                                                               \
-            SET_REGISTER(vdst, result);                                     \
-        } else {                                                            \
-            SET_REGISTER(vdst,                                              \
-                (s4) GET_REGISTER(vsrc1) _op (s1) vsrc2);                   \
-        }                                                                   \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_OP_SHX_INT_LIT8(_opcode, _opname, _cast, _op)                \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, #+CC*/)                               \
-    {                                                                       \
-        u2 litInfo;                                                         \
-        vdst = INST_AA(inst);                                               \
-        litInfo = FETCH(1);                                                 \
-        vsrc1 = litInfo & 0xff;                                             \
-        vsrc2 = litInfo >> 8;       /* constant */                          \
-        ILOGV("|%s-int/lit8 v%d,v%d,#+0x%02x",                              \
-            (_opname), vdst, vsrc1, vsrc2);                                 \
-        SET_REGISTER(vdst,                                                  \
-            _cast GET_REGISTER(vsrc1) _op (vsrc2 & 0x1f));                  \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_OP_X_INT_2ADDR(_opcode, _opname, _op, _chkdiv)               \
-    HANDLE_OPCODE(_opcode /*vA, vB*/)                                       \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        ILOGV("|%s-int-2addr v%d,v%d", (_opname), vdst, vsrc1);             \
-        if (_chkdiv != 0) {                                                 \
-            s4 firstVal, secondVal, result;                                 \
-            firstVal = GET_REGISTER(vdst);                                  \
-            secondVal = GET_REGISTER(vsrc1);                                \
-            if (secondVal == 0) {                                           \
-                EXPORT_PC();                                                \
-                dvmThrowArithmeticException("divide by zero");              \
-                GOTO_exceptionThrown();                                     \
-            }                                                               \
-            if ((u4)firstVal == 0x80000000 && secondVal == -1) {            \
-                if (_chkdiv == 1)                                           \
-                    result = firstVal;  /* division */                      \
-                else                                                        \
-                    result = 0;         /* remainder */                     \
-            } else {                                                        \
-                result = firstVal _op secondVal;                            \
-            }                                                               \
-            SET_REGISTER(vdst, result);                                     \
-        } else {                                                            \
-            SET_REGISTER(vdst,                                              \
-                (s4) GET_REGISTER(vdst) _op (s4) GET_REGISTER(vsrc1));      \
-        }                                                                   \
-        FINISH(1);
-
-#define HANDLE_OP_SHX_INT_2ADDR(_opcode, _opname, _cast, _op)               \
-    HANDLE_OPCODE(_opcode /*vA, vB*/)                                       \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        ILOGV("|%s-int-2addr v%d,v%d", (_opname), vdst, vsrc1);             \
-        SET_REGISTER(vdst,                                                  \
-            _cast GET_REGISTER(vdst) _op (GET_REGISTER(vsrc1) & 0x1f));     \
-        FINISH(1);
-
-#define HANDLE_OP_X_LONG(_opcode, _opname, _op, _chkdiv)                    \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, vCC*/)                                \
-    {                                                                       \
-        u2 srcRegs;                                                         \
-        vdst = INST_AA(inst);                                               \
-        srcRegs = FETCH(1);                                                 \
-        vsrc1 = srcRegs & 0xff;                                             \
-        vsrc2 = srcRegs >> 8;                                               \
-        ILOGV("|%s-long v%d,v%d,v%d", (_opname), vdst, vsrc1, vsrc2);       \
-        if (_chkdiv != 0) {                                                 \
-            s8 firstVal, secondVal, result;                                 \
-            firstVal = GET_REGISTER_WIDE(vsrc1);                            \
-            secondVal = GET_REGISTER_WIDE(vsrc2);                           \
-            if (secondVal == 0LL) {                                         \
-                EXPORT_PC();                                                \
-                dvmThrowArithmeticException("divide by zero");              \
-                GOTO_exceptionThrown();                                     \
-            }                                                               \
-            if ((u8)firstVal == 0x8000000000000000ULL &&                    \
-                secondVal == -1LL)                                          \
-            {                                                               \
-                if (_chkdiv == 1)                                           \
-                    result = firstVal;  /* division */                      \
-                else                                                        \
-                    result = 0;         /* remainder */                     \
-            } else {                                                        \
-                result = firstVal _op secondVal;                            \
-            }                                                               \
-            SET_REGISTER_WIDE(vdst, result);                                \
-        } else {                                                            \
-            SET_REGISTER_WIDE(vdst,                                         \
-                (s8) GET_REGISTER_WIDE(vsrc1) _op (s8) GET_REGISTER_WIDE(vsrc2)); \
-        }                                                                   \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_OP_SHX_LONG(_opcode, _opname, _cast, _op)                    \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, vCC*/)                                \
-    {                                                                       \
-        u2 srcRegs;                                                         \
-        vdst = INST_AA(inst);                                               \
-        srcRegs = FETCH(1);                                                 \
-        vsrc1 = srcRegs & 0xff;                                             \
-        vsrc2 = srcRegs >> 8;                                               \
-        ILOGV("|%s-long v%d,v%d,v%d", (_opname), vdst, vsrc1, vsrc2);       \
-        SET_REGISTER_WIDE(vdst,                                             \
-            _cast GET_REGISTER_WIDE(vsrc1) _op (GET_REGISTER(vsrc2) & 0x3f)); \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_OP_X_LONG_2ADDR(_opcode, _opname, _op, _chkdiv)              \
-    HANDLE_OPCODE(_opcode /*vA, vB*/)                                       \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        ILOGV("|%s-long-2addr v%d,v%d", (_opname), vdst, vsrc1);            \
-        if (_chkdiv != 0) {                                                 \
-            s8 firstVal, secondVal, result;                                 \
-            firstVal = GET_REGISTER_WIDE(vdst);                             \
-            secondVal = GET_REGISTER_WIDE(vsrc1);                           \
-            if (secondVal == 0LL) {                                         \
-                EXPORT_PC();                                                \
-                dvmThrowArithmeticException("divide by zero");              \
-                GOTO_exceptionThrown();                                     \
-            }                                                               \
-            if ((u8)firstVal == 0x8000000000000000ULL &&                    \
-                secondVal == -1LL)                                          \
-            {                                                               \
-                if (_chkdiv == 1)                                           \
-                    result = firstVal;  /* division */                      \
-                else                                                        \
-                    result = 0;         /* remainder */                     \
-            } else {                                                        \
-                result = firstVal _op secondVal;                            \
-            }                                                               \
-            SET_REGISTER_WIDE(vdst, result);                                \
-        } else {                                                            \
-            SET_REGISTER_WIDE(vdst,                                         \
-                (s8) GET_REGISTER_WIDE(vdst) _op (s8)GET_REGISTER_WIDE(vsrc1));\
-        }                                                                   \
-        FINISH(1);
-
-#define HANDLE_OP_SHX_LONG_2ADDR(_opcode, _opname, _cast, _op)              \
-    HANDLE_OPCODE(_opcode /*vA, vB*/)                                       \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        ILOGV("|%s-long-2addr v%d,v%d", (_opname), vdst, vsrc1);            \
-        SET_REGISTER_WIDE(vdst,                                             \
-            _cast GET_REGISTER_WIDE(vdst) _op (GET_REGISTER(vsrc1) & 0x3f)); \
-        FINISH(1);
-
-#define HANDLE_OP_X_FLOAT(_opcode, _opname, _op)                            \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, vCC*/)                                \
-    {                                                                       \
-        u2 srcRegs;                                                         \
-        vdst = INST_AA(inst);                                               \
-        srcRegs = FETCH(1);                                                 \
-        vsrc1 = srcRegs & 0xff;                                             \
-        vsrc2 = srcRegs >> 8;                                               \
-        ILOGV("|%s-float v%d,v%d,v%d", (_opname), vdst, vsrc1, vsrc2);      \
-        SET_REGISTER_FLOAT(vdst,                                            \
-            GET_REGISTER_FLOAT(vsrc1) _op GET_REGISTER_FLOAT(vsrc2));       \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_OP_X_DOUBLE(_opcode, _opname, _op)                           \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, vCC*/)                                \
-    {                                                                       \
-        u2 srcRegs;                                                         \
-        vdst = INST_AA(inst);                                               \
-        srcRegs = FETCH(1);                                                 \
-        vsrc1 = srcRegs & 0xff;                                             \
-        vsrc2 = srcRegs >> 8;                                               \
-        ILOGV("|%s-double v%d,v%d,v%d", (_opname), vdst, vsrc1, vsrc2);     \
-        SET_REGISTER_DOUBLE(vdst,                                           \
-            GET_REGISTER_DOUBLE(vsrc1) _op GET_REGISTER_DOUBLE(vsrc2));     \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_OP_X_FLOAT_2ADDR(_opcode, _opname, _op)                      \
-    HANDLE_OPCODE(_opcode /*vA, vB*/)                                       \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        ILOGV("|%s-float-2addr v%d,v%d", (_opname), vdst, vsrc1);           \
-        SET_REGISTER_FLOAT(vdst,                                            \
-            GET_REGISTER_FLOAT(vdst) _op GET_REGISTER_FLOAT(vsrc1));        \
-        FINISH(1);
-
-#define HANDLE_OP_X_DOUBLE_2ADDR(_opcode, _opname, _op)                     \
-    HANDLE_OPCODE(_opcode /*vA, vB*/)                                       \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);                                               \
-        ILOGV("|%s-double-2addr v%d,v%d", (_opname), vdst, vsrc1);          \
-        SET_REGISTER_DOUBLE(vdst,                                           \
-            GET_REGISTER_DOUBLE(vdst) _op GET_REGISTER_DOUBLE(vsrc1));      \
-        FINISH(1);
-
-#define HANDLE_OP_AGET(_opcode, _opname, _type, _regsize)                   \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, vCC*/)                                \
-    {                                                                       \
-        ArrayObject* arrayObj;                                              \
-        u2 arrayInfo;                                                       \
-        EXPORT_PC();                                                        \
-        vdst = INST_AA(inst);                                               \
-        arrayInfo = FETCH(1);                                               \
-        vsrc1 = arrayInfo & 0xff;    /* array ptr */                        \
-        vsrc2 = arrayInfo >> 8;      /* index */                            \
-        ILOGV("|aget%s v%d,v%d,v%d", (_opname), vdst, vsrc1, vsrc2);        \
-        arrayObj = (ArrayObject*) GET_REGISTER(vsrc1);                      \
-        if (!checkForNull((Object*) arrayObj))                              \
-            GOTO_exceptionThrown();                                         \
-        if (GET_REGISTER(vsrc2) >= arrayObj->length) {                      \
-            dvmThrowArrayIndexOutOfBoundsException(                         \
-                arrayObj->length, GET_REGISTER(vsrc2));                     \
-            GOTO_exceptionThrown();                                         \
-        }                                                                   \
-        SET_REGISTER##_regsize(vdst,                                        \
-            ((_type*) arrayObj->contents)[GET_REGISTER(vsrc2)]);            \
-        ILOGV("+ AGET[%d]=0x%x", GET_REGISTER(vsrc2), GET_REGISTER(vdst));  \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_OP_APUT(_opcode, _opname, _type, _regsize)                   \
-    HANDLE_OPCODE(_opcode /*vAA, vBB, vCC*/)                                \
-    {                                                                       \
-        ArrayObject* arrayObj;                                              \
-        u2 arrayInfo;                                                       \
-        EXPORT_PC();                                                        \
-        vdst = INST_AA(inst);       /* AA: source value */                  \
-        arrayInfo = FETCH(1);                                               \
-        vsrc1 = arrayInfo & 0xff;   /* BB: array ptr */                     \
-        vsrc2 = arrayInfo >> 8;     /* CC: index */                         \
-        ILOGV("|aput%s v%d,v%d,v%d", (_opname), vdst, vsrc1, vsrc2);        \
-        arrayObj = (ArrayObject*) GET_REGISTER(vsrc1);                      \
-        if (!checkForNull((Object*) arrayObj))                              \
-            GOTO_exceptionThrown();                                         \
-        if (GET_REGISTER(vsrc2) >= arrayObj->length) {                      \
-            dvmThrowArrayIndexOutOfBoundsException(                         \
-                arrayObj->length, GET_REGISTER(vsrc2));                     \
-            GOTO_exceptionThrown();                                         \
-        }                                                                   \
-        ILOGV("+ APUT[%d]=0x%08x", GET_REGISTER(vsrc2), GET_REGISTER(vdst));\
-        ((_type*) arrayObj->contents)[GET_REGISTER(vsrc2)] =                \
-            GET_REGISTER##_regsize(vdst);                                   \
-    }                                                                       \
-    FINISH(2);
-
-/*
- * It's possible to get a bad value out of a field with sub-32-bit stores
- * because the -quick versions always operate on 32 bits.  Consider:
- *   short foo = -1  (sets a 32-bit register to 0xffffffff)
- *   iput-quick foo  (writes all 32 bits to the field)
- *   short bar = 1   (sets a 32-bit register to 0x00000001)
- *   iput-short      (writes the low 16 bits to the field)
- *   iget-quick foo  (reads all 32 bits from the field, yielding 0xffff0001)
- * This can only happen when optimized and non-optimized code has interleaved
- * access to the same field.  This is unlikely but possible.
- *
- * The easiest way to fix this is to always read/write 32 bits at a time.  On
- * a device with a 16-bit data bus this is sub-optimal.  (The alternative
- * approach is to have sub-int versions of iget-quick, but now we're wasting
- * Dalvik instruction space and making it less likely that handler code will
- * already be in the CPU i-cache.)
- */
-#define HANDLE_IGET_X(_opcode, _opname, _ftype, _regsize)                   \
-    HANDLE_OPCODE(_opcode /*vA, vB, field@CCCC*/)                           \
-    {                                                                       \
-        InstField* ifield;                                                  \
-        Object* obj;                                                        \
-        EXPORT_PC();                                                        \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);   /* object ptr */                            \
-        ref = FETCH(1);         /* field ref */                             \
-        ILOGV("|iget%s v%d,v%d,field@0x%04x", (_opname), vdst, vsrc1, ref); \
-        obj = (Object*) GET_REGISTER(vsrc1);                                \
-        if (!checkForNull(obj))                                             \
-            GOTO_exceptionThrown();                                         \
-        ifield = (InstField*) dvmDexGetResolvedField(methodClassDex, ref);  \
-        if (ifield == NULL) {                                               \
-            ifield = dvmResolveInstField(curMethod->clazz, ref);            \
-            if (ifield == NULL)                                             \
-                GOTO_exceptionThrown();                                     \
-        }                                                                   \
-        SET_REGISTER##_regsize(vdst,                                        \
-            dvmGetField##_ftype(obj, ifield->byteOffset));                  \
-        ILOGV("+ IGET '%s'=0x%08llx", ifield->field.name,                   \
-            (u8) GET_REGISTER##_regsize(vdst));                             \
-        UPDATE_FIELD_GET(&ifield->field);                                   \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_IGET_X_JUMBO(_opcode, _opname, _ftype, _regsize)             \
-    HANDLE_OPCODE(_opcode /*vBBBB, vCCCC, class@AAAAAAAA*/)                 \
-    {                                                                       \
-        InstField* ifield;                                                  \
-        Object* obj;                                                        \
-        EXPORT_PC();                                                        \
-        ref = FETCH(1) | (u4)FETCH(2) << 16;   /* field ref */              \
-        vdst = FETCH(3);                                                    \
-        vsrc1 = FETCH(4);                      /* object ptr */             \
-        ILOGV("|iget%s/jumbo v%d,v%d,field@0x%08x",                         \
-            (_opname), vdst, vsrc1, ref);                                   \
-        obj = (Object*) GET_REGISTER(vsrc1);                                \
-        if (!checkForNull(obj))                                             \
-            GOTO_exceptionThrown();                                         \
-        ifield = (InstField*) dvmDexGetResolvedField(methodClassDex, ref);  \
-        if (ifield == NULL) {                                               \
-            ifield = dvmResolveInstField(curMethod->clazz, ref);            \
-            if (ifield == NULL)                                             \
-                GOTO_exceptionThrown();                                     \
-        }                                                                   \
-        SET_REGISTER##_regsize(vdst,                                        \
-            dvmGetField##_ftype(obj, ifield->byteOffset));                  \
-        ILOGV("+ IGET '%s'=0x%08llx", ifield->field.name,                   \
-            (u8) GET_REGISTER##_regsize(vdst));                             \
-        UPDATE_FIELD_GET(&ifield->field);                                   \
-    }                                                                       \
-    FINISH(5);
-
-#define HANDLE_IGET_X_QUICK(_opcode, _opname, _ftype, _regsize)             \
-    HANDLE_OPCODE(_opcode /*vA, vB, field@CCCC*/)                           \
-    {                                                                       \
-        Object* obj;                                                        \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);   /* object ptr */                            \
-        ref = FETCH(1);         /* field offset */                          \
-        ILOGV("|iget%s-quick v%d,v%d,field@+%u",                            \
-            (_opname), vdst, vsrc1, ref);                                   \
-        obj = (Object*) GET_REGISTER(vsrc1);                                \
-        if (!checkForNullExportPC(obj, fp, pc))                             \
-            GOTO_exceptionThrown();                                         \
-        SET_REGISTER##_regsize(vdst, dvmGetField##_ftype(obj, ref));        \
-        ILOGV("+ IGETQ %d=0x%08llx", ref,                                   \
-            (u8) GET_REGISTER##_regsize(vdst));                             \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_IPUT_X(_opcode, _opname, _ftype, _regsize)                   \
-    HANDLE_OPCODE(_opcode /*vA, vB, field@CCCC*/)                           \
-    {                                                                       \
-        InstField* ifield;                                                  \
-        Object* obj;                                                        \
-        EXPORT_PC();                                                        \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);   /* object ptr */                            \
-        ref = FETCH(1);         /* field ref */                             \
-        ILOGV("|iput%s v%d,v%d,field@0x%04x", (_opname), vdst, vsrc1, ref); \
-        obj = (Object*) GET_REGISTER(vsrc1);                                \
-        if (!checkForNull(obj))                                             \
-            GOTO_exceptionThrown();                                         \
-        ifield = (InstField*) dvmDexGetResolvedField(methodClassDex, ref);  \
-        if (ifield == NULL) {                                               \
-            ifield = dvmResolveInstField(curMethod->clazz, ref);            \
-            if (ifield == NULL)                                             \
-                GOTO_exceptionThrown();                                     \
-        }                                                                   \
-        dvmSetField##_ftype(obj, ifield->byteOffset,                        \
-            GET_REGISTER##_regsize(vdst));                                  \
-        ILOGV("+ IPUT '%s'=0x%08llx", ifield->field.name,                   \
-            (u8) GET_REGISTER##_regsize(vdst));                             \
-        UPDATE_FIELD_PUT(&ifield->field);                                   \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_IPUT_X_JUMBO(_opcode, _opname, _ftype, _regsize)             \
-    HANDLE_OPCODE(_opcode /*vBBBB, vCCCC, class@AAAAAAAA*/)                 \
-    {                                                                       \
-        InstField* ifield;                                                  \
-        Object* obj;                                                        \
-        EXPORT_PC();                                                        \
-        ref = FETCH(1) | (u4)FETCH(2) << 16;   /* field ref */              \
-        vdst = FETCH(3);                                                    \
-        vsrc1 = FETCH(4);                      /* object ptr */             \
-        ILOGV("|iput%s/jumbo v%d,v%d,field@0x%08x",                         \
-            (_opname), vdst, vsrc1, ref);                                   \
-        obj = (Object*) GET_REGISTER(vsrc1);                                \
-        if (!checkForNull(obj))                                             \
-            GOTO_exceptionThrown();                                         \
-        ifield = (InstField*) dvmDexGetResolvedField(methodClassDex, ref);  \
-        if (ifield == NULL) {                                               \
-            ifield = dvmResolveInstField(curMethod->clazz, ref);            \
-            if (ifield == NULL)                                             \
-                GOTO_exceptionThrown();                                     \
-        }                                                                   \
-        dvmSetField##_ftype(obj, ifield->byteOffset,                        \
-            GET_REGISTER##_regsize(vdst));                                  \
-        ILOGV("+ IPUT '%s'=0x%08llx", ifield->field.name,                   \
-            (u8) GET_REGISTER##_regsize(vdst));                             \
-        UPDATE_FIELD_PUT(&ifield->field);                                   \
-    }                                                                       \
-    FINISH(5);
-
-#define HANDLE_IPUT_X_QUICK(_opcode, _opname, _ftype, _regsize)             \
-    HANDLE_OPCODE(_opcode /*vA, vB, field@CCCC*/)                           \
-    {                                                                       \
-        Object* obj;                                                        \
-        vdst = INST_A(inst);                                                \
-        vsrc1 = INST_B(inst);   /* object ptr */                            \
-        ref = FETCH(1);         /* field offset */                          \
-        ILOGV("|iput%s-quick v%d,v%d,field@0x%04x",                         \
-            (_opname), vdst, vsrc1, ref);                                   \
-        obj = (Object*) GET_REGISTER(vsrc1);                                \
-        if (!checkForNullExportPC(obj, fp, pc))                             \
-            GOTO_exceptionThrown();                                         \
-        dvmSetField##_ftype(obj, ref, GET_REGISTER##_regsize(vdst));        \
-        ILOGV("+ IPUTQ %d=0x%08llx", ref,                                   \
-            (u8) GET_REGISTER##_regsize(vdst));                             \
-    }                                                                       \
-    FINISH(2);
-
-/*
- * The JIT needs dvmDexGetResolvedField() to return non-null.
- * Because the portable interpreter is not involved with the JIT
- * and trace building, we only need the extra check here when this
- * code is massaged into a stub called from an assembly interpreter.
- * This is controlled by the JIT_STUB_HACK maco.
- */
-
-#define HANDLE_SGET_X(_opcode, _opname, _ftype, _regsize)                   \
-    HANDLE_OPCODE(_opcode /*vAA, field@BBBB*/)                              \
-    {                                                                       \
-        StaticField* sfield;                                                \
-        vdst = INST_AA(inst);                                               \
-        ref = FETCH(1);         /* field ref */                             \
-        ILOGV("|sget%s v%d,sfield@0x%04x", (_opname), vdst, ref);           \
-        sfield = (StaticField*)dvmDexGetResolvedField(methodClassDex, ref); \
-        if (sfield == NULL) {                                               \
-            EXPORT_PC();                                                    \
-            sfield = dvmResolveStaticField(curMethod->clazz, ref);          \
-            if (sfield == NULL)                                             \
-                GOTO_exceptionThrown();                                     \
-            if (dvmDexGetResolvedField(methodClassDex, ref) == NULL) {      \
-                JIT_STUB_HACK(dvmJitEndTraceSelect(self,pc));                  \
-            }                                                               \
-        }                                                                   \
-        SET_REGISTER##_regsize(vdst, dvmGetStaticField##_ftype(sfield));    \
-        ILOGV("+ SGET '%s'=0x%08llx",                                       \
-            sfield->field.name, (u8)GET_REGISTER##_regsize(vdst));          \
-        UPDATE_FIELD_GET(&sfield->field);                                   \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_SGET_X_JUMBO(_opcode, _opname, _ftype, _regsize)             \
-    HANDLE_OPCODE(_opcode /*vBBBB, class@AAAAAAAA*/)                        \
-    {                                                                       \
-        StaticField* sfield;                                                \
-        ref = FETCH(1) | (u4)FETCH(2) << 16;   /* field ref */              \
-        vdst = FETCH(3);                                                    \
-        ILOGV("|sget%s/jumbo v%d,sfield@0x%08x", (_opname), vdst, ref);     \
-        sfield = (StaticField*)dvmDexGetResolvedField(methodClassDex, ref); \
-        if (sfield == NULL) {                                               \
-            EXPORT_PC();                                                    \
-            sfield = dvmResolveStaticField(curMethod->clazz, ref);          \
-            if (sfield == NULL)                                             \
-                GOTO_exceptionThrown();                                     \
-            if (dvmDexGetResolvedField(methodClassDex, ref) == NULL) {      \
-                JIT_STUB_HACK(dvmJitEndTraceSelect(self,pc));                  \
-            }                                                               \
-        }                                                                   \
-        SET_REGISTER##_regsize(vdst, dvmGetStaticField##_ftype(sfield));    \
-        ILOGV("+ SGET '%s'=0x%08llx",                                       \
-            sfield->field.name, (u8)GET_REGISTER##_regsize(vdst));          \
-        UPDATE_FIELD_GET(&sfield->field);                                   \
-    }                                                                       \
-    FINISH(4);
-
-#define HANDLE_SPUT_X(_opcode, _opname, _ftype, _regsize)                   \
-    HANDLE_OPCODE(_opcode /*vAA, field@BBBB*/)                              \
-    {                                                                       \
-        StaticField* sfield;                                                \
-        vdst = INST_AA(inst);                                               \
-        ref = FETCH(1);         /* field ref */                             \
-        ILOGV("|sput%s v%d,sfield@0x%04x", (_opname), vdst, ref);           \
-        sfield = (StaticField*)dvmDexGetResolvedField(methodClassDex, ref); \
-        if (sfield == NULL) {                                               \
-            EXPORT_PC();                                                    \
-            sfield = dvmResolveStaticField(curMethod->clazz, ref);          \
-            if (sfield == NULL)                                             \
-                GOTO_exceptionThrown();                                     \
-            if (dvmDexGetResolvedField(methodClassDex, ref) == NULL) {      \
-                JIT_STUB_HACK(dvmJitEndTraceSelect(self,pc));                  \
-            }                                                               \
-        }                                                                   \
-        dvmSetStaticField##_ftype(sfield, GET_REGISTER##_regsize(vdst));    \
-        ILOGV("+ SPUT '%s'=0x%08llx",                                       \
-            sfield->field.name, (u8)GET_REGISTER##_regsize(vdst));          \
-        UPDATE_FIELD_PUT(&sfield->field);                                   \
-    }                                                                       \
-    FINISH(2);
-
-#define HANDLE_SPUT_X_JUMBO(_opcode, _opname, _ftype, _regsize)             \
-    HANDLE_OPCODE(_opcode /*vBBBB, class@AAAAAAAA*/)                        \
-    {                                                                       \
-        StaticField* sfield;                                                \
-        ref = FETCH(1) | (u4)FETCH(2) << 16;   /* field ref */              \
-        vdst = FETCH(3);                                                    \
-        ILOGV("|sput%s/jumbo v%d,sfield@0x%08x", (_opname), vdst, ref);     \
-        sfield = (StaticField*)dvmDexGetResolvedField(methodClassDex, ref); \
-        if (sfield == NULL) {                                               \
-            EXPORT_PC();                                                    \
-            sfield = dvmResolveStaticField(curMethod->clazz, ref);          \
-            if (sfield == NULL)                                             \
-                GOTO_exceptionThrown();                                     \
-            if (dvmDexGetResolvedField(methodClassDex, ref) == NULL) {      \
-                JIT_STUB_HACK(dvmJitEndTraceSelect(self,pc));                  \
-            }                                                               \
-        }                                                                   \
-        dvmSetStaticField##_ftype(sfield, GET_REGISTER##_regsize(vdst));    \
-        ILOGV("+ SPUT '%s'=0x%08llx",                                       \
-            sfield->field.name, (u8)GET_REGISTER##_regsize(vdst));          \
-        UPDATE_FIELD_PUT(&sfield->field);                                   \
-    }                                                                       \
-    FINISH(4);
-
-/* File: cstubs/enddefs.c */
-
-/* undefine "magic" name remapping */
-#undef retval
-#undef pc
-#undef fp
-#undef curMethod
-#undef methodClassDex
-#undef self
-#undef debugTrackedRefStart
-
-/* File: armv5te/debug.c */
-#include <inttypes.h>
-
-/*
- * Dump the fixed-purpose ARM registers, along with some other info.
- *
- * This function MUST be compiled in ARM mode -- THUMB will yield bogus
- * results.
- *
- * This will NOT preserve r0-r3/ip.
- */
-void dvmMterpDumpArmRegs(uint32_t r0, uint32_t r1, uint32_t r2, uint32_t r3)
-{
-    register uint32_t rPC       asm("r4");
-    register uint32_t rFP       asm("r5");
-    register uint32_t rSELF     asm("r6");
-    register uint32_t rINST     asm("r7");
-    register uint32_t rIBASE    asm("r8");
-    register uint32_t r9        asm("r9");
-    register uint32_t r10       asm("r10");
-
-    //extern char dvmAsmInstructionStart[];
-
-    printf("REGS: r0=%08x r1=%08x r2=%08x r3=%08x\n", r0, r1, r2, r3);
-    printf("    : rPC=%08x rFP=%08x rSELF=%08x rINST=%08x\n",
-        rPC, rFP, rSELF, rINST);
-    printf("    : rIBASE=%08x r9=%08x r10=%08x\n", rIBASE, r9, r10);
-
-    //Thread* self = (Thread*) rSELF;
-    //const Method* method = self->method;
-    printf("    + self is %p\n", dvmThreadSelf());
-    //printf("    + currently in %s.%s %s\n",
-    //    method->clazz->descriptor, method->name, method->shorty);
-    //printf("    + dvmAsmInstructionStart = %p\n", dvmAsmInstructionStart);
-    //printf("    + next handler for 0x%02x = %p\n",
-    //    rINST & 0xff, dvmAsmInstructionStart + (rINST & 0xff) * 64);
-}
-
-/*
- * Dump the StackSaveArea for the specified frame pointer.
- */
-void dvmDumpFp(void* fp, StackSaveArea* otherSaveArea)
-{
-    StackSaveArea* saveArea = SAVEAREA_FROM_FP(fp);
-    printf("StackSaveArea for fp %p [%p/%p]:\n", fp, saveArea, otherSaveArea);
-#ifdef EASY_GDB
-    printf("  prevSave=%p, prevFrame=%p savedPc=%p meth=%p curPc=%p\n",
-        saveArea->prevSave, saveArea->prevFrame, saveArea->savedPc,
-        saveArea->method, saveArea->xtra.currentPc);
-#else
-    printf("  prevFrame=%p savedPc=%p meth=%p curPc=%p fp[0]=0x%08x\n",
-        saveArea->prevFrame, saveArea->savedPc,
-        saveArea->method, saveArea->xtra.currentPc,
-        *(u4*)fp);
-#endif
-}
-
-/*
- * Does the bulk of the work for common_printMethod().
- */
-void dvmMterpPrintMethod(Method* method)
-{
-    /*
-     * It is a direct (non-virtual) method if it is static, private,
-     * or a constructor.
-     */
-    bool isDirect =
-        ((method->accessFlags & (ACC_STATIC|ACC_PRIVATE)) != 0) ||
-        (method->name[0] == '<');
-
-    char* desc = dexProtoCopyMethodDescriptor(&method->prototype);
-
-    printf("<%c:%s.%s %s> ",
-            isDirect ? 'D' : 'V',
-            method->clazz->descriptor,
-            method->name,
-            desc);
-
-    free(desc);
-}
-

vm/mterp/out/InterpC-armv7-a.cpp

diff --git a/vm/mterp/out/InterpC-armv5te-vfp.c b/vm/mterp/out/InterpC-armv7-a.cpp
similarity index 98%
copy from vm/mterp/out/InterpC-armv5te-vfp.c
copy to vm/mterp/out/InterpC-armv7-a.cpp
index bcf03c1..3c24b7b 100644
--- a/vm/mterp/out/InterpC-armv5te-vfp.c
+++ b/vm/mterp/out/InterpC-armv7-a.cpp
@@ -1,10 +1,10 @@
 /*
- * This file was generated automatically by gen-mterp.py for 'armv5te-vfp'.
+ * This file was generated automatically by gen-mterp.py for 'armv7-a'.
  *
  * --> DO NOT EDIT <--
  */
 
-/* File: c/header.c */
+/* File: c/header.cpp */
 /*
  * Copyright (C) 2008 The Android Open Source Project
  *
@@ -379,14 +379,14 @@
     return true;
 }
 
-/* File: cstubs/stubdefs.c */
+/* File: cstubs/stubdefs.cpp */
 /*
  * In the C mterp stubs, "goto" is a function call followed immediately
  * by a return.
  */
 
 #define GOTO_TARGET_DECL(_target, ...)                                      \
-    void dvmMterp_##_target(Thread* self, ## __VA_ARGS__);
+    extern "C" void dvmMterp_##_target(Thread* self, ## __VA_ARGS__);
 
 /* (void)xxx to quiet unused variable compiler warnings. */
 #define GOTO_TARGET(_target, ...)                                           \
@@ -434,6 +434,7 @@
  * (void)xxx to quiet unused variable compiler warnings.
  */
 #define HANDLE_OPCODE(_op)                                                  \
+    extern "C" void dvmMterp_##_op(Thread* self);                           \
     void dvmMterp_##_op(Thread* self) {                                     \
         u4 ref;                                                             \
         u2 vsrc1, vsrc2, vdst;                                              \
@@ -513,7 +514,7 @@
         }                                                                   \
     }
 
-/* File: c/opcommon.c */
+/* File: c/opcommon.cpp */
 /* forward declarations of goto targets */
 GOTO_TARGET_DECL(filledNewArray, bool methodCallRange, bool jumboFormat);
 GOTO_TARGET_DECL(invokeVirtual, bool methodCallRange, bool jumboFormat);
@@ -973,7 +974,7 @@
             GOTO_exceptionThrown();                                         \
         }                                                                   \
         SET_REGISTER##_regsize(vdst,                                        \
-            ((_type*) arrayObj->contents)[GET_REGISTER(vsrc2)]);            \
+            ((_type*)(void*)arrayObj->contents)[GET_REGISTER(vsrc2)]);      \
         ILOGV("+ AGET[%d]=0x%x", GET_REGISTER(vsrc2), GET_REGISTER(vdst));  \
     }                                                                       \
     FINISH(2);
@@ -998,7 +999,7 @@
             GOTO_exceptionThrown();                                         \
         }                                                                   \
         ILOGV("+ APUT[%d]=0x%08x", GET_REGISTER(vsrc2), GET_REGISTER(vdst));\
-        ((_type*) arrayObj->contents)[GET_REGISTER(vsrc2)] =                \
+        ((_type*)(void*)arrayObj->contents)[GET_REGISTER(vsrc2)] =          \
             GET_REGISTER##_regsize(vdst);                                   \
     }                                                                       \
     FINISH(2);
@@ -1270,7 +1271,7 @@
     }                                                                       \
     FINISH(4);
 
-/* File: cstubs/enddefs.c */
+/* File: cstubs/enddefs.cpp */
 
 /* undefine "magic" name remapping */
 #undef retval
@@ -1281,7 +1282,7 @@
 #undef self
 #undef debugTrackedRefStart
 
-/* File: armv5te/debug.c */
+/* File: armv5te/debug.cpp */
 #include <inttypes.h>
 
 /*

vm/mterp/out/InterpC-portable.cpp

diff --git a/vm/mterp/out/InterpC-portable.c b/vm/mterp/out/InterpC-portable.cpp
similarity index 90%
rename from vm/mterp/out/InterpC-portable.c
rename to vm/mterp/out/InterpC-portable.cpp
index 425885e..593a7f7 100644
--- a/vm/mterp/out/InterpC-portable.c
+++ b/vm/mterp/out/InterpC-portable.cpp
@@ -4,7 +4,7 @@
  * --> DO NOT EDIT <--
  */
 
-/* File: c/header.c */
+/* File: c/header.cpp */
 /*
  * Copyright (C) 2008 The Android Open Source Project
  *
@@ -379,7 +379,7 @@
     return true;
 }
 
-/* File: portable/stubdefs.c */
+/* File: portable/stubdefs.cpp */
 /*
  * In the C mterp stubs, "goto" is a function call followed immediately
  * by a return.
@@ -466,7 +466,7 @@
         }                                                                   \
     }
 
-/* File: c/opcommon.c */
+/* File: c/opcommon.cpp */
 /* forward declarations of goto targets */
 GOTO_TARGET_DECL(filledNewArray, bool methodCallRange, bool jumboFormat);
 GOTO_TARGET_DECL(invokeVirtual, bool methodCallRange, bool jumboFormat);
@@ -926,7 +926,7 @@
             GOTO_exceptionThrown();                                         \
         }                                                                   \
         SET_REGISTER##_regsize(vdst,                                        \
-            ((_type*) arrayObj->contents)[GET_REGISTER(vsrc2)]);            \
+            ((_type*)(void*)arrayObj->contents)[GET_REGISTER(vsrc2)]);      \
         ILOGV("+ AGET[%d]=0x%x", GET_REGISTER(vsrc2), GET_REGISTER(vdst));  \
     }                                                                       \
     FINISH(2);
@@ -951,7 +951,7 @@
             GOTO_exceptionThrown();                                         \
         }                                                                   \
         ILOGV("+ APUT[%d]=0x%08x", GET_REGISTER(vsrc2), GET_REGISTER(vdst));\
-        ((_type*) arrayObj->contents)[GET_REGISTER(vsrc2)] =                \
+        ((_type*)(void*)arrayObj->contents)[GET_REGISTER(vsrc2)] =          \
             GET_REGISTER##_regsize(vdst);                                   \
     }                                                                       \
     FINISH(2);
@@ -1223,7 +1223,7 @@
     }                                                                       \
     FINISH(4);
 
-/* File: portable/entry.c */
+/* File: portable/entry.cpp */
 /*
  * Main interpreter loop.
  *
@@ -1293,12 +1293,12 @@
 
 /*--- start of opcodes ---*/
 
-/* File: c/OP_NOP.c */
+/* File: c/OP_NOP.cpp */
 HANDLE_OPCODE(OP_NOP)
     FINISH(1);
 OP_END
 
-/* File: c/OP_MOVE.c */
+/* File: c/OP_MOVE.cpp */
 HANDLE_OPCODE(OP_MOVE /*vA, vB*/)
     vdst = INST_A(inst);
     vsrc1 = INST_B(inst);
@@ -1309,7 +1309,7 @@
     FINISH(1);
 OP_END
 
-/* File: c/OP_MOVE_FROM16.c */
+/* File: c/OP_MOVE_FROM16.cpp */
 HANDLE_OPCODE(OP_MOVE_FROM16 /*vAA, vBBBB*/)
     vdst = INST_AA(inst);
     vsrc1 = FETCH(1);
@@ -1320,7 +1320,7 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_MOVE_16.c */
+/* File: c/OP_MOVE_16.cpp */
 HANDLE_OPCODE(OP_MOVE_16 /*vAAAA, vBBBB*/)
     vdst = FETCH(1);
     vsrc1 = FETCH(2);
@@ -1331,7 +1331,7 @@
     FINISH(3);
 OP_END
 
-/* File: c/OP_MOVE_WIDE.c */
+/* File: c/OP_MOVE_WIDE.cpp */
 HANDLE_OPCODE(OP_MOVE_WIDE /*vA, vB*/)
     /* IMPORTANT: must correctly handle overlapping registers, e.g. both
      * "move-wide v6, v7" and "move-wide v7, v6" */
@@ -1343,7 +1343,7 @@
     FINISH(1);
 OP_END
 
-/* File: c/OP_MOVE_WIDE_FROM16.c */
+/* File: c/OP_MOVE_WIDE_FROM16.cpp */
 HANDLE_OPCODE(OP_MOVE_WIDE_FROM16 /*vAA, vBBBB*/)
     vdst = INST_AA(inst);
     vsrc1 = FETCH(1);
@@ -1353,7 +1353,7 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_MOVE_WIDE_16.c */
+/* File: c/OP_MOVE_WIDE_16.cpp */
 HANDLE_OPCODE(OP_MOVE_WIDE_16 /*vAAAA, vBBBB*/)
     vdst = FETCH(1);
     vsrc1 = FETCH(2);
@@ -1363,8 +1363,8 @@
     FINISH(3);
 OP_END
 
-/* File: c/OP_MOVE_OBJECT.c */
-/* File: c/OP_MOVE.c */
+/* File: c/OP_MOVE_OBJECT.cpp */
+/* File: c/OP_MOVE.cpp */
 HANDLE_OPCODE(OP_MOVE_OBJECT /*vA, vB*/)
     vdst = INST_A(inst);
     vsrc1 = INST_B(inst);
@@ -1376,8 +1376,8 @@
 OP_END
 
 
-/* File: c/OP_MOVE_OBJECT_FROM16.c */
-/* File: c/OP_MOVE_FROM16.c */
+/* File: c/OP_MOVE_OBJECT_FROM16.cpp */
+/* File: c/OP_MOVE_FROM16.cpp */
 HANDLE_OPCODE(OP_MOVE_OBJECT_FROM16 /*vAA, vBBBB*/)
     vdst = INST_AA(inst);
     vsrc1 = FETCH(1);
@@ -1389,8 +1389,8 @@
 OP_END
 
 
-/* File: c/OP_MOVE_OBJECT_16.c */
-/* File: c/OP_MOVE_16.c */
+/* File: c/OP_MOVE_OBJECT_16.cpp */
+/* File: c/OP_MOVE_16.cpp */
 HANDLE_OPCODE(OP_MOVE_OBJECT_16 /*vAAAA, vBBBB*/)
     vdst = FETCH(1);
     vsrc1 = FETCH(2);
@@ -1402,7 +1402,7 @@
 OP_END
 
 
-/* File: c/OP_MOVE_RESULT.c */
+/* File: c/OP_MOVE_RESULT.cpp */
 HANDLE_OPCODE(OP_MOVE_RESULT /*vAA*/)
     vdst = INST_AA(inst);
     ILOGV("|move-result%s v%d %s(v%d=0x%08x)",
@@ -1412,7 +1412,7 @@
     FINISH(1);
 OP_END
 
-/* File: c/OP_MOVE_RESULT_WIDE.c */
+/* File: c/OP_MOVE_RESULT_WIDE.cpp */
 HANDLE_OPCODE(OP_MOVE_RESULT_WIDE /*vAA*/)
     vdst = INST_AA(inst);
     ILOGV("|move-result-wide v%d %s(0x%08llx)", vdst, kSpacing, retval.j);
@@ -1420,8 +1420,8 @@
     FINISH(1);
 OP_END
 
-/* File: c/OP_MOVE_RESULT_OBJECT.c */
-/* File: c/OP_MOVE_RESULT.c */
+/* File: c/OP_MOVE_RESULT_OBJECT.cpp */
+/* File: c/OP_MOVE_RESULT.cpp */
 HANDLE_OPCODE(OP_MOVE_RESULT_OBJECT /*vAA*/)
     vdst = INST_AA(inst);
     ILOGV("|move-result%s v%d %s(v%d=0x%08x)",
@@ -1432,7 +1432,7 @@
 OP_END
 
 
-/* File: c/OP_MOVE_EXCEPTION.c */
+/* File: c/OP_MOVE_EXCEPTION.cpp */
 HANDLE_OPCODE(OP_MOVE_EXCEPTION /*vAA*/)
     vdst = INST_AA(inst);
     ILOGV("|move-exception v%d", vdst);
@@ -1442,7 +1442,7 @@
     FINISH(1);
 OP_END
 
-/* File: c/OP_RETURN_VOID.c */
+/* File: c/OP_RETURN_VOID.cpp */
 HANDLE_OPCODE(OP_RETURN_VOID /**/)
     ILOGV("|return-void");
 #ifndef NDEBUG
@@ -1451,7 +1451,7 @@
     GOTO_returnFromMethod();
 OP_END
 
-/* File: c/OP_RETURN.c */
+/* File: c/OP_RETURN.cpp */
 HANDLE_OPCODE(OP_RETURN /*vAA*/)
     vsrc1 = INST_AA(inst);
     ILOGV("|return%s v%d",
@@ -1460,7 +1460,7 @@
     GOTO_returnFromMethod();
 OP_END
 
-/* File: c/OP_RETURN_WIDE.c */
+/* File: c/OP_RETURN_WIDE.cpp */
 HANDLE_OPCODE(OP_RETURN_WIDE /*vAA*/)
     vsrc1 = INST_AA(inst);
     ILOGV("|return-wide v%d", vsrc1);
@@ -1468,8 +1468,8 @@
     GOTO_returnFromMethod();
 OP_END
 
-/* File: c/OP_RETURN_OBJECT.c */
-/* File: c/OP_RETURN.c */
+/* File: c/OP_RETURN_OBJECT.cpp */
+/* File: c/OP_RETURN.cpp */
 HANDLE_OPCODE(OP_RETURN_OBJECT /*vAA*/)
     vsrc1 = INST_AA(inst);
     ILOGV("|return%s v%d",
@@ -1479,7 +1479,7 @@
 OP_END
 
 
-/* File: c/OP_CONST_4.c */
+/* File: c/OP_CONST_4.cpp */
 HANDLE_OPCODE(OP_CONST_4 /*vA, #+B*/)
     {
         s4 tmp;
@@ -1492,7 +1492,7 @@
     FINISH(1);
 OP_END
 
-/* File: c/OP_CONST_16.c */
+/* File: c/OP_CONST_16.cpp */
 HANDLE_OPCODE(OP_CONST_16 /*vAA, #+BBBB*/)
     vdst = INST_AA(inst);
     vsrc1 = FETCH(1);
@@ -1501,7 +1501,7 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_CONST.c */
+/* File: c/OP_CONST.cpp */
 HANDLE_OPCODE(OP_CONST /*vAA, #+BBBBBBBB*/)
     {
         u4 tmp;
@@ -1515,7 +1515,7 @@
     FINISH(3);
 OP_END
 
-/* File: c/OP_CONST_HIGH16.c */
+/* File: c/OP_CONST_HIGH16.cpp */
 HANDLE_OPCODE(OP_CONST_HIGH16 /*vAA, #+BBBB0000*/)
     vdst = INST_AA(inst);
     vsrc1 = FETCH(1);
@@ -1524,7 +1524,7 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_CONST_WIDE_16.c */
+/* File: c/OP_CONST_WIDE_16.cpp */
 HANDLE_OPCODE(OP_CONST_WIDE_16 /*vAA, #+BBBB*/)
     vdst = INST_AA(inst);
     vsrc1 = FETCH(1);
@@ -1533,7 +1533,7 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_CONST_WIDE_32.c */
+/* File: c/OP_CONST_WIDE_32.cpp */
 HANDLE_OPCODE(OP_CONST_WIDE_32 /*vAA, #+BBBBBBBB*/)
     {
         u4 tmp;
@@ -1547,7 +1547,7 @@
     FINISH(3);
 OP_END
 
-/* File: c/OP_CONST_WIDE.c */
+/* File: c/OP_CONST_WIDE.cpp */
 HANDLE_OPCODE(OP_CONST_WIDE /*vAA, #+BBBBBBBBBBBBBBBB*/)
     {
         u8 tmp;
@@ -1563,7 +1563,7 @@
     FINISH(5);
 OP_END
 
-/* File: c/OP_CONST_WIDE_HIGH16.c */
+/* File: c/OP_CONST_WIDE_HIGH16.cpp */
 HANDLE_OPCODE(OP_CONST_WIDE_HIGH16 /*vAA, #+BBBB000000000000*/)
     vdst = INST_AA(inst);
     vsrc1 = FETCH(1);
@@ -1572,7 +1572,7 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_CONST_STRING.c */
+/* File: c/OP_CONST_STRING.cpp */
 HANDLE_OPCODE(OP_CONST_STRING /*vAA, string@BBBB*/)
     {
         StringObject* strObj;
@@ -1592,7 +1592,7 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_CONST_STRING_JUMBO.c */
+/* File: c/OP_CONST_STRING_JUMBO.cpp */
 HANDLE_OPCODE(OP_CONST_STRING_JUMBO /*vAA, string@BBBBBBBB*/)
     {
         StringObject* strObj;
@@ -1614,7 +1614,7 @@
     FINISH(3);
 OP_END
 
-/* File: c/OP_CONST_CLASS.c */
+/* File: c/OP_CONST_CLASS.cpp */
 HANDLE_OPCODE(OP_CONST_CLASS /*vAA, class@BBBB*/)
     {
         ClassObject* clazz;
@@ -1634,7 +1634,7 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_MONITOR_ENTER.c */
+/* File: c/OP_MONITOR_ENTER.cpp */
 HANDLE_OPCODE(OP_MONITOR_ENTER /*vAA*/)
     {
         Object* obj;
@@ -1652,7 +1652,7 @@
     FINISH(1);
 OP_END
 
-/* File: c/OP_MONITOR_EXIT.c */
+/* File: c/OP_MONITOR_EXIT.cpp */
 HANDLE_OPCODE(OP_MONITOR_EXIT /*vAA*/)
     {
         Object* obj;
@@ -1684,7 +1684,7 @@
     FINISH(1);
 OP_END
 
-/* File: c/OP_CHECK_CAST.c */
+/* File: c/OP_CHECK_CAST.cpp */
 HANDLE_OPCODE(OP_CHECK_CAST /*vAA, class@BBBB*/)
     {
         ClassObject* clazz;
@@ -1717,7 +1717,7 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_INSTANCE_OF.c */
+/* File: c/OP_INSTANCE_OF.cpp */
 HANDLE_OPCODE(OP_INSTANCE_OF /*vA, vB, class@CCCC*/)
     {
         ClassObject* clazz;
@@ -1749,7 +1749,7 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_ARRAY_LENGTH.c */
+/* File: c/OP_ARRAY_LENGTH.cpp */
 HANDLE_OPCODE(OP_ARRAY_LENGTH /*vA, vB*/)
     {
         ArrayObject* arrayObj;
@@ -1766,7 +1766,7 @@
     FINISH(1);
 OP_END
 
-/* File: c/OP_NEW_INSTANCE.c */
+/* File: c/OP_NEW_INSTANCE.cpp */
 HANDLE_OPCODE(OP_NEW_INSTANCE /*vAA, class@BBBB*/)
     {
         ClassObject* clazz;
@@ -1816,7 +1816,7 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_NEW_ARRAY.c */
+/* File: c/OP_NEW_ARRAY.cpp */
 HANDLE_OPCODE(OP_NEW_ARRAY /*vA, vB, class@CCCC*/)
     {
         ClassObject* arrayClass;
@@ -1853,17 +1853,17 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_FILLED_NEW_ARRAY.c */
+/* File: c/OP_FILLED_NEW_ARRAY.cpp */
 HANDLE_OPCODE(OP_FILLED_NEW_ARRAY /*vB, {vD, vE, vF, vG, vA}, class@CCCC*/)
     GOTO_invoke(filledNewArray, false, false);
 OP_END
 
-/* File: c/OP_FILLED_NEW_ARRAY_RANGE.c */
+/* File: c/OP_FILLED_NEW_ARRAY_RANGE.cpp */
 HANDLE_OPCODE(OP_FILLED_NEW_ARRAY_RANGE /*{vCCCC..v(CCCC+AA-1)}, class@BBBB*/)
     GOTO_invoke(filledNewArray, true, false);
 OP_END
 
-/* File: c/OP_FILL_ARRAY_DATA.c */
+/* File: c/OP_FILL_ARRAY_DATA.cpp */
 HANDLE_OPCODE(OP_FILL_ARRAY_DATA)   /*vAA, +BBBBBBBB*/
     {
         const u2* arrayData;
@@ -1892,7 +1892,7 @@
     }
 OP_END
 
-/* File: c/OP_THROW.c */
+/* File: c/OP_THROW.cpp */
 HANDLE_OPCODE(OP_THROW /*vAA*/)
     {
         Object* obj;
@@ -1918,7 +1918,7 @@
     }
 OP_END
 
-/* File: c/OP_GOTO.c */
+/* File: c/OP_GOTO.cpp */
 HANDLE_OPCODE(OP_GOTO /*+AA*/)
     vdst = INST_AA(inst);
     if ((s1)vdst < 0)
@@ -1931,7 +1931,7 @@
     FINISH((s1)vdst);
 OP_END
 
-/* File: c/OP_GOTO_16.c */
+/* File: c/OP_GOTO_16.cpp */
 HANDLE_OPCODE(OP_GOTO_16 /*+AAAA*/)
     {
         s4 offset = (s2) FETCH(1);          /* sign-extend next code unit */
@@ -1947,7 +1947,7 @@
     }
 OP_END
 
-/* File: c/OP_GOTO_32.c */
+/* File: c/OP_GOTO_32.cpp */
 HANDLE_OPCODE(OP_GOTO_32 /*+AAAAAAAA*/)
     {
         s4 offset = FETCH(1);               /* low-order 16 bits */
@@ -1964,7 +1964,7 @@
     }
 OP_END
 
-/* File: c/OP_PACKED_SWITCH.c */
+/* File: c/OP_PACKED_SWITCH.cpp */
 HANDLE_OPCODE(OP_PACKED_SWITCH /*vAA, +BBBB*/)
     {
         const u2* switchData;
@@ -1995,7 +1995,7 @@
     }
 OP_END
 
-/* File: c/OP_SPARSE_SWITCH.c */
+/* File: c/OP_SPARSE_SWITCH.cpp */
 HANDLE_OPCODE(OP_SPARSE_SWITCH /*vAA, +BBBB*/)
     {
         const u2* switchData;
@@ -2026,135 +2026,135 @@
     }
 OP_END
 
-/* File: c/OP_CMPL_FLOAT.c */
+/* File: c/OP_CMPL_FLOAT.cpp */
 HANDLE_OP_CMPX(OP_CMPL_FLOAT, "l-float", float, _FLOAT, -1)
 OP_END
 
-/* File: c/OP_CMPG_FLOAT.c */
+/* File: c/OP_CMPG_FLOAT.cpp */
 HANDLE_OP_CMPX(OP_CMPG_FLOAT, "g-float", float, _FLOAT, 1)
 OP_END
 
-/* File: c/OP_CMPL_DOUBLE.c */
+/* File: c/OP_CMPL_DOUBLE.cpp */
 HANDLE_OP_CMPX(OP_CMPL_DOUBLE, "l-double", double, _DOUBLE, -1)
 OP_END
 
-/* File: c/OP_CMPG_DOUBLE.c */
+/* File: c/OP_CMPG_DOUBLE.cpp */
 HANDLE_OP_CMPX(OP_CMPG_DOUBLE, "g-double", double, _DOUBLE, 1)
 OP_END
 
-/* File: c/OP_CMP_LONG.c */
+/* File: c/OP_CMP_LONG.cpp */
 HANDLE_OP_CMPX(OP_CMP_LONG, "-long", s8, _WIDE, 0)
 OP_END
 
-/* File: c/OP_IF_EQ.c */
+/* File: c/OP_IF_EQ.cpp */
 HANDLE_OP_IF_XX(OP_IF_EQ, "eq", ==)
 OP_END
 
-/* File: c/OP_IF_NE.c */
+/* File: c/OP_IF_NE.cpp */
 HANDLE_OP_IF_XX(OP_IF_NE, "ne", !=)
 OP_END
 
-/* File: c/OP_IF_LT.c */
+/* File: c/OP_IF_LT.cpp */
 HANDLE_OP_IF_XX(OP_IF_LT, "lt", <)
 OP_END
 
-/* File: c/OP_IF_GE.c */
+/* File: c/OP_IF_GE.cpp */
 HANDLE_OP_IF_XX(OP_IF_GE, "ge", >=)
 OP_END
 
-/* File: c/OP_IF_GT.c */
+/* File: c/OP_IF_GT.cpp */
 HANDLE_OP_IF_XX(OP_IF_GT, "gt", >)
 OP_END
 
-/* File: c/OP_IF_LE.c */
+/* File: c/OP_IF_LE.cpp */
 HANDLE_OP_IF_XX(OP_IF_LE, "le", <=)
 OP_END
 
-/* File: c/OP_IF_EQZ.c */
+/* File: c/OP_IF_EQZ.cpp */
 HANDLE_OP_IF_XXZ(OP_IF_EQZ, "eqz", ==)
 OP_END
 
-/* File: c/OP_IF_NEZ.c */
+/* File: c/OP_IF_NEZ.cpp */
 HANDLE_OP_IF_XXZ(OP_IF_NEZ, "nez", !=)
 OP_END
 
-/* File: c/OP_IF_LTZ.c */
+/* File: c/OP_IF_LTZ.cpp */
 HANDLE_OP_IF_XXZ(OP_IF_LTZ, "ltz", <)
 OP_END
 
-/* File: c/OP_IF_GEZ.c */
+/* File: c/OP_IF_GEZ.cpp */
 HANDLE_OP_IF_XXZ(OP_IF_GEZ, "gez", >=)
 OP_END
 
-/* File: c/OP_IF_GTZ.c */
+/* File: c/OP_IF_GTZ.cpp */
 HANDLE_OP_IF_XXZ(OP_IF_GTZ, "gtz", >)
 OP_END
 
-/* File: c/OP_IF_LEZ.c */
+/* File: c/OP_IF_LEZ.cpp */
 HANDLE_OP_IF_XXZ(OP_IF_LEZ, "lez", <=)
 OP_END
 
-/* File: c/OP_UNUSED_3E.c */
+/* File: c/OP_UNUSED_3E.cpp */
 HANDLE_OPCODE(OP_UNUSED_3E)
 OP_END
 
-/* File: c/OP_UNUSED_3F.c */
+/* File: c/OP_UNUSED_3F.cpp */
 HANDLE_OPCODE(OP_UNUSED_3F)
 OP_END
 
-/* File: c/OP_UNUSED_40.c */
+/* File: c/OP_UNUSED_40.cpp */
 HANDLE_OPCODE(OP_UNUSED_40)
 OP_END
 
-/* File: c/OP_UNUSED_41.c */
+/* File: c/OP_UNUSED_41.cpp */
 HANDLE_OPCODE(OP_UNUSED_41)
 OP_END
 
-/* File: c/OP_UNUSED_42.c */
+/* File: c/OP_UNUSED_42.cpp */
 HANDLE_OPCODE(OP_UNUSED_42)
 OP_END
 
-/* File: c/OP_UNUSED_43.c */
+/* File: c/OP_UNUSED_43.cpp */
 HANDLE_OPCODE(OP_UNUSED_43)
 OP_END
 
-/* File: c/OP_AGET.c */
+/* File: c/OP_AGET.cpp */
 HANDLE_OP_AGET(OP_AGET, "", u4, )
 OP_END
 
-/* File: c/OP_AGET_WIDE.c */
+/* File: c/OP_AGET_WIDE.cpp */
 HANDLE_OP_AGET(OP_AGET_WIDE, "-wide", s8, _WIDE)
 OP_END
 
-/* File: c/OP_AGET_OBJECT.c */
+/* File: c/OP_AGET_OBJECT.cpp */
 HANDLE_OP_AGET(OP_AGET_OBJECT, "-object", u4, )
 OP_END
 
-/* File: c/OP_AGET_BOOLEAN.c */
+/* File: c/OP_AGET_BOOLEAN.cpp */
 HANDLE_OP_AGET(OP_AGET_BOOLEAN, "-boolean", u1, )
 OP_END
 
-/* File: c/OP_AGET_BYTE.c */
+/* File: c/OP_AGET_BYTE.cpp */
 HANDLE_OP_AGET(OP_AGET_BYTE, "-byte", s1, )
 OP_END
 
-/* File: c/OP_AGET_CHAR.c */
+/* File: c/OP_AGET_CHAR.cpp */
 HANDLE_OP_AGET(OP_AGET_CHAR, "-char", u2, )
 OP_END
 
-/* File: c/OP_AGET_SHORT.c */
+/* File: c/OP_AGET_SHORT.cpp */
 HANDLE_OP_AGET(OP_AGET_SHORT, "-short", s2, )
 OP_END
 
-/* File: c/OP_APUT.c */
+/* File: c/OP_APUT.cpp */
 HANDLE_OP_APUT(OP_APUT, "", u4, )
 OP_END
 
-/* File: c/OP_APUT_WIDE.c */
+/* File: c/OP_APUT_WIDE.cpp */
 HANDLE_OP_APUT(OP_APUT_WIDE, "-wide", s8, _WIDE)
 OP_END
 
-/* File: c/OP_APUT_OBJECT.c */
+/* File: c/OP_APUT_OBJECT.cpp */
 HANDLE_OPCODE(OP_APUT_OBJECT /*vAA, vBB, vCC*/)
     {
         ArrayObject* arrayObj;
@@ -2194,59 +2194,59 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_APUT_BOOLEAN.c */
+/* File: c/OP_APUT_BOOLEAN.cpp */
 HANDLE_OP_APUT(OP_APUT_BOOLEAN, "-boolean", u1, )
 OP_END
 
-/* File: c/OP_APUT_BYTE.c */
+/* File: c/OP_APUT_BYTE.cpp */
 HANDLE_OP_APUT(OP_APUT_BYTE, "-byte", s1, )
 OP_END
 
-/* File: c/OP_APUT_CHAR.c */
+/* File: c/OP_APUT_CHAR.cpp */
 HANDLE_OP_APUT(OP_APUT_CHAR, "-char", u2, )
 OP_END
 
-/* File: c/OP_APUT_SHORT.c */
+/* File: c/OP_APUT_SHORT.cpp */
 HANDLE_OP_APUT(OP_APUT_SHORT, "-short", s2, )
 OP_END
 
-/* File: c/OP_IGET.c */
+/* File: c/OP_IGET.cpp */
 HANDLE_IGET_X(OP_IGET,                  "", Int, )
 OP_END
 
-/* File: c/OP_IGET_WIDE.c */
+/* File: c/OP_IGET_WIDE.cpp */
 HANDLE_IGET_X(OP_IGET_WIDE,             "-wide", Long, _WIDE)
 OP_END
 
-/* File: c/OP_IGET_OBJECT.c */
+/* File: c/OP_IGET_OBJECT.cpp */
 HANDLE_IGET_X(OP_IGET_OBJECT,           "-object", Object, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_IGET_BOOLEAN.c */
+/* File: c/OP_IGET_BOOLEAN.cpp */
 HANDLE_IGET_X(OP_IGET_BOOLEAN,          "", Int, )
 OP_END
 
-/* File: c/OP_IGET_BYTE.c */
+/* File: c/OP_IGET_BYTE.cpp */
 HANDLE_IGET_X(OP_IGET_BYTE,             "", Int, )
 OP_END
 
-/* File: c/OP_IGET_CHAR.c */
+/* File: c/OP_IGET_CHAR.cpp */
 HANDLE_IGET_X(OP_IGET_CHAR,             "", Int, )
 OP_END
 
-/* File: c/OP_IGET_SHORT.c */
+/* File: c/OP_IGET_SHORT.cpp */
 HANDLE_IGET_X(OP_IGET_SHORT,            "", Int, )
 OP_END
 
-/* File: c/OP_IPUT.c */
+/* File: c/OP_IPUT.cpp */
 HANDLE_IPUT_X(OP_IPUT,                  "", Int, )
 OP_END
 
-/* File: c/OP_IPUT_WIDE.c */
+/* File: c/OP_IPUT_WIDE.cpp */
 HANDLE_IPUT_X(OP_IPUT_WIDE,             "-wide", Long, _WIDE)
 OP_END
 
-/* File: c/OP_IPUT_OBJECT.c */
+/* File: c/OP_IPUT_OBJECT.cpp */
 /*
  * The VM spec says we should verify that the reference being stored into
  * the field is assignment compatible.  In practice, many popular VMs don't
@@ -2261,333 +2261,333 @@
 HANDLE_IPUT_X(OP_IPUT_OBJECT,           "-object", Object, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_IPUT_BOOLEAN.c */
+/* File: c/OP_IPUT_BOOLEAN.cpp */
 HANDLE_IPUT_X(OP_IPUT_BOOLEAN,          "", Int, )
 OP_END
 
-/* File: c/OP_IPUT_BYTE.c */
+/* File: c/OP_IPUT_BYTE.cpp */
 HANDLE_IPUT_X(OP_IPUT_BYTE,             "", Int, )
 OP_END
 
-/* File: c/OP_IPUT_CHAR.c */
+/* File: c/OP_IPUT_CHAR.cpp */
 HANDLE_IPUT_X(OP_IPUT_CHAR,             "", Int, )
 OP_END
 
-/* File: c/OP_IPUT_SHORT.c */
+/* File: c/OP_IPUT_SHORT.cpp */
 HANDLE_IPUT_X(OP_IPUT_SHORT,            "", Int, )
 OP_END
 
-/* File: c/OP_SGET.c */
+/* File: c/OP_SGET.cpp */
 HANDLE_SGET_X(OP_SGET,                  "", Int, )
 OP_END
 
-/* File: c/OP_SGET_WIDE.c */
+/* File: c/OP_SGET_WIDE.cpp */
 HANDLE_SGET_X(OP_SGET_WIDE,             "-wide", Long, _WIDE)
 OP_END
 
-/* File: c/OP_SGET_OBJECT.c */
+/* File: c/OP_SGET_OBJECT.cpp */
 HANDLE_SGET_X(OP_SGET_OBJECT,           "-object", Object, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_SGET_BOOLEAN.c */
+/* File: c/OP_SGET_BOOLEAN.cpp */
 HANDLE_SGET_X(OP_SGET_BOOLEAN,          "", Int, )
 OP_END
 
-/* File: c/OP_SGET_BYTE.c */
+/* File: c/OP_SGET_BYTE.cpp */
 HANDLE_SGET_X(OP_SGET_BYTE,             "", Int, )
 OP_END
 
-/* File: c/OP_SGET_CHAR.c */
+/* File: c/OP_SGET_CHAR.cpp */
 HANDLE_SGET_X(OP_SGET_CHAR,             "", Int, )
 OP_END
 
-/* File: c/OP_SGET_SHORT.c */
+/* File: c/OP_SGET_SHORT.cpp */
 HANDLE_SGET_X(OP_SGET_SHORT,            "", Int, )
 OP_END
 
-/* File: c/OP_SPUT.c */
+/* File: c/OP_SPUT.cpp */
 HANDLE_SPUT_X(OP_SPUT,                  "", Int, )
 OP_END
 
-/* File: c/OP_SPUT_WIDE.c */
+/* File: c/OP_SPUT_WIDE.cpp */
 HANDLE_SPUT_X(OP_SPUT_WIDE,             "-wide", Long, _WIDE)
 OP_END
 
-/* File: c/OP_SPUT_OBJECT.c */
+/* File: c/OP_SPUT_OBJECT.cpp */
 HANDLE_SPUT_X(OP_SPUT_OBJECT,           "-object", Object, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_SPUT_BOOLEAN.c */
+/* File: c/OP_SPUT_BOOLEAN.cpp */
 HANDLE_SPUT_X(OP_SPUT_BOOLEAN,          "", Int, )
 OP_END
 
-/* File: c/OP_SPUT_BYTE.c */
+/* File: c/OP_SPUT_BYTE.cpp */
 HANDLE_SPUT_X(OP_SPUT_BYTE,             "", Int, )
 OP_END
 
-/* File: c/OP_SPUT_CHAR.c */
+/* File: c/OP_SPUT_CHAR.cpp */
 HANDLE_SPUT_X(OP_SPUT_CHAR,             "", Int, )
 OP_END
 
-/* File: c/OP_SPUT_SHORT.c */
+/* File: c/OP_SPUT_SHORT.cpp */
 HANDLE_SPUT_X(OP_SPUT_SHORT,            "", Int, )
 OP_END
 
-/* File: c/OP_INVOKE_VIRTUAL.c */
+/* File: c/OP_INVOKE_VIRTUAL.cpp */
 HANDLE_OPCODE(OP_INVOKE_VIRTUAL /*vB, {vD, vE, vF, vG, vA}, meth@CCCC*/)
     GOTO_invoke(invokeVirtual, false, false);
 OP_END
 
-/* File: c/OP_INVOKE_SUPER.c */
+/* File: c/OP_INVOKE_SUPER.cpp */
 HANDLE_OPCODE(OP_INVOKE_SUPER /*vB, {vD, vE, vF, vG, vA}, meth@CCCC*/)
     GOTO_invoke(invokeSuper, false, false);
 OP_END
 
-/* File: c/OP_INVOKE_DIRECT.c */
+/* File: c/OP_INVOKE_DIRECT.cpp */
 HANDLE_OPCODE(OP_INVOKE_DIRECT /*vB, {vD, vE, vF, vG, vA}, meth@CCCC*/)
     GOTO_invoke(invokeDirect, false, false);
 OP_END
 
-/* File: c/OP_INVOKE_STATIC.c */
+/* File: c/OP_INVOKE_STATIC.cpp */
 HANDLE_OPCODE(OP_INVOKE_STATIC /*vB, {vD, vE, vF, vG, vA}, meth@CCCC*/)
     GOTO_invoke(invokeStatic, false, false);
 OP_END
 
-/* File: c/OP_INVOKE_INTERFACE.c */
+/* File: c/OP_INVOKE_INTERFACE.cpp */
 HANDLE_OPCODE(OP_INVOKE_INTERFACE /*vB, {vD, vE, vF, vG, vA}, meth@CCCC*/)
     GOTO_invoke(invokeInterface, false, false);
 OP_END
 
-/* File: c/OP_UNUSED_73.c */
+/* File: c/OP_UNUSED_73.cpp */
 HANDLE_OPCODE(OP_UNUSED_73)
 OP_END
 
-/* File: c/OP_INVOKE_VIRTUAL_RANGE.c */
+/* File: c/OP_INVOKE_VIRTUAL_RANGE.cpp */
 HANDLE_OPCODE(OP_INVOKE_VIRTUAL_RANGE /*{vCCCC..v(CCCC+AA-1)}, meth@BBBB*/)
     GOTO_invoke(invokeVirtual, true, false);
 OP_END
 
-/* File: c/OP_INVOKE_SUPER_RANGE.c */
+/* File: c/OP_INVOKE_SUPER_RANGE.cpp */
 HANDLE_OPCODE(OP_INVOKE_SUPER_RANGE /*{vCCCC..v(CCCC+AA-1)}, meth@BBBB*/)
     GOTO_invoke(invokeSuper, true, false);
 OP_END
 
-/* File: c/OP_INVOKE_DIRECT_RANGE.c */
+/* File: c/OP_INVOKE_DIRECT_RANGE.cpp */
 HANDLE_OPCODE(OP_INVOKE_DIRECT_RANGE /*{vCCCC..v(CCCC+AA-1)}, meth@BBBB*/)
     GOTO_invoke(invokeDirect, true, false);
 OP_END
 
-/* File: c/OP_INVOKE_STATIC_RANGE.c */
+/* File: c/OP_INVOKE_STATIC_RANGE.cpp */
 HANDLE_OPCODE(OP_INVOKE_STATIC_RANGE /*{vCCCC..v(CCCC+AA-1)}, meth@BBBB*/)
     GOTO_invoke(invokeStatic, true, false);
 OP_END
 
-/* File: c/OP_INVOKE_INTERFACE_RANGE.c */
+/* File: c/OP_INVOKE_INTERFACE_RANGE.cpp */
 HANDLE_OPCODE(OP_INVOKE_INTERFACE_RANGE /*{vCCCC..v(CCCC+AA-1)}, meth@BBBB*/)
     GOTO_invoke(invokeInterface, true, false);
 OP_END
 
-/* File: c/OP_UNUSED_79.c */
+/* File: c/OP_UNUSED_79.cpp */
 HANDLE_OPCODE(OP_UNUSED_79)
 OP_END
 
-/* File: c/OP_UNUSED_7A.c */
+/* File: c/OP_UNUSED_7A.cpp */
 HANDLE_OPCODE(OP_UNUSED_7A)
 OP_END
 
-/* File: c/OP_NEG_INT.c */
+/* File: c/OP_NEG_INT.cpp */
 HANDLE_UNOP(OP_NEG_INT, "neg-int", -, , )
 OP_END
 
-/* File: c/OP_NOT_INT.c */
+/* File: c/OP_NOT_INT.cpp */
 HANDLE_UNOP(OP_NOT_INT, "not-int", , ^ 0xffffffff, )
 OP_END
 
-/* File: c/OP_NEG_LONG.c */
+/* File: c/OP_NEG_LONG.cpp */
 HANDLE_UNOP(OP_NEG_LONG, "neg-long", -, , _WIDE)
 OP_END
 
-/* File: c/OP_NOT_LONG.c */
+/* File: c/OP_NOT_LONG.cpp */
 HANDLE_UNOP(OP_NOT_LONG, "not-long", , ^ 0xffffffffffffffffULL, _WIDE)
 OP_END
 
-/* File: c/OP_NEG_FLOAT.c */
+/* File: c/OP_NEG_FLOAT.cpp */
 HANDLE_UNOP(OP_NEG_FLOAT, "neg-float", -, , _FLOAT)
 OP_END
 
-/* File: c/OP_NEG_DOUBLE.c */
+/* File: c/OP_NEG_DOUBLE.cpp */
 HANDLE_UNOP(OP_NEG_DOUBLE, "neg-double", -, , _DOUBLE)
 OP_END
 
-/* File: c/OP_INT_TO_LONG.c */
+/* File: c/OP_INT_TO_LONG.cpp */
 HANDLE_NUMCONV(OP_INT_TO_LONG,          "int-to-long", _INT, _WIDE)
 OP_END
 
-/* File: c/OP_INT_TO_FLOAT.c */
+/* File: c/OP_INT_TO_FLOAT.cpp */
 HANDLE_NUMCONV(OP_INT_TO_FLOAT,         "int-to-float", _INT, _FLOAT)
 OP_END
 
-/* File: c/OP_INT_TO_DOUBLE.c */
+/* File: c/OP_INT_TO_DOUBLE.cpp */
 HANDLE_NUMCONV(OP_INT_TO_DOUBLE,        "int-to-double", _INT, _DOUBLE)
 OP_END
 
-/* File: c/OP_LONG_TO_INT.c */
+/* File: c/OP_LONG_TO_INT.cpp */
 HANDLE_NUMCONV(OP_LONG_TO_INT,          "long-to-int", _WIDE, _INT)
 OP_END
 
-/* File: c/OP_LONG_TO_FLOAT.c */
+/* File: c/OP_LONG_TO_FLOAT.cpp */
 HANDLE_NUMCONV(OP_LONG_TO_FLOAT,        "long-to-float", _WIDE, _FLOAT)
 OP_END
 
-/* File: c/OP_LONG_TO_DOUBLE.c */
+/* File: c/OP_LONG_TO_DOUBLE.cpp */
 HANDLE_NUMCONV(OP_LONG_TO_DOUBLE,       "long-to-double", _WIDE, _DOUBLE)
 OP_END
 
-/* File: c/OP_FLOAT_TO_INT.c */
+/* File: c/OP_FLOAT_TO_INT.cpp */
 HANDLE_FLOAT_TO_INT(OP_FLOAT_TO_INT,    "float-to-int",
     float, _FLOAT, s4, _INT)
 OP_END
 
-/* File: c/OP_FLOAT_TO_LONG.c */
+/* File: c/OP_FLOAT_TO_LONG.cpp */
 HANDLE_FLOAT_TO_INT(OP_FLOAT_TO_LONG,   "float-to-long",
     float, _FLOAT, s8, _WIDE)
 OP_END
 
-/* File: c/OP_FLOAT_TO_DOUBLE.c */
+/* File: c/OP_FLOAT_TO_DOUBLE.cpp */
 HANDLE_NUMCONV(OP_FLOAT_TO_DOUBLE,      "float-to-double", _FLOAT, _DOUBLE)
 OP_END
 
-/* File: c/OP_DOUBLE_TO_INT.c */
+/* File: c/OP_DOUBLE_TO_INT.cpp */
 HANDLE_FLOAT_TO_INT(OP_DOUBLE_TO_INT,   "double-to-int",
     double, _DOUBLE, s4, _INT)
 OP_END
 
-/* File: c/OP_DOUBLE_TO_LONG.c */
+/* File: c/OP_DOUBLE_TO_LONG.cpp */
 HANDLE_FLOAT_TO_INT(OP_DOUBLE_TO_LONG,  "double-to-long",
     double, _DOUBLE, s8, _WIDE)
 OP_END
 
-/* File: c/OP_DOUBLE_TO_FLOAT.c */
+/* File: c/OP_DOUBLE_TO_FLOAT.cpp */
 HANDLE_NUMCONV(OP_DOUBLE_TO_FLOAT,      "double-to-float", _DOUBLE, _FLOAT)
 OP_END
 
-/* File: c/OP_INT_TO_BYTE.c */
+/* File: c/OP_INT_TO_BYTE.cpp */
 HANDLE_INT_TO_SMALL(OP_INT_TO_BYTE,     "byte", s1)
 OP_END
 
-/* File: c/OP_INT_TO_CHAR.c */
+/* File: c/OP_INT_TO_CHAR.cpp */
 HANDLE_INT_TO_SMALL(OP_INT_TO_CHAR,     "char", u2)
 OP_END
 
-/* File: c/OP_INT_TO_SHORT.c */
+/* File: c/OP_INT_TO_SHORT.cpp */
 HANDLE_INT_TO_SMALL(OP_INT_TO_SHORT,    "short", s2)    /* want sign bit */
 OP_END
 
-/* File: c/OP_ADD_INT.c */
+/* File: c/OP_ADD_INT.cpp */
 HANDLE_OP_X_INT(OP_ADD_INT, "add", +, 0)
 OP_END
 
-/* File: c/OP_SUB_INT.c */
+/* File: c/OP_SUB_INT.cpp */
 HANDLE_OP_X_INT(OP_SUB_INT, "sub", -, 0)
 OP_END
 
-/* File: c/OP_MUL_INT.c */
+/* File: c/OP_MUL_INT.cpp */
 HANDLE_OP_X_INT(OP_MUL_INT, "mul", *, 0)
 OP_END
 
-/* File: c/OP_DIV_INT.c */
+/* File: c/OP_DIV_INT.cpp */
 HANDLE_OP_X_INT(OP_DIV_INT, "div", /, 1)
 OP_END
 
-/* File: c/OP_REM_INT.c */
+/* File: c/OP_REM_INT.cpp */
 HANDLE_OP_X_INT(OP_REM_INT, "rem", %, 2)
 OP_END
 
-/* File: c/OP_AND_INT.c */
+/* File: c/OP_AND_INT.cpp */
 HANDLE_OP_X_INT(OP_AND_INT, "and", &, 0)
 OP_END
 
-/* File: c/OP_OR_INT.c */
+/* File: c/OP_OR_INT.cpp */
 HANDLE_OP_X_INT(OP_OR_INT,  "or",  |, 0)
 OP_END
 
-/* File: c/OP_XOR_INT.c */
+/* File: c/OP_XOR_INT.cpp */
 HANDLE_OP_X_INT(OP_XOR_INT, "xor", ^, 0)
 OP_END
 
-/* File: c/OP_SHL_INT.c */
+/* File: c/OP_SHL_INT.cpp */
 HANDLE_OP_SHX_INT(OP_SHL_INT, "shl", (s4), <<)
 OP_END
 
-/* File: c/OP_SHR_INT.c */
+/* File: c/OP_SHR_INT.cpp */
 HANDLE_OP_SHX_INT(OP_SHR_INT, "shr", (s4), >>)
 OP_END
 
-/* File: c/OP_USHR_INT.c */
+/* File: c/OP_USHR_INT.cpp */
 HANDLE_OP_SHX_INT(OP_USHR_INT, "ushr", (u4), >>)
 OP_END
 
-/* File: c/OP_ADD_LONG.c */
+/* File: c/OP_ADD_LONG.cpp */
 HANDLE_OP_X_LONG(OP_ADD_LONG, "add", +, 0)
 OP_END
 
-/* File: c/OP_SUB_LONG.c */
+/* File: c/OP_SUB_LONG.cpp */
 HANDLE_OP_X_LONG(OP_SUB_LONG, "sub", -, 0)
 OP_END
 
-/* File: c/OP_MUL_LONG.c */
+/* File: c/OP_MUL_LONG.cpp */
 HANDLE_OP_X_LONG(OP_MUL_LONG, "mul", *, 0)
 OP_END
 
-/* File: c/OP_DIV_LONG.c */
+/* File: c/OP_DIV_LONG.cpp */
 HANDLE_OP_X_LONG(OP_DIV_LONG, "div", /, 1)
 OP_END
 
-/* File: c/OP_REM_LONG.c */
+/* File: c/OP_REM_LONG.cpp */
 HANDLE_OP_X_LONG(OP_REM_LONG, "rem", %, 2)
 OP_END
 
-/* File: c/OP_AND_LONG.c */
+/* File: c/OP_AND_LONG.cpp */
 HANDLE_OP_X_LONG(OP_AND_LONG, "and", &, 0)
 OP_END
 
-/* File: c/OP_OR_LONG.c */
+/* File: c/OP_OR_LONG.cpp */
 HANDLE_OP_X_LONG(OP_OR_LONG,  "or", |, 0)
 OP_END
 
-/* File: c/OP_XOR_LONG.c */
+/* File: c/OP_XOR_LONG.cpp */
 HANDLE_OP_X_LONG(OP_XOR_LONG, "xor", ^, 0)
 OP_END
 
-/* File: c/OP_SHL_LONG.c */
+/* File: c/OP_SHL_LONG.cpp */
 HANDLE_OP_SHX_LONG(OP_SHL_LONG, "shl", (s8), <<)
 OP_END
 
-/* File: c/OP_SHR_LONG.c */
+/* File: c/OP_SHR_LONG.cpp */
 HANDLE_OP_SHX_LONG(OP_SHR_LONG, "shr", (s8), >>)
 OP_END
 
-/* File: c/OP_USHR_LONG.c */
+/* File: c/OP_USHR_LONG.cpp */
 HANDLE_OP_SHX_LONG(OP_USHR_LONG, "ushr", (u8), >>)
 OP_END
 
-/* File: c/OP_ADD_FLOAT.c */
+/* File: c/OP_ADD_FLOAT.cpp */
 HANDLE_OP_X_FLOAT(OP_ADD_FLOAT, "add", +)
 OP_END
 
-/* File: c/OP_SUB_FLOAT.c */
+/* File: c/OP_SUB_FLOAT.cpp */
 HANDLE_OP_X_FLOAT(OP_SUB_FLOAT, "sub", -)
 OP_END
 
-/* File: c/OP_MUL_FLOAT.c */
+/* File: c/OP_MUL_FLOAT.cpp */
 HANDLE_OP_X_FLOAT(OP_MUL_FLOAT, "mul", *)
 OP_END
 
-/* File: c/OP_DIV_FLOAT.c */
+/* File: c/OP_DIV_FLOAT.cpp */
 HANDLE_OP_X_FLOAT(OP_DIV_FLOAT, "div", /)
 OP_END
 
-/* File: c/OP_REM_FLOAT.c */
+/* File: c/OP_REM_FLOAT.cpp */
 HANDLE_OPCODE(OP_REM_FLOAT /*vAA, vBB, vCC*/)
     {
         u2 srcRegs;
@@ -2602,23 +2602,23 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_ADD_DOUBLE.c */
+/* File: c/OP_ADD_DOUBLE.cpp */
 HANDLE_OP_X_DOUBLE(OP_ADD_DOUBLE, "add", +)
 OP_END
 
-/* File: c/OP_SUB_DOUBLE.c */
+/* File: c/OP_SUB_DOUBLE.cpp */
 HANDLE_OP_X_DOUBLE(OP_SUB_DOUBLE, "sub", -)
 OP_END
 
-/* File: c/OP_MUL_DOUBLE.c */
+/* File: c/OP_MUL_DOUBLE.cpp */
 HANDLE_OP_X_DOUBLE(OP_MUL_DOUBLE, "mul", *)
 OP_END
 
-/* File: c/OP_DIV_DOUBLE.c */
+/* File: c/OP_DIV_DOUBLE.cpp */
 HANDLE_OP_X_DOUBLE(OP_DIV_DOUBLE, "div", /)
 OP_END
 
-/* File: c/OP_REM_DOUBLE.c */
+/* File: c/OP_REM_DOUBLE.cpp */
 HANDLE_OPCODE(OP_REM_DOUBLE /*vAA, vBB, vCC*/)
     {
         u2 srcRegs;
@@ -2633,111 +2633,111 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_ADD_INT_2ADDR.c */
+/* File: c/OP_ADD_INT_2ADDR.cpp */
 HANDLE_OP_X_INT_2ADDR(OP_ADD_INT_2ADDR, "add", +, 0)
 OP_END
 
-/* File: c/OP_SUB_INT_2ADDR.c */
+/* File: c/OP_SUB_INT_2ADDR.cpp */
 HANDLE_OP_X_INT_2ADDR(OP_SUB_INT_2ADDR, "sub", -, 0)
 OP_END
 
-/* File: c/OP_MUL_INT_2ADDR.c */
+/* File: c/OP_MUL_INT_2ADDR.cpp */
 HANDLE_OP_X_INT_2ADDR(OP_MUL_INT_2ADDR, "mul", *, 0)
 OP_END
 
-/* File: c/OP_DIV_INT_2ADDR.c */
+/* File: c/OP_DIV_INT_2ADDR.cpp */
 HANDLE_OP_X_INT_2ADDR(OP_DIV_INT_2ADDR, "div", /, 1)
 OP_END
 
-/* File: c/OP_REM_INT_2ADDR.c */
+/* File: c/OP_REM_INT_2ADDR.cpp */
 HANDLE_OP_X_INT_2ADDR(OP_REM_INT_2ADDR, "rem", %, 2)
 OP_END
 
-/* File: c/OP_AND_INT_2ADDR.c */
+/* File: c/OP_AND_INT_2ADDR.cpp */
 HANDLE_OP_X_INT_2ADDR(OP_AND_INT_2ADDR, "and", &, 0)
 OP_END
 
-/* File: c/OP_OR_INT_2ADDR.c */
+/* File: c/OP_OR_INT_2ADDR.cpp */
 HANDLE_OP_X_INT_2ADDR(OP_OR_INT_2ADDR,  "or", |, 0)
 OP_END
 
-/* File: c/OP_XOR_INT_2ADDR.c */
+/* File: c/OP_XOR_INT_2ADDR.cpp */
 HANDLE_OP_X_INT_2ADDR(OP_XOR_INT_2ADDR, "xor", ^, 0)
 OP_END
 
-/* File: c/OP_SHL_INT_2ADDR.c */
+/* File: c/OP_SHL_INT_2ADDR.cpp */
 HANDLE_OP_SHX_INT_2ADDR(OP_SHL_INT_2ADDR, "shl", (s4), <<)
 OP_END
 
-/* File: c/OP_SHR_INT_2ADDR.c */
+/* File: c/OP_SHR_INT_2ADDR.cpp */
 HANDLE_OP_SHX_INT_2ADDR(OP_SHR_INT_2ADDR, "shr", (s4), >>)
 OP_END
 
-/* File: c/OP_USHR_INT_2ADDR.c */
+/* File: c/OP_USHR_INT_2ADDR.cpp */
 HANDLE_OP_SHX_INT_2ADDR(OP_USHR_INT_2ADDR, "ushr", (u4), >>)
 OP_END
 
-/* File: c/OP_ADD_LONG_2ADDR.c */
+/* File: c/OP_ADD_LONG_2ADDR.cpp */
 HANDLE_OP_X_LONG_2ADDR(OP_ADD_LONG_2ADDR, "add", +, 0)
 OP_END
 
-/* File: c/OP_SUB_LONG_2ADDR.c */
+/* File: c/OP_SUB_LONG_2ADDR.cpp */
 HANDLE_OP_X_LONG_2ADDR(OP_SUB_LONG_2ADDR, "sub", -, 0)
 OP_END
 
-/* File: c/OP_MUL_LONG_2ADDR.c */
+/* File: c/OP_MUL_LONG_2ADDR.cpp */
 HANDLE_OP_X_LONG_2ADDR(OP_MUL_LONG_2ADDR, "mul", *, 0)
 OP_END
 
-/* File: c/OP_DIV_LONG_2ADDR.c */
+/* File: c/OP_DIV_LONG_2ADDR.cpp */
 HANDLE_OP_X_LONG_2ADDR(OP_DIV_LONG_2ADDR, "div", /, 1)
 OP_END
 
-/* File: c/OP_REM_LONG_2ADDR.c */
+/* File: c/OP_REM_LONG_2ADDR.cpp */
 HANDLE_OP_X_LONG_2ADDR(OP_REM_LONG_2ADDR, "rem", %, 2)
 OP_END
 
-/* File: c/OP_AND_LONG_2ADDR.c */
+/* File: c/OP_AND_LONG_2ADDR.cpp */
 HANDLE_OP_X_LONG_2ADDR(OP_AND_LONG_2ADDR, "and", &, 0)
 OP_END
 
-/* File: c/OP_OR_LONG_2ADDR.c */
+/* File: c/OP_OR_LONG_2ADDR.cpp */
 HANDLE_OP_X_LONG_2ADDR(OP_OR_LONG_2ADDR,  "or", |, 0)
 OP_END
 
-/* File: c/OP_XOR_LONG_2ADDR.c */
+/* File: c/OP_XOR_LONG_2ADDR.cpp */
 HANDLE_OP_X_LONG_2ADDR(OP_XOR_LONG_2ADDR, "xor", ^, 0)
 OP_END
 
-/* File: c/OP_SHL_LONG_2ADDR.c */
+/* File: c/OP_SHL_LONG_2ADDR.cpp */
 HANDLE_OP_SHX_LONG_2ADDR(OP_SHL_LONG_2ADDR, "shl", (s8), <<)
 OP_END
 
-/* File: c/OP_SHR_LONG_2ADDR.c */
+/* File: c/OP_SHR_LONG_2ADDR.cpp */
 HANDLE_OP_SHX_LONG_2ADDR(OP_SHR_LONG_2ADDR, "shr", (s8), >>)
 OP_END
 
-/* File: c/OP_USHR_LONG_2ADDR.c */
+/* File: c/OP_USHR_LONG_2ADDR.cpp */
 HANDLE_OP_SHX_LONG_2ADDR(OP_USHR_LONG_2ADDR, "ushr", (u8), >>)
 OP_END
 
-/* File: c/OP_ADD_FLOAT_2ADDR.c */
+/* File: c/OP_ADD_FLOAT_2ADDR.cpp */
 HANDLE_OP_X_FLOAT_2ADDR(OP_ADD_FLOAT_2ADDR, "add", +)
 OP_END
 
-/* File: c/OP_SUB_FLOAT_2ADDR.c */
+/* File: c/OP_SUB_FLOAT_2ADDR.cpp */
 HANDLE_OP_X_FLOAT_2ADDR(OP_SUB_FLOAT_2ADDR, "sub", -)
 OP_END
 
-/* File: c/OP_MUL_FLOAT_2ADDR.c */
+/* File: c/OP_MUL_FLOAT_2ADDR.cpp */
 HANDLE_OP_X_FLOAT_2ADDR(OP_MUL_FLOAT_2ADDR, "mul", *)
 OP_END
 
-/* File: c/OP_DIV_FLOAT_2ADDR.c */
+/* File: c/OP_DIV_FLOAT_2ADDR.cpp */
 HANDLE_OP_X_FLOAT_2ADDR(OP_DIV_FLOAT_2ADDR, "div", /)
 OP_END
 
-/* File: c/OP_REM_FLOAT_2ADDR.c */
+/* File: c/OP_REM_FLOAT_2ADDR.cpp */
 HANDLE_OPCODE(OP_REM_FLOAT_2ADDR /*vA, vB*/)
     vdst = INST_A(inst);
     vsrc1 = INST_B(inst);
@@ -2747,23 +2747,23 @@
     FINISH(1);
 OP_END
 
-/* File: c/OP_ADD_DOUBLE_2ADDR.c */
+/* File: c/OP_ADD_DOUBLE_2ADDR.cpp */
 HANDLE_OP_X_DOUBLE_2ADDR(OP_ADD_DOUBLE_2ADDR, "add", +)
 OP_END
 
-/* File: c/OP_SUB_DOUBLE_2ADDR.c */
+/* File: c/OP_SUB_DOUBLE_2ADDR.cpp */
 HANDLE_OP_X_DOUBLE_2ADDR(OP_SUB_DOUBLE_2ADDR, "sub", -)
 OP_END
 
-/* File: c/OP_MUL_DOUBLE_2ADDR.c */
+/* File: c/OP_MUL_DOUBLE_2ADDR.cpp */
 HANDLE_OP_X_DOUBLE_2ADDR(OP_MUL_DOUBLE_2ADDR, "mul", *)
 OP_END
 
-/* File: c/OP_DIV_DOUBLE_2ADDR.c */
+/* File: c/OP_DIV_DOUBLE_2ADDR.cpp */
 HANDLE_OP_X_DOUBLE_2ADDR(OP_DIV_DOUBLE_2ADDR, "div", /)
 OP_END
 
-/* File: c/OP_REM_DOUBLE_2ADDR.c */
+/* File: c/OP_REM_DOUBLE_2ADDR.cpp */
 HANDLE_OPCODE(OP_REM_DOUBLE_2ADDR /*vA, vB*/)
     vdst = INST_A(inst);
     vsrc1 = INST_B(inst);
@@ -2773,11 +2773,11 @@
     FINISH(1);
 OP_END
 
-/* File: c/OP_ADD_INT_LIT16.c */
+/* File: c/OP_ADD_INT_LIT16.cpp */
 HANDLE_OP_X_INT_LIT16(OP_ADD_INT_LIT16, "add", +, 0)
 OP_END
 
-/* File: c/OP_RSUB_INT.c */
+/* File: c/OP_RSUB_INT.cpp */
 HANDLE_OPCODE(OP_RSUB_INT /*vA, vB, #+CCCC*/)
     {
         vdst = INST_A(inst);
@@ -2789,35 +2789,35 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_MUL_INT_LIT16.c */
+/* File: c/OP_MUL_INT_LIT16.cpp */
 HANDLE_OP_X_INT_LIT16(OP_MUL_INT_LIT16, "mul", *, 0)
 OP_END
 
-/* File: c/OP_DIV_INT_LIT16.c */
+/* File: c/OP_DIV_INT_LIT16.cpp */
 HANDLE_OP_X_INT_LIT16(OP_DIV_INT_LIT16, "div", /, 1)
 OP_END
 
-/* File: c/OP_REM_INT_LIT16.c */
+/* File: c/OP_REM_INT_LIT16.cpp */
 HANDLE_OP_X_INT_LIT16(OP_REM_INT_LIT16, "rem", %, 2)
 OP_END
 
-/* File: c/OP_AND_INT_LIT16.c */
+/* File: c/OP_AND_INT_LIT16.cpp */
 HANDLE_OP_X_INT_LIT16(OP_AND_INT_LIT16, "and", &, 0)
 OP_END
 
-/* File: c/OP_OR_INT_LIT16.c */
+/* File: c/OP_OR_INT_LIT16.cpp */
 HANDLE_OP_X_INT_LIT16(OP_OR_INT_LIT16,  "or",  |, 0)
 OP_END
 
-/* File: c/OP_XOR_INT_LIT16.c */
+/* File: c/OP_XOR_INT_LIT16.cpp */
 HANDLE_OP_X_INT_LIT16(OP_XOR_INT_LIT16, "xor", ^, 0)
 OP_END
 
-/* File: c/OP_ADD_INT_LIT8.c */
+/* File: c/OP_ADD_INT_LIT8.cpp */
 HANDLE_OP_X_INT_LIT8(OP_ADD_INT_LIT8,   "add", +, 0)
 OP_END
 
-/* File: c/OP_RSUB_INT_LIT8.c */
+/* File: c/OP_RSUB_INT_LIT8.cpp */
 HANDLE_OPCODE(OP_RSUB_INT_LIT8 /*vAA, vBB, #+CC*/)
     {
         u2 litInfo;
@@ -2831,79 +2831,79 @@
     FINISH(2);
 OP_END
 
-/* File: c/OP_MUL_INT_LIT8.c */
+/* File: c/OP_MUL_INT_LIT8.cpp */
 HANDLE_OP_X_INT_LIT8(OP_MUL_INT_LIT8,   "mul", *, 0)
 OP_END
 
-/* File: c/OP_DIV_INT_LIT8.c */
+/* File: c/OP_DIV_INT_LIT8.cpp */
 HANDLE_OP_X_INT_LIT8(OP_DIV_INT_LIT8,   "div", /, 1)
 OP_END
 
-/* File: c/OP_REM_INT_LIT8.c */
+/* File: c/OP_REM_INT_LIT8.cpp */
 HANDLE_OP_X_INT_LIT8(OP_REM_INT_LIT8,   "rem", %, 2)
 OP_END
 
-/* File: c/OP_AND_INT_LIT8.c */
+/* File: c/OP_AND_INT_LIT8.cpp */
 HANDLE_OP_X_INT_LIT8(OP_AND_INT_LIT8,   "and", &, 0)
 OP_END
 
-/* File: c/OP_OR_INT_LIT8.c */
+/* File: c/OP_OR_INT_LIT8.cpp */
 HANDLE_OP_X_INT_LIT8(OP_OR_INT_LIT8,    "or",  |, 0)
 OP_END
 
-/* File: c/OP_XOR_INT_LIT8.c */
+/* File: c/OP_XOR_INT_LIT8.cpp */
 HANDLE_OP_X_INT_LIT8(OP_XOR_INT_LIT8,   "xor", ^, 0)
 OP_END
 
-/* File: c/OP_SHL_INT_LIT8.c */
+/* File: c/OP_SHL_INT_LIT8.cpp */
 HANDLE_OP_SHX_INT_LIT8(OP_SHL_INT_LIT8,   "shl", (s4), <<)
 OP_END
 
-/* File: c/OP_SHR_INT_LIT8.c */
+/* File: c/OP_SHR_INT_LIT8.cpp */
 HANDLE_OP_SHX_INT_LIT8(OP_SHR_INT_LIT8,   "shr", (s4), >>)
 OP_END
 
-/* File: c/OP_USHR_INT_LIT8.c */
+/* File: c/OP_USHR_INT_LIT8.cpp */
 HANDLE_OP_SHX_INT_LIT8(OP_USHR_INT_LIT8,  "ushr", (u4), >>)
 OP_END
 
-/* File: c/OP_IGET_VOLATILE.c */
+/* File: c/OP_IGET_VOLATILE.cpp */
 HANDLE_IGET_X(OP_IGET_VOLATILE,         "-volatile", IntVolatile, )
 OP_END
 
-/* File: c/OP_IPUT_VOLATILE.c */
+/* File: c/OP_IPUT_VOLATILE.cpp */
 HANDLE_IPUT_X(OP_IPUT_VOLATILE,         "-volatile", IntVolatile, )
 OP_END
 
-/* File: c/OP_SGET_VOLATILE.c */
+/* File: c/OP_SGET_VOLATILE.cpp */
 HANDLE_SGET_X(OP_SGET_VOLATILE,         "-volatile", IntVolatile, )
 OP_END
 
-/* File: c/OP_SPUT_VOLATILE.c */
+/* File: c/OP_SPUT_VOLATILE.cpp */
 HANDLE_SPUT_X(OP_SPUT_VOLATILE,         "-volatile", IntVolatile, )
 OP_END
 
-/* File: c/OP_IGET_OBJECT_VOLATILE.c */
+/* File: c/OP_IGET_OBJECT_VOLATILE.cpp */
 HANDLE_IGET_X(OP_IGET_OBJECT_VOLATILE,  "-object-volatile", ObjectVolatile, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_IGET_WIDE_VOLATILE.c */
+/* File: c/OP_IGET_WIDE_VOLATILE.cpp */
 HANDLE_IGET_X(OP_IGET_WIDE_VOLATILE,    "-wide-volatile", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_IPUT_WIDE_VOLATILE.c */
+/* File: c/OP_IPUT_WIDE_VOLATILE.cpp */
 HANDLE_IPUT_X(OP_IPUT_WIDE_VOLATILE,    "-wide-volatile", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_SGET_WIDE_VOLATILE.c */
+/* File: c/OP_SGET_WIDE_VOLATILE.cpp */
 HANDLE_SGET_X(OP_SGET_WIDE_VOLATILE,    "-wide-volatile", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_SPUT_WIDE_VOLATILE.c */
+/* File: c/OP_SPUT_WIDE_VOLATILE.cpp */
 HANDLE_SPUT_X(OP_SPUT_WIDE_VOLATILE,    "-wide-volatile", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_BREAKPOINT.c */
+/* File: c/OP_BREAKPOINT.cpp */
 HANDLE_OPCODE(OP_BREAKPOINT)
     {
         /*
@@ -2929,7 +2929,7 @@
     }
 OP_END
 
-/* File: c/OP_THROW_VERIFICATION_ERROR.c */
+/* File: c/OP_THROW_VERIFICATION_ERROR.cpp */
 HANDLE_OPCODE(OP_THROW_VERIFICATION_ERROR)
     EXPORT_PC();
     vsrc1 = INST_AA(inst);
@@ -2938,7 +2938,7 @@
     GOTO_exceptionThrown();
 OP_END
 
-/* File: c/OP_EXECUTE_INLINE.c */
+/* File: c/OP_EXECUTE_INLINE.cpp */
 HANDLE_OPCODE(OP_EXECUTE_INLINE /*vB, {vD, vE, vF, vG}, inline@CCCC*/)
     {
         /*
@@ -2999,7 +2999,7 @@
     FINISH(3);
 OP_END
 
-/* File: c/OP_EXECUTE_INLINE_RANGE.c */
+/* File: c/OP_EXECUTE_INLINE_RANGE.cpp */
 HANDLE_OPCODE(OP_EXECUTE_INLINE_RANGE /*{vCCCC..v(CCCC+AA-1)}, inline@BBBB*/)
     {
         u4 arg0, arg1, arg2, arg3;
@@ -3044,7 +3044,7 @@
     FINISH(3);
 OP_END
 
-/* File: c/OP_INVOKE_OBJECT_INIT_RANGE.c */
+/* File: c/OP_INVOKE_OBJECT_INIT_RANGE.cpp */
 HANDLE_OPCODE(OP_INVOKE_OBJECT_INIT_RANGE /*{vCCCC..v(CCCC+AA-1)}, meth@BBBB*/)
     {
         Object* obj;
@@ -3075,7 +3075,7 @@
     }
 OP_END
 
-/* File: c/OP_RETURN_VOID_BARRIER.c */
+/* File: c/OP_RETURN_VOID_BARRIER.cpp */
 HANDLE_OPCODE(OP_RETURN_VOID_BARRIER /**/)
     ILOGV("|return-void");
 #ifndef NDEBUG
@@ -3085,63 +3085,63 @@
     GOTO_returnFromMethod();
 OP_END
 
-/* File: c/OP_IGET_QUICK.c */
+/* File: c/OP_IGET_QUICK.cpp */
 HANDLE_IGET_X_QUICK(OP_IGET_QUICK,          "", Int, )
 OP_END
 
-/* File: c/OP_IGET_WIDE_QUICK.c */
+/* File: c/OP_IGET_WIDE_QUICK.cpp */
 HANDLE_IGET_X_QUICK(OP_IGET_WIDE_QUICK,     "-wide", Long, _WIDE)
 OP_END
 
-/* File: c/OP_IGET_OBJECT_QUICK.c */
+/* File: c/OP_IGET_OBJECT_QUICK.cpp */
 HANDLE_IGET_X_QUICK(OP_IGET_OBJECT_QUICK,   "-object", Object, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_IPUT_QUICK.c */
+/* File: c/OP_IPUT_QUICK.cpp */
 HANDLE_IPUT_X_QUICK(OP_IPUT_QUICK,          "", Int, )
 OP_END
 
-/* File: c/OP_IPUT_WIDE_QUICK.c */
+/* File: c/OP_IPUT_WIDE_QUICK.cpp */
 HANDLE_IPUT_X_QUICK(OP_IPUT_WIDE_QUICK,     "-wide", Long, _WIDE)
 OP_END
 
-/* File: c/OP_IPUT_OBJECT_QUICK.c */
+/* File: c/OP_IPUT_OBJECT_QUICK.cpp */
 HANDLE_IPUT_X_QUICK(OP_IPUT_OBJECT_QUICK,   "-object", Object, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_INVOKE_VIRTUAL_QUICK.c */
+/* File: c/OP_INVOKE_VIRTUAL_QUICK.cpp */
 HANDLE_OPCODE(OP_INVOKE_VIRTUAL_QUICK /*vB, {vD, vE, vF, vG, vA}, meth@CCCC*/)
     GOTO_invoke(invokeVirtualQuick, false, false);
 OP_END
 
-/* File: c/OP_INVOKE_VIRTUAL_QUICK_RANGE.c */
+/* File: c/OP_INVOKE_VIRTUAL_QUICK_RANGE.cpp */
 HANDLE_OPCODE(OP_INVOKE_VIRTUAL_QUICK_RANGE/*{vCCCC..v(CCCC+AA-1)}, meth@BBBB*/)
     GOTO_invoke(invokeVirtualQuick, true, false);
 OP_END
 
-/* File: c/OP_INVOKE_SUPER_QUICK.c */
+/* File: c/OP_INVOKE_SUPER_QUICK.cpp */
 HANDLE_OPCODE(OP_INVOKE_SUPER_QUICK /*vB, {vD, vE, vF, vG, vA}, meth@CCCC*/)
     GOTO_invoke(invokeSuperQuick, false, false);
 OP_END
 
-/* File: c/OP_INVOKE_SUPER_QUICK_RANGE.c */
+/* File: c/OP_INVOKE_SUPER_QUICK_RANGE.cpp */
 HANDLE_OPCODE(OP_INVOKE_SUPER_QUICK_RANGE /*{vCCCC..v(CCCC+AA-1)}, meth@BBBB*/)
     GOTO_invoke(invokeSuperQuick, true, false);
 OP_END
 
-/* File: c/OP_IPUT_OBJECT_VOLATILE.c */
+/* File: c/OP_IPUT_OBJECT_VOLATILE.cpp */
 HANDLE_IPUT_X(OP_IPUT_OBJECT_VOLATILE,  "-object-volatile", ObjectVolatile, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_SGET_OBJECT_VOLATILE.c */
+/* File: c/OP_SGET_OBJECT_VOLATILE.cpp */
 HANDLE_SGET_X(OP_SGET_OBJECT_VOLATILE,  "-object-volatile", ObjectVolatile, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_SPUT_OBJECT_VOLATILE.c */
+/* File: c/OP_SPUT_OBJECT_VOLATILE.cpp */
 HANDLE_SPUT_X(OP_SPUT_OBJECT_VOLATILE,  "-object-volatile", ObjectVolatile, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_DISPATCH_FF.c */
+/* File: c/OP_DISPATCH_FF.cpp */
 HANDLE_OPCODE(OP_DISPATCH_FF)
     /*
      * Indicates extended opcode.  Use next 8 bits to choose where to branch.
@@ -3149,7 +3149,7 @@
     DISPATCH_EXTENDED(INST_AA(inst));
 OP_END
 
-/* File: c/OP_CONST_CLASS_JUMBO.c */
+/* File: c/OP_CONST_CLASS_JUMBO.cpp */
 HANDLE_OPCODE(OP_CONST_CLASS_JUMBO /*vBBBB, class@AAAAAAAA*/)
     {
         ClassObject* clazz;
@@ -3169,7 +3169,7 @@
     FINISH(4);
 OP_END
 
-/* File: c/OP_CHECK_CAST_JUMBO.c */
+/* File: c/OP_CHECK_CAST_JUMBO.cpp */
 HANDLE_OPCODE(OP_CHECK_CAST_JUMBO /*vBBBB, class@AAAAAAAA*/)
     {
         ClassObject* clazz;
@@ -3202,7 +3202,7 @@
     FINISH(4);
 OP_END
 
-/* File: c/OP_INSTANCE_OF_JUMBO.c */
+/* File: c/OP_INSTANCE_OF_JUMBO.cpp */
 HANDLE_OPCODE(OP_INSTANCE_OF_JUMBO /*vBBBB, vCCCC, class@AAAAAAAA*/)
     {
         ClassObject* clazz;
@@ -3234,7 +3234,7 @@
     FINISH(5);
 OP_END
 
-/* File: c/OP_NEW_INSTANCE_JUMBO.c */
+/* File: c/OP_NEW_INSTANCE_JUMBO.cpp */
 HANDLE_OPCODE(OP_NEW_INSTANCE_JUMBO /*vBBBB, class@AAAAAAAA*/)
     {
         ClassObject* clazz;
@@ -3284,7 +3284,7 @@
     FINISH(4);
 OP_END
 
-/* File: c/OP_NEW_ARRAY_JUMBO.c */
+/* File: c/OP_NEW_ARRAY_JUMBO.cpp */
 HANDLE_OPCODE(OP_NEW_ARRAY_JUMBO /*vBBBB, vCCCC, class@AAAAAAAA*/)
     {
         ClassObject* arrayClass;
@@ -3321,48 +3321,48 @@
     FINISH(5);
 OP_END
 
-/* File: c/OP_FILLED_NEW_ARRAY_JUMBO.c */
+/* File: c/OP_FILLED_NEW_ARRAY_JUMBO.cpp */
 HANDLE_OPCODE(OP_FILLED_NEW_ARRAY_JUMBO /*{vCCCC..v(CCCC+BBBB-1)}, class@AAAAAAAA*/)
     GOTO_invoke(filledNewArray, true, true);
 OP_END
 
-/* File: c/OP_IGET_JUMBO.c */
+/* File: c/OP_IGET_JUMBO.cpp */
 HANDLE_IGET_X_JUMBO(OP_IGET_JUMBO,          "", Int, )
 OP_END
 
-/* File: c/OP_IGET_WIDE_JUMBO.c */
+/* File: c/OP_IGET_WIDE_JUMBO.cpp */
 HANDLE_IGET_X_JUMBO(OP_IGET_WIDE_JUMBO,     "-wide", Long, _WIDE)
 OP_END
 
-/* File: c/OP_IGET_OBJECT_JUMBO.c */
+/* File: c/OP_IGET_OBJECT_JUMBO.cpp */
 HANDLE_IGET_X_JUMBO(OP_IGET_OBJECT_JUMBO,   "-object", Object, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_IGET_BOOLEAN_JUMBO.c */
+/* File: c/OP_IGET_BOOLEAN_JUMBO.cpp */
 HANDLE_IGET_X_JUMBO(OP_IGET_BOOLEAN_JUMBO,  "", Int, )
 OP_END
 
-/* File: c/OP_IGET_BYTE_JUMBO.c */
+/* File: c/OP_IGET_BYTE_JUMBO.cpp */
 HANDLE_IGET_X_JUMBO(OP_IGET_BYTE_JUMBO,     "", Int, )
 OP_END
 
-/* File: c/OP_IGET_CHAR_JUMBO.c */
+/* File: c/OP_IGET_CHAR_JUMBO.cpp */
 HANDLE_IGET_X_JUMBO(OP_IGET_CHAR_JUMBO,     "", Int, )
 OP_END
 
-/* File: c/OP_IGET_SHORT_JUMBO.c */
+/* File: c/OP_IGET_SHORT_JUMBO.cpp */
 HANDLE_IGET_X_JUMBO(OP_IGET_SHORT_JUMBO,    "", Int, )
 OP_END
 
-/* File: c/OP_IPUT_JUMBO.c */
+/* File: c/OP_IPUT_JUMBO.cpp */
 HANDLE_IPUT_X_JUMBO(OP_IPUT_JUMBO,          "", Int, )
 OP_END
 
-/* File: c/OP_IPUT_WIDE_JUMBO.c */
+/* File: c/OP_IPUT_WIDE_JUMBO.cpp */
 HANDLE_IPUT_X_JUMBO(OP_IPUT_WIDE_JUMBO,     "-wide", Long, _WIDE)
 OP_END
 
-/* File: c/OP_IPUT_OBJECT_JUMBO.c */
+/* File: c/OP_IPUT_OBJECT_JUMBO.cpp */
 /*
  * The VM spec says we should verify that the reference being stored into
  * the field is assignment compatible.  In practice, many popular VMs don't
@@ -3377,912 +3377,912 @@
 HANDLE_IPUT_X_JUMBO(OP_IPUT_OBJECT_JUMBO,   "-object", Object, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_IPUT_BOOLEAN_JUMBO.c */
+/* File: c/OP_IPUT_BOOLEAN_JUMBO.cpp */
 HANDLE_IPUT_X_JUMBO(OP_IPUT_BOOLEAN_JUMBO,  "", Int, )
 OP_END
 
-/* File: c/OP_IPUT_BYTE_JUMBO.c */
+/* File: c/OP_IPUT_BYTE_JUMBO.cpp */
 HANDLE_IPUT_X_JUMBO(OP_IPUT_BYTE_JUMBO,     "", Int, )
 OP_END
 
-/* File: c/OP_IPUT_CHAR_JUMBO.c */
+/* File: c/OP_IPUT_CHAR_JUMBO.cpp */
 HANDLE_IPUT_X_JUMBO(OP_IPUT_CHAR_JUMBO,     "", Int, )
 OP_END
 
-/* File: c/OP_IPUT_SHORT_JUMBO.c */
+/* File: c/OP_IPUT_SHORT_JUMBO.cpp */
 HANDLE_IPUT_X_JUMBO(OP_IPUT_SHORT_JUMBO,    "", Int, )
 OP_END
 
-/* File: c/OP_SGET_JUMBO.c */
+/* File: c/OP_SGET_JUMBO.cpp */
 HANDLE_SGET_X_JUMBO(OP_SGET_JUMBO,          "", Int, )
 OP_END
 
-/* File: c/OP_SGET_WIDE_JUMBO.c */
+/* File: c/OP_SGET_WIDE_JUMBO.cpp */
 HANDLE_SGET_X_JUMBO(OP_SGET_WIDE_JUMBO,     "-wide", Long, _WIDE)
 OP_END
 
-/* File: c/OP_SGET_OBJECT_JUMBO.c */
+/* File: c/OP_SGET_OBJECT_JUMBO.cpp */
 HANDLE_SGET_X_JUMBO(OP_SGET_OBJECT_JUMBO,   "-object", Object, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_SGET_BOOLEAN_JUMBO.c */
+/* File: c/OP_SGET_BOOLEAN_JUMBO.cpp */
 HANDLE_SGET_X_JUMBO(OP_SGET_BOOLEAN_JUMBO,  "", Int, )
 OP_END
 
-/* File: c/OP_SGET_BYTE_JUMBO.c */
+/* File: c/OP_SGET_BYTE_JUMBO.cpp */
 HANDLE_SGET_X_JUMBO(OP_SGET_BYTE_JUMBO,     "", Int, )
 OP_END
 
-/* File: c/OP_SGET_CHAR_JUMBO.c */
+/* File: c/OP_SGET_CHAR_JUMBO.cpp */
 HANDLE_SGET_X_JUMBO(OP_SGET_CHAR_JUMBO,     "", Int, )
 OP_END
 
-/* File: c/OP_SGET_SHORT_JUMBO.c */
+/* File: c/OP_SGET_SHORT_JUMBO.cpp */
 HANDLE_SGET_X_JUMBO(OP_SGET_SHORT_JUMBO,    "", Int, )
 OP_END
 
-/* File: c/OP_SPUT_JUMBO.c */
+/* File: c/OP_SPUT_JUMBO.cpp */
 HANDLE_SPUT_X_JUMBO(OP_SPUT_JUMBO,          "", Int, )
 OP_END
 
-/* File: c/OP_SPUT_WIDE_JUMBO.c */
+/* File: c/OP_SPUT_WIDE_JUMBO.cpp */
 HANDLE_SPUT_X_JUMBO(OP_SPUT_WIDE_JUMBO,     "-wide", Long, _WIDE)
 OP_END
 
-/* File: c/OP_SPUT_OBJECT_JUMBO.c */
+/* File: c/OP_SPUT_OBJECT_JUMBO.cpp */
 HANDLE_SPUT_X_JUMBO(OP_SPUT_OBJECT_JUMBO,   "-object", Object, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_SPUT_BOOLEAN_JUMBO.c */
+/* File: c/OP_SPUT_BOOLEAN_JUMBO.cpp */
 HANDLE_SPUT_X_JUMBO(OP_SPUT_BOOLEAN_JUMBO,          "", Int, )
 OP_END
 
-/* File: c/OP_SPUT_BYTE_JUMBO.c */
+/* File: c/OP_SPUT_BYTE_JUMBO.cpp */
 HANDLE_SPUT_X_JUMBO(OP_SPUT_BYTE_JUMBO,     "", Int, )
 OP_END
 
-/* File: c/OP_SPUT_CHAR_JUMBO.c */
+/* File: c/OP_SPUT_CHAR_JUMBO.cpp */
 HANDLE_SPUT_X_JUMBO(OP_SPUT_CHAR_JUMBO,     "", Int, )
 OP_END
 
-/* File: c/OP_SPUT_SHORT_JUMBO.c */
+/* File: c/OP_SPUT_SHORT_JUMBO.cpp */
 HANDLE_SPUT_X_JUMBO(OP_SPUT_SHORT_JUMBO,    "", Int, )
 OP_END
 
-/* File: c/OP_INVOKE_VIRTUAL_JUMBO.c */
+/* File: c/OP_INVOKE_VIRTUAL_JUMBO.cpp */
 HANDLE_OPCODE(OP_INVOKE_VIRTUAL_JUMBO /*{vCCCC..v(CCCC+BBBB-1)}, meth@AAAAAAAA*/)
     GOTO_invoke(invokeVirtual, true, true);
 OP_END
 
-/* File: c/OP_INVOKE_SUPER_JUMBO.c */
+/* File: c/OP_INVOKE_SUPER_JUMBO.cpp */
 HANDLE_OPCODE(OP_INVOKE_SUPER_JUMBO /*{vCCCC..v(CCCC+BBBB-1)}, meth@AAAAAAAA*/)
     GOTO_invoke(invokeSuper, true, true);
 OP_END
 
-/* File: c/OP_INVOKE_DIRECT_JUMBO.c */
+/* File: c/OP_INVOKE_DIRECT_JUMBO.cpp */
 HANDLE_OPCODE(OP_INVOKE_DIRECT_JUMBO /*{vCCCC..v(CCCC+BBBB-1)}, meth@AAAAAAAA*/)
     GOTO_invoke(invokeDirect, true, true);
 OP_END
 
-/* File: c/OP_INVOKE_STATIC_JUMBO.c */
+/* File: c/OP_INVOKE_STATIC_JUMBO.cpp */
 HANDLE_OPCODE(OP_INVOKE_STATIC_JUMBO /*{vCCCC..v(CCCC+BBBB-1)}, meth@AAAAAAAA*/)
     GOTO_invoke(invokeStatic, true, true);
 OP_END
 
-/* File: c/OP_INVOKE_INTERFACE_JUMBO.c */
+/* File: c/OP_INVOKE_INTERFACE_JUMBO.cpp */
 HANDLE_OPCODE(OP_INVOKE_INTERFACE_JUMBO /*{vCCCC..v(CCCC+BBBB-1)}, meth@AAAAAAAA*/)
     GOTO_invoke(invokeInterface, true, true);
 OP_END
 
-/* File: c/OP_UNUSED_27FF.c */
+/* File: c/OP_UNUSED_27FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_27FF)
 OP_END
 
-/* File: c/OP_UNUSED_28FF.c */
+/* File: c/OP_UNUSED_28FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_28FF)
 OP_END
 
-/* File: c/OP_UNUSED_29FF.c */
+/* File: c/OP_UNUSED_29FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_29FF)
 OP_END
 
-/* File: c/OP_UNUSED_2AFF.c */
+/* File: c/OP_UNUSED_2AFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_2AFF)
 OP_END
 
-/* File: c/OP_UNUSED_2BFF.c */
+/* File: c/OP_UNUSED_2BFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_2BFF)
 OP_END
 
-/* File: c/OP_UNUSED_2CFF.c */
+/* File: c/OP_UNUSED_2CFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_2CFF)
 OP_END
 
-/* File: c/OP_UNUSED_2DFF.c */
+/* File: c/OP_UNUSED_2DFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_2DFF)
 OP_END
 
-/* File: c/OP_UNUSED_2EFF.c */
+/* File: c/OP_UNUSED_2EFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_2EFF)
 OP_END
 
-/* File: c/OP_UNUSED_2FFF.c */
+/* File: c/OP_UNUSED_2FFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_2FFF)
 OP_END
 
-/* File: c/OP_UNUSED_30FF.c */
+/* File: c/OP_UNUSED_30FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_30FF)
 OP_END
 
-/* File: c/OP_UNUSED_31FF.c */
+/* File: c/OP_UNUSED_31FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_31FF)
 OP_END
 
-/* File: c/OP_UNUSED_32FF.c */
+/* File: c/OP_UNUSED_32FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_32FF)
 OP_END
 
-/* File: c/OP_UNUSED_33FF.c */
+/* File: c/OP_UNUSED_33FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_33FF)
 OP_END
 
-/* File: c/OP_UNUSED_34FF.c */
+/* File: c/OP_UNUSED_34FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_34FF)
 OP_END
 
-/* File: c/OP_UNUSED_35FF.c */
+/* File: c/OP_UNUSED_35FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_35FF)
 OP_END
 
-/* File: c/OP_UNUSED_36FF.c */
+/* File: c/OP_UNUSED_36FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_36FF)
 OP_END
 
-/* File: c/OP_UNUSED_37FF.c */
+/* File: c/OP_UNUSED_37FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_37FF)
 OP_END
 
-/* File: c/OP_UNUSED_38FF.c */
+/* File: c/OP_UNUSED_38FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_38FF)
 OP_END
 
-/* File: c/OP_UNUSED_39FF.c */
+/* File: c/OP_UNUSED_39FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_39FF)
 OP_END
 
-/* File: c/OP_UNUSED_3AFF.c */
+/* File: c/OP_UNUSED_3AFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_3AFF)
 OP_END
 
-/* File: c/OP_UNUSED_3BFF.c */
+/* File: c/OP_UNUSED_3BFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_3BFF)
 OP_END
 
-/* File: c/OP_UNUSED_3CFF.c */
+/* File: c/OP_UNUSED_3CFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_3CFF)
 OP_END
 
-/* File: c/OP_UNUSED_3DFF.c */
+/* File: c/OP_UNUSED_3DFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_3DFF)
 OP_END
 
-/* File: c/OP_UNUSED_3EFF.c */
+/* File: c/OP_UNUSED_3EFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_3EFF)
 OP_END
 
-/* File: c/OP_UNUSED_3FFF.c */
+/* File: c/OP_UNUSED_3FFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_3FFF)
 OP_END
 
-/* File: c/OP_UNUSED_40FF.c */
+/* File: c/OP_UNUSED_40FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_40FF)
 OP_END
 
-/* File: c/OP_UNUSED_41FF.c */
+/* File: c/OP_UNUSED_41FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_41FF)
 OP_END
 
-/* File: c/OP_UNUSED_42FF.c */
+/* File: c/OP_UNUSED_42FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_42FF)
 OP_END
 
-/* File: c/OP_UNUSED_43FF.c */
+/* File: c/OP_UNUSED_43FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_43FF)
 OP_END
 
-/* File: c/OP_UNUSED_44FF.c */
+/* File: c/OP_UNUSED_44FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_44FF)
 OP_END
 
-/* File: c/OP_UNUSED_45FF.c */
+/* File: c/OP_UNUSED_45FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_45FF)
 OP_END
 
-/* File: c/OP_UNUSED_46FF.c */
+/* File: c/OP_UNUSED_46FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_46FF)
 OP_END
 
-/* File: c/OP_UNUSED_47FF.c */
+/* File: c/OP_UNUSED_47FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_47FF)
 OP_END
 
-/* File: c/OP_UNUSED_48FF.c */
+/* File: c/OP_UNUSED_48FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_48FF)
 OP_END
 
-/* File: c/OP_UNUSED_49FF.c */
+/* File: c/OP_UNUSED_49FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_49FF)
 OP_END
 
-/* File: c/OP_UNUSED_4AFF.c */
+/* File: c/OP_UNUSED_4AFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_4AFF)
 OP_END
 
-/* File: c/OP_UNUSED_4BFF.c */
+/* File: c/OP_UNUSED_4BFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_4BFF)
 OP_END
 
-/* File: c/OP_UNUSED_4CFF.c */
+/* File: c/OP_UNUSED_4CFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_4CFF)
 OP_END
 
-/* File: c/OP_UNUSED_4DFF.c */
+/* File: c/OP_UNUSED_4DFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_4DFF)
 OP_END
 
-/* File: c/OP_UNUSED_4EFF.c */
+/* File: c/OP_UNUSED_4EFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_4EFF)
 OP_END
 
-/* File: c/OP_UNUSED_4FFF.c */
+/* File: c/OP_UNUSED_4FFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_4FFF)
 OP_END
 
-/* File: c/OP_UNUSED_50FF.c */
+/* File: c/OP_UNUSED_50FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_50FF)
 OP_END
 
-/* File: c/OP_UNUSED_51FF.c */
+/* File: c/OP_UNUSED_51FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_51FF)
 OP_END
 
-/* File: c/OP_UNUSED_52FF.c */
+/* File: c/OP_UNUSED_52FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_52FF)
 OP_END
 
-/* File: c/OP_UNUSED_53FF.c */
+/* File: c/OP_UNUSED_53FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_53FF)
 OP_END
 
-/* File: c/OP_UNUSED_54FF.c */
+/* File: c/OP_UNUSED_54FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_54FF)
 OP_END
 
-/* File: c/OP_UNUSED_55FF.c */
+/* File: c/OP_UNUSED_55FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_55FF)
 OP_END
 
-/* File: c/OP_UNUSED_56FF.c */
+/* File: c/OP_UNUSED_56FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_56FF)
 OP_END
 
-/* File: c/OP_UNUSED_57FF.c */
+/* File: c/OP_UNUSED_57FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_57FF)
 OP_END
 
-/* File: c/OP_UNUSED_58FF.c */
+/* File: c/OP_UNUSED_58FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_58FF)
 OP_END
 
-/* File: c/OP_UNUSED_59FF.c */
+/* File: c/OP_UNUSED_59FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_59FF)
 OP_END
 
-/* File: c/OP_UNUSED_5AFF.c */
+/* File: c/OP_UNUSED_5AFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_5AFF)
 OP_END
 
-/* File: c/OP_UNUSED_5BFF.c */
+/* File: c/OP_UNUSED_5BFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_5BFF)
 OP_END
 
-/* File: c/OP_UNUSED_5CFF.c */
+/* File: c/OP_UNUSED_5CFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_5CFF)
 OP_END
 
-/* File: c/OP_UNUSED_5DFF.c */
+/* File: c/OP_UNUSED_5DFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_5DFF)
 OP_END
 
-/* File: c/OP_UNUSED_5EFF.c */
+/* File: c/OP_UNUSED_5EFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_5EFF)
 OP_END
 
-/* File: c/OP_UNUSED_5FFF.c */
+/* File: c/OP_UNUSED_5FFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_5FFF)
 OP_END
 
-/* File: c/OP_UNUSED_60FF.c */
+/* File: c/OP_UNUSED_60FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_60FF)
 OP_END
 
-/* File: c/OP_UNUSED_61FF.c */
+/* File: c/OP_UNUSED_61FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_61FF)
 OP_END
 
-/* File: c/OP_UNUSED_62FF.c */
+/* File: c/OP_UNUSED_62FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_62FF)
 OP_END
 
-/* File: c/OP_UNUSED_63FF.c */
+/* File: c/OP_UNUSED_63FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_63FF)
 OP_END
 
-/* File: c/OP_UNUSED_64FF.c */
+/* File: c/OP_UNUSED_64FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_64FF)
 OP_END
 
-/* File: c/OP_UNUSED_65FF.c */
+/* File: c/OP_UNUSED_65FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_65FF)
 OP_END
 
-/* File: c/OP_UNUSED_66FF.c */
+/* File: c/OP_UNUSED_66FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_66FF)
 OP_END
 
-/* File: c/OP_UNUSED_67FF.c */
+/* File: c/OP_UNUSED_67FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_67FF)
 OP_END
 
-/* File: c/OP_UNUSED_68FF.c */
+/* File: c/OP_UNUSED_68FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_68FF)
 OP_END
 
-/* File: c/OP_UNUSED_69FF.c */
+/* File: c/OP_UNUSED_69FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_69FF)
 OP_END
 
-/* File: c/OP_UNUSED_6AFF.c */
+/* File: c/OP_UNUSED_6AFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_6AFF)
 OP_END
 
-/* File: c/OP_UNUSED_6BFF.c */
+/* File: c/OP_UNUSED_6BFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_6BFF)
 OP_END
 
-/* File: c/OP_UNUSED_6CFF.c */
+/* File: c/OP_UNUSED_6CFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_6CFF)
 OP_END
 
-/* File: c/OP_UNUSED_6DFF.c */
+/* File: c/OP_UNUSED_6DFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_6DFF)
 OP_END
 
-/* File: c/OP_UNUSED_6EFF.c */
+/* File: c/OP_UNUSED_6EFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_6EFF)
 OP_END
 
-/* File: c/OP_UNUSED_6FFF.c */
+/* File: c/OP_UNUSED_6FFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_6FFF)
 OP_END
 
-/* File: c/OP_UNUSED_70FF.c */
+/* File: c/OP_UNUSED_70FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_70FF)
 OP_END
 
-/* File: c/OP_UNUSED_71FF.c */
+/* File: c/OP_UNUSED_71FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_71FF)
 OP_END
 
-/* File: c/OP_UNUSED_72FF.c */
+/* File: c/OP_UNUSED_72FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_72FF)
 OP_END
 
-/* File: c/OP_UNUSED_73FF.c */
+/* File: c/OP_UNUSED_73FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_73FF)
 OP_END
 
-/* File: c/OP_UNUSED_74FF.c */
+/* File: c/OP_UNUSED_74FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_74FF)
 OP_END
 
-/* File: c/OP_UNUSED_75FF.c */
+/* File: c/OP_UNUSED_75FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_75FF)
 OP_END
 
-/* File: c/OP_UNUSED_76FF.c */
+/* File: c/OP_UNUSED_76FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_76FF)
 OP_END
 
-/* File: c/OP_UNUSED_77FF.c */
+/* File: c/OP_UNUSED_77FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_77FF)
 OP_END
 
-/* File: c/OP_UNUSED_78FF.c */
+/* File: c/OP_UNUSED_78FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_78FF)
 OP_END
 
-/* File: c/OP_UNUSED_79FF.c */
+/* File: c/OP_UNUSED_79FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_79FF)
 OP_END
 
-/* File: c/OP_UNUSED_7AFF.c */
+/* File: c/OP_UNUSED_7AFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_7AFF)
 OP_END
 
-/* File: c/OP_UNUSED_7BFF.c */
+/* File: c/OP_UNUSED_7BFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_7BFF)
 OP_END
 
-/* File: c/OP_UNUSED_7CFF.c */
+/* File: c/OP_UNUSED_7CFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_7CFF)
 OP_END
 
-/* File: c/OP_UNUSED_7DFF.c */
+/* File: c/OP_UNUSED_7DFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_7DFF)
 OP_END
 
-/* File: c/OP_UNUSED_7EFF.c */
+/* File: c/OP_UNUSED_7EFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_7EFF)
 OP_END
 
-/* File: c/OP_UNUSED_7FFF.c */
+/* File: c/OP_UNUSED_7FFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_7FFF)
 OP_END
 
-/* File: c/OP_UNUSED_80FF.c */
+/* File: c/OP_UNUSED_80FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_80FF)
 OP_END
 
-/* File: c/OP_UNUSED_81FF.c */
+/* File: c/OP_UNUSED_81FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_81FF)
 OP_END
 
-/* File: c/OP_UNUSED_82FF.c */
+/* File: c/OP_UNUSED_82FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_82FF)
 OP_END
 
-/* File: c/OP_UNUSED_83FF.c */
+/* File: c/OP_UNUSED_83FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_83FF)
 OP_END
 
-/* File: c/OP_UNUSED_84FF.c */
+/* File: c/OP_UNUSED_84FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_84FF)
 OP_END
 
-/* File: c/OP_UNUSED_85FF.c */
+/* File: c/OP_UNUSED_85FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_85FF)
 OP_END
 
-/* File: c/OP_UNUSED_86FF.c */
+/* File: c/OP_UNUSED_86FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_86FF)
 OP_END
 
-/* File: c/OP_UNUSED_87FF.c */
+/* File: c/OP_UNUSED_87FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_87FF)
 OP_END
 
-/* File: c/OP_UNUSED_88FF.c */
+/* File: c/OP_UNUSED_88FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_88FF)
 OP_END
 
-/* File: c/OP_UNUSED_89FF.c */
+/* File: c/OP_UNUSED_89FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_89FF)
 OP_END
 
-/* File: c/OP_UNUSED_8AFF.c */
+/* File: c/OP_UNUSED_8AFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_8AFF)
 OP_END
 
-/* File: c/OP_UNUSED_8BFF.c */
+/* File: c/OP_UNUSED_8BFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_8BFF)
 OP_END
 
-/* File: c/OP_UNUSED_8CFF.c */
+/* File: c/OP_UNUSED_8CFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_8CFF)
 OP_END
 
-/* File: c/OP_UNUSED_8DFF.c */
+/* File: c/OP_UNUSED_8DFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_8DFF)
 OP_END
 
-/* File: c/OP_UNUSED_8EFF.c */
+/* File: c/OP_UNUSED_8EFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_8EFF)
 OP_END
 
-/* File: c/OP_UNUSED_8FFF.c */
+/* File: c/OP_UNUSED_8FFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_8FFF)
 OP_END
 
-/* File: c/OP_UNUSED_90FF.c */
+/* File: c/OP_UNUSED_90FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_90FF)
 OP_END
 
-/* File: c/OP_UNUSED_91FF.c */
+/* File: c/OP_UNUSED_91FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_91FF)
 OP_END
 
-/* File: c/OP_UNUSED_92FF.c */
+/* File: c/OP_UNUSED_92FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_92FF)
 OP_END
 
-/* File: c/OP_UNUSED_93FF.c */
+/* File: c/OP_UNUSED_93FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_93FF)
 OP_END
 
-/* File: c/OP_UNUSED_94FF.c */
+/* File: c/OP_UNUSED_94FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_94FF)
 OP_END
 
-/* File: c/OP_UNUSED_95FF.c */
+/* File: c/OP_UNUSED_95FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_95FF)
 OP_END
 
-/* File: c/OP_UNUSED_96FF.c */
+/* File: c/OP_UNUSED_96FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_96FF)
 OP_END
 
-/* File: c/OP_UNUSED_97FF.c */
+/* File: c/OP_UNUSED_97FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_97FF)
 OP_END
 
-/* File: c/OP_UNUSED_98FF.c */
+/* File: c/OP_UNUSED_98FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_98FF)
 OP_END
 
-/* File: c/OP_UNUSED_99FF.c */
+/* File: c/OP_UNUSED_99FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_99FF)
 OP_END
 
-/* File: c/OP_UNUSED_9AFF.c */
+/* File: c/OP_UNUSED_9AFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_9AFF)
 OP_END
 
-/* File: c/OP_UNUSED_9BFF.c */
+/* File: c/OP_UNUSED_9BFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_9BFF)
 OP_END
 
-/* File: c/OP_UNUSED_9CFF.c */
+/* File: c/OP_UNUSED_9CFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_9CFF)
 OP_END
 
-/* File: c/OP_UNUSED_9DFF.c */
+/* File: c/OP_UNUSED_9DFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_9DFF)
 OP_END
 
-/* File: c/OP_UNUSED_9EFF.c */
+/* File: c/OP_UNUSED_9EFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_9EFF)
 OP_END
 
-/* File: c/OP_UNUSED_9FFF.c */
+/* File: c/OP_UNUSED_9FFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_9FFF)
 OP_END
 
-/* File: c/OP_UNUSED_A0FF.c */
+/* File: c/OP_UNUSED_A0FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_A0FF)
 OP_END
 
-/* File: c/OP_UNUSED_A1FF.c */
+/* File: c/OP_UNUSED_A1FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_A1FF)
 OP_END
 
-/* File: c/OP_UNUSED_A2FF.c */
+/* File: c/OP_UNUSED_A2FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_A2FF)
 OP_END
 
-/* File: c/OP_UNUSED_A3FF.c */
+/* File: c/OP_UNUSED_A3FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_A3FF)
 OP_END
 
-/* File: c/OP_UNUSED_A4FF.c */
+/* File: c/OP_UNUSED_A4FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_A4FF)
 OP_END
 
-/* File: c/OP_UNUSED_A5FF.c */
+/* File: c/OP_UNUSED_A5FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_A5FF)
 OP_END
 
-/* File: c/OP_UNUSED_A6FF.c */
+/* File: c/OP_UNUSED_A6FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_A6FF)
 OP_END
 
-/* File: c/OP_UNUSED_A7FF.c */
+/* File: c/OP_UNUSED_A7FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_A7FF)
 OP_END
 
-/* File: c/OP_UNUSED_A8FF.c */
+/* File: c/OP_UNUSED_A8FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_A8FF)
 OP_END
 
-/* File: c/OP_UNUSED_A9FF.c */
+/* File: c/OP_UNUSED_A9FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_A9FF)
 OP_END
 
-/* File: c/OP_UNUSED_AAFF.c */
+/* File: c/OP_UNUSED_AAFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_AAFF)
 OP_END
 
-/* File: c/OP_UNUSED_ABFF.c */
+/* File: c/OP_UNUSED_ABFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_ABFF)
 OP_END
 
-/* File: c/OP_UNUSED_ACFF.c */
+/* File: c/OP_UNUSED_ACFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_ACFF)
 OP_END
 
-/* File: c/OP_UNUSED_ADFF.c */
+/* File: c/OP_UNUSED_ADFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_ADFF)
 OP_END
 
-/* File: c/OP_UNUSED_AEFF.c */
+/* File: c/OP_UNUSED_AEFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_AEFF)
 OP_END
 
-/* File: c/OP_UNUSED_AFFF.c */
+/* File: c/OP_UNUSED_AFFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_AFFF)
 OP_END
 
-/* File: c/OP_UNUSED_B0FF.c */
+/* File: c/OP_UNUSED_B0FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_B0FF)
 OP_END
 
-/* File: c/OP_UNUSED_B1FF.c */
+/* File: c/OP_UNUSED_B1FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_B1FF)
 OP_END
 
-/* File: c/OP_UNUSED_B2FF.c */
+/* File: c/OP_UNUSED_B2FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_B2FF)
 OP_END
 
-/* File: c/OP_UNUSED_B3FF.c */
+/* File: c/OP_UNUSED_B3FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_B3FF)
 OP_END
 
-/* File: c/OP_UNUSED_B4FF.c */
+/* File: c/OP_UNUSED_B4FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_B4FF)
 OP_END
 
-/* File: c/OP_UNUSED_B5FF.c */
+/* File: c/OP_UNUSED_B5FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_B5FF)
 OP_END
 
-/* File: c/OP_UNUSED_B6FF.c */
+/* File: c/OP_UNUSED_B6FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_B6FF)
 OP_END
 
-/* File: c/OP_UNUSED_B7FF.c */
+/* File: c/OP_UNUSED_B7FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_B7FF)
 OP_END
 
-/* File: c/OP_UNUSED_B8FF.c */
+/* File: c/OP_UNUSED_B8FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_B8FF)
 OP_END
 
-/* File: c/OP_UNUSED_B9FF.c */
+/* File: c/OP_UNUSED_B9FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_B9FF)
 OP_END
 
-/* File: c/OP_UNUSED_BAFF.c */
+/* File: c/OP_UNUSED_BAFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_BAFF)
 OP_END
 
-/* File: c/OP_UNUSED_BBFF.c */
+/* File: c/OP_UNUSED_BBFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_BBFF)
 OP_END
 
-/* File: c/OP_UNUSED_BCFF.c */
+/* File: c/OP_UNUSED_BCFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_BCFF)
 OP_END
 
-/* File: c/OP_UNUSED_BDFF.c */
+/* File: c/OP_UNUSED_BDFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_BDFF)
 OP_END
 
-/* File: c/OP_UNUSED_BEFF.c */
+/* File: c/OP_UNUSED_BEFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_BEFF)
 OP_END
 
-/* File: c/OP_UNUSED_BFFF.c */
+/* File: c/OP_UNUSED_BFFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_BFFF)
 OP_END
 
-/* File: c/OP_UNUSED_C0FF.c */
+/* File: c/OP_UNUSED_C0FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_C0FF)
 OP_END
 
-/* File: c/OP_UNUSED_C1FF.c */
+/* File: c/OP_UNUSED_C1FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_C1FF)
 OP_END
 
-/* File: c/OP_UNUSED_C2FF.c */
+/* File: c/OP_UNUSED_C2FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_C2FF)
 OP_END
 
-/* File: c/OP_UNUSED_C3FF.c */
+/* File: c/OP_UNUSED_C3FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_C3FF)
 OP_END
 
-/* File: c/OP_UNUSED_C4FF.c */
+/* File: c/OP_UNUSED_C4FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_C4FF)
 OP_END
 
-/* File: c/OP_UNUSED_C5FF.c */
+/* File: c/OP_UNUSED_C5FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_C5FF)
 OP_END
 
-/* File: c/OP_UNUSED_C6FF.c */
+/* File: c/OP_UNUSED_C6FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_C6FF)
 OP_END
 
-/* File: c/OP_UNUSED_C7FF.c */
+/* File: c/OP_UNUSED_C7FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_C7FF)
 OP_END
 
-/* File: c/OP_UNUSED_C8FF.c */
+/* File: c/OP_UNUSED_C8FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_C8FF)
 OP_END
 
-/* File: c/OP_UNUSED_C9FF.c */
+/* File: c/OP_UNUSED_C9FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_C9FF)
 OP_END
 
-/* File: c/OP_UNUSED_CAFF.c */
+/* File: c/OP_UNUSED_CAFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_CAFF)
 OP_END
 
-/* File: c/OP_UNUSED_CBFF.c */
+/* File: c/OP_UNUSED_CBFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_CBFF)
 OP_END
 
-/* File: c/OP_UNUSED_CCFF.c */
+/* File: c/OP_UNUSED_CCFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_CCFF)
 OP_END
 
-/* File: c/OP_UNUSED_CDFF.c */
+/* File: c/OP_UNUSED_CDFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_CDFF)
 OP_END
 
-/* File: c/OP_UNUSED_CEFF.c */
+/* File: c/OP_UNUSED_CEFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_CEFF)
 OP_END
 
-/* File: c/OP_UNUSED_CFFF.c */
+/* File: c/OP_UNUSED_CFFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_CFFF)
 OP_END
 
-/* File: c/OP_UNUSED_D0FF.c */
+/* File: c/OP_UNUSED_D0FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_D0FF)
 OP_END
 
-/* File: c/OP_UNUSED_D1FF.c */
+/* File: c/OP_UNUSED_D1FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_D1FF)
 OP_END
 
-/* File: c/OP_UNUSED_D2FF.c */
+/* File: c/OP_UNUSED_D2FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_D2FF)
 OP_END
 
-/* File: c/OP_UNUSED_D3FF.c */
+/* File: c/OP_UNUSED_D3FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_D3FF)
 OP_END
 
-/* File: c/OP_UNUSED_D4FF.c */
+/* File: c/OP_UNUSED_D4FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_D4FF)
 OP_END
 
-/* File: c/OP_UNUSED_D5FF.c */
+/* File: c/OP_UNUSED_D5FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_D5FF)
 OP_END
 
-/* File: c/OP_UNUSED_D6FF.c */
+/* File: c/OP_UNUSED_D6FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_D6FF)
 OP_END
 
-/* File: c/OP_UNUSED_D7FF.c */
+/* File: c/OP_UNUSED_D7FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_D7FF)
 OP_END
 
-/* File: c/OP_UNUSED_D8FF.c */
+/* File: c/OP_UNUSED_D8FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_D8FF)
 OP_END
 
-/* File: c/OP_UNUSED_D9FF.c */
+/* File: c/OP_UNUSED_D9FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_D9FF)
 OP_END
 
-/* File: c/OP_UNUSED_DAFF.c */
+/* File: c/OP_UNUSED_DAFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_DAFF)
 OP_END
 
-/* File: c/OP_UNUSED_DBFF.c */
+/* File: c/OP_UNUSED_DBFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_DBFF)
 OP_END
 
-/* File: c/OP_UNUSED_DCFF.c */
+/* File: c/OP_UNUSED_DCFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_DCFF)
 OP_END
 
-/* File: c/OP_UNUSED_DDFF.c */
+/* File: c/OP_UNUSED_DDFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_DDFF)
 OP_END
 
-/* File: c/OP_UNUSED_DEFF.c */
+/* File: c/OP_UNUSED_DEFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_DEFF)
 OP_END
 
-/* File: c/OP_UNUSED_DFFF.c */
+/* File: c/OP_UNUSED_DFFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_DFFF)
 OP_END
 
-/* File: c/OP_UNUSED_E0FF.c */
+/* File: c/OP_UNUSED_E0FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_E0FF)
 OP_END
 
-/* File: c/OP_UNUSED_E1FF.c */
+/* File: c/OP_UNUSED_E1FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_E1FF)
 OP_END
 
-/* File: c/OP_UNUSED_E2FF.c */
+/* File: c/OP_UNUSED_E2FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_E2FF)
 OP_END
 
-/* File: c/OP_UNUSED_E3FF.c */
+/* File: c/OP_UNUSED_E3FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_E3FF)
 OP_END
 
-/* File: c/OP_UNUSED_E4FF.c */
+/* File: c/OP_UNUSED_E4FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_E4FF)
 OP_END
 
-/* File: c/OP_UNUSED_E5FF.c */
+/* File: c/OP_UNUSED_E5FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_E5FF)
 OP_END
 
-/* File: c/OP_UNUSED_E6FF.c */
+/* File: c/OP_UNUSED_E6FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_E6FF)
 OP_END
 
-/* File: c/OP_UNUSED_E7FF.c */
+/* File: c/OP_UNUSED_E7FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_E7FF)
 OP_END
 
-/* File: c/OP_UNUSED_E8FF.c */
+/* File: c/OP_UNUSED_E8FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_E8FF)
 OP_END
 
-/* File: c/OP_UNUSED_E9FF.c */
+/* File: c/OP_UNUSED_E9FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_E9FF)
 OP_END
 
-/* File: c/OP_UNUSED_EAFF.c */
+/* File: c/OP_UNUSED_EAFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_EAFF)
 OP_END
 
-/* File: c/OP_UNUSED_EBFF.c */
+/* File: c/OP_UNUSED_EBFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_EBFF)
 OP_END
 
-/* File: c/OP_UNUSED_ECFF.c */
+/* File: c/OP_UNUSED_ECFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_ECFF)
 OP_END
 
-/* File: c/OP_UNUSED_EDFF.c */
+/* File: c/OP_UNUSED_EDFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_EDFF)
 OP_END
 
-/* File: c/OP_UNUSED_EEFF.c */
+/* File: c/OP_UNUSED_EEFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_EEFF)
 OP_END
 
-/* File: c/OP_UNUSED_EFFF.c */
+/* File: c/OP_UNUSED_EFFF.cpp */
 HANDLE_OPCODE(OP_UNUSED_EFFF)
 OP_END
 
-/* File: c/OP_UNUSED_F0FF.c */
+/* File: c/OP_UNUSED_F0FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_F0FF)
 OP_END
 
-/* File: c/OP_UNUSED_F1FF.c */
+/* File: c/OP_UNUSED_F1FF.cpp */
 HANDLE_OPCODE(OP_UNUSED_F1FF)
     /*
      * In portable interp, most unused opcodes will fall through to here.
@@ -4292,7 +4292,7 @@
     FINISH(1);
 OP_END
 
-/* File: c/OP_INVOKE_OBJECT_INIT_JUMBO.c */
+/* File: c/OP_INVOKE_OBJECT_INIT_JUMBO.cpp */
 HANDLE_OPCODE(OP_INVOKE_OBJECT_INIT_JUMBO /*{vCCCC..vNNNN}, meth@AAAAAAAA*/)
     {
         Object* obj;
@@ -4323,55 +4323,55 @@
     }
 OP_END
 
-/* File: c/OP_IGET_VOLATILE_JUMBO.c */
+/* File: c/OP_IGET_VOLATILE_JUMBO.cpp */
 HANDLE_IGET_X_JUMBO(OP_IGET_VOLATILE_JUMBO, "-volatile/jumbo", IntVolatile, )
 OP_END
 
-/* File: c/OP_IGET_WIDE_VOLATILE_JUMBO.c */
+/* File: c/OP_IGET_WIDE_VOLATILE_JUMBO.cpp */
 HANDLE_IGET_X_JUMBO(OP_IGET_WIDE_VOLATILE_JUMBO, "-wide-volatile/jumbo", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_IGET_OBJECT_VOLATILE_JUMBO.c */
+/* File: c/OP_IGET_OBJECT_VOLATILE_JUMBO.cpp */
 HANDLE_IGET_X_JUMBO(OP_IGET_OBJECT_VOLATILE_JUMBO, "-object-volatile/jumbo", ObjectVolatile, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_IPUT_VOLATILE_JUMBO.c */
+/* File: c/OP_IPUT_VOLATILE_JUMBO.cpp */
 HANDLE_IPUT_X_JUMBO(OP_IPUT_VOLATILE_JUMBO, "-volatile/jumbo", IntVolatile, )
 OP_END
 
-/* File: c/OP_IPUT_WIDE_VOLATILE_JUMBO.c */
+/* File: c/OP_IPUT_WIDE_VOLATILE_JUMBO.cpp */
 HANDLE_IPUT_X_JUMBO(OP_IPUT_WIDE_VOLATILE_JUMBO, "-wide-volatile/jumbo", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_IPUT_OBJECT_VOLATILE_JUMBO.c */
+/* File: c/OP_IPUT_OBJECT_VOLATILE_JUMBO.cpp */
 HANDLE_IPUT_X_JUMBO(OP_IPUT_OBJECT_VOLATILE_JUMBO, "-object-volatile/jumbo", ObjectVolatile, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_SGET_VOLATILE_JUMBO.c */
+/* File: c/OP_SGET_VOLATILE_JUMBO.cpp */
 HANDLE_SGET_X_JUMBO(OP_SGET_VOLATILE_JUMBO, "-volatile/jumbo", IntVolatile, )
 OP_END
 
-/* File: c/OP_SGET_WIDE_VOLATILE_JUMBO.c */
+/* File: c/OP_SGET_WIDE_VOLATILE_JUMBO.cpp */
 HANDLE_SGET_X_JUMBO(OP_SGET_WIDE_VOLATILE_JUMBO, "-wide-volatile/jumbo", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_SGET_OBJECT_VOLATILE_JUMBO.c */
+/* File: c/OP_SGET_OBJECT_VOLATILE_JUMBO.cpp */
 HANDLE_SGET_X_JUMBO(OP_SGET_OBJECT_VOLATILE_JUMBO, "-object-volatile/jumbo", ObjectVolatile, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_SPUT_VOLATILE_JUMBO.c */
+/* File: c/OP_SPUT_VOLATILE_JUMBO.cpp */
 HANDLE_SPUT_X_JUMBO(OP_SPUT_VOLATILE_JUMBO, "-volatile", IntVolatile, )
 OP_END
 
-/* File: c/OP_SPUT_WIDE_VOLATILE_JUMBO.c */
+/* File: c/OP_SPUT_WIDE_VOLATILE_JUMBO.cpp */
 HANDLE_SPUT_X_JUMBO(OP_SPUT_WIDE_VOLATILE_JUMBO, "-wide-volatile/jumbo", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_SPUT_OBJECT_VOLATILE_JUMBO.c */
+/* File: c/OP_SPUT_OBJECT_VOLATILE_JUMBO.cpp */
 HANDLE_SPUT_X_JUMBO(OP_SPUT_OBJECT_VOLATILE_JUMBO, "-object-volatile/jumbo", ObjectVolatile, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_THROW_VERIFICATION_ERROR_JUMBO.c */
+/* File: c/OP_THROW_VERIFICATION_ERROR_JUMBO.cpp */
 HANDLE_OPCODE(OP_THROW_VERIFICATION_ERROR_JUMBO)
     EXPORT_PC();
     vsrc1 = FETCH(3);
@@ -4380,7 +4380,7 @@
     GOTO_exceptionThrown();
 OP_END
 
-/* File: c/gotoTargets.c */
+/* File: c/gotoTargets.cpp */
 /*
  * C footer.  This has some common code shared by the various targets.
  */
@@ -4470,7 +4470,7 @@
         /*
          * Fill in the elements.  It's legal for vsrc1 to be zero.
          */
-        contents = (u4*) newArray->contents;
+        contents = (u4*)(void*)newArray->contents;
         if (methodCallRange) {
             for (i = 0; i < vsrc1; i++)
                 contents[i] = GET_REGISTER(vdst+i);
@@ -5416,7 +5416,7 @@
     assert(false);      // should not get here
 GOTO_TARGET_END
 
-/* File: portable/enddefs.c */
+/* File: portable/enddefs.cpp */
 /*--- end of opcodes ---*/
 
 bail:

vm/mterp/out/InterpC-x86-atom.cpp

diff --git a/vm/mterp/out/InterpC-x86-atom.c b/vm/mterp/out/InterpC-x86-atom.cpp
similarity index 98%
rename from vm/mterp/out/InterpC-x86-atom.c
rename to vm/mterp/out/InterpC-x86-atom.cpp
index 85414bb..5483b84 100644
--- a/vm/mterp/out/InterpC-x86-atom.c
+++ b/vm/mterp/out/InterpC-x86-atom.cpp
@@ -4,7 +4,7 @@
  * --> DO NOT EDIT <--
  */
 
-/* File: c/header.c */
+/* File: c/header.cpp */
 /*
  * Copyright (C) 2008 The Android Open Source Project
  *
@@ -379,14 +379,14 @@
     return true;
 }
 
-/* File: cstubs/stubdefs.c */
+/* File: cstubs/stubdefs.cpp */
 /*
  * In the C mterp stubs, "goto" is a function call followed immediately
  * by a return.
  */
 
 #define GOTO_TARGET_DECL(_target, ...)                                      \
-    void dvmMterp_##_target(Thread* self, ## __VA_ARGS__);
+    extern "C" void dvmMterp_##_target(Thread* self, ## __VA_ARGS__);
 
 /* (void)xxx to quiet unused variable compiler warnings. */
 #define GOTO_TARGET(_target, ...)                                           \
@@ -434,6 +434,7 @@
  * (void)xxx to quiet unused variable compiler warnings.
  */
 #define HANDLE_OPCODE(_op)                                                  \
+    extern "C" void dvmMterp_##_op(Thread* self);                           \
     void dvmMterp_##_op(Thread* self) {                                     \
         u4 ref;                                                             \
         u2 vsrc1, vsrc2, vdst;                                              \
@@ -513,7 +514,7 @@
         }                                                                   \
     }
 
-/* File: c/opcommon.c */
+/* File: c/opcommon.cpp */
 /* forward declarations of goto targets */
 GOTO_TARGET_DECL(filledNewArray, bool methodCallRange, bool jumboFormat);
 GOTO_TARGET_DECL(invokeVirtual, bool methodCallRange, bool jumboFormat);
@@ -973,7 +974,7 @@
             GOTO_exceptionThrown();                                         \
         }                                                                   \
         SET_REGISTER##_regsize(vdst,                                        \
-            ((_type*) arrayObj->contents)[GET_REGISTER(vsrc2)]);            \
+            ((_type*)(void*)arrayObj->contents)[GET_REGISTER(vsrc2)]);      \
         ILOGV("+ AGET[%d]=0x%x", GET_REGISTER(vsrc2), GET_REGISTER(vdst));  \
     }                                                                       \
     FINISH(2);
@@ -998,7 +999,7 @@
             GOTO_exceptionThrown();                                         \
         }                                                                   \
         ILOGV("+ APUT[%d]=0x%08x", GET_REGISTER(vsrc2), GET_REGISTER(vdst));\
-        ((_type*) arrayObj->contents)[GET_REGISTER(vsrc2)] =                \
+        ((_type*)(void*)arrayObj->contents)[GET_REGISTER(vsrc2)] =          \
             GET_REGISTER##_regsize(vdst);                                   \
     }                                                                       \
     FINISH(2);
@@ -1270,43 +1271,43 @@
     }                                                                       \
     FINISH(4);
 
-/* File: c/OP_IGET_VOLATILE.c */
+/* File: c/OP_IGET_VOLATILE.cpp */
 HANDLE_IGET_X(OP_IGET_VOLATILE,         "-volatile", IntVolatile, )
 OP_END
 
-/* File: c/OP_IPUT_VOLATILE.c */
+/* File: c/OP_IPUT_VOLATILE.cpp */
 HANDLE_IPUT_X(OP_IPUT_VOLATILE,         "-volatile", IntVolatile, )
 OP_END
 
-/* File: c/OP_SGET_VOLATILE.c */
+/* File: c/OP_SGET_VOLATILE.cpp */
 HANDLE_SGET_X(OP_SGET_VOLATILE,         "-volatile", IntVolatile, )
 OP_END
 
-/* File: c/OP_SPUT_VOLATILE.c */
+/* File: c/OP_SPUT_VOLATILE.cpp */
 HANDLE_SPUT_X(OP_SPUT_VOLATILE,         "-volatile", IntVolatile, )
 OP_END
 
-/* File: c/OP_IGET_OBJECT_VOLATILE.c */
+/* File: c/OP_IGET_OBJECT_VOLATILE.cpp */
 HANDLE_IGET_X(OP_IGET_OBJECT_VOLATILE,  "-object-volatile", ObjectVolatile, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_IGET_WIDE_VOLATILE.c */
+/* File: c/OP_IGET_WIDE_VOLATILE.cpp */
 HANDLE_IGET_X(OP_IGET_WIDE_VOLATILE,    "-wide-volatile", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_IPUT_WIDE_VOLATILE.c */
+/* File: c/OP_IPUT_WIDE_VOLATILE.cpp */
 HANDLE_IPUT_X(OP_IPUT_WIDE_VOLATILE,    "-wide-volatile", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_SGET_WIDE_VOLATILE.c */
+/* File: c/OP_SGET_WIDE_VOLATILE.cpp */
 HANDLE_SGET_X(OP_SGET_WIDE_VOLATILE,    "-wide-volatile", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_SPUT_WIDE_VOLATILE.c */
+/* File: c/OP_SPUT_WIDE_VOLATILE.cpp */
 HANDLE_SPUT_X(OP_SPUT_WIDE_VOLATILE,    "-wide-volatile", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_BREAKPOINT.c */
+/* File: c/OP_BREAKPOINT.cpp */
 HANDLE_OPCODE(OP_BREAKPOINT)
     {
         /*
@@ -1332,7 +1333,7 @@
     }
 OP_END
 
-/* File: c/OP_EXECUTE_INLINE_RANGE.c */
+/* File: c/OP_EXECUTE_INLINE_RANGE.cpp */
 HANDLE_OPCODE(OP_EXECUTE_INLINE_RANGE /*{vCCCC..v(CCCC+AA-1)}, inline@BBBB*/)
     {
         u4 arg0, arg1, arg2, arg3;
@@ -1377,7 +1378,7 @@
     FINISH(3);
 OP_END
 
-/* File: c/OP_INVOKE_OBJECT_INIT_RANGE.c */
+/* File: c/OP_INVOKE_OBJECT_INIT_RANGE.cpp */
 HANDLE_OPCODE(OP_INVOKE_OBJECT_INIT_RANGE /*{vCCCC..v(CCCC+AA-1)}, meth@BBBB*/)
     {
         Object* obj;
@@ -1408,7 +1409,7 @@
     }
 OP_END
 
-/* File: c/OP_RETURN_VOID_BARRIER.c */
+/* File: c/OP_RETURN_VOID_BARRIER.cpp */
 HANDLE_OPCODE(OP_RETURN_VOID_BARRIER /**/)
     ILOGV("|return-void");
 #ifndef NDEBUG
@@ -1418,19 +1419,19 @@
     GOTO_returnFromMethod();
 OP_END
 
-/* File: c/OP_IPUT_OBJECT_VOLATILE.c */
+/* File: c/OP_IPUT_OBJECT_VOLATILE.cpp */
 HANDLE_IPUT_X(OP_IPUT_OBJECT_VOLATILE,  "-object-volatile", ObjectVolatile, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_SGET_OBJECT_VOLATILE.c */
+/* File: c/OP_SGET_OBJECT_VOLATILE.cpp */
 HANDLE_SGET_X(OP_SGET_OBJECT_VOLATILE,  "-object-volatile", ObjectVolatile, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_SPUT_OBJECT_VOLATILE.c */
+/* File: c/OP_SPUT_OBJECT_VOLATILE.cpp */
 HANDLE_SPUT_X(OP_SPUT_OBJECT_VOLATILE,  "-object-volatile", ObjectVolatile, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_INVOKE_OBJECT_INIT_JUMBO.c */
+/* File: c/OP_INVOKE_OBJECT_INIT_JUMBO.cpp */
 HANDLE_OPCODE(OP_INVOKE_OBJECT_INIT_JUMBO /*{vCCCC..vNNNN}, meth@AAAAAAAA*/)
     {
         Object* obj;
@@ -1461,55 +1462,55 @@
     }
 OP_END
 
-/* File: c/OP_IGET_VOLATILE_JUMBO.c */
+/* File: c/OP_IGET_VOLATILE_JUMBO.cpp */
 HANDLE_IGET_X_JUMBO(OP_IGET_VOLATILE_JUMBO, "-volatile/jumbo", IntVolatile, )
 OP_END
 
-/* File: c/OP_IGET_WIDE_VOLATILE_JUMBO.c */
+/* File: c/OP_IGET_WIDE_VOLATILE_JUMBO.cpp */
 HANDLE_IGET_X_JUMBO(OP_IGET_WIDE_VOLATILE_JUMBO, "-wide-volatile/jumbo", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_IGET_OBJECT_VOLATILE_JUMBO.c */
+/* File: c/OP_IGET_OBJECT_VOLATILE_JUMBO.cpp */
 HANDLE_IGET_X_JUMBO(OP_IGET_OBJECT_VOLATILE_JUMBO, "-object-volatile/jumbo", ObjectVolatile, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_IPUT_VOLATILE_JUMBO.c */
+/* File: c/OP_IPUT_VOLATILE_JUMBO.cpp */
 HANDLE_IPUT_X_JUMBO(OP_IPUT_VOLATILE_JUMBO, "-volatile/jumbo", IntVolatile, )
 OP_END
 
-/* File: c/OP_IPUT_WIDE_VOLATILE_JUMBO.c */
+/* File: c/OP_IPUT_WIDE_VOLATILE_JUMBO.cpp */
 HANDLE_IPUT_X_JUMBO(OP_IPUT_WIDE_VOLATILE_JUMBO, "-wide-volatile/jumbo", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_IPUT_OBJECT_VOLATILE_JUMBO.c */
+/* File: c/OP_IPUT_OBJECT_VOLATILE_JUMBO.cpp */
 HANDLE_IPUT_X_JUMBO(OP_IPUT_OBJECT_VOLATILE_JUMBO, "-object-volatile/jumbo", ObjectVolatile, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_SGET_VOLATILE_JUMBO.c */
+/* File: c/OP_SGET_VOLATILE_JUMBO.cpp */
 HANDLE_SGET_X_JUMBO(OP_SGET_VOLATILE_JUMBO, "-volatile/jumbo", IntVolatile, )
 OP_END
 
-/* File: c/OP_SGET_WIDE_VOLATILE_JUMBO.c */
+/* File: c/OP_SGET_WIDE_VOLATILE_JUMBO.cpp */
 HANDLE_SGET_X_JUMBO(OP_SGET_WIDE_VOLATILE_JUMBO, "-wide-volatile/jumbo", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_SGET_OBJECT_VOLATILE_JUMBO.c */
+/* File: c/OP_SGET_OBJECT_VOLATILE_JUMBO.cpp */
 HANDLE_SGET_X_JUMBO(OP_SGET_OBJECT_VOLATILE_JUMBO, "-object-volatile/jumbo", ObjectVolatile, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_SPUT_VOLATILE_JUMBO.c */
+/* File: c/OP_SPUT_VOLATILE_JUMBO.cpp */
 HANDLE_SPUT_X_JUMBO(OP_SPUT_VOLATILE_JUMBO, "-volatile", IntVolatile, )
 OP_END
 
-/* File: c/OP_SPUT_WIDE_VOLATILE_JUMBO.c */
+/* File: c/OP_SPUT_WIDE_VOLATILE_JUMBO.cpp */
 HANDLE_SPUT_X_JUMBO(OP_SPUT_WIDE_VOLATILE_JUMBO, "-wide-volatile/jumbo", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_SPUT_OBJECT_VOLATILE_JUMBO.c */
+/* File: c/OP_SPUT_OBJECT_VOLATILE_JUMBO.cpp */
 HANDLE_SPUT_X_JUMBO(OP_SPUT_OBJECT_VOLATILE_JUMBO, "-object-volatile/jumbo", ObjectVolatile, _AS_OBJECT)
 OP_END
 
-/* File: c/gotoTargets.c */
+/* File: c/gotoTargets.cpp */
 /*
  * C footer.  This has some common code shared by the various targets.
  */
@@ -1599,7 +1600,7 @@
         /*
          * Fill in the elements.  It's legal for vsrc1 to be zero.
          */
-        contents = (u4*) newArray->contents;
+        contents = (u4*)(void*)newArray->contents;
         if (methodCallRange) {
             for (i = 0; i < vsrc1; i++)
                 contents[i] = GET_REGISTER(vdst+i);
@@ -2545,7 +2546,7 @@
     assert(false);      // should not get here
 GOTO_TARGET_END
 
-/* File: cstubs/enddefs.c */
+/* File: cstubs/enddefs.cpp */
 
 /* undefine "magic" name remapping */
 #undef retval

vm/mterp/out/InterpC-x86.cpp

diff --git a/vm/mterp/out/InterpC-x86.c b/vm/mterp/out/InterpC-x86.cpp
similarity index 98%
rename from vm/mterp/out/InterpC-x86.c
rename to vm/mterp/out/InterpC-x86.cpp
index dd25604..ce4435b 100644
--- a/vm/mterp/out/InterpC-x86.c
+++ b/vm/mterp/out/InterpC-x86.cpp
@@ -4,7 +4,7 @@
  * --> DO NOT EDIT <--
  */
 
-/* File: c/header.c */
+/* File: c/header.cpp */
 /*
  * Copyright (C) 2008 The Android Open Source Project
  *
@@ -379,14 +379,14 @@
     return true;
 }
 
-/* File: cstubs/stubdefs.c */
+/* File: cstubs/stubdefs.cpp */
 /*
  * In the C mterp stubs, "goto" is a function call followed immediately
  * by a return.
  */
 
 #define GOTO_TARGET_DECL(_target, ...)                                      \
-    void dvmMterp_##_target(Thread* self, ## __VA_ARGS__);
+    extern "C" void dvmMterp_##_target(Thread* self, ## __VA_ARGS__);
 
 /* (void)xxx to quiet unused variable compiler warnings. */
 #define GOTO_TARGET(_target, ...)                                           \
@@ -434,6 +434,7 @@
  * (void)xxx to quiet unused variable compiler warnings.
  */
 #define HANDLE_OPCODE(_op)                                                  \
+    extern "C" void dvmMterp_##_op(Thread* self);                           \
     void dvmMterp_##_op(Thread* self) {                                     \
         u4 ref;                                                             \
         u2 vsrc1, vsrc2, vdst;                                              \
@@ -513,7 +514,7 @@
         }                                                                   \
     }
 
-/* File: c/opcommon.c */
+/* File: c/opcommon.cpp */
 /* forward declarations of goto targets */
 GOTO_TARGET_DECL(filledNewArray, bool methodCallRange, bool jumboFormat);
 GOTO_TARGET_DECL(invokeVirtual, bool methodCallRange, bool jumboFormat);
@@ -973,7 +974,7 @@
             GOTO_exceptionThrown();                                         \
         }                                                                   \
         SET_REGISTER##_regsize(vdst,                                        \
-            ((_type*) arrayObj->contents)[GET_REGISTER(vsrc2)]);            \
+            ((_type*)(void*)arrayObj->contents)[GET_REGISTER(vsrc2)]);      \
         ILOGV("+ AGET[%d]=0x%x", GET_REGISTER(vsrc2), GET_REGISTER(vdst));  \
     }                                                                       \
     FINISH(2);
@@ -998,7 +999,7 @@
             GOTO_exceptionThrown();                                         \
         }                                                                   \
         ILOGV("+ APUT[%d]=0x%08x", GET_REGISTER(vsrc2), GET_REGISTER(vdst));\
-        ((_type*) arrayObj->contents)[GET_REGISTER(vsrc2)] =                \
+        ((_type*)(void*)arrayObj->contents)[GET_REGISTER(vsrc2)] =          \
             GET_REGISTER##_regsize(vdst);                                   \
     }                                                                       \
     FINISH(2);
@@ -1270,23 +1271,23 @@
     }                                                                       \
     FINISH(4);
 
-/* File: c/OP_IGET_WIDE_VOLATILE.c */
+/* File: c/OP_IGET_WIDE_VOLATILE.cpp */
 HANDLE_IGET_X(OP_IGET_WIDE_VOLATILE,    "-wide-volatile", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_IPUT_WIDE_VOLATILE.c */
+/* File: c/OP_IPUT_WIDE_VOLATILE.cpp */
 HANDLE_IPUT_X(OP_IPUT_WIDE_VOLATILE,    "-wide-volatile", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_SGET_WIDE_VOLATILE.c */
+/* File: c/OP_SGET_WIDE_VOLATILE.cpp */
 HANDLE_SGET_X(OP_SGET_WIDE_VOLATILE,    "-wide-volatile", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_SPUT_WIDE_VOLATILE.c */
+/* File: c/OP_SPUT_WIDE_VOLATILE.cpp */
 HANDLE_SPUT_X(OP_SPUT_WIDE_VOLATILE,    "-wide-volatile", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_EXECUTE_INLINE_RANGE.c */
+/* File: c/OP_EXECUTE_INLINE_RANGE.cpp */
 HANDLE_OPCODE(OP_EXECUTE_INLINE_RANGE /*{vCCCC..v(CCCC+AA-1)}, inline@BBBB*/)
     {
         u4 arg0, arg1, arg2, arg3;
@@ -1331,7 +1332,7 @@
     FINISH(3);
 OP_END
 
-/* File: c/OP_INVOKE_OBJECT_INIT_RANGE.c */
+/* File: c/OP_INVOKE_OBJECT_INIT_RANGE.cpp */
 HANDLE_OPCODE(OP_INVOKE_OBJECT_INIT_RANGE /*{vCCCC..v(CCCC+AA-1)}, meth@BBBB*/)
     {
         Object* obj;
@@ -1362,7 +1363,7 @@
     }
 OP_END
 
-/* File: c/OP_RETURN_VOID_BARRIER.c */
+/* File: c/OP_RETURN_VOID_BARRIER.cpp */
 HANDLE_OPCODE(OP_RETURN_VOID_BARRIER /**/)
     ILOGV("|return-void");
 #ifndef NDEBUG
@@ -1372,7 +1373,7 @@
     GOTO_returnFromMethod();
 OP_END
 
-/* File: c/OP_INVOKE_OBJECT_INIT_JUMBO.c */
+/* File: c/OP_INVOKE_OBJECT_INIT_JUMBO.cpp */
 HANDLE_OPCODE(OP_INVOKE_OBJECT_INIT_JUMBO /*{vCCCC..vNNNN}, meth@AAAAAAAA*/)
     {
         Object* obj;
@@ -1403,55 +1404,55 @@
     }
 OP_END
 
-/* File: c/OP_IGET_VOLATILE_JUMBO.c */
+/* File: c/OP_IGET_VOLATILE_JUMBO.cpp */
 HANDLE_IGET_X_JUMBO(OP_IGET_VOLATILE_JUMBO, "-volatile/jumbo", IntVolatile, )
 OP_END
 
-/* File: c/OP_IGET_WIDE_VOLATILE_JUMBO.c */
+/* File: c/OP_IGET_WIDE_VOLATILE_JUMBO.cpp */
 HANDLE_IGET_X_JUMBO(OP_IGET_WIDE_VOLATILE_JUMBO, "-wide-volatile/jumbo", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_IGET_OBJECT_VOLATILE_JUMBO.c */
+/* File: c/OP_IGET_OBJECT_VOLATILE_JUMBO.cpp */
 HANDLE_IGET_X_JUMBO(OP_IGET_OBJECT_VOLATILE_JUMBO, "-object-volatile/jumbo", ObjectVolatile, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_IPUT_VOLATILE_JUMBO.c */
+/* File: c/OP_IPUT_VOLATILE_JUMBO.cpp */
 HANDLE_IPUT_X_JUMBO(OP_IPUT_VOLATILE_JUMBO, "-volatile/jumbo", IntVolatile, )
 OP_END
 
-/* File: c/OP_IPUT_WIDE_VOLATILE_JUMBO.c */
+/* File: c/OP_IPUT_WIDE_VOLATILE_JUMBO.cpp */
 HANDLE_IPUT_X_JUMBO(OP_IPUT_WIDE_VOLATILE_JUMBO, "-wide-volatile/jumbo", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_IPUT_OBJECT_VOLATILE_JUMBO.c */
+/* File: c/OP_IPUT_OBJECT_VOLATILE_JUMBO.cpp */
 HANDLE_IPUT_X_JUMBO(OP_IPUT_OBJECT_VOLATILE_JUMBO, "-object-volatile/jumbo", ObjectVolatile, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_SGET_VOLATILE_JUMBO.c */
+/* File: c/OP_SGET_VOLATILE_JUMBO.cpp */
 HANDLE_SGET_X_JUMBO(OP_SGET_VOLATILE_JUMBO, "-volatile/jumbo", IntVolatile, )
 OP_END
 
-/* File: c/OP_SGET_WIDE_VOLATILE_JUMBO.c */
+/* File: c/OP_SGET_WIDE_VOLATILE_JUMBO.cpp */
 HANDLE_SGET_X_JUMBO(OP_SGET_WIDE_VOLATILE_JUMBO, "-wide-volatile/jumbo", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_SGET_OBJECT_VOLATILE_JUMBO.c */
+/* File: c/OP_SGET_OBJECT_VOLATILE_JUMBO.cpp */
 HANDLE_SGET_X_JUMBO(OP_SGET_OBJECT_VOLATILE_JUMBO, "-object-volatile/jumbo", ObjectVolatile, _AS_OBJECT)
 OP_END
 
-/* File: c/OP_SPUT_VOLATILE_JUMBO.c */
+/* File: c/OP_SPUT_VOLATILE_JUMBO.cpp */
 HANDLE_SPUT_X_JUMBO(OP_SPUT_VOLATILE_JUMBO, "-volatile", IntVolatile, )
 OP_END
 
-/* File: c/OP_SPUT_WIDE_VOLATILE_JUMBO.c */
+/* File: c/OP_SPUT_WIDE_VOLATILE_JUMBO.cpp */
 HANDLE_SPUT_X_JUMBO(OP_SPUT_WIDE_VOLATILE_JUMBO, "-wide-volatile/jumbo", LongVolatile, _WIDE)
 OP_END
 
-/* File: c/OP_SPUT_OBJECT_VOLATILE_JUMBO.c */
+/* File: c/OP_SPUT_OBJECT_VOLATILE_JUMBO.cpp */
 HANDLE_SPUT_X_JUMBO(OP_SPUT_OBJECT_VOLATILE_JUMBO, "-object-volatile/jumbo", ObjectVolatile, _AS_OBJECT)
 OP_END
 
-/* File: c/gotoTargets.c */
+/* File: c/gotoTargets.cpp */
 /*
  * C footer.  This has some common code shared by the various targets.
  */
@@ -1541,7 +1542,7 @@
         /*
          * Fill in the elements.  It's legal for vsrc1 to be zero.
          */
-        contents = (u4*) newArray->contents;
+        contents = (u4*)(void*)newArray->contents;
         if (methodCallRange) {
             for (i = 0; i < vsrc1; i++)
                 contents[i] = GET_REGISTER(vdst+i);
@@ -2487,7 +2488,7 @@
     assert(false);      // should not get here
 GOTO_TARGET_END
 
-/* File: cstubs/enddefs.c */
+/* File: cstubs/enddefs.cpp */
 
 /* undefine "magic" name remapping */
 #undef retval

vm/mterp/portable/enddefs.cpp

diff --git a/vm/mterp/portable/enddefs.c b/vm/mterp/portable/enddefs.cpp
similarity index 100%
rename from vm/mterp/portable/enddefs.c
rename to vm/mterp/portable/enddefs.cpp

vm/mterp/portable/entry.cpp

diff --git a/vm/mterp/portable/entry.c b/vm/mterp/portable/entry.cpp
similarity index 100%
rename from vm/mterp/portable/entry.c
rename to vm/mterp/portable/entry.cpp

vm/mterp/portable/stubdefs.cpp

diff --git a/vm/mterp/portable/stubdefs.c b/vm/mterp/portable/stubdefs.cpp
similarity index 100%
rename from vm/mterp/portable/stubdefs.c
rename to vm/mterp/portable/stubdefs.cpp