mterp generation cleanup

Change I3a22048a introduced a new interpreter breakout mechanism, and
with it a bit of hackish ugliness in the mechanism to automatically
generate interpreter source files.

This CL applies some Lipo and Botox:
   o New alt-op-start, alt-op-end commands removed - will just use
     existing op-start & op-end.
   o New command "handler-style" to explicitly declare interpreter
     style (computed-goto, jump-table or all-c).  Previous trigger
     on "handler-size==0" removed.
   o Alternate handler stub no longer using fixed file name, but
     intead is named by command asm-alt-stub (which is modelled on
     existing alt-stub command).
   o Previous CL stated requirement for explicitly called-out handler
     for the Dalvik dispatch opcode.  Turns out this was not necessary.
     Requirement removed.

Change-Id: I20f7411820715476533c2073d28f357e28c1ae52
diff --git a/vm/mterp/README.txt b/vm/mterp/README.txt
index c5537d7..e628fb5 100644
--- a/vm/mterp/README.txt
+++ b/vm/mterp/README.txt
@@ -38,8 +38,8 @@
 
 Depending on architecture, instruction-to-instruction transitions may
 be done as either computed goto or jump table.  In the computed goto
-variant, each instruction handler is allocated fixed-size area (e.g. 64
-byte).  "Overflow" code is tacked to the end.  In the jump table variant,
+variant, each instruction handler is allocated a fixed-size area (e.g. 64
+byte).  "Overflow" code is tacked on to the end.  In the jump table variant,
 all of the instructions handlers are contiguous and may be of any size.
 The interpreter style is selected via the "handler-size" command (see below).
 
@@ -62,12 +62,25 @@
 
 The commands are:
 
+  handler-style <computed-goto|jump-table|all-c>
+
+    Specify which style of interpreter to generate.  In computed-goto,
+    each handler is allocated a fixed region, allowing transitions to
+    be done via table-start-address + (opcode * handler-size). With
+    jump-table style, handlers may be of any length, and the generated
+    table is an array of pointers to the handlers. The "all-c" style is
+    for the portable interpreter (which is implemented completely in C).
+    [Note: all-c is distinct from an "allstubs" configuration.  In both
+    configurations, all handlers are the C versions, but the allstubs
+    configuration uses the assembly outer loop and assembly stubs to
+    transition to the handlers].  This command is required, and must be
+    the first command in the config file.
+
   handler-size <bytes>
 
-    Specify the size of the assembly region, in bytes.  On most platforms
-    this will need to be a power of 2.  A handler-size of 0 denotes a
-    special case in which a jump table will be generated, rather than
-    a computed-goto target block.
+    Specify the size of the fixed region, in bytes.  On most platforms
+    this will need to be a power of 2.  For jump-table and all-c
+    implementations, this command is ignored.
 
   import <filename>
 
@@ -77,8 +90,16 @@
 
   asm-stub <filename>
 
-    The named file will be included whenever an assembly "stub" is needed.
-    Text substitution is performed on the opcode name.
+    The named file will be included whenever an assembly "stub" is needed
+    to transfer control to a handler written in C.  Text substitution is
+    performed on the opcode name.  This command is not applicable to
+    to "all-c" configurations.
+
+  asm-alt-stub <filename>
+
+    When present, this command will cause the generation of an alternate
+    set of entry points (for computed-goto interpreters) or an alternate
+    jump table (for jump-table interpreters).
 
   op-start <directory>
 
@@ -94,31 +115,21 @@
     will load from "armv5te/OP_NOP.S".  A substitution dictionary will be
     applied (see below).
 
+  alt <opcode> <directory>
+
+    Can only appear after "op-start" and before "op-end".  Similar to the
+    "op" command above, but denotes a source file to override the entry
+    in the alternate handler table.  The opcode definition will come from
+    the specified file, e.g. "alt OP_NOP armv5te" will load from
+    "armv5te/ALT_OP_NOP.S".  A substitution dictionary will be applied
+    (see below).
+
   op-end
 
     Indicates the end of the opcode list.  All kNumPackedOpcodes
     opcodes are emitted when this is seen, followed by any code that
     didn't fit inside the fixed-size instruction handler space.
 
-  alt-op-start <directory>
-  alt <opcode> <directory>
-  alt-op-end
-
-    These three commands operate similar - but not identical - to op-start,
-    op and op-end.  When present, they will cause the generation of an
-    alternate opcode handler table.  This table is intended to be swapped
-    with the normal handler table when control breaks are needed (generally
-    for use when debugging, profiling or thread-suspend).  Note some important
-    differences:
-        Unless an opcode is specifically called out with an "alt" command,
-        its body will be generated by including the assembly file ALT_STUB.S,
-        which should appear in the <directory> specified by alt-op-start.
-        Specifically called-out opcode handlers should be in files named
-        ALT_OP_<opcode>.S in the directory specified on the "alt" command.
-        At minimum, each implementation should have a generic ALT_STUB.S
-        handler and a called-out handler for the dispatch extension opcode
-        ALT_OP_DISPATCH_FF.S.
-
 The order of "op" and "alt" directives are not significant; the generation
 tool will extract ordering info from the VM sources.
 
@@ -136,13 +147,6 @@
 instructions, unless "asm-stub" was left blank, in which case it only
 emits some labels.)
 
-In general, the actual implementation of an opcode handler should appear
-only in the handler table created by op-start, op and op-end.  The control
-intercept stubs used by alt-op-start, alt and alt-op-end should handle
-any necessary inter-instruction bookeeping and then route to the real handlers
-in the primary table.
-
-
 
 ==== Instruction file format ====
 
diff --git a/vm/mterp/armv5te/ALT_OP_DISPATCH_FF.S b/vm/mterp/armv5te/ALT_OP_DISPATCH_FF.S
deleted file mode 100644
index e3d8010..0000000
--- a/vm/mterp/armv5te/ALT_OP_DISPATCH_FF.S
+++ /dev/null
@@ -1,5 +0,0 @@
-%verify "executed"
-    mov     ip, rINST, lsr #8            @ ip<- extended opcode
-    add     ip, ip, #256                 @ add offset for extended opcodes
-    GOTO_OPCODE(ip)                      @ go to proper extended handler
-
diff --git a/vm/mterp/armv5te/ALT_STUB.S b/vm/mterp/armv5te/alt_stub.S
similarity index 100%
rename from vm/mterp/armv5te/ALT_STUB.S
rename to vm/mterp/armv5te/alt_stub.S
diff --git a/vm/mterp/config-allstubs b/vm/mterp/config-allstubs
index 23796d8..a105049 100644
--- a/vm/mterp/config-allstubs
+++ b/vm/mterp/config-allstubs
@@ -15,9 +15,12 @@
 #
 # Configuration for "allstubs" target.  This is structured like the
 # assembly interpreters, but consists entirely of C stubs, making it
-# a handy if inefficient way to exercise all of the C handlers.
+# a handy if inefficient way to exercise all of the C handlers.  The
+# handler-style command should match the target assembly interpreter.
 #
 
+#handler-style jump-table
+handler-style computed-goto
 handler-size 64
 
 # C file header and basic definitions
diff --git a/vm/mterp/config-armv5te b/vm/mterp/config-armv5te
index aeff468..e00fea9 100644
--- a/vm/mterp/config-armv5te
+++ b/vm/mterp/config-armv5te
@@ -16,11 +16,15 @@
 # Configuration for ARMv5TE architecture targets.
 #
 
+handler-style computed-goto
 handler-size 64
 
 # source for the instruction table stub
 asm-stub armv5te/stub.S
 
+# source for alternate entry stub
+asm-alt-stub armv5te/alt_stub.S
+
 # file header and basic definitions
 import c/header.c
 import armv5te/header.S
@@ -42,11 +46,6 @@
     #op OP_FILL_ARRAY_DATA c
 op-end
 
-# alternate opcode entry points (used to redirect control)
-op-alt-start armv5te
-    alt OP_DISPATCH_FF armv5te
-op-alt-end
-
 # "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
diff --git a/vm/mterp/config-armv5te-vfp b/vm/mterp/config-armv5te-vfp
index 048b178..70ce967 100644
--- a/vm/mterp/config-armv5te-vfp
+++ b/vm/mterp/config-armv5te-vfp
@@ -20,11 +20,15 @@
 # operations except for "remainder" and conversions to/from 64-bit ints.
 #
 
+handler-style computed-goto
 handler-size 64
 
 # source for the instruction table stub
 asm-stub armv5te/stub.S
 
+# source for alternate entry stub
+asm-alt-stub armv5te/alt_stub.S
+
 # file header and basic definitions
 import c/header.c
 import armv5te/header.S
@@ -92,11 +96,6 @@
     #op OP_INT_TO_SHORT armv6
 op-end
 
-# alternate opcode entry points (used to redirect control)
-op-alt-start armv5te
-    alt OP_DISPATCH_FF armv5te
-op-alt-end
-
 # "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
diff --git a/vm/mterp/config-armv7-a b/vm/mterp/config-armv7-a
index ed08dd5..b9b998f 100644
--- a/vm/mterp/config-armv7-a
+++ b/vm/mterp/config-armv7-a
@@ -21,11 +21,15 @@
 # negligible on a Cortex-A8 CPU, so this is really just an experiment.
 #
 
+handler-style computed-goto
 handler-size 64
 
 # source for the instruction table stub
 asm-stub armv5te/stub.S
 
+# source for alternate entry stub
+asm-alt-stub armv5te/alt_stub.S
+
 # file header and basic definitions
 import c/header.c
 import armv5te/header.S
@@ -154,11 +158,6 @@
     op OP_SUB_FLOAT_2ADDR arm-vfp
 op-end
 
-# alternate opcode entry points (used to redirect control)
-op-alt-start armv5te
-    alt OP_DISPATCH_FF armv5te
-op-alt-end
-
 # "helper" code for C; include if you use any of the C stubs (this generates
 # object code, so it's normally excluded)
 #
diff --git a/vm/mterp/config-armv7-a-neon b/vm/mterp/config-armv7-a-neon
index c6ac47f..fd18f69 100644
--- a/vm/mterp/config-armv7-a-neon
+++ b/vm/mterp/config-armv7-a-neon
@@ -21,11 +21,15 @@
 # negligible on a Cortex-A8 CPU, so this is really just an experiment.
 #
 
+handler-style computed-goto
 handler-size 64
 
 # source for the instruction table stub
 asm-stub armv5te/stub.S
 
+# source for alternate entry stub
+asm-alt-stub armv5te/alt_stub.S
+
 # file header and basic definitions
 import c/header.c
 import armv5te/header.S
@@ -154,11 +158,6 @@
     op OP_SUB_FLOAT_2ADDR arm-vfp
 op-end
 
-# alternate opcode entry points (used to redirect control)
-op-alt-start armv5te
-    alt OP_DISPATCH_FF armv5te
-op-alt-end
-
 # "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
diff --git a/vm/mterp/config-portdbg b/vm/mterp/config-portdbg
index c6982d7..feab06d 100644
--- a/vm/mterp/config-portdbg
+++ b/vm/mterp/config-portdbg
@@ -17,7 +17,7 @@
 # debugging enabled.
 #
 
-#handler-size 64
+handler-style all-c
 
 # C file header and basic definitions
 import c/header.c
diff --git a/vm/mterp/config-portstd b/vm/mterp/config-portstd
index 41ecb4f..d0f609e 100644
--- a/vm/mterp/config-portstd
+++ b/vm/mterp/config-portstd
@@ -19,7 +19,7 @@
 # here because it's convenient.
 #
 
-#handler-size 64
+handler-style all-c
 
 # C file header and basic definitions
 import c/header.c
diff --git a/vm/mterp/config-x86 b/vm/mterp/config-x86
index 2af0f28..76bd5f7 100644
--- a/vm/mterp/config-x86
+++ b/vm/mterp/config-x86
@@ -16,11 +16,14 @@
 # Configuration for "desktop" targets.
 #
 
-handler-size 0
+handler-style jump-table
 
 # source for the instruction table stub
 asm-stub x86/stub.S
 
+# source for alternate entry stub
+asm-alt-stub x86/alt_stub.S
+
 # C file header and basic definitions
 import c/header.c
 import x86/header.S
@@ -43,11 +46,6 @@
     op OP_INVOKE_OBJECT_INIT c
 op-end
 
-# alternate opcode entry points (used to redirect control)
-op-alt-start x86
-    alt OP_DISPATCH_FF x86
-op-alt-end
-
 # arch-specific entry point to interpreter
 import x86/entry.S
 
diff --git a/vm/mterp/config-x86-atom b/vm/mterp/config-x86-atom
index 11e667c..3b6a9e8 100644
--- a/vm/mterp/config-x86-atom
+++ b/vm/mterp/config-x86-atom
@@ -13,6 +13,7 @@
 # limitations under the License.
 
 # Specifies the size of the assembly region in bytes
+handler-style computed-goto
 handler-size 64
 
 # source for the instruction table stub
diff --git a/vm/mterp/gen-mterp.py b/vm/mterp/gen-mterp.py
index ec354f4..f8043bb 100755
--- a/vm/mterp/gen-mterp.py
+++ b/vm/mterp/gen-mterp.py
@@ -31,13 +31,14 @@
 in_op_start = 0             # 0=not started, 1=started, 2=ended
 in_alt_op_start = 0         # 0=not started, 1=started, 2=ended
 default_op_dir = None
-default_alt_op_dir = None
+default_alt_stub = None
 opcode_locations = {}
 alt_opcode_locations = {}
 asm_stub_text = []
 label_prefix = ".L"         # use ".L" to hide labels from gdb
 alt_label_prefix = ".L_ALT" # use ".L" to hide labels from gdb
-jmp_table = False           # jump table vs. computed goto style
+style = None                # interpreter style
+generate_alt_table = False
 
 # Exception class.
 class DataParseError(SyntaxError):
@@ -52,12 +53,26 @@
 
 #
 # Parse arch config file --
+# Set interpreter style.
+#
+def setHandlerStyle(tokens):
+    global style
+    if len(tokens) != 2:
+        raise DataParseError("handler-style requires one argument")
+    style = tokens[1]
+    if style != "computed-goto" and style != "jump-table" and style != "all-c":
+        raise DataParseError("handler-style (%s) invalid" % style)
+
+#
+# Parse arch config file --
 # Set handler_size_bytes to the value of tokens[1], and handler_size_bits to
 # log2(handler_size_bytes).  Throws an exception if "bytes" is not 0 or
 # a power of two.
 #
 def setHandlerSize(tokens):
-    global handler_size_bits, handler_size_bytes, jmp_table
+    global handler_size_bits, handler_size_bytes
+    if style != "computed-goto":
+        print "Warning: handler-size valid only for computed-goto interpreters"
     if len(tokens) != 2:
         raise DataParseError("handler-size requires one argument")
     if handler_size_bits != -1000:
@@ -65,19 +80,15 @@
 
     # compute log2(n), and make sure n is 0 or a power of 2
     handler_size_bytes = bytes = int(tokens[1])
-    if handler_size_bytes == 0:
-        jmp_table = True
-        handler_size_bits = 0;
-    else:
-        bits = -1
-        while bytes > 0:
-            bytes //= 2     # halve with truncating division
-            bits += 1
+    bits = -1
+    while bytes > 0:
+        bytes //= 2     # halve with truncating division
+        bits += 1
 
-        if handler_size_bytes == 0 or handler_size_bytes != (1 << bits):
-            raise DataParseError("handler-size (%d) must be power of 2" \
-                    % orig_bytes)
-        handler_size_bits = bits
+    if handler_size_bytes == 0 or handler_size_bytes != (1 << bits):
+        raise DataParseError("handler-size (%d) must be power of 2" \
+                % orig_bytes)
+    handler_size_bits = bits
 
 #
 # Parse arch config file --
@@ -101,6 +112,8 @@
 #
 def setAsmStub(tokens):
     global asm_stub_text
+    if style == "all-c":
+        print "Warning: asm-stub ignored for all-c interpreter"
     if len(tokens) != 2:
         raise DataParseError("import requires one argument")
     try:
@@ -113,6 +126,19 @@
 
 #
 # Parse arch config file --
+# Record location of default alt stub
+#
+def setAsmAltStub(tokens):
+    global default_alt_stub, generate_alt_table
+    if style == "all-c":
+        print "Warning: asm-alt-stub ingored for all-c interpreter"
+    if len(tokens) != 2:
+        raise DataParseError("import requires one argument")
+    default_alt_stub = tokens[1]
+    generate_alt_table = True
+
+#
+# Parse arch config file --
 # Start of opcode list.
 #
 def opStart(tokens):
@@ -126,28 +152,14 @@
     in_op_start = 1
 
 #
-# Parse arch config file
-# Start of optional alternate opcode list.
-#
-def altOpStart(tokens):
-    global in_alt_op_start
-    global default_alt_op_dir
-    if len(tokens) != 2:
-        raise DataParseError("altOpStart takes a directory name argument")
-    if in_alt_op_start != 0:
-        raise DataParseError("altOpStart can only be specified once")
-    default_alt_op_dir = tokens[1]
-    in_alt_op_start = 1
-
-#
 # Parse arch config file --
 # Set location of a single alt opcode's source file.
 #
 def altEntry(tokens):
-    #global alt_opcode_locations
+    global generate_alt_table
     if len(tokens) != 3:
         raise DataParseError("alt requires exactly two arguments")
-    if in_alt_op_start != 1:
+    if in_op_start != 1:
         raise DataParseError("alt statements must be between opStart/opEnd")
     try:
         index = opcodes.index(tokens[1])
@@ -157,6 +169,7 @@
         print "Warning: alt overrides earlier %s (%s -> %s)" \
                 % (tokens[1], alt_opcode_locations[tokens[1]], tokens[2])
     alt_opcode_locations[tokens[1]] = tokens[2]
+    generate_alt_table = True
 
 #
 # Parse arch config file --
@@ -178,20 +191,6 @@
     opcode_locations[tokens[1]] = tokens[2]
 
 #
-# Parse arch config file --
-# End of opcode list; emit instruction blocks.
-#
-def opEnd(tokens):
-    global in_op_start
-    if len(tokens) != 1:
-        raise DataParseError("opEnd takes no arguments")
-    if in_op_start != 1:
-        raise DataParseError("opEnd must follow opStart, and only appear once")
-    in_op_start = 2
-
-    loadAndEmitOpcodes()
-
-#
 # Emit jump table
 #
 def emitJmpTable(start_label, prefix):
@@ -207,22 +206,24 @@
 
 #
 # Parse arch config file --
-# End of alternate opcode list; emit instruction blocks.
-# If jump table style, emit tables following
+# End of opcode list; emit instruction blocks.
 #
-def altOpEnd(tokens):
-    global in_alt_op_start
+def opEnd(tokens):
+    global in_op_start
     if len(tokens) != 1:
-        raise DataParseError("altOpEnd takes no arguments")
-    if in_alt_op_start != 1:
-        raise DataParseError("altOpEnd follows altOStart, once")
-    in_alt_op_start = 2
+        raise DataParseError("opEnd takes no arguments")
+    if in_op_start != 1:
+        raise DataParseError("opEnd must follow opStart, and only appear once")
+    in_op_start = 2
 
-    loadAndEmitAltOpcodes()
+    loadAndEmitOpcodes()
 
-    if jmp_table:
-        emitJmpTable("dvmAsmInstructionStart", label_prefix);
-        emitJmpTable("dvmAsmAltInstructionStart", alt_label_prefix);
+    if generate_alt_table:
+        loadAndEmitAltOpcodes()
+        if style == "jump-table":
+            emitJmpTable("dvmAsmInstructionStart", label_prefix);
+            emitJmpTable("dvmAsmAltInstructionStart", alt_label_prefix);
+
 
 #
 # Extract an ordered list of instructions from the VM sources.  We use the
@@ -247,7 +248,7 @@
     return opcodes
 
 def emitAlign():
-    if not jmp_table:
+    if style == "computed-goto":
         asm_fp.write("    .balign %d\n" % handler_size_bytes)
 
 #
@@ -257,7 +258,7 @@
     sister_list = []
     assert len(opcodes) == kNumPackedOpcodes
     need_dummy_start = False
-    if jmp_table:
+    if style == "jump-table":
         start_label = "dvmAsmInstructionStartCode"
         end_label = "dvmAsmInstructionEndCode"
     else:
@@ -298,7 +299,7 @@
     asm_fp.write("    .global %s\n" % end_label)
     asm_fp.write("%s:\n" % end_label)
 
-    if not jmp_table:
+    if style == "computed-goto":
         emitSectionComment("Sister implementations", asm_fp)
         asm_fp.write("    .global dvmAsmSisterStart\n")
         asm_fp.write("    .type   dvmAsmSisterStart, %function\n")
@@ -329,7 +330,7 @@
 #
 def loadAndEmitAltOpcodes():
     assert len(opcodes) == kNumPackedOpcodes
-    if jmp_table:
+    if style == "jump-table":
         start_label = "dvmAsmAltInstructionStartCode"
         end_label = "dvmAsmAltInstructionEndCode"
     else:
@@ -347,7 +348,7 @@
         if alt_opcode_locations.has_key(op):
             source = "%s/ALT_%s.S" % (alt_opcode_locations[op], op)
         else:
-            source = "%s/ALT_STUB.S" % default_alt_op_dir
+            source = default_alt_stub
         loadAndEmitAltStub(source, i)
 
     emitAlign()
@@ -462,7 +463,7 @@
 
         elif line.startswith("%break") and sister_list != None:
             # allow more than one %break, ignoring all following the first
-            if not jmp_table and not in_sister:
+            if style == "computed-goto" and not in_sister:
                 in_sister = True
                 sister_list.append("\n/* continuation for %(opcode)s */\n"%dict)
             continue
@@ -580,20 +581,23 @@
                 importFile(tokens)
             elif tokens[0] == "asm-stub":
                 setAsmStub(tokens)
+            elif tokens[0] == "asm-alt-stub":
+                setAsmAltStub(tokens)
             elif tokens[0] == "op-start":
                 opStart(tokens)
             elif tokens[0] == "op-end":
                 opEnd(tokens)
-            elif tokens[0] == "op-alt-start":
-                altOpStart(tokens)
-            elif tokens[0] == "op-alt-end":
-                altOpEnd(tokens)
             elif tokens[0] == "alt":
                 altEntry(tokens)
             elif tokens[0] == "op":
                 opEntry(tokens)
+            elif tokens[0] == "handler-style":
+                setHandlerStyle(tokens)
             else:
                 raise DataParseError, "unrecognized command '%s'" % tokens[0]
+            if style == None:
+                print "tokens[0] = %s" % tokens[0]
+                raise DataParseError, "handler-style must be first command"
 except DataParseError, err:
     print "Failed: " + str(err)
     # TODO: remove output files so "make" doesn't get confused
diff --git a/vm/mterp/out/InterpAsm-armv5te-vfp.S b/vm/mterp/out/InterpAsm-armv5te-vfp.S
index 12e31a4..94db581 100644
--- a/vm/mterp/out/InterpAsm-armv5te-vfp.S
+++ b/vm/mterp/out/InterpAsm-armv5te-vfp.S
@@ -13155,7 +13155,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NOP: /* 0x00 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13169,7 +13169,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE: /* 0x01 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13183,7 +13183,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_FROM16: /* 0x02 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13197,7 +13197,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_16: /* 0x03 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13211,7 +13211,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_WIDE: /* 0x04 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13225,7 +13225,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_WIDE_FROM16: /* 0x05 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13239,7 +13239,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_WIDE_16: /* 0x06 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13253,7 +13253,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_OBJECT: /* 0x07 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13267,7 +13267,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_OBJECT_FROM16: /* 0x08 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13281,7 +13281,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_OBJECT_16: /* 0x09 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13295,7 +13295,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_RESULT: /* 0x0a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13309,7 +13309,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_RESULT_WIDE: /* 0x0b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13323,7 +13323,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_RESULT_OBJECT: /* 0x0c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13337,7 +13337,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_EXCEPTION: /* 0x0d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13351,7 +13351,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_RETURN_VOID: /* 0x0e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13365,7 +13365,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_RETURN: /* 0x0f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13379,7 +13379,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_RETURN_WIDE: /* 0x10 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13393,7 +13393,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_RETURN_OBJECT: /* 0x11 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13407,7 +13407,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_4: /* 0x12 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13421,7 +13421,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_16: /* 0x13 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13435,7 +13435,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST: /* 0x14 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13449,7 +13449,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_HIGH16: /* 0x15 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13463,7 +13463,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_WIDE_16: /* 0x16 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13477,7 +13477,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_WIDE_32: /* 0x17 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13491,7 +13491,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_WIDE: /* 0x18 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13505,7 +13505,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_WIDE_HIGH16: /* 0x19 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13519,7 +13519,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_STRING: /* 0x1a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13533,7 +13533,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_STRING_JUMBO: /* 0x1b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13547,7 +13547,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_CLASS: /* 0x1c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13561,7 +13561,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MONITOR_ENTER: /* 0x1d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13575,7 +13575,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MONITOR_EXIT: /* 0x1e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13589,7 +13589,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CHECK_CAST: /* 0x1f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13603,7 +13603,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INSTANCE_OF: /* 0x20 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13617,7 +13617,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ARRAY_LENGTH: /* 0x21 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13631,7 +13631,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEW_INSTANCE: /* 0x22 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13645,7 +13645,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEW_ARRAY: /* 0x23 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13659,7 +13659,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_FILLED_NEW_ARRAY: /* 0x24 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13673,7 +13673,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_FILLED_NEW_ARRAY_RANGE: /* 0x25 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13687,7 +13687,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_FILL_ARRAY_DATA: /* 0x26 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13701,7 +13701,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_THROW: /* 0x27 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13715,7 +13715,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_GOTO: /* 0x28 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13729,7 +13729,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_GOTO_16: /* 0x29 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13743,7 +13743,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_GOTO_32: /* 0x2a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13757,7 +13757,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_PACKED_SWITCH: /* 0x2b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13771,7 +13771,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPARSE_SWITCH: /* 0x2c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13785,7 +13785,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CMPL_FLOAT: /* 0x2d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13799,7 +13799,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CMPG_FLOAT: /* 0x2e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13813,7 +13813,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CMPL_DOUBLE: /* 0x2f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13827,7 +13827,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CMPG_DOUBLE: /* 0x30 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13841,7 +13841,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CMP_LONG: /* 0x31 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13855,7 +13855,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_EQ: /* 0x32 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13869,7 +13869,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_NE: /* 0x33 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13883,7 +13883,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_LT: /* 0x34 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13897,7 +13897,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_GE: /* 0x35 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13911,7 +13911,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_GT: /* 0x36 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13925,7 +13925,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_LE: /* 0x37 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13939,7 +13939,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_EQZ: /* 0x38 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13953,7 +13953,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_NEZ: /* 0x39 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13967,7 +13967,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_LTZ: /* 0x3a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13981,7 +13981,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_GEZ: /* 0x3b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13995,7 +13995,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_GTZ: /* 0x3c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14009,7 +14009,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_LEZ: /* 0x3d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14023,7 +14023,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3E: /* 0x3e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14037,7 +14037,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3F: /* 0x3f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14051,7 +14051,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_40: /* 0x40 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14065,7 +14065,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_41: /* 0x41 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14079,7 +14079,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_42: /* 0x42 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14093,7 +14093,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_43: /* 0x43 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14107,7 +14107,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AGET: /* 0x44 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14121,7 +14121,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AGET_WIDE: /* 0x45 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14135,7 +14135,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AGET_OBJECT: /* 0x46 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14149,7 +14149,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AGET_BOOLEAN: /* 0x47 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14163,7 +14163,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AGET_BYTE: /* 0x48 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14177,7 +14177,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AGET_CHAR: /* 0x49 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14191,7 +14191,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AGET_SHORT: /* 0x4a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14205,7 +14205,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_APUT: /* 0x4b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14219,7 +14219,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_APUT_WIDE: /* 0x4c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14233,7 +14233,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_APUT_OBJECT: /* 0x4d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14247,7 +14247,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_APUT_BOOLEAN: /* 0x4e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14261,7 +14261,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_APUT_BYTE: /* 0x4f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14275,7 +14275,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_APUT_CHAR: /* 0x50 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14289,7 +14289,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_APUT_SHORT: /* 0x51 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14303,7 +14303,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET: /* 0x52 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14317,7 +14317,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_WIDE: /* 0x53 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14331,7 +14331,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_OBJECT: /* 0x54 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14345,7 +14345,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_BOOLEAN: /* 0x55 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14359,7 +14359,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_BYTE: /* 0x56 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14373,7 +14373,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_CHAR: /* 0x57 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14387,7 +14387,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_SHORT: /* 0x58 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14401,7 +14401,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT: /* 0x59 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14415,7 +14415,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_WIDE: /* 0x5a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14429,7 +14429,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_OBJECT: /* 0x5b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14443,7 +14443,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_BOOLEAN: /* 0x5c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14457,7 +14457,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_BYTE: /* 0x5d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14471,7 +14471,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_CHAR: /* 0x5e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14485,7 +14485,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_SHORT: /* 0x5f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14499,7 +14499,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET: /* 0x60 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14513,7 +14513,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_WIDE: /* 0x61 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14527,7 +14527,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_OBJECT: /* 0x62 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14541,7 +14541,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_BOOLEAN: /* 0x63 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14555,7 +14555,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_BYTE: /* 0x64 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14569,7 +14569,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_CHAR: /* 0x65 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14583,7 +14583,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_SHORT: /* 0x66 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14597,7 +14597,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT: /* 0x67 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14611,7 +14611,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_WIDE: /* 0x68 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14625,7 +14625,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_OBJECT: /* 0x69 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14639,7 +14639,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_BOOLEAN: /* 0x6a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14653,7 +14653,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_BYTE: /* 0x6b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14667,7 +14667,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_CHAR: /* 0x6c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14681,7 +14681,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_SHORT: /* 0x6d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14695,7 +14695,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_VIRTUAL: /* 0x6e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14709,7 +14709,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_SUPER: /* 0x6f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14723,7 +14723,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_DIRECT: /* 0x70 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14737,7 +14737,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_STATIC: /* 0x71 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14751,7 +14751,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_INTERFACE: /* 0x72 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14765,7 +14765,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_73: /* 0x73 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14779,7 +14779,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_VIRTUAL_RANGE: /* 0x74 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14793,7 +14793,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_SUPER_RANGE: /* 0x75 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14807,7 +14807,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_DIRECT_RANGE: /* 0x76 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14821,7 +14821,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_STATIC_RANGE: /* 0x77 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14835,7 +14835,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_INTERFACE_RANGE: /* 0x78 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14849,7 +14849,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_79: /* 0x79 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14863,7 +14863,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_7A: /* 0x7a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14877,7 +14877,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEG_INT: /* 0x7b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14891,7 +14891,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NOT_INT: /* 0x7c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14905,7 +14905,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEG_LONG: /* 0x7d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14919,7 +14919,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NOT_LONG: /* 0x7e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14933,7 +14933,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEG_FLOAT: /* 0x7f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14947,7 +14947,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEG_DOUBLE: /* 0x80 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14961,7 +14961,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INT_TO_LONG: /* 0x81 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14975,7 +14975,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INT_TO_FLOAT: /* 0x82 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14989,7 +14989,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INT_TO_DOUBLE: /* 0x83 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15003,7 +15003,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_LONG_TO_INT: /* 0x84 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15017,7 +15017,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_LONG_TO_FLOAT: /* 0x85 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15031,7 +15031,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_LONG_TO_DOUBLE: /* 0x86 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15045,7 +15045,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_FLOAT_TO_INT: /* 0x87 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15059,7 +15059,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_FLOAT_TO_LONG: /* 0x88 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15073,7 +15073,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_FLOAT_TO_DOUBLE: /* 0x89 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15087,7 +15087,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DOUBLE_TO_INT: /* 0x8a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15101,7 +15101,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DOUBLE_TO_LONG: /* 0x8b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15115,7 +15115,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DOUBLE_TO_FLOAT: /* 0x8c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15129,7 +15129,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INT_TO_BYTE: /* 0x8d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15143,7 +15143,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INT_TO_CHAR: /* 0x8e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15157,7 +15157,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INT_TO_SHORT: /* 0x8f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15171,7 +15171,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_INT: /* 0x90 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15185,7 +15185,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_INT: /* 0x91 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15199,7 +15199,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_INT: /* 0x92 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15213,7 +15213,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_INT: /* 0x93 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15227,7 +15227,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_INT: /* 0x94 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15241,7 +15241,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AND_INT: /* 0x95 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15255,7 +15255,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_OR_INT: /* 0x96 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15269,7 +15269,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_XOR_INT: /* 0x97 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15283,7 +15283,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHL_INT: /* 0x98 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15297,7 +15297,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHR_INT: /* 0x99 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15311,7 +15311,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_USHR_INT: /* 0x9a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15325,7 +15325,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_LONG: /* 0x9b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15339,7 +15339,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_LONG: /* 0x9c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15353,7 +15353,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_LONG: /* 0x9d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15367,7 +15367,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_LONG: /* 0x9e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15381,7 +15381,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_LONG: /* 0x9f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15395,7 +15395,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AND_LONG: /* 0xa0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15409,7 +15409,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_OR_LONG: /* 0xa1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15423,7 +15423,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_XOR_LONG: /* 0xa2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15437,7 +15437,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHL_LONG: /* 0xa3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15451,7 +15451,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHR_LONG: /* 0xa4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15465,7 +15465,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_USHR_LONG: /* 0xa5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15479,7 +15479,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_FLOAT: /* 0xa6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15493,7 +15493,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_FLOAT: /* 0xa7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15507,7 +15507,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_FLOAT: /* 0xa8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15521,7 +15521,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_FLOAT: /* 0xa9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15535,7 +15535,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_FLOAT: /* 0xaa */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15549,7 +15549,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_DOUBLE: /* 0xab */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15563,7 +15563,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_DOUBLE: /* 0xac */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15577,7 +15577,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_DOUBLE: /* 0xad */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15591,7 +15591,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_DOUBLE: /* 0xae */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15605,7 +15605,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_DOUBLE: /* 0xaf */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15619,7 +15619,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_INT_2ADDR: /* 0xb0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15633,7 +15633,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_INT_2ADDR: /* 0xb1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15647,7 +15647,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_INT_2ADDR: /* 0xb2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15661,7 +15661,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_INT_2ADDR: /* 0xb3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15675,7 +15675,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_INT_2ADDR: /* 0xb4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15689,7 +15689,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AND_INT_2ADDR: /* 0xb5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15703,7 +15703,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_OR_INT_2ADDR: /* 0xb6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15717,7 +15717,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_XOR_INT_2ADDR: /* 0xb7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15731,7 +15731,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHL_INT_2ADDR: /* 0xb8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15745,7 +15745,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHR_INT_2ADDR: /* 0xb9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15759,7 +15759,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_USHR_INT_2ADDR: /* 0xba */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15773,7 +15773,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_LONG_2ADDR: /* 0xbb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15787,7 +15787,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_LONG_2ADDR: /* 0xbc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15801,7 +15801,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_LONG_2ADDR: /* 0xbd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15815,7 +15815,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_LONG_2ADDR: /* 0xbe */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15829,7 +15829,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_LONG_2ADDR: /* 0xbf */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15843,7 +15843,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AND_LONG_2ADDR: /* 0xc0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15857,7 +15857,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_OR_LONG_2ADDR: /* 0xc1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15871,7 +15871,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_XOR_LONG_2ADDR: /* 0xc2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15885,7 +15885,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHL_LONG_2ADDR: /* 0xc3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15899,7 +15899,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHR_LONG_2ADDR: /* 0xc4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15913,7 +15913,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_USHR_LONG_2ADDR: /* 0xc5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15927,7 +15927,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_FLOAT_2ADDR: /* 0xc6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15941,7 +15941,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_FLOAT_2ADDR: /* 0xc7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15955,7 +15955,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_FLOAT_2ADDR: /* 0xc8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15969,7 +15969,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_FLOAT_2ADDR: /* 0xc9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15983,7 +15983,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_FLOAT_2ADDR: /* 0xca */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15997,7 +15997,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_DOUBLE_2ADDR: /* 0xcb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16011,7 +16011,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_DOUBLE_2ADDR: /* 0xcc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16025,7 +16025,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_DOUBLE_2ADDR: /* 0xcd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16039,7 +16039,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_DOUBLE_2ADDR: /* 0xce */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16053,7 +16053,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_DOUBLE_2ADDR: /* 0xcf */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16067,7 +16067,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_INT_LIT16: /* 0xd0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16081,7 +16081,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_RSUB_INT: /* 0xd1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16095,7 +16095,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_INT_LIT16: /* 0xd2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16109,7 +16109,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_INT_LIT16: /* 0xd3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16123,7 +16123,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_INT_LIT16: /* 0xd4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16137,7 +16137,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AND_INT_LIT16: /* 0xd5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16151,7 +16151,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_OR_INT_LIT16: /* 0xd6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16165,7 +16165,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_XOR_INT_LIT16: /* 0xd7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16179,7 +16179,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_INT_LIT8: /* 0xd8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16193,7 +16193,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_RSUB_INT_LIT8: /* 0xd9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16207,7 +16207,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_INT_LIT8: /* 0xda */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16221,7 +16221,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_INT_LIT8: /* 0xdb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16235,7 +16235,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_INT_LIT8: /* 0xdc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16249,7 +16249,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AND_INT_LIT8: /* 0xdd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16263,7 +16263,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_OR_INT_LIT8: /* 0xde */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16277,7 +16277,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_XOR_INT_LIT8: /* 0xdf */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16291,7 +16291,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHL_INT_LIT8: /* 0xe0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16305,7 +16305,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHR_INT_LIT8: /* 0xe1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16319,7 +16319,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_USHR_INT_LIT8: /* 0xe2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16333,7 +16333,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_VOLATILE: /* 0xe3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16347,7 +16347,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_VOLATILE: /* 0xe4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16361,7 +16361,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_VOLATILE: /* 0xe5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16375,7 +16375,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_VOLATILE: /* 0xe6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16389,7 +16389,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_OBJECT_VOLATILE: /* 0xe7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16403,7 +16403,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_WIDE_VOLATILE: /* 0xe8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16417,7 +16417,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_WIDE_VOLATILE: /* 0xe9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16431,7 +16431,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_WIDE_VOLATILE: /* 0xea */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16445,7 +16445,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_WIDE_VOLATILE: /* 0xeb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16459,7 +16459,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_BREAKPOINT: /* 0xec */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16473,7 +16473,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_THROW_VERIFICATION_ERROR: /* 0xed */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16487,7 +16487,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_EXECUTE_INLINE: /* 0xee */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16501,7 +16501,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_EXECUTE_INLINE_RANGE: /* 0xef */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16515,7 +16515,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_OBJECT_INIT: /* 0xf0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16529,7 +16529,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_RETURN_VOID_BARRIER: /* 0xf1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16543,7 +16543,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_QUICK: /* 0xf2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16557,7 +16557,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_WIDE_QUICK: /* 0xf3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16571,7 +16571,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_OBJECT_QUICK: /* 0xf4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16585,7 +16585,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_QUICK: /* 0xf5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16599,7 +16599,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_WIDE_QUICK: /* 0xf6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16613,7 +16613,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_OBJECT_QUICK: /* 0xf7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16627,7 +16627,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_VIRTUAL_QUICK: /* 0xf8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16641,7 +16641,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_VIRTUAL_QUICK_RANGE: /* 0xf9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16655,7 +16655,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_SUPER_QUICK: /* 0xfa */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16669,7 +16669,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_SUPER_QUICK_RANGE: /* 0xfb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16683,7 +16683,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_OBJECT_VOLATILE: /* 0xfc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16697,7 +16697,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_OBJECT_VOLATILE: /* 0xfd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16711,7 +16711,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_OBJECT_VOLATILE: /* 0xfe */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16725,16 +16725,21 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DISPATCH_FF: /* 0xff */
-/* File: armv5te/ALT_OP_DISPATCH_FF.S */
-    mov     ip, rINST, lsr #8            @ ip<- extended opcode
-    add     ip, ip, #256                 @ add offset for extended opcodes
-    GOTO_OPCODE(ip)                      @ go to proper extended handler
-
+/* File: armv5te/alt_stub.S */
+/*
+ * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
+ * any interesting requests and then jump to the real instruction
+ * handler.  Note that the call to dvmCheckInst is done as a tail call.
+ */
+    adrl   lr, dvmAsmInstructionStart + (255 * 64)
+    mov    r0, rPC              @ arg0
+    mov    r1, rSELF            @ arg1
+    b      dvmCheckInst         @ (dPC,self) tail call to instruction checker
 
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_CLASS_JUMBO: /* 0x100 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16748,7 +16753,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CHECK_CAST_JUMBO: /* 0x101 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16762,7 +16767,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INSTANCE_OF_JUMBO: /* 0x102 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16776,7 +16781,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEW_INSTANCE_JUMBO: /* 0x103 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16790,7 +16795,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEW_ARRAY_JUMBO: /* 0x104 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16804,7 +16809,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_FILLED_NEW_ARRAY_JUMBO: /* 0x105 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16818,7 +16823,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_JUMBO: /* 0x106 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16832,7 +16837,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_WIDE_JUMBO: /* 0x107 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16846,7 +16851,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_OBJECT_JUMBO: /* 0x108 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16860,7 +16865,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_BOOLEAN_JUMBO: /* 0x109 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16874,7 +16879,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_BYTE_JUMBO: /* 0x10a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16888,7 +16893,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_CHAR_JUMBO: /* 0x10b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16902,7 +16907,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_SHORT_JUMBO: /* 0x10c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16916,7 +16921,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_JUMBO: /* 0x10d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16930,7 +16935,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_WIDE_JUMBO: /* 0x10e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16944,7 +16949,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_OBJECT_JUMBO: /* 0x10f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16958,7 +16963,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_BOOLEAN_JUMBO: /* 0x110 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16972,7 +16977,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_BYTE_JUMBO: /* 0x111 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16986,7 +16991,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_CHAR_JUMBO: /* 0x112 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17000,7 +17005,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_SHORT_JUMBO: /* 0x113 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17014,7 +17019,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_JUMBO: /* 0x114 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17028,7 +17033,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_WIDE_JUMBO: /* 0x115 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17042,7 +17047,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_OBJECT_JUMBO: /* 0x116 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17056,7 +17061,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_BOOLEAN_JUMBO: /* 0x117 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17070,7 +17075,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_BYTE_JUMBO: /* 0x118 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17084,7 +17089,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_CHAR_JUMBO: /* 0x119 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17098,7 +17103,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_SHORT_JUMBO: /* 0x11a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17112,7 +17117,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_JUMBO: /* 0x11b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17126,7 +17131,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_WIDE_JUMBO: /* 0x11c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17140,7 +17145,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_OBJECT_JUMBO: /* 0x11d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17154,7 +17159,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_BOOLEAN_JUMBO: /* 0x11e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17168,7 +17173,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_BYTE_JUMBO: /* 0x11f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17182,7 +17187,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_CHAR_JUMBO: /* 0x120 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17196,7 +17201,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_SHORT_JUMBO: /* 0x121 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17210,7 +17215,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_VIRTUAL_JUMBO: /* 0x122 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17224,7 +17229,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_SUPER_JUMBO: /* 0x123 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17238,7 +17243,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_DIRECT_JUMBO: /* 0x124 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17252,7 +17257,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_STATIC_JUMBO: /* 0x125 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17266,7 +17271,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_INTERFACE_JUMBO: /* 0x126 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17280,7 +17285,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_27FF: /* 0x127 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17294,7 +17299,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_28FF: /* 0x128 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17308,7 +17313,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_29FF: /* 0x129 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17322,7 +17327,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_2AFF: /* 0x12a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17336,7 +17341,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_2BFF: /* 0x12b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17350,7 +17355,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_2CFF: /* 0x12c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17364,7 +17369,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_2DFF: /* 0x12d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17378,7 +17383,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_2EFF: /* 0x12e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17392,7 +17397,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_2FFF: /* 0x12f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17406,7 +17411,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_30FF: /* 0x130 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17420,7 +17425,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_31FF: /* 0x131 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17434,7 +17439,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_32FF: /* 0x132 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17448,7 +17453,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_33FF: /* 0x133 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17462,7 +17467,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_34FF: /* 0x134 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17476,7 +17481,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_35FF: /* 0x135 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17490,7 +17495,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_36FF: /* 0x136 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17504,7 +17509,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_37FF: /* 0x137 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17518,7 +17523,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_38FF: /* 0x138 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17532,7 +17537,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_39FF: /* 0x139 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17546,7 +17551,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3AFF: /* 0x13a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17560,7 +17565,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3BFF: /* 0x13b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17574,7 +17579,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3CFF: /* 0x13c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17588,7 +17593,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3DFF: /* 0x13d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17602,7 +17607,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3EFF: /* 0x13e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17616,7 +17621,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3FFF: /* 0x13f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17630,7 +17635,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_40FF: /* 0x140 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17644,7 +17649,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_41FF: /* 0x141 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17658,7 +17663,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_42FF: /* 0x142 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17672,7 +17677,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_43FF: /* 0x143 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17686,7 +17691,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_44FF: /* 0x144 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17700,7 +17705,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_45FF: /* 0x145 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17714,7 +17719,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_46FF: /* 0x146 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17728,7 +17733,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_47FF: /* 0x147 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17742,7 +17747,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_48FF: /* 0x148 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17756,7 +17761,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_49FF: /* 0x149 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17770,7 +17775,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_4AFF: /* 0x14a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17784,7 +17789,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_4BFF: /* 0x14b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17798,7 +17803,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_4CFF: /* 0x14c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17812,7 +17817,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_4DFF: /* 0x14d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17826,7 +17831,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_4EFF: /* 0x14e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17840,7 +17845,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_4FFF: /* 0x14f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17854,7 +17859,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_50FF: /* 0x150 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17868,7 +17873,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_51FF: /* 0x151 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17882,7 +17887,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_52FF: /* 0x152 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17896,7 +17901,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_53FF: /* 0x153 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17910,7 +17915,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_54FF: /* 0x154 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17924,7 +17929,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_55FF: /* 0x155 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17938,7 +17943,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_56FF: /* 0x156 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17952,7 +17957,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_57FF: /* 0x157 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17966,7 +17971,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_58FF: /* 0x158 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17980,7 +17985,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_59FF: /* 0x159 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17994,7 +17999,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_5AFF: /* 0x15a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18008,7 +18013,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_5BFF: /* 0x15b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18022,7 +18027,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_5CFF: /* 0x15c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18036,7 +18041,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_5DFF: /* 0x15d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18050,7 +18055,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_5EFF: /* 0x15e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18064,7 +18069,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_5FFF: /* 0x15f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18078,7 +18083,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_60FF: /* 0x160 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18092,7 +18097,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_61FF: /* 0x161 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18106,7 +18111,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_62FF: /* 0x162 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18120,7 +18125,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_63FF: /* 0x163 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18134,7 +18139,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_64FF: /* 0x164 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18148,7 +18153,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_65FF: /* 0x165 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18162,7 +18167,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_66FF: /* 0x166 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18176,7 +18181,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_67FF: /* 0x167 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18190,7 +18195,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_68FF: /* 0x168 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18204,7 +18209,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_69FF: /* 0x169 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18218,7 +18223,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_6AFF: /* 0x16a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18232,7 +18237,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_6BFF: /* 0x16b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18246,7 +18251,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_6CFF: /* 0x16c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18260,7 +18265,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_6DFF: /* 0x16d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18274,7 +18279,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_6EFF: /* 0x16e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18288,7 +18293,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_6FFF: /* 0x16f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18302,7 +18307,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_70FF: /* 0x170 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18316,7 +18321,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_71FF: /* 0x171 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18330,7 +18335,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_72FF: /* 0x172 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18344,7 +18349,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_73FF: /* 0x173 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18358,7 +18363,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_74FF: /* 0x174 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18372,7 +18377,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_75FF: /* 0x175 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18386,7 +18391,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_76FF: /* 0x176 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18400,7 +18405,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_77FF: /* 0x177 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18414,7 +18419,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_78FF: /* 0x178 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18428,7 +18433,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_79FF: /* 0x179 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18442,7 +18447,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_7AFF: /* 0x17a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18456,7 +18461,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_7BFF: /* 0x17b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18470,7 +18475,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_7CFF: /* 0x17c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18484,7 +18489,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_7DFF: /* 0x17d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18498,7 +18503,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_7EFF: /* 0x17e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18512,7 +18517,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_7FFF: /* 0x17f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18526,7 +18531,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_80FF: /* 0x180 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18540,7 +18545,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_81FF: /* 0x181 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18554,7 +18559,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_82FF: /* 0x182 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18568,7 +18573,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_83FF: /* 0x183 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18582,7 +18587,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_84FF: /* 0x184 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18596,7 +18601,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_85FF: /* 0x185 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18610,7 +18615,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_86FF: /* 0x186 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18624,7 +18629,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_87FF: /* 0x187 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18638,7 +18643,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_88FF: /* 0x188 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18652,7 +18657,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_89FF: /* 0x189 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18666,7 +18671,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_8AFF: /* 0x18a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18680,7 +18685,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_8BFF: /* 0x18b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18694,7 +18699,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_8CFF: /* 0x18c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18708,7 +18713,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_8DFF: /* 0x18d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18722,7 +18727,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_8EFF: /* 0x18e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18736,7 +18741,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_8FFF: /* 0x18f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18750,7 +18755,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_90FF: /* 0x190 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18764,7 +18769,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_91FF: /* 0x191 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18778,7 +18783,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_92FF: /* 0x192 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18792,7 +18797,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_93FF: /* 0x193 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18806,7 +18811,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_94FF: /* 0x194 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18820,7 +18825,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_95FF: /* 0x195 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18834,7 +18839,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_96FF: /* 0x196 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18848,7 +18853,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_97FF: /* 0x197 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18862,7 +18867,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_98FF: /* 0x198 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18876,7 +18881,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_99FF: /* 0x199 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18890,7 +18895,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_9AFF: /* 0x19a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18904,7 +18909,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_9BFF: /* 0x19b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18918,7 +18923,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_9CFF: /* 0x19c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18932,7 +18937,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_9DFF: /* 0x19d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18946,7 +18951,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_9EFF: /* 0x19e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18960,7 +18965,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_9FFF: /* 0x19f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18974,7 +18979,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A0FF: /* 0x1a0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18988,7 +18993,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A1FF: /* 0x1a1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19002,7 +19007,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A2FF: /* 0x1a2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19016,7 +19021,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A3FF: /* 0x1a3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19030,7 +19035,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A4FF: /* 0x1a4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19044,7 +19049,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A5FF: /* 0x1a5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19058,7 +19063,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A6FF: /* 0x1a6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19072,7 +19077,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A7FF: /* 0x1a7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19086,7 +19091,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A8FF: /* 0x1a8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19100,7 +19105,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A9FF: /* 0x1a9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19114,7 +19119,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_AAFF: /* 0x1aa */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19128,7 +19133,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_ABFF: /* 0x1ab */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19142,7 +19147,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_ACFF: /* 0x1ac */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19156,7 +19161,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_ADFF: /* 0x1ad */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19170,7 +19175,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_AEFF: /* 0x1ae */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19184,7 +19189,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_AFFF: /* 0x1af */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19198,7 +19203,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B0FF: /* 0x1b0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19212,7 +19217,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B1FF: /* 0x1b1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19226,7 +19231,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B2FF: /* 0x1b2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19240,7 +19245,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B3FF: /* 0x1b3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19254,7 +19259,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B4FF: /* 0x1b4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19268,7 +19273,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B5FF: /* 0x1b5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19282,7 +19287,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B6FF: /* 0x1b6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19296,7 +19301,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B7FF: /* 0x1b7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19310,7 +19315,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B8FF: /* 0x1b8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19324,7 +19329,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B9FF: /* 0x1b9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19338,7 +19343,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_BAFF: /* 0x1ba */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19352,7 +19357,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_BBFF: /* 0x1bb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19366,7 +19371,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_BCFF: /* 0x1bc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19380,7 +19385,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_BDFF: /* 0x1bd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19394,7 +19399,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_BEFF: /* 0x1be */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19408,7 +19413,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_BFFF: /* 0x1bf */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19422,7 +19427,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C0FF: /* 0x1c0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19436,7 +19441,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C1FF: /* 0x1c1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19450,7 +19455,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C2FF: /* 0x1c2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19464,7 +19469,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C3FF: /* 0x1c3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19478,7 +19483,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C4FF: /* 0x1c4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19492,7 +19497,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C5FF: /* 0x1c5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19506,7 +19511,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C6FF: /* 0x1c6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19520,7 +19525,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C7FF: /* 0x1c7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19534,7 +19539,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C8FF: /* 0x1c8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19548,7 +19553,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C9FF: /* 0x1c9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19562,7 +19567,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_CAFF: /* 0x1ca */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19576,7 +19581,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_CBFF: /* 0x1cb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19590,7 +19595,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_CCFF: /* 0x1cc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19604,7 +19609,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_CDFF: /* 0x1cd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19618,7 +19623,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_CEFF: /* 0x1ce */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19632,7 +19637,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_CFFF: /* 0x1cf */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19646,7 +19651,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D0FF: /* 0x1d0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19660,7 +19665,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D1FF: /* 0x1d1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19674,7 +19679,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D2FF: /* 0x1d2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19688,7 +19693,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D3FF: /* 0x1d3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19702,7 +19707,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D4FF: /* 0x1d4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19716,7 +19721,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D5FF: /* 0x1d5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19730,7 +19735,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D6FF: /* 0x1d6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19744,7 +19749,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D7FF: /* 0x1d7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19758,7 +19763,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D8FF: /* 0x1d8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19772,7 +19777,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D9FF: /* 0x1d9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19786,7 +19791,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_DAFF: /* 0x1da */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19800,7 +19805,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_DBFF: /* 0x1db */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19814,7 +19819,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_DCFF: /* 0x1dc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19828,7 +19833,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_DDFF: /* 0x1dd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19842,7 +19847,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_DEFF: /* 0x1de */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19856,7 +19861,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_DFFF: /* 0x1df */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19870,7 +19875,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E0FF: /* 0x1e0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19884,7 +19889,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E1FF: /* 0x1e1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19898,7 +19903,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E2FF: /* 0x1e2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19912,7 +19917,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E3FF: /* 0x1e3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19926,7 +19931,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E4FF: /* 0x1e4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19940,7 +19945,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E5FF: /* 0x1e5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19954,7 +19959,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E6FF: /* 0x1e6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19968,7 +19973,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E7FF: /* 0x1e7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19982,7 +19987,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E8FF: /* 0x1e8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19996,7 +20001,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E9FF: /* 0x1e9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20010,7 +20015,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_EAFF: /* 0x1ea */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20024,7 +20029,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_EBFF: /* 0x1eb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20038,7 +20043,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_ECFF: /* 0x1ec */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20052,7 +20057,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_EDFF: /* 0x1ed */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20066,7 +20071,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_EEFF: /* 0x1ee */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20080,7 +20085,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_EFFF: /* 0x1ef */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20094,7 +20099,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F0FF: /* 0x1f0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20108,7 +20113,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F1FF: /* 0x1f1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20122,7 +20127,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F2FF: /* 0x1f2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20136,7 +20141,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F3FF: /* 0x1f3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20150,7 +20155,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F4FF: /* 0x1f4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20164,7 +20169,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F5FF: /* 0x1f5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20178,7 +20183,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F6FF: /* 0x1f6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20192,7 +20197,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F7FF: /* 0x1f7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20206,7 +20211,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F8FF: /* 0x1f8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20220,7 +20225,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F9FF: /* 0x1f9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20234,7 +20239,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_FAFF: /* 0x1fa */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20248,7 +20253,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_FBFF: /* 0x1fb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20262,7 +20267,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_FCFF: /* 0x1fc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20276,7 +20281,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_FDFF: /* 0x1fd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20290,7 +20295,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_FEFF: /* 0x1fe */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20304,7 +20309,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_THROW_VERIFICATION_ERROR_JUMBO: /* 0x1ff */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
diff --git a/vm/mterp/out/InterpAsm-armv5te.S b/vm/mterp/out/InterpAsm-armv5te.S
index a36a75a..4134327 100644
--- a/vm/mterp/out/InterpAsm-armv5te.S
+++ b/vm/mterp/out/InterpAsm-armv5te.S
@@ -13613,7 +13613,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NOP: /* 0x00 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13627,7 +13627,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE: /* 0x01 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13641,7 +13641,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_FROM16: /* 0x02 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13655,7 +13655,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_16: /* 0x03 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13669,7 +13669,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_WIDE: /* 0x04 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13683,7 +13683,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_WIDE_FROM16: /* 0x05 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13697,7 +13697,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_WIDE_16: /* 0x06 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13711,7 +13711,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_OBJECT: /* 0x07 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13725,7 +13725,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_OBJECT_FROM16: /* 0x08 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13739,7 +13739,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_OBJECT_16: /* 0x09 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13753,7 +13753,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_RESULT: /* 0x0a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13767,7 +13767,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_RESULT_WIDE: /* 0x0b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13781,7 +13781,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_RESULT_OBJECT: /* 0x0c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13795,7 +13795,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_EXCEPTION: /* 0x0d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13809,7 +13809,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_RETURN_VOID: /* 0x0e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13823,7 +13823,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_RETURN: /* 0x0f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13837,7 +13837,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_RETURN_WIDE: /* 0x10 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13851,7 +13851,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_RETURN_OBJECT: /* 0x11 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13865,7 +13865,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_4: /* 0x12 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13879,7 +13879,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_16: /* 0x13 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13893,7 +13893,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST: /* 0x14 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13907,7 +13907,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_HIGH16: /* 0x15 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13921,7 +13921,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_WIDE_16: /* 0x16 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13935,7 +13935,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_WIDE_32: /* 0x17 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13949,7 +13949,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_WIDE: /* 0x18 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13963,7 +13963,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_WIDE_HIGH16: /* 0x19 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13977,7 +13977,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_STRING: /* 0x1a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13991,7 +13991,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_STRING_JUMBO: /* 0x1b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14005,7 +14005,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_CLASS: /* 0x1c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14019,7 +14019,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MONITOR_ENTER: /* 0x1d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14033,7 +14033,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MONITOR_EXIT: /* 0x1e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14047,7 +14047,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CHECK_CAST: /* 0x1f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14061,7 +14061,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INSTANCE_OF: /* 0x20 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14075,7 +14075,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ARRAY_LENGTH: /* 0x21 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14089,7 +14089,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEW_INSTANCE: /* 0x22 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14103,7 +14103,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEW_ARRAY: /* 0x23 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14117,7 +14117,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_FILLED_NEW_ARRAY: /* 0x24 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14131,7 +14131,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_FILLED_NEW_ARRAY_RANGE: /* 0x25 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14145,7 +14145,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_FILL_ARRAY_DATA: /* 0x26 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14159,7 +14159,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_THROW: /* 0x27 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14173,7 +14173,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_GOTO: /* 0x28 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14187,7 +14187,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_GOTO_16: /* 0x29 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14201,7 +14201,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_GOTO_32: /* 0x2a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14215,7 +14215,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_PACKED_SWITCH: /* 0x2b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14229,7 +14229,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPARSE_SWITCH: /* 0x2c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14243,7 +14243,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CMPL_FLOAT: /* 0x2d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14257,7 +14257,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CMPG_FLOAT: /* 0x2e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14271,7 +14271,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CMPL_DOUBLE: /* 0x2f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14285,7 +14285,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CMPG_DOUBLE: /* 0x30 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14299,7 +14299,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CMP_LONG: /* 0x31 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14313,7 +14313,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_EQ: /* 0x32 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14327,7 +14327,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_NE: /* 0x33 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14341,7 +14341,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_LT: /* 0x34 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14355,7 +14355,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_GE: /* 0x35 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14369,7 +14369,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_GT: /* 0x36 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14383,7 +14383,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_LE: /* 0x37 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14397,7 +14397,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_EQZ: /* 0x38 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14411,7 +14411,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_NEZ: /* 0x39 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14425,7 +14425,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_LTZ: /* 0x3a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14439,7 +14439,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_GEZ: /* 0x3b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14453,7 +14453,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_GTZ: /* 0x3c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14467,7 +14467,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_LEZ: /* 0x3d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14481,7 +14481,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3E: /* 0x3e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14495,7 +14495,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3F: /* 0x3f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14509,7 +14509,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_40: /* 0x40 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14523,7 +14523,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_41: /* 0x41 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14537,7 +14537,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_42: /* 0x42 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14551,7 +14551,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_43: /* 0x43 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14565,7 +14565,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AGET: /* 0x44 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14579,7 +14579,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AGET_WIDE: /* 0x45 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14593,7 +14593,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AGET_OBJECT: /* 0x46 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14607,7 +14607,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AGET_BOOLEAN: /* 0x47 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14621,7 +14621,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AGET_BYTE: /* 0x48 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14635,7 +14635,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AGET_CHAR: /* 0x49 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14649,7 +14649,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AGET_SHORT: /* 0x4a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14663,7 +14663,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_APUT: /* 0x4b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14677,7 +14677,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_APUT_WIDE: /* 0x4c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14691,7 +14691,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_APUT_OBJECT: /* 0x4d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14705,7 +14705,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_APUT_BOOLEAN: /* 0x4e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14719,7 +14719,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_APUT_BYTE: /* 0x4f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14733,7 +14733,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_APUT_CHAR: /* 0x50 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14747,7 +14747,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_APUT_SHORT: /* 0x51 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14761,7 +14761,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET: /* 0x52 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14775,7 +14775,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_WIDE: /* 0x53 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14789,7 +14789,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_OBJECT: /* 0x54 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14803,7 +14803,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_BOOLEAN: /* 0x55 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14817,7 +14817,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_BYTE: /* 0x56 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14831,7 +14831,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_CHAR: /* 0x57 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14845,7 +14845,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_SHORT: /* 0x58 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14859,7 +14859,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT: /* 0x59 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14873,7 +14873,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_WIDE: /* 0x5a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14887,7 +14887,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_OBJECT: /* 0x5b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14901,7 +14901,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_BOOLEAN: /* 0x5c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14915,7 +14915,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_BYTE: /* 0x5d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14929,7 +14929,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_CHAR: /* 0x5e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14943,7 +14943,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_SHORT: /* 0x5f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14957,7 +14957,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET: /* 0x60 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14971,7 +14971,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_WIDE: /* 0x61 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14985,7 +14985,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_OBJECT: /* 0x62 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14999,7 +14999,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_BOOLEAN: /* 0x63 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15013,7 +15013,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_BYTE: /* 0x64 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15027,7 +15027,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_CHAR: /* 0x65 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15041,7 +15041,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_SHORT: /* 0x66 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15055,7 +15055,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT: /* 0x67 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15069,7 +15069,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_WIDE: /* 0x68 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15083,7 +15083,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_OBJECT: /* 0x69 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15097,7 +15097,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_BOOLEAN: /* 0x6a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15111,7 +15111,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_BYTE: /* 0x6b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15125,7 +15125,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_CHAR: /* 0x6c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15139,7 +15139,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_SHORT: /* 0x6d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15153,7 +15153,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_VIRTUAL: /* 0x6e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15167,7 +15167,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_SUPER: /* 0x6f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15181,7 +15181,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_DIRECT: /* 0x70 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15195,7 +15195,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_STATIC: /* 0x71 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15209,7 +15209,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_INTERFACE: /* 0x72 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15223,7 +15223,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_73: /* 0x73 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15237,7 +15237,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_VIRTUAL_RANGE: /* 0x74 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15251,7 +15251,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_SUPER_RANGE: /* 0x75 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15265,7 +15265,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_DIRECT_RANGE: /* 0x76 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15279,7 +15279,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_STATIC_RANGE: /* 0x77 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15293,7 +15293,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_INTERFACE_RANGE: /* 0x78 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15307,7 +15307,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_79: /* 0x79 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15321,7 +15321,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_7A: /* 0x7a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15335,7 +15335,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEG_INT: /* 0x7b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15349,7 +15349,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NOT_INT: /* 0x7c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15363,7 +15363,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEG_LONG: /* 0x7d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15377,7 +15377,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NOT_LONG: /* 0x7e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15391,7 +15391,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEG_FLOAT: /* 0x7f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15405,7 +15405,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEG_DOUBLE: /* 0x80 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15419,7 +15419,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INT_TO_LONG: /* 0x81 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15433,7 +15433,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INT_TO_FLOAT: /* 0x82 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15447,7 +15447,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INT_TO_DOUBLE: /* 0x83 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15461,7 +15461,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_LONG_TO_INT: /* 0x84 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15475,7 +15475,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_LONG_TO_FLOAT: /* 0x85 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15489,7 +15489,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_LONG_TO_DOUBLE: /* 0x86 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15503,7 +15503,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_FLOAT_TO_INT: /* 0x87 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15517,7 +15517,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_FLOAT_TO_LONG: /* 0x88 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15531,7 +15531,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_FLOAT_TO_DOUBLE: /* 0x89 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15545,7 +15545,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DOUBLE_TO_INT: /* 0x8a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15559,7 +15559,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DOUBLE_TO_LONG: /* 0x8b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15573,7 +15573,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DOUBLE_TO_FLOAT: /* 0x8c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15587,7 +15587,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INT_TO_BYTE: /* 0x8d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15601,7 +15601,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INT_TO_CHAR: /* 0x8e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15615,7 +15615,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INT_TO_SHORT: /* 0x8f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15629,7 +15629,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_INT: /* 0x90 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15643,7 +15643,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_INT: /* 0x91 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15657,7 +15657,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_INT: /* 0x92 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15671,7 +15671,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_INT: /* 0x93 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15685,7 +15685,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_INT: /* 0x94 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15699,7 +15699,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AND_INT: /* 0x95 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15713,7 +15713,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_OR_INT: /* 0x96 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15727,7 +15727,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_XOR_INT: /* 0x97 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15741,7 +15741,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHL_INT: /* 0x98 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15755,7 +15755,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHR_INT: /* 0x99 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15769,7 +15769,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_USHR_INT: /* 0x9a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15783,7 +15783,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_LONG: /* 0x9b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15797,7 +15797,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_LONG: /* 0x9c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15811,7 +15811,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_LONG: /* 0x9d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15825,7 +15825,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_LONG: /* 0x9e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15839,7 +15839,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_LONG: /* 0x9f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15853,7 +15853,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AND_LONG: /* 0xa0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15867,7 +15867,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_OR_LONG: /* 0xa1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15881,7 +15881,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_XOR_LONG: /* 0xa2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15895,7 +15895,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHL_LONG: /* 0xa3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15909,7 +15909,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHR_LONG: /* 0xa4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15923,7 +15923,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_USHR_LONG: /* 0xa5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15937,7 +15937,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_FLOAT: /* 0xa6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15951,7 +15951,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_FLOAT: /* 0xa7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15965,7 +15965,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_FLOAT: /* 0xa8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15979,7 +15979,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_FLOAT: /* 0xa9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15993,7 +15993,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_FLOAT: /* 0xaa */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16007,7 +16007,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_DOUBLE: /* 0xab */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16021,7 +16021,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_DOUBLE: /* 0xac */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16035,7 +16035,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_DOUBLE: /* 0xad */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16049,7 +16049,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_DOUBLE: /* 0xae */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16063,7 +16063,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_DOUBLE: /* 0xaf */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16077,7 +16077,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_INT_2ADDR: /* 0xb0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16091,7 +16091,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_INT_2ADDR: /* 0xb1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16105,7 +16105,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_INT_2ADDR: /* 0xb2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16119,7 +16119,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_INT_2ADDR: /* 0xb3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16133,7 +16133,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_INT_2ADDR: /* 0xb4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16147,7 +16147,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AND_INT_2ADDR: /* 0xb5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16161,7 +16161,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_OR_INT_2ADDR: /* 0xb6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16175,7 +16175,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_XOR_INT_2ADDR: /* 0xb7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16189,7 +16189,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHL_INT_2ADDR: /* 0xb8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16203,7 +16203,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHR_INT_2ADDR: /* 0xb9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16217,7 +16217,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_USHR_INT_2ADDR: /* 0xba */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16231,7 +16231,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_LONG_2ADDR: /* 0xbb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16245,7 +16245,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_LONG_2ADDR: /* 0xbc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16259,7 +16259,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_LONG_2ADDR: /* 0xbd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16273,7 +16273,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_LONG_2ADDR: /* 0xbe */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16287,7 +16287,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_LONG_2ADDR: /* 0xbf */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16301,7 +16301,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AND_LONG_2ADDR: /* 0xc0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16315,7 +16315,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_OR_LONG_2ADDR: /* 0xc1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16329,7 +16329,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_XOR_LONG_2ADDR: /* 0xc2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16343,7 +16343,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHL_LONG_2ADDR: /* 0xc3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16357,7 +16357,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHR_LONG_2ADDR: /* 0xc4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16371,7 +16371,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_USHR_LONG_2ADDR: /* 0xc5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16385,7 +16385,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_FLOAT_2ADDR: /* 0xc6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16399,7 +16399,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_FLOAT_2ADDR: /* 0xc7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16413,7 +16413,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_FLOAT_2ADDR: /* 0xc8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16427,7 +16427,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_FLOAT_2ADDR: /* 0xc9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16441,7 +16441,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_FLOAT_2ADDR: /* 0xca */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16455,7 +16455,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_DOUBLE_2ADDR: /* 0xcb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16469,7 +16469,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_DOUBLE_2ADDR: /* 0xcc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16483,7 +16483,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_DOUBLE_2ADDR: /* 0xcd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16497,7 +16497,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_DOUBLE_2ADDR: /* 0xce */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16511,7 +16511,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_DOUBLE_2ADDR: /* 0xcf */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16525,7 +16525,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_INT_LIT16: /* 0xd0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16539,7 +16539,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_RSUB_INT: /* 0xd1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16553,7 +16553,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_INT_LIT16: /* 0xd2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16567,7 +16567,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_INT_LIT16: /* 0xd3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16581,7 +16581,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_INT_LIT16: /* 0xd4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16595,7 +16595,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AND_INT_LIT16: /* 0xd5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16609,7 +16609,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_OR_INT_LIT16: /* 0xd6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16623,7 +16623,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_XOR_INT_LIT16: /* 0xd7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16637,7 +16637,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_INT_LIT8: /* 0xd8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16651,7 +16651,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_RSUB_INT_LIT8: /* 0xd9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16665,7 +16665,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_INT_LIT8: /* 0xda */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16679,7 +16679,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_INT_LIT8: /* 0xdb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16693,7 +16693,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_INT_LIT8: /* 0xdc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16707,7 +16707,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AND_INT_LIT8: /* 0xdd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16721,7 +16721,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_OR_INT_LIT8: /* 0xde */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16735,7 +16735,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_XOR_INT_LIT8: /* 0xdf */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16749,7 +16749,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHL_INT_LIT8: /* 0xe0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16763,7 +16763,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHR_INT_LIT8: /* 0xe1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16777,7 +16777,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_USHR_INT_LIT8: /* 0xe2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16791,7 +16791,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_VOLATILE: /* 0xe3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16805,7 +16805,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_VOLATILE: /* 0xe4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16819,7 +16819,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_VOLATILE: /* 0xe5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16833,7 +16833,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_VOLATILE: /* 0xe6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16847,7 +16847,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_OBJECT_VOLATILE: /* 0xe7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16861,7 +16861,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_WIDE_VOLATILE: /* 0xe8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16875,7 +16875,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_WIDE_VOLATILE: /* 0xe9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16889,7 +16889,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_WIDE_VOLATILE: /* 0xea */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16903,7 +16903,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_WIDE_VOLATILE: /* 0xeb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16917,7 +16917,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_BREAKPOINT: /* 0xec */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16931,7 +16931,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_THROW_VERIFICATION_ERROR: /* 0xed */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16945,7 +16945,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_EXECUTE_INLINE: /* 0xee */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16959,7 +16959,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_EXECUTE_INLINE_RANGE: /* 0xef */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16973,7 +16973,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_OBJECT_INIT: /* 0xf0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16987,7 +16987,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_RETURN_VOID_BARRIER: /* 0xf1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17001,7 +17001,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_QUICK: /* 0xf2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17015,7 +17015,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_WIDE_QUICK: /* 0xf3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17029,7 +17029,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_OBJECT_QUICK: /* 0xf4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17043,7 +17043,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_QUICK: /* 0xf5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17057,7 +17057,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_WIDE_QUICK: /* 0xf6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17071,7 +17071,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_OBJECT_QUICK: /* 0xf7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17085,7 +17085,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_VIRTUAL_QUICK: /* 0xf8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17099,7 +17099,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_VIRTUAL_QUICK_RANGE: /* 0xf9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17113,7 +17113,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_SUPER_QUICK: /* 0xfa */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17127,7 +17127,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_SUPER_QUICK_RANGE: /* 0xfb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17141,7 +17141,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_OBJECT_VOLATILE: /* 0xfc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17155,7 +17155,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_OBJECT_VOLATILE: /* 0xfd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17169,7 +17169,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_OBJECT_VOLATILE: /* 0xfe */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17183,16 +17183,21 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DISPATCH_FF: /* 0xff */
-/* File: armv5te/ALT_OP_DISPATCH_FF.S */
-    mov     ip, rINST, lsr #8            @ ip<- extended opcode
-    add     ip, ip, #256                 @ add offset for extended opcodes
-    GOTO_OPCODE(ip)                      @ go to proper extended handler
-
+/* File: armv5te/alt_stub.S */
+/*
+ * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
+ * any interesting requests and then jump to the real instruction
+ * handler.  Note that the call to dvmCheckInst is done as a tail call.
+ */
+    adrl   lr, dvmAsmInstructionStart + (255 * 64)
+    mov    r0, rPC              @ arg0
+    mov    r1, rSELF            @ arg1
+    b      dvmCheckInst         @ (dPC,self) tail call to instruction checker
 
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_CLASS_JUMBO: /* 0x100 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17206,7 +17211,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CHECK_CAST_JUMBO: /* 0x101 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17220,7 +17225,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INSTANCE_OF_JUMBO: /* 0x102 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17234,7 +17239,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEW_INSTANCE_JUMBO: /* 0x103 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17248,7 +17253,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEW_ARRAY_JUMBO: /* 0x104 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17262,7 +17267,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_FILLED_NEW_ARRAY_JUMBO: /* 0x105 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17276,7 +17281,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_JUMBO: /* 0x106 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17290,7 +17295,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_WIDE_JUMBO: /* 0x107 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17304,7 +17309,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_OBJECT_JUMBO: /* 0x108 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17318,7 +17323,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_BOOLEAN_JUMBO: /* 0x109 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17332,7 +17337,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_BYTE_JUMBO: /* 0x10a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17346,7 +17351,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_CHAR_JUMBO: /* 0x10b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17360,7 +17365,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_SHORT_JUMBO: /* 0x10c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17374,7 +17379,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_JUMBO: /* 0x10d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17388,7 +17393,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_WIDE_JUMBO: /* 0x10e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17402,7 +17407,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_OBJECT_JUMBO: /* 0x10f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17416,7 +17421,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_BOOLEAN_JUMBO: /* 0x110 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17430,7 +17435,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_BYTE_JUMBO: /* 0x111 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17444,7 +17449,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_CHAR_JUMBO: /* 0x112 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17458,7 +17463,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_SHORT_JUMBO: /* 0x113 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17472,7 +17477,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_JUMBO: /* 0x114 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17486,7 +17491,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_WIDE_JUMBO: /* 0x115 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17500,7 +17505,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_OBJECT_JUMBO: /* 0x116 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17514,7 +17519,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_BOOLEAN_JUMBO: /* 0x117 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17528,7 +17533,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_BYTE_JUMBO: /* 0x118 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17542,7 +17547,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_CHAR_JUMBO: /* 0x119 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17556,7 +17561,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_SHORT_JUMBO: /* 0x11a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17570,7 +17575,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_JUMBO: /* 0x11b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17584,7 +17589,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_WIDE_JUMBO: /* 0x11c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17598,7 +17603,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_OBJECT_JUMBO: /* 0x11d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17612,7 +17617,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_BOOLEAN_JUMBO: /* 0x11e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17626,7 +17631,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_BYTE_JUMBO: /* 0x11f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17640,7 +17645,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_CHAR_JUMBO: /* 0x120 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17654,7 +17659,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_SHORT_JUMBO: /* 0x121 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17668,7 +17673,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_VIRTUAL_JUMBO: /* 0x122 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17682,7 +17687,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_SUPER_JUMBO: /* 0x123 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17696,7 +17701,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_DIRECT_JUMBO: /* 0x124 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17710,7 +17715,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_STATIC_JUMBO: /* 0x125 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17724,7 +17729,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_INTERFACE_JUMBO: /* 0x126 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17738,7 +17743,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_27FF: /* 0x127 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17752,7 +17757,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_28FF: /* 0x128 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17766,7 +17771,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_29FF: /* 0x129 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17780,7 +17785,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_2AFF: /* 0x12a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17794,7 +17799,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_2BFF: /* 0x12b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17808,7 +17813,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_2CFF: /* 0x12c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17822,7 +17827,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_2DFF: /* 0x12d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17836,7 +17841,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_2EFF: /* 0x12e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17850,7 +17855,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_2FFF: /* 0x12f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17864,7 +17869,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_30FF: /* 0x130 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17878,7 +17883,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_31FF: /* 0x131 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17892,7 +17897,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_32FF: /* 0x132 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17906,7 +17911,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_33FF: /* 0x133 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17920,7 +17925,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_34FF: /* 0x134 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17934,7 +17939,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_35FF: /* 0x135 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17948,7 +17953,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_36FF: /* 0x136 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17962,7 +17967,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_37FF: /* 0x137 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17976,7 +17981,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_38FF: /* 0x138 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17990,7 +17995,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_39FF: /* 0x139 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18004,7 +18009,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3AFF: /* 0x13a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18018,7 +18023,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3BFF: /* 0x13b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18032,7 +18037,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3CFF: /* 0x13c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18046,7 +18051,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3DFF: /* 0x13d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18060,7 +18065,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3EFF: /* 0x13e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18074,7 +18079,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3FFF: /* 0x13f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18088,7 +18093,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_40FF: /* 0x140 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18102,7 +18107,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_41FF: /* 0x141 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18116,7 +18121,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_42FF: /* 0x142 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18130,7 +18135,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_43FF: /* 0x143 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18144,7 +18149,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_44FF: /* 0x144 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18158,7 +18163,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_45FF: /* 0x145 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18172,7 +18177,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_46FF: /* 0x146 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18186,7 +18191,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_47FF: /* 0x147 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18200,7 +18205,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_48FF: /* 0x148 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18214,7 +18219,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_49FF: /* 0x149 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18228,7 +18233,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_4AFF: /* 0x14a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18242,7 +18247,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_4BFF: /* 0x14b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18256,7 +18261,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_4CFF: /* 0x14c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18270,7 +18275,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_4DFF: /* 0x14d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18284,7 +18289,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_4EFF: /* 0x14e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18298,7 +18303,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_4FFF: /* 0x14f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18312,7 +18317,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_50FF: /* 0x150 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18326,7 +18331,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_51FF: /* 0x151 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18340,7 +18345,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_52FF: /* 0x152 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18354,7 +18359,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_53FF: /* 0x153 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18368,7 +18373,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_54FF: /* 0x154 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18382,7 +18387,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_55FF: /* 0x155 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18396,7 +18401,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_56FF: /* 0x156 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18410,7 +18415,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_57FF: /* 0x157 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18424,7 +18429,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_58FF: /* 0x158 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18438,7 +18443,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_59FF: /* 0x159 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18452,7 +18457,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_5AFF: /* 0x15a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18466,7 +18471,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_5BFF: /* 0x15b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18480,7 +18485,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_5CFF: /* 0x15c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18494,7 +18499,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_5DFF: /* 0x15d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18508,7 +18513,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_5EFF: /* 0x15e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18522,7 +18527,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_5FFF: /* 0x15f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18536,7 +18541,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_60FF: /* 0x160 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18550,7 +18555,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_61FF: /* 0x161 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18564,7 +18569,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_62FF: /* 0x162 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18578,7 +18583,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_63FF: /* 0x163 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18592,7 +18597,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_64FF: /* 0x164 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18606,7 +18611,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_65FF: /* 0x165 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18620,7 +18625,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_66FF: /* 0x166 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18634,7 +18639,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_67FF: /* 0x167 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18648,7 +18653,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_68FF: /* 0x168 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18662,7 +18667,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_69FF: /* 0x169 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18676,7 +18681,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_6AFF: /* 0x16a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18690,7 +18695,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_6BFF: /* 0x16b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18704,7 +18709,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_6CFF: /* 0x16c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18718,7 +18723,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_6DFF: /* 0x16d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18732,7 +18737,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_6EFF: /* 0x16e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18746,7 +18751,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_6FFF: /* 0x16f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18760,7 +18765,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_70FF: /* 0x170 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18774,7 +18779,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_71FF: /* 0x171 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18788,7 +18793,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_72FF: /* 0x172 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18802,7 +18807,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_73FF: /* 0x173 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18816,7 +18821,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_74FF: /* 0x174 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18830,7 +18835,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_75FF: /* 0x175 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18844,7 +18849,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_76FF: /* 0x176 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18858,7 +18863,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_77FF: /* 0x177 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18872,7 +18877,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_78FF: /* 0x178 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18886,7 +18891,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_79FF: /* 0x179 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18900,7 +18905,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_7AFF: /* 0x17a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18914,7 +18919,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_7BFF: /* 0x17b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18928,7 +18933,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_7CFF: /* 0x17c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18942,7 +18947,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_7DFF: /* 0x17d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18956,7 +18961,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_7EFF: /* 0x17e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18970,7 +18975,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_7FFF: /* 0x17f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18984,7 +18989,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_80FF: /* 0x180 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18998,7 +19003,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_81FF: /* 0x181 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19012,7 +19017,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_82FF: /* 0x182 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19026,7 +19031,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_83FF: /* 0x183 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19040,7 +19045,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_84FF: /* 0x184 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19054,7 +19059,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_85FF: /* 0x185 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19068,7 +19073,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_86FF: /* 0x186 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19082,7 +19087,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_87FF: /* 0x187 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19096,7 +19101,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_88FF: /* 0x188 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19110,7 +19115,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_89FF: /* 0x189 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19124,7 +19129,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_8AFF: /* 0x18a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19138,7 +19143,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_8BFF: /* 0x18b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19152,7 +19157,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_8CFF: /* 0x18c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19166,7 +19171,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_8DFF: /* 0x18d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19180,7 +19185,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_8EFF: /* 0x18e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19194,7 +19199,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_8FFF: /* 0x18f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19208,7 +19213,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_90FF: /* 0x190 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19222,7 +19227,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_91FF: /* 0x191 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19236,7 +19241,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_92FF: /* 0x192 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19250,7 +19255,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_93FF: /* 0x193 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19264,7 +19269,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_94FF: /* 0x194 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19278,7 +19283,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_95FF: /* 0x195 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19292,7 +19297,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_96FF: /* 0x196 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19306,7 +19311,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_97FF: /* 0x197 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19320,7 +19325,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_98FF: /* 0x198 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19334,7 +19339,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_99FF: /* 0x199 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19348,7 +19353,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_9AFF: /* 0x19a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19362,7 +19367,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_9BFF: /* 0x19b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19376,7 +19381,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_9CFF: /* 0x19c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19390,7 +19395,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_9DFF: /* 0x19d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19404,7 +19409,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_9EFF: /* 0x19e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19418,7 +19423,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_9FFF: /* 0x19f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19432,7 +19437,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A0FF: /* 0x1a0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19446,7 +19451,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A1FF: /* 0x1a1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19460,7 +19465,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A2FF: /* 0x1a2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19474,7 +19479,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A3FF: /* 0x1a3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19488,7 +19493,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A4FF: /* 0x1a4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19502,7 +19507,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A5FF: /* 0x1a5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19516,7 +19521,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A6FF: /* 0x1a6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19530,7 +19535,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A7FF: /* 0x1a7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19544,7 +19549,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A8FF: /* 0x1a8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19558,7 +19563,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A9FF: /* 0x1a9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19572,7 +19577,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_AAFF: /* 0x1aa */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19586,7 +19591,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_ABFF: /* 0x1ab */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19600,7 +19605,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_ACFF: /* 0x1ac */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19614,7 +19619,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_ADFF: /* 0x1ad */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19628,7 +19633,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_AEFF: /* 0x1ae */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19642,7 +19647,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_AFFF: /* 0x1af */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19656,7 +19661,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B0FF: /* 0x1b0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19670,7 +19675,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B1FF: /* 0x1b1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19684,7 +19689,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B2FF: /* 0x1b2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19698,7 +19703,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B3FF: /* 0x1b3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19712,7 +19717,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B4FF: /* 0x1b4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19726,7 +19731,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B5FF: /* 0x1b5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19740,7 +19745,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B6FF: /* 0x1b6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19754,7 +19759,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B7FF: /* 0x1b7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19768,7 +19773,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B8FF: /* 0x1b8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19782,7 +19787,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B9FF: /* 0x1b9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19796,7 +19801,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_BAFF: /* 0x1ba */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19810,7 +19815,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_BBFF: /* 0x1bb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19824,7 +19829,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_BCFF: /* 0x1bc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19838,7 +19843,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_BDFF: /* 0x1bd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19852,7 +19857,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_BEFF: /* 0x1be */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19866,7 +19871,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_BFFF: /* 0x1bf */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19880,7 +19885,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C0FF: /* 0x1c0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19894,7 +19899,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C1FF: /* 0x1c1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19908,7 +19913,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C2FF: /* 0x1c2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19922,7 +19927,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C3FF: /* 0x1c3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19936,7 +19941,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C4FF: /* 0x1c4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19950,7 +19955,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C5FF: /* 0x1c5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19964,7 +19969,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C6FF: /* 0x1c6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19978,7 +19983,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C7FF: /* 0x1c7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19992,7 +19997,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C8FF: /* 0x1c8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20006,7 +20011,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C9FF: /* 0x1c9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20020,7 +20025,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_CAFF: /* 0x1ca */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20034,7 +20039,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_CBFF: /* 0x1cb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20048,7 +20053,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_CCFF: /* 0x1cc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20062,7 +20067,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_CDFF: /* 0x1cd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20076,7 +20081,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_CEFF: /* 0x1ce */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20090,7 +20095,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_CFFF: /* 0x1cf */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20104,7 +20109,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D0FF: /* 0x1d0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20118,7 +20123,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D1FF: /* 0x1d1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20132,7 +20137,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D2FF: /* 0x1d2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20146,7 +20151,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D3FF: /* 0x1d3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20160,7 +20165,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D4FF: /* 0x1d4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20174,7 +20179,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D5FF: /* 0x1d5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20188,7 +20193,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D6FF: /* 0x1d6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20202,7 +20207,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D7FF: /* 0x1d7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20216,7 +20221,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D8FF: /* 0x1d8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20230,7 +20235,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D9FF: /* 0x1d9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20244,7 +20249,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_DAFF: /* 0x1da */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20258,7 +20263,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_DBFF: /* 0x1db */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20272,7 +20277,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_DCFF: /* 0x1dc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20286,7 +20291,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_DDFF: /* 0x1dd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20300,7 +20305,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_DEFF: /* 0x1de */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20314,7 +20319,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_DFFF: /* 0x1df */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20328,7 +20333,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E0FF: /* 0x1e0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20342,7 +20347,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E1FF: /* 0x1e1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20356,7 +20361,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E2FF: /* 0x1e2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20370,7 +20375,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E3FF: /* 0x1e3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20384,7 +20389,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E4FF: /* 0x1e4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20398,7 +20403,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E5FF: /* 0x1e5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20412,7 +20417,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E6FF: /* 0x1e6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20426,7 +20431,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E7FF: /* 0x1e7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20440,7 +20445,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E8FF: /* 0x1e8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20454,7 +20459,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E9FF: /* 0x1e9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20468,7 +20473,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_EAFF: /* 0x1ea */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20482,7 +20487,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_EBFF: /* 0x1eb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20496,7 +20501,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_ECFF: /* 0x1ec */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20510,7 +20515,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_EDFF: /* 0x1ed */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20524,7 +20529,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_EEFF: /* 0x1ee */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20538,7 +20543,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_EFFF: /* 0x1ef */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20552,7 +20557,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F0FF: /* 0x1f0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20566,7 +20571,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F1FF: /* 0x1f1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20580,7 +20585,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F2FF: /* 0x1f2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20594,7 +20599,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F3FF: /* 0x1f3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20608,7 +20613,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F4FF: /* 0x1f4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20622,7 +20627,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F5FF: /* 0x1f5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20636,7 +20641,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F6FF: /* 0x1f6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20650,7 +20655,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F7FF: /* 0x1f7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20664,7 +20669,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F8FF: /* 0x1f8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20678,7 +20683,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F9FF: /* 0x1f9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20692,7 +20697,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_FAFF: /* 0x1fa */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20706,7 +20711,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_FBFF: /* 0x1fb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20720,7 +20725,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_FCFF: /* 0x1fc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20734,7 +20739,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_FDFF: /* 0x1fd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20748,7 +20753,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_FEFF: /* 0x1fe */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20762,7 +20767,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_THROW_VERIFICATION_ERROR_JUMBO: /* 0x1ff */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
diff --git a/vm/mterp/out/InterpAsm-armv7-a-neon.S b/vm/mterp/out/InterpAsm-armv7-a-neon.S
index 4ef5d0d..d6d8456 100644
--- a/vm/mterp/out/InterpAsm-armv7-a-neon.S
+++ b/vm/mterp/out/InterpAsm-armv7-a-neon.S
@@ -13093,7 +13093,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NOP: /* 0x00 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13107,7 +13107,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE: /* 0x01 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13121,7 +13121,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_FROM16: /* 0x02 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13135,7 +13135,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_16: /* 0x03 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13149,7 +13149,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_WIDE: /* 0x04 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13163,7 +13163,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_WIDE_FROM16: /* 0x05 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13177,7 +13177,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_WIDE_16: /* 0x06 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13191,7 +13191,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_OBJECT: /* 0x07 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13205,7 +13205,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_OBJECT_FROM16: /* 0x08 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13219,7 +13219,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_OBJECT_16: /* 0x09 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13233,7 +13233,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_RESULT: /* 0x0a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13247,7 +13247,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_RESULT_WIDE: /* 0x0b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13261,7 +13261,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_RESULT_OBJECT: /* 0x0c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13275,7 +13275,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_EXCEPTION: /* 0x0d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13289,7 +13289,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_RETURN_VOID: /* 0x0e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13303,7 +13303,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_RETURN: /* 0x0f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13317,7 +13317,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_RETURN_WIDE: /* 0x10 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13331,7 +13331,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_RETURN_OBJECT: /* 0x11 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13345,7 +13345,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_4: /* 0x12 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13359,7 +13359,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_16: /* 0x13 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13373,7 +13373,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST: /* 0x14 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13387,7 +13387,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_HIGH16: /* 0x15 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13401,7 +13401,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_WIDE_16: /* 0x16 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13415,7 +13415,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_WIDE_32: /* 0x17 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13429,7 +13429,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_WIDE: /* 0x18 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13443,7 +13443,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_WIDE_HIGH16: /* 0x19 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13457,7 +13457,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_STRING: /* 0x1a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13471,7 +13471,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_STRING_JUMBO: /* 0x1b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13485,7 +13485,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_CLASS: /* 0x1c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13499,7 +13499,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MONITOR_ENTER: /* 0x1d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13513,7 +13513,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MONITOR_EXIT: /* 0x1e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13527,7 +13527,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CHECK_CAST: /* 0x1f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13541,7 +13541,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INSTANCE_OF: /* 0x20 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13555,7 +13555,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ARRAY_LENGTH: /* 0x21 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13569,7 +13569,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEW_INSTANCE: /* 0x22 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13583,7 +13583,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEW_ARRAY: /* 0x23 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13597,7 +13597,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_FILLED_NEW_ARRAY: /* 0x24 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13611,7 +13611,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_FILLED_NEW_ARRAY_RANGE: /* 0x25 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13625,7 +13625,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_FILL_ARRAY_DATA: /* 0x26 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13639,7 +13639,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_THROW: /* 0x27 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13653,7 +13653,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_GOTO: /* 0x28 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13667,7 +13667,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_GOTO_16: /* 0x29 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13681,7 +13681,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_GOTO_32: /* 0x2a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13695,7 +13695,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_PACKED_SWITCH: /* 0x2b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13709,7 +13709,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPARSE_SWITCH: /* 0x2c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13723,7 +13723,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CMPL_FLOAT: /* 0x2d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13737,7 +13737,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CMPG_FLOAT: /* 0x2e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13751,7 +13751,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CMPL_DOUBLE: /* 0x2f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13765,7 +13765,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CMPG_DOUBLE: /* 0x30 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13779,7 +13779,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CMP_LONG: /* 0x31 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13793,7 +13793,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_EQ: /* 0x32 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13807,7 +13807,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_NE: /* 0x33 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13821,7 +13821,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_LT: /* 0x34 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13835,7 +13835,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_GE: /* 0x35 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13849,7 +13849,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_GT: /* 0x36 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13863,7 +13863,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_LE: /* 0x37 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13877,7 +13877,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_EQZ: /* 0x38 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13891,7 +13891,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_NEZ: /* 0x39 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13905,7 +13905,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_LTZ: /* 0x3a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13919,7 +13919,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_GEZ: /* 0x3b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13933,7 +13933,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_GTZ: /* 0x3c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13947,7 +13947,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_LEZ: /* 0x3d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13961,7 +13961,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3E: /* 0x3e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13975,7 +13975,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3F: /* 0x3f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13989,7 +13989,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_40: /* 0x40 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14003,7 +14003,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_41: /* 0x41 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14017,7 +14017,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_42: /* 0x42 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14031,7 +14031,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_43: /* 0x43 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14045,7 +14045,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AGET: /* 0x44 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14059,7 +14059,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AGET_WIDE: /* 0x45 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14073,7 +14073,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AGET_OBJECT: /* 0x46 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14087,7 +14087,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AGET_BOOLEAN: /* 0x47 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14101,7 +14101,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AGET_BYTE: /* 0x48 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14115,7 +14115,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AGET_CHAR: /* 0x49 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14129,7 +14129,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AGET_SHORT: /* 0x4a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14143,7 +14143,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_APUT: /* 0x4b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14157,7 +14157,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_APUT_WIDE: /* 0x4c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14171,7 +14171,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_APUT_OBJECT: /* 0x4d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14185,7 +14185,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_APUT_BOOLEAN: /* 0x4e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14199,7 +14199,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_APUT_BYTE: /* 0x4f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14213,7 +14213,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_APUT_CHAR: /* 0x50 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14227,7 +14227,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_APUT_SHORT: /* 0x51 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14241,7 +14241,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET: /* 0x52 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14255,7 +14255,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_WIDE: /* 0x53 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14269,7 +14269,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_OBJECT: /* 0x54 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14283,7 +14283,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_BOOLEAN: /* 0x55 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14297,7 +14297,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_BYTE: /* 0x56 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14311,7 +14311,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_CHAR: /* 0x57 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14325,7 +14325,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_SHORT: /* 0x58 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14339,7 +14339,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT: /* 0x59 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14353,7 +14353,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_WIDE: /* 0x5a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14367,7 +14367,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_OBJECT: /* 0x5b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14381,7 +14381,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_BOOLEAN: /* 0x5c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14395,7 +14395,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_BYTE: /* 0x5d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14409,7 +14409,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_CHAR: /* 0x5e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14423,7 +14423,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_SHORT: /* 0x5f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14437,7 +14437,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET: /* 0x60 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14451,7 +14451,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_WIDE: /* 0x61 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14465,7 +14465,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_OBJECT: /* 0x62 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14479,7 +14479,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_BOOLEAN: /* 0x63 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14493,7 +14493,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_BYTE: /* 0x64 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14507,7 +14507,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_CHAR: /* 0x65 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14521,7 +14521,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_SHORT: /* 0x66 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14535,7 +14535,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT: /* 0x67 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14549,7 +14549,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_WIDE: /* 0x68 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14563,7 +14563,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_OBJECT: /* 0x69 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14577,7 +14577,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_BOOLEAN: /* 0x6a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14591,7 +14591,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_BYTE: /* 0x6b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14605,7 +14605,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_CHAR: /* 0x6c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14619,7 +14619,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_SHORT: /* 0x6d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14633,7 +14633,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_VIRTUAL: /* 0x6e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14647,7 +14647,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_SUPER: /* 0x6f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14661,7 +14661,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_DIRECT: /* 0x70 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14675,7 +14675,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_STATIC: /* 0x71 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14689,7 +14689,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_INTERFACE: /* 0x72 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14703,7 +14703,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_73: /* 0x73 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14717,7 +14717,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_VIRTUAL_RANGE: /* 0x74 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14731,7 +14731,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_SUPER_RANGE: /* 0x75 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14745,7 +14745,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_DIRECT_RANGE: /* 0x76 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14759,7 +14759,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_STATIC_RANGE: /* 0x77 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14773,7 +14773,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_INTERFACE_RANGE: /* 0x78 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14787,7 +14787,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_79: /* 0x79 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14801,7 +14801,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_7A: /* 0x7a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14815,7 +14815,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEG_INT: /* 0x7b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14829,7 +14829,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NOT_INT: /* 0x7c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14843,7 +14843,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEG_LONG: /* 0x7d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14857,7 +14857,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NOT_LONG: /* 0x7e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14871,7 +14871,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEG_FLOAT: /* 0x7f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14885,7 +14885,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEG_DOUBLE: /* 0x80 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14899,7 +14899,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INT_TO_LONG: /* 0x81 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14913,7 +14913,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INT_TO_FLOAT: /* 0x82 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14927,7 +14927,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INT_TO_DOUBLE: /* 0x83 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14941,7 +14941,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_LONG_TO_INT: /* 0x84 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14955,7 +14955,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_LONG_TO_FLOAT: /* 0x85 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14969,7 +14969,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_LONG_TO_DOUBLE: /* 0x86 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14983,7 +14983,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_FLOAT_TO_INT: /* 0x87 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14997,7 +14997,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_FLOAT_TO_LONG: /* 0x88 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15011,7 +15011,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_FLOAT_TO_DOUBLE: /* 0x89 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15025,7 +15025,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DOUBLE_TO_INT: /* 0x8a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15039,7 +15039,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DOUBLE_TO_LONG: /* 0x8b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15053,7 +15053,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DOUBLE_TO_FLOAT: /* 0x8c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15067,7 +15067,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INT_TO_BYTE: /* 0x8d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15081,7 +15081,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INT_TO_CHAR: /* 0x8e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15095,7 +15095,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INT_TO_SHORT: /* 0x8f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15109,7 +15109,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_INT: /* 0x90 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15123,7 +15123,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_INT: /* 0x91 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15137,7 +15137,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_INT: /* 0x92 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15151,7 +15151,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_INT: /* 0x93 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15165,7 +15165,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_INT: /* 0x94 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15179,7 +15179,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AND_INT: /* 0x95 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15193,7 +15193,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_OR_INT: /* 0x96 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15207,7 +15207,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_XOR_INT: /* 0x97 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15221,7 +15221,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHL_INT: /* 0x98 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15235,7 +15235,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHR_INT: /* 0x99 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15249,7 +15249,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_USHR_INT: /* 0x9a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15263,7 +15263,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_LONG: /* 0x9b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15277,7 +15277,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_LONG: /* 0x9c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15291,7 +15291,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_LONG: /* 0x9d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15305,7 +15305,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_LONG: /* 0x9e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15319,7 +15319,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_LONG: /* 0x9f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15333,7 +15333,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AND_LONG: /* 0xa0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15347,7 +15347,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_OR_LONG: /* 0xa1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15361,7 +15361,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_XOR_LONG: /* 0xa2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15375,7 +15375,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHL_LONG: /* 0xa3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15389,7 +15389,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHR_LONG: /* 0xa4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15403,7 +15403,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_USHR_LONG: /* 0xa5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15417,7 +15417,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_FLOAT: /* 0xa6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15431,7 +15431,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_FLOAT: /* 0xa7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15445,7 +15445,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_FLOAT: /* 0xa8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15459,7 +15459,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_FLOAT: /* 0xa9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15473,7 +15473,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_FLOAT: /* 0xaa */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15487,7 +15487,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_DOUBLE: /* 0xab */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15501,7 +15501,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_DOUBLE: /* 0xac */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15515,7 +15515,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_DOUBLE: /* 0xad */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15529,7 +15529,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_DOUBLE: /* 0xae */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15543,7 +15543,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_DOUBLE: /* 0xaf */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15557,7 +15557,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_INT_2ADDR: /* 0xb0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15571,7 +15571,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_INT_2ADDR: /* 0xb1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15585,7 +15585,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_INT_2ADDR: /* 0xb2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15599,7 +15599,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_INT_2ADDR: /* 0xb3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15613,7 +15613,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_INT_2ADDR: /* 0xb4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15627,7 +15627,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AND_INT_2ADDR: /* 0xb5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15641,7 +15641,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_OR_INT_2ADDR: /* 0xb6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15655,7 +15655,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_XOR_INT_2ADDR: /* 0xb7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15669,7 +15669,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHL_INT_2ADDR: /* 0xb8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15683,7 +15683,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHR_INT_2ADDR: /* 0xb9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15697,7 +15697,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_USHR_INT_2ADDR: /* 0xba */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15711,7 +15711,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_LONG_2ADDR: /* 0xbb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15725,7 +15725,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_LONG_2ADDR: /* 0xbc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15739,7 +15739,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_LONG_2ADDR: /* 0xbd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15753,7 +15753,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_LONG_2ADDR: /* 0xbe */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15767,7 +15767,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_LONG_2ADDR: /* 0xbf */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15781,7 +15781,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AND_LONG_2ADDR: /* 0xc0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15795,7 +15795,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_OR_LONG_2ADDR: /* 0xc1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15809,7 +15809,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_XOR_LONG_2ADDR: /* 0xc2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15823,7 +15823,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHL_LONG_2ADDR: /* 0xc3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15837,7 +15837,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHR_LONG_2ADDR: /* 0xc4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15851,7 +15851,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_USHR_LONG_2ADDR: /* 0xc5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15865,7 +15865,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_FLOAT_2ADDR: /* 0xc6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15879,7 +15879,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_FLOAT_2ADDR: /* 0xc7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15893,7 +15893,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_FLOAT_2ADDR: /* 0xc8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15907,7 +15907,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_FLOAT_2ADDR: /* 0xc9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15921,7 +15921,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_FLOAT_2ADDR: /* 0xca */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15935,7 +15935,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_DOUBLE_2ADDR: /* 0xcb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15949,7 +15949,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_DOUBLE_2ADDR: /* 0xcc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15963,7 +15963,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_DOUBLE_2ADDR: /* 0xcd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15977,7 +15977,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_DOUBLE_2ADDR: /* 0xce */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15991,7 +15991,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_DOUBLE_2ADDR: /* 0xcf */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16005,7 +16005,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_INT_LIT16: /* 0xd0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16019,7 +16019,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_RSUB_INT: /* 0xd1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16033,7 +16033,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_INT_LIT16: /* 0xd2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16047,7 +16047,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_INT_LIT16: /* 0xd3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16061,7 +16061,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_INT_LIT16: /* 0xd4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16075,7 +16075,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AND_INT_LIT16: /* 0xd5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16089,7 +16089,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_OR_INT_LIT16: /* 0xd6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16103,7 +16103,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_XOR_INT_LIT16: /* 0xd7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16117,7 +16117,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_INT_LIT8: /* 0xd8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16131,7 +16131,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_RSUB_INT_LIT8: /* 0xd9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16145,7 +16145,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_INT_LIT8: /* 0xda */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16159,7 +16159,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_INT_LIT8: /* 0xdb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16173,7 +16173,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_INT_LIT8: /* 0xdc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16187,7 +16187,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AND_INT_LIT8: /* 0xdd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16201,7 +16201,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_OR_INT_LIT8: /* 0xde */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16215,7 +16215,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_XOR_INT_LIT8: /* 0xdf */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16229,7 +16229,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHL_INT_LIT8: /* 0xe0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16243,7 +16243,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHR_INT_LIT8: /* 0xe1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16257,7 +16257,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_USHR_INT_LIT8: /* 0xe2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16271,7 +16271,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_VOLATILE: /* 0xe3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16285,7 +16285,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_VOLATILE: /* 0xe4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16299,7 +16299,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_VOLATILE: /* 0xe5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16313,7 +16313,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_VOLATILE: /* 0xe6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16327,7 +16327,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_OBJECT_VOLATILE: /* 0xe7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16341,7 +16341,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_WIDE_VOLATILE: /* 0xe8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16355,7 +16355,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_WIDE_VOLATILE: /* 0xe9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16369,7 +16369,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_WIDE_VOLATILE: /* 0xea */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16383,7 +16383,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_WIDE_VOLATILE: /* 0xeb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16397,7 +16397,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_BREAKPOINT: /* 0xec */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16411,7 +16411,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_THROW_VERIFICATION_ERROR: /* 0xed */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16425,7 +16425,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_EXECUTE_INLINE: /* 0xee */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16439,7 +16439,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_EXECUTE_INLINE_RANGE: /* 0xef */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16453,7 +16453,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_OBJECT_INIT: /* 0xf0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16467,7 +16467,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_RETURN_VOID_BARRIER: /* 0xf1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16481,7 +16481,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_QUICK: /* 0xf2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16495,7 +16495,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_WIDE_QUICK: /* 0xf3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16509,7 +16509,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_OBJECT_QUICK: /* 0xf4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16523,7 +16523,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_QUICK: /* 0xf5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16537,7 +16537,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_WIDE_QUICK: /* 0xf6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16551,7 +16551,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_OBJECT_QUICK: /* 0xf7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16565,7 +16565,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_VIRTUAL_QUICK: /* 0xf8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16579,7 +16579,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_VIRTUAL_QUICK_RANGE: /* 0xf9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16593,7 +16593,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_SUPER_QUICK: /* 0xfa */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16607,7 +16607,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_SUPER_QUICK_RANGE: /* 0xfb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16621,7 +16621,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_OBJECT_VOLATILE: /* 0xfc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16635,7 +16635,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_OBJECT_VOLATILE: /* 0xfd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16649,7 +16649,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_OBJECT_VOLATILE: /* 0xfe */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16663,16 +16663,21 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DISPATCH_FF: /* 0xff */
-/* File: armv5te/ALT_OP_DISPATCH_FF.S */
-    mov     ip, rINST, lsr #8            @ ip<- extended opcode
-    add     ip, ip, #256                 @ add offset for extended opcodes
-    GOTO_OPCODE(ip)                      @ go to proper extended handler
-
+/* File: armv5te/alt_stub.S */
+/*
+ * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
+ * any interesting requests and then jump to the real instruction
+ * handler.  Note that the call to dvmCheckInst is done as a tail call.
+ */
+    adrl   lr, dvmAsmInstructionStart + (255 * 64)
+    mov    r0, rPC              @ arg0
+    mov    r1, rSELF            @ arg1
+    b      dvmCheckInst         @ (dPC,self) tail call to instruction checker
 
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_CLASS_JUMBO: /* 0x100 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16686,7 +16691,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CHECK_CAST_JUMBO: /* 0x101 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16700,7 +16705,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INSTANCE_OF_JUMBO: /* 0x102 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16714,7 +16719,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEW_INSTANCE_JUMBO: /* 0x103 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16728,7 +16733,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEW_ARRAY_JUMBO: /* 0x104 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16742,7 +16747,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_FILLED_NEW_ARRAY_JUMBO: /* 0x105 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16756,7 +16761,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_JUMBO: /* 0x106 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16770,7 +16775,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_WIDE_JUMBO: /* 0x107 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16784,7 +16789,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_OBJECT_JUMBO: /* 0x108 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16798,7 +16803,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_BOOLEAN_JUMBO: /* 0x109 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16812,7 +16817,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_BYTE_JUMBO: /* 0x10a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16826,7 +16831,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_CHAR_JUMBO: /* 0x10b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16840,7 +16845,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_SHORT_JUMBO: /* 0x10c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16854,7 +16859,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_JUMBO: /* 0x10d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16868,7 +16873,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_WIDE_JUMBO: /* 0x10e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16882,7 +16887,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_OBJECT_JUMBO: /* 0x10f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16896,7 +16901,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_BOOLEAN_JUMBO: /* 0x110 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16910,7 +16915,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_BYTE_JUMBO: /* 0x111 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16924,7 +16929,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_CHAR_JUMBO: /* 0x112 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16938,7 +16943,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_SHORT_JUMBO: /* 0x113 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16952,7 +16957,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_JUMBO: /* 0x114 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16966,7 +16971,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_WIDE_JUMBO: /* 0x115 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16980,7 +16985,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_OBJECT_JUMBO: /* 0x116 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16994,7 +16999,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_BOOLEAN_JUMBO: /* 0x117 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17008,7 +17013,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_BYTE_JUMBO: /* 0x118 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17022,7 +17027,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_CHAR_JUMBO: /* 0x119 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17036,7 +17041,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_SHORT_JUMBO: /* 0x11a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17050,7 +17055,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_JUMBO: /* 0x11b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17064,7 +17069,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_WIDE_JUMBO: /* 0x11c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17078,7 +17083,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_OBJECT_JUMBO: /* 0x11d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17092,7 +17097,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_BOOLEAN_JUMBO: /* 0x11e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17106,7 +17111,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_BYTE_JUMBO: /* 0x11f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17120,7 +17125,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_CHAR_JUMBO: /* 0x120 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17134,7 +17139,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_SHORT_JUMBO: /* 0x121 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17148,7 +17153,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_VIRTUAL_JUMBO: /* 0x122 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17162,7 +17167,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_SUPER_JUMBO: /* 0x123 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17176,7 +17181,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_DIRECT_JUMBO: /* 0x124 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17190,7 +17195,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_STATIC_JUMBO: /* 0x125 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17204,7 +17209,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_INTERFACE_JUMBO: /* 0x126 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17218,7 +17223,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_27FF: /* 0x127 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17232,7 +17237,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_28FF: /* 0x128 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17246,7 +17251,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_29FF: /* 0x129 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17260,7 +17265,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_2AFF: /* 0x12a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17274,7 +17279,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_2BFF: /* 0x12b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17288,7 +17293,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_2CFF: /* 0x12c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17302,7 +17307,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_2DFF: /* 0x12d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17316,7 +17321,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_2EFF: /* 0x12e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17330,7 +17335,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_2FFF: /* 0x12f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17344,7 +17349,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_30FF: /* 0x130 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17358,7 +17363,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_31FF: /* 0x131 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17372,7 +17377,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_32FF: /* 0x132 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17386,7 +17391,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_33FF: /* 0x133 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17400,7 +17405,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_34FF: /* 0x134 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17414,7 +17419,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_35FF: /* 0x135 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17428,7 +17433,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_36FF: /* 0x136 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17442,7 +17447,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_37FF: /* 0x137 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17456,7 +17461,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_38FF: /* 0x138 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17470,7 +17475,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_39FF: /* 0x139 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17484,7 +17489,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3AFF: /* 0x13a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17498,7 +17503,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3BFF: /* 0x13b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17512,7 +17517,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3CFF: /* 0x13c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17526,7 +17531,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3DFF: /* 0x13d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17540,7 +17545,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3EFF: /* 0x13e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17554,7 +17559,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3FFF: /* 0x13f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17568,7 +17573,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_40FF: /* 0x140 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17582,7 +17587,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_41FF: /* 0x141 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17596,7 +17601,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_42FF: /* 0x142 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17610,7 +17615,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_43FF: /* 0x143 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17624,7 +17629,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_44FF: /* 0x144 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17638,7 +17643,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_45FF: /* 0x145 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17652,7 +17657,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_46FF: /* 0x146 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17666,7 +17671,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_47FF: /* 0x147 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17680,7 +17685,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_48FF: /* 0x148 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17694,7 +17699,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_49FF: /* 0x149 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17708,7 +17713,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_4AFF: /* 0x14a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17722,7 +17727,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_4BFF: /* 0x14b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17736,7 +17741,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_4CFF: /* 0x14c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17750,7 +17755,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_4DFF: /* 0x14d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17764,7 +17769,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_4EFF: /* 0x14e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17778,7 +17783,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_4FFF: /* 0x14f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17792,7 +17797,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_50FF: /* 0x150 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17806,7 +17811,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_51FF: /* 0x151 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17820,7 +17825,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_52FF: /* 0x152 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17834,7 +17839,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_53FF: /* 0x153 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17848,7 +17853,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_54FF: /* 0x154 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17862,7 +17867,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_55FF: /* 0x155 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17876,7 +17881,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_56FF: /* 0x156 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17890,7 +17895,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_57FF: /* 0x157 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17904,7 +17909,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_58FF: /* 0x158 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17918,7 +17923,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_59FF: /* 0x159 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17932,7 +17937,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_5AFF: /* 0x15a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17946,7 +17951,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_5BFF: /* 0x15b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17960,7 +17965,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_5CFF: /* 0x15c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17974,7 +17979,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_5DFF: /* 0x15d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17988,7 +17993,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_5EFF: /* 0x15e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18002,7 +18007,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_5FFF: /* 0x15f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18016,7 +18021,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_60FF: /* 0x160 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18030,7 +18035,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_61FF: /* 0x161 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18044,7 +18049,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_62FF: /* 0x162 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18058,7 +18063,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_63FF: /* 0x163 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18072,7 +18077,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_64FF: /* 0x164 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18086,7 +18091,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_65FF: /* 0x165 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18100,7 +18105,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_66FF: /* 0x166 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18114,7 +18119,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_67FF: /* 0x167 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18128,7 +18133,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_68FF: /* 0x168 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18142,7 +18147,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_69FF: /* 0x169 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18156,7 +18161,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_6AFF: /* 0x16a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18170,7 +18175,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_6BFF: /* 0x16b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18184,7 +18189,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_6CFF: /* 0x16c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18198,7 +18203,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_6DFF: /* 0x16d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18212,7 +18217,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_6EFF: /* 0x16e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18226,7 +18231,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_6FFF: /* 0x16f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18240,7 +18245,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_70FF: /* 0x170 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18254,7 +18259,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_71FF: /* 0x171 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18268,7 +18273,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_72FF: /* 0x172 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18282,7 +18287,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_73FF: /* 0x173 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18296,7 +18301,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_74FF: /* 0x174 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18310,7 +18315,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_75FF: /* 0x175 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18324,7 +18329,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_76FF: /* 0x176 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18338,7 +18343,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_77FF: /* 0x177 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18352,7 +18357,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_78FF: /* 0x178 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18366,7 +18371,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_79FF: /* 0x179 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18380,7 +18385,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_7AFF: /* 0x17a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18394,7 +18399,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_7BFF: /* 0x17b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18408,7 +18413,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_7CFF: /* 0x17c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18422,7 +18427,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_7DFF: /* 0x17d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18436,7 +18441,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_7EFF: /* 0x17e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18450,7 +18455,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_7FFF: /* 0x17f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18464,7 +18469,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_80FF: /* 0x180 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18478,7 +18483,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_81FF: /* 0x181 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18492,7 +18497,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_82FF: /* 0x182 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18506,7 +18511,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_83FF: /* 0x183 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18520,7 +18525,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_84FF: /* 0x184 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18534,7 +18539,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_85FF: /* 0x185 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18548,7 +18553,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_86FF: /* 0x186 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18562,7 +18567,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_87FF: /* 0x187 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18576,7 +18581,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_88FF: /* 0x188 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18590,7 +18595,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_89FF: /* 0x189 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18604,7 +18609,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_8AFF: /* 0x18a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18618,7 +18623,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_8BFF: /* 0x18b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18632,7 +18637,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_8CFF: /* 0x18c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18646,7 +18651,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_8DFF: /* 0x18d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18660,7 +18665,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_8EFF: /* 0x18e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18674,7 +18679,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_8FFF: /* 0x18f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18688,7 +18693,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_90FF: /* 0x190 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18702,7 +18707,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_91FF: /* 0x191 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18716,7 +18721,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_92FF: /* 0x192 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18730,7 +18735,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_93FF: /* 0x193 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18744,7 +18749,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_94FF: /* 0x194 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18758,7 +18763,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_95FF: /* 0x195 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18772,7 +18777,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_96FF: /* 0x196 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18786,7 +18791,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_97FF: /* 0x197 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18800,7 +18805,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_98FF: /* 0x198 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18814,7 +18819,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_99FF: /* 0x199 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18828,7 +18833,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_9AFF: /* 0x19a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18842,7 +18847,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_9BFF: /* 0x19b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18856,7 +18861,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_9CFF: /* 0x19c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18870,7 +18875,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_9DFF: /* 0x19d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18884,7 +18889,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_9EFF: /* 0x19e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18898,7 +18903,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_9FFF: /* 0x19f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18912,7 +18917,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A0FF: /* 0x1a0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18926,7 +18931,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A1FF: /* 0x1a1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18940,7 +18945,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A2FF: /* 0x1a2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18954,7 +18959,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A3FF: /* 0x1a3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18968,7 +18973,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A4FF: /* 0x1a4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18982,7 +18987,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A5FF: /* 0x1a5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18996,7 +19001,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A6FF: /* 0x1a6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19010,7 +19015,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A7FF: /* 0x1a7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19024,7 +19029,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A8FF: /* 0x1a8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19038,7 +19043,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A9FF: /* 0x1a9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19052,7 +19057,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_AAFF: /* 0x1aa */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19066,7 +19071,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_ABFF: /* 0x1ab */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19080,7 +19085,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_ACFF: /* 0x1ac */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19094,7 +19099,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_ADFF: /* 0x1ad */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19108,7 +19113,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_AEFF: /* 0x1ae */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19122,7 +19127,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_AFFF: /* 0x1af */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19136,7 +19141,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B0FF: /* 0x1b0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19150,7 +19155,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B1FF: /* 0x1b1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19164,7 +19169,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B2FF: /* 0x1b2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19178,7 +19183,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B3FF: /* 0x1b3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19192,7 +19197,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B4FF: /* 0x1b4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19206,7 +19211,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B5FF: /* 0x1b5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19220,7 +19225,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B6FF: /* 0x1b6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19234,7 +19239,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B7FF: /* 0x1b7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19248,7 +19253,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B8FF: /* 0x1b8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19262,7 +19267,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B9FF: /* 0x1b9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19276,7 +19281,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_BAFF: /* 0x1ba */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19290,7 +19295,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_BBFF: /* 0x1bb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19304,7 +19309,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_BCFF: /* 0x1bc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19318,7 +19323,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_BDFF: /* 0x1bd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19332,7 +19337,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_BEFF: /* 0x1be */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19346,7 +19351,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_BFFF: /* 0x1bf */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19360,7 +19365,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C0FF: /* 0x1c0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19374,7 +19379,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C1FF: /* 0x1c1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19388,7 +19393,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C2FF: /* 0x1c2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19402,7 +19407,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C3FF: /* 0x1c3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19416,7 +19421,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C4FF: /* 0x1c4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19430,7 +19435,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C5FF: /* 0x1c5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19444,7 +19449,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C6FF: /* 0x1c6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19458,7 +19463,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C7FF: /* 0x1c7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19472,7 +19477,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C8FF: /* 0x1c8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19486,7 +19491,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C9FF: /* 0x1c9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19500,7 +19505,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_CAFF: /* 0x1ca */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19514,7 +19519,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_CBFF: /* 0x1cb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19528,7 +19533,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_CCFF: /* 0x1cc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19542,7 +19547,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_CDFF: /* 0x1cd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19556,7 +19561,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_CEFF: /* 0x1ce */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19570,7 +19575,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_CFFF: /* 0x1cf */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19584,7 +19589,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D0FF: /* 0x1d0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19598,7 +19603,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D1FF: /* 0x1d1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19612,7 +19617,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D2FF: /* 0x1d2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19626,7 +19631,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D3FF: /* 0x1d3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19640,7 +19645,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D4FF: /* 0x1d4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19654,7 +19659,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D5FF: /* 0x1d5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19668,7 +19673,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D6FF: /* 0x1d6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19682,7 +19687,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D7FF: /* 0x1d7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19696,7 +19701,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D8FF: /* 0x1d8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19710,7 +19715,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D9FF: /* 0x1d9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19724,7 +19729,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_DAFF: /* 0x1da */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19738,7 +19743,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_DBFF: /* 0x1db */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19752,7 +19757,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_DCFF: /* 0x1dc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19766,7 +19771,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_DDFF: /* 0x1dd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19780,7 +19785,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_DEFF: /* 0x1de */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19794,7 +19799,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_DFFF: /* 0x1df */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19808,7 +19813,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E0FF: /* 0x1e0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19822,7 +19827,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E1FF: /* 0x1e1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19836,7 +19841,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E2FF: /* 0x1e2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19850,7 +19855,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E3FF: /* 0x1e3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19864,7 +19869,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E4FF: /* 0x1e4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19878,7 +19883,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E5FF: /* 0x1e5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19892,7 +19897,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E6FF: /* 0x1e6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19906,7 +19911,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E7FF: /* 0x1e7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19920,7 +19925,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E8FF: /* 0x1e8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19934,7 +19939,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E9FF: /* 0x1e9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19948,7 +19953,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_EAFF: /* 0x1ea */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19962,7 +19967,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_EBFF: /* 0x1eb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19976,7 +19981,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_ECFF: /* 0x1ec */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19990,7 +19995,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_EDFF: /* 0x1ed */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20004,7 +20009,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_EEFF: /* 0x1ee */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20018,7 +20023,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_EFFF: /* 0x1ef */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20032,7 +20037,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F0FF: /* 0x1f0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20046,7 +20051,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F1FF: /* 0x1f1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20060,7 +20065,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F2FF: /* 0x1f2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20074,7 +20079,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F3FF: /* 0x1f3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20088,7 +20093,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F4FF: /* 0x1f4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20102,7 +20107,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F5FF: /* 0x1f5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20116,7 +20121,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F6FF: /* 0x1f6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20130,7 +20135,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F7FF: /* 0x1f7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20144,7 +20149,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F8FF: /* 0x1f8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20158,7 +20163,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F9FF: /* 0x1f9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20172,7 +20177,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_FAFF: /* 0x1fa */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20186,7 +20191,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_FBFF: /* 0x1fb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20200,7 +20205,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_FCFF: /* 0x1fc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20214,7 +20219,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_FDFF: /* 0x1fd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20228,7 +20233,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_FEFF: /* 0x1fe */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20242,7 +20247,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_THROW_VERIFICATION_ERROR_JUMBO: /* 0x1ff */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
diff --git a/vm/mterp/out/InterpAsm-armv7-a.S b/vm/mterp/out/InterpAsm-armv7-a.S
index c1a790b..658c09b 100644
--- a/vm/mterp/out/InterpAsm-armv7-a.S
+++ b/vm/mterp/out/InterpAsm-armv7-a.S
@@ -13093,7 +13093,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NOP: /* 0x00 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13107,7 +13107,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE: /* 0x01 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13121,7 +13121,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_FROM16: /* 0x02 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13135,7 +13135,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_16: /* 0x03 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13149,7 +13149,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_WIDE: /* 0x04 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13163,7 +13163,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_WIDE_FROM16: /* 0x05 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13177,7 +13177,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_WIDE_16: /* 0x06 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13191,7 +13191,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_OBJECT: /* 0x07 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13205,7 +13205,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_OBJECT_FROM16: /* 0x08 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13219,7 +13219,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_OBJECT_16: /* 0x09 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13233,7 +13233,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_RESULT: /* 0x0a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13247,7 +13247,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_RESULT_WIDE: /* 0x0b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13261,7 +13261,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_RESULT_OBJECT: /* 0x0c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13275,7 +13275,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MOVE_EXCEPTION: /* 0x0d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13289,7 +13289,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_RETURN_VOID: /* 0x0e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13303,7 +13303,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_RETURN: /* 0x0f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13317,7 +13317,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_RETURN_WIDE: /* 0x10 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13331,7 +13331,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_RETURN_OBJECT: /* 0x11 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13345,7 +13345,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_4: /* 0x12 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13359,7 +13359,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_16: /* 0x13 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13373,7 +13373,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST: /* 0x14 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13387,7 +13387,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_HIGH16: /* 0x15 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13401,7 +13401,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_WIDE_16: /* 0x16 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13415,7 +13415,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_WIDE_32: /* 0x17 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13429,7 +13429,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_WIDE: /* 0x18 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13443,7 +13443,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_WIDE_HIGH16: /* 0x19 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13457,7 +13457,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_STRING: /* 0x1a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13471,7 +13471,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_STRING_JUMBO: /* 0x1b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13485,7 +13485,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_CLASS: /* 0x1c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13499,7 +13499,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MONITOR_ENTER: /* 0x1d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13513,7 +13513,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MONITOR_EXIT: /* 0x1e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13527,7 +13527,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CHECK_CAST: /* 0x1f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13541,7 +13541,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INSTANCE_OF: /* 0x20 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13555,7 +13555,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ARRAY_LENGTH: /* 0x21 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13569,7 +13569,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEW_INSTANCE: /* 0x22 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13583,7 +13583,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEW_ARRAY: /* 0x23 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13597,7 +13597,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_FILLED_NEW_ARRAY: /* 0x24 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13611,7 +13611,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_FILLED_NEW_ARRAY_RANGE: /* 0x25 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13625,7 +13625,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_FILL_ARRAY_DATA: /* 0x26 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13639,7 +13639,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_THROW: /* 0x27 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13653,7 +13653,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_GOTO: /* 0x28 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13667,7 +13667,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_GOTO_16: /* 0x29 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13681,7 +13681,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_GOTO_32: /* 0x2a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13695,7 +13695,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_PACKED_SWITCH: /* 0x2b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13709,7 +13709,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPARSE_SWITCH: /* 0x2c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13723,7 +13723,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CMPL_FLOAT: /* 0x2d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13737,7 +13737,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CMPG_FLOAT: /* 0x2e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13751,7 +13751,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CMPL_DOUBLE: /* 0x2f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13765,7 +13765,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CMPG_DOUBLE: /* 0x30 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13779,7 +13779,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CMP_LONG: /* 0x31 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13793,7 +13793,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_EQ: /* 0x32 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13807,7 +13807,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_NE: /* 0x33 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13821,7 +13821,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_LT: /* 0x34 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13835,7 +13835,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_GE: /* 0x35 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13849,7 +13849,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_GT: /* 0x36 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13863,7 +13863,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_LE: /* 0x37 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13877,7 +13877,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_EQZ: /* 0x38 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13891,7 +13891,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_NEZ: /* 0x39 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13905,7 +13905,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_LTZ: /* 0x3a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13919,7 +13919,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_GEZ: /* 0x3b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13933,7 +13933,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_GTZ: /* 0x3c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13947,7 +13947,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IF_LEZ: /* 0x3d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13961,7 +13961,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3E: /* 0x3e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13975,7 +13975,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3F: /* 0x3f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13989,7 +13989,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_40: /* 0x40 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14003,7 +14003,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_41: /* 0x41 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14017,7 +14017,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_42: /* 0x42 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14031,7 +14031,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_43: /* 0x43 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14045,7 +14045,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AGET: /* 0x44 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14059,7 +14059,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AGET_WIDE: /* 0x45 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14073,7 +14073,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AGET_OBJECT: /* 0x46 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14087,7 +14087,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AGET_BOOLEAN: /* 0x47 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14101,7 +14101,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AGET_BYTE: /* 0x48 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14115,7 +14115,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AGET_CHAR: /* 0x49 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14129,7 +14129,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AGET_SHORT: /* 0x4a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14143,7 +14143,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_APUT: /* 0x4b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14157,7 +14157,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_APUT_WIDE: /* 0x4c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14171,7 +14171,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_APUT_OBJECT: /* 0x4d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14185,7 +14185,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_APUT_BOOLEAN: /* 0x4e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14199,7 +14199,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_APUT_BYTE: /* 0x4f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14213,7 +14213,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_APUT_CHAR: /* 0x50 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14227,7 +14227,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_APUT_SHORT: /* 0x51 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14241,7 +14241,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET: /* 0x52 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14255,7 +14255,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_WIDE: /* 0x53 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14269,7 +14269,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_OBJECT: /* 0x54 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14283,7 +14283,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_BOOLEAN: /* 0x55 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14297,7 +14297,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_BYTE: /* 0x56 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14311,7 +14311,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_CHAR: /* 0x57 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14325,7 +14325,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_SHORT: /* 0x58 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14339,7 +14339,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT: /* 0x59 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14353,7 +14353,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_WIDE: /* 0x5a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14367,7 +14367,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_OBJECT: /* 0x5b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14381,7 +14381,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_BOOLEAN: /* 0x5c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14395,7 +14395,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_BYTE: /* 0x5d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14409,7 +14409,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_CHAR: /* 0x5e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14423,7 +14423,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_SHORT: /* 0x5f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14437,7 +14437,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET: /* 0x60 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14451,7 +14451,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_WIDE: /* 0x61 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14465,7 +14465,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_OBJECT: /* 0x62 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14479,7 +14479,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_BOOLEAN: /* 0x63 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14493,7 +14493,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_BYTE: /* 0x64 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14507,7 +14507,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_CHAR: /* 0x65 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14521,7 +14521,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_SHORT: /* 0x66 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14535,7 +14535,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT: /* 0x67 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14549,7 +14549,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_WIDE: /* 0x68 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14563,7 +14563,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_OBJECT: /* 0x69 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14577,7 +14577,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_BOOLEAN: /* 0x6a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14591,7 +14591,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_BYTE: /* 0x6b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14605,7 +14605,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_CHAR: /* 0x6c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14619,7 +14619,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_SHORT: /* 0x6d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14633,7 +14633,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_VIRTUAL: /* 0x6e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14647,7 +14647,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_SUPER: /* 0x6f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14661,7 +14661,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_DIRECT: /* 0x70 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14675,7 +14675,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_STATIC: /* 0x71 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14689,7 +14689,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_INTERFACE: /* 0x72 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14703,7 +14703,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_73: /* 0x73 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14717,7 +14717,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_VIRTUAL_RANGE: /* 0x74 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14731,7 +14731,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_SUPER_RANGE: /* 0x75 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14745,7 +14745,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_DIRECT_RANGE: /* 0x76 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14759,7 +14759,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_STATIC_RANGE: /* 0x77 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14773,7 +14773,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_INTERFACE_RANGE: /* 0x78 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14787,7 +14787,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_79: /* 0x79 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14801,7 +14801,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_7A: /* 0x7a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14815,7 +14815,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEG_INT: /* 0x7b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14829,7 +14829,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NOT_INT: /* 0x7c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14843,7 +14843,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEG_LONG: /* 0x7d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14857,7 +14857,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NOT_LONG: /* 0x7e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14871,7 +14871,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEG_FLOAT: /* 0x7f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14885,7 +14885,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEG_DOUBLE: /* 0x80 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14899,7 +14899,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INT_TO_LONG: /* 0x81 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14913,7 +14913,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INT_TO_FLOAT: /* 0x82 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14927,7 +14927,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INT_TO_DOUBLE: /* 0x83 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14941,7 +14941,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_LONG_TO_INT: /* 0x84 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14955,7 +14955,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_LONG_TO_FLOAT: /* 0x85 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14969,7 +14969,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_LONG_TO_DOUBLE: /* 0x86 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14983,7 +14983,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_FLOAT_TO_INT: /* 0x87 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14997,7 +14997,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_FLOAT_TO_LONG: /* 0x88 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15011,7 +15011,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_FLOAT_TO_DOUBLE: /* 0x89 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15025,7 +15025,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DOUBLE_TO_INT: /* 0x8a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15039,7 +15039,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DOUBLE_TO_LONG: /* 0x8b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15053,7 +15053,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DOUBLE_TO_FLOAT: /* 0x8c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15067,7 +15067,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INT_TO_BYTE: /* 0x8d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15081,7 +15081,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INT_TO_CHAR: /* 0x8e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15095,7 +15095,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INT_TO_SHORT: /* 0x8f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15109,7 +15109,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_INT: /* 0x90 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15123,7 +15123,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_INT: /* 0x91 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15137,7 +15137,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_INT: /* 0x92 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15151,7 +15151,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_INT: /* 0x93 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15165,7 +15165,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_INT: /* 0x94 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15179,7 +15179,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AND_INT: /* 0x95 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15193,7 +15193,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_OR_INT: /* 0x96 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15207,7 +15207,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_XOR_INT: /* 0x97 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15221,7 +15221,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHL_INT: /* 0x98 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15235,7 +15235,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHR_INT: /* 0x99 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15249,7 +15249,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_USHR_INT: /* 0x9a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15263,7 +15263,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_LONG: /* 0x9b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15277,7 +15277,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_LONG: /* 0x9c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15291,7 +15291,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_LONG: /* 0x9d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15305,7 +15305,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_LONG: /* 0x9e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15319,7 +15319,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_LONG: /* 0x9f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15333,7 +15333,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AND_LONG: /* 0xa0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15347,7 +15347,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_OR_LONG: /* 0xa1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15361,7 +15361,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_XOR_LONG: /* 0xa2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15375,7 +15375,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHL_LONG: /* 0xa3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15389,7 +15389,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHR_LONG: /* 0xa4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15403,7 +15403,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_USHR_LONG: /* 0xa5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15417,7 +15417,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_FLOAT: /* 0xa6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15431,7 +15431,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_FLOAT: /* 0xa7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15445,7 +15445,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_FLOAT: /* 0xa8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15459,7 +15459,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_FLOAT: /* 0xa9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15473,7 +15473,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_FLOAT: /* 0xaa */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15487,7 +15487,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_DOUBLE: /* 0xab */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15501,7 +15501,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_DOUBLE: /* 0xac */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15515,7 +15515,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_DOUBLE: /* 0xad */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15529,7 +15529,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_DOUBLE: /* 0xae */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15543,7 +15543,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_DOUBLE: /* 0xaf */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15557,7 +15557,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_INT_2ADDR: /* 0xb0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15571,7 +15571,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_INT_2ADDR: /* 0xb1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15585,7 +15585,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_INT_2ADDR: /* 0xb2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15599,7 +15599,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_INT_2ADDR: /* 0xb3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15613,7 +15613,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_INT_2ADDR: /* 0xb4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15627,7 +15627,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AND_INT_2ADDR: /* 0xb5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15641,7 +15641,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_OR_INT_2ADDR: /* 0xb6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15655,7 +15655,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_XOR_INT_2ADDR: /* 0xb7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15669,7 +15669,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHL_INT_2ADDR: /* 0xb8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15683,7 +15683,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHR_INT_2ADDR: /* 0xb9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15697,7 +15697,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_USHR_INT_2ADDR: /* 0xba */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15711,7 +15711,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_LONG_2ADDR: /* 0xbb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15725,7 +15725,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_LONG_2ADDR: /* 0xbc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15739,7 +15739,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_LONG_2ADDR: /* 0xbd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15753,7 +15753,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_LONG_2ADDR: /* 0xbe */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15767,7 +15767,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_LONG_2ADDR: /* 0xbf */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15781,7 +15781,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AND_LONG_2ADDR: /* 0xc0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15795,7 +15795,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_OR_LONG_2ADDR: /* 0xc1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15809,7 +15809,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_XOR_LONG_2ADDR: /* 0xc2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15823,7 +15823,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHL_LONG_2ADDR: /* 0xc3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15837,7 +15837,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHR_LONG_2ADDR: /* 0xc4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15851,7 +15851,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_USHR_LONG_2ADDR: /* 0xc5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15865,7 +15865,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_FLOAT_2ADDR: /* 0xc6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15879,7 +15879,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_FLOAT_2ADDR: /* 0xc7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15893,7 +15893,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_FLOAT_2ADDR: /* 0xc8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15907,7 +15907,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_FLOAT_2ADDR: /* 0xc9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15921,7 +15921,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_FLOAT_2ADDR: /* 0xca */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15935,7 +15935,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_DOUBLE_2ADDR: /* 0xcb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15949,7 +15949,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SUB_DOUBLE_2ADDR: /* 0xcc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15963,7 +15963,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_DOUBLE_2ADDR: /* 0xcd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15977,7 +15977,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_DOUBLE_2ADDR: /* 0xce */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15991,7 +15991,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_DOUBLE_2ADDR: /* 0xcf */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16005,7 +16005,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_INT_LIT16: /* 0xd0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16019,7 +16019,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_RSUB_INT: /* 0xd1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16033,7 +16033,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_INT_LIT16: /* 0xd2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16047,7 +16047,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_INT_LIT16: /* 0xd3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16061,7 +16061,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_INT_LIT16: /* 0xd4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16075,7 +16075,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AND_INT_LIT16: /* 0xd5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16089,7 +16089,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_OR_INT_LIT16: /* 0xd6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16103,7 +16103,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_XOR_INT_LIT16: /* 0xd7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16117,7 +16117,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_ADD_INT_LIT8: /* 0xd8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16131,7 +16131,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_RSUB_INT_LIT8: /* 0xd9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16145,7 +16145,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_MUL_INT_LIT8: /* 0xda */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16159,7 +16159,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DIV_INT_LIT8: /* 0xdb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16173,7 +16173,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_REM_INT_LIT8: /* 0xdc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16187,7 +16187,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_AND_INT_LIT8: /* 0xdd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16201,7 +16201,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_OR_INT_LIT8: /* 0xde */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16215,7 +16215,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_XOR_INT_LIT8: /* 0xdf */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16229,7 +16229,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHL_INT_LIT8: /* 0xe0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16243,7 +16243,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SHR_INT_LIT8: /* 0xe1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16257,7 +16257,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_USHR_INT_LIT8: /* 0xe2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16271,7 +16271,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_VOLATILE: /* 0xe3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16285,7 +16285,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_VOLATILE: /* 0xe4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16299,7 +16299,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_VOLATILE: /* 0xe5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16313,7 +16313,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_VOLATILE: /* 0xe6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16327,7 +16327,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_OBJECT_VOLATILE: /* 0xe7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16341,7 +16341,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_WIDE_VOLATILE: /* 0xe8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16355,7 +16355,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_WIDE_VOLATILE: /* 0xe9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16369,7 +16369,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_WIDE_VOLATILE: /* 0xea */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16383,7 +16383,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_WIDE_VOLATILE: /* 0xeb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16397,7 +16397,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_BREAKPOINT: /* 0xec */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16411,7 +16411,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_THROW_VERIFICATION_ERROR: /* 0xed */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16425,7 +16425,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_EXECUTE_INLINE: /* 0xee */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16439,7 +16439,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_EXECUTE_INLINE_RANGE: /* 0xef */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16453,7 +16453,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_OBJECT_INIT: /* 0xf0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16467,7 +16467,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_RETURN_VOID_BARRIER: /* 0xf1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16481,7 +16481,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_QUICK: /* 0xf2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16495,7 +16495,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_WIDE_QUICK: /* 0xf3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16509,7 +16509,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_OBJECT_QUICK: /* 0xf4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16523,7 +16523,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_QUICK: /* 0xf5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16537,7 +16537,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_WIDE_QUICK: /* 0xf6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16551,7 +16551,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_OBJECT_QUICK: /* 0xf7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16565,7 +16565,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_VIRTUAL_QUICK: /* 0xf8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16579,7 +16579,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_VIRTUAL_QUICK_RANGE: /* 0xf9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16593,7 +16593,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_SUPER_QUICK: /* 0xfa */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16607,7 +16607,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_SUPER_QUICK_RANGE: /* 0xfb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16621,7 +16621,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_OBJECT_VOLATILE: /* 0xfc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16635,7 +16635,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_OBJECT_VOLATILE: /* 0xfd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16649,7 +16649,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_OBJECT_VOLATILE: /* 0xfe */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16663,16 +16663,21 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_DISPATCH_FF: /* 0xff */
-/* File: armv5te/ALT_OP_DISPATCH_FF.S */
-    mov     ip, rINST, lsr #8            @ ip<- extended opcode
-    add     ip, ip, #256                 @ add offset for extended opcodes
-    GOTO_OPCODE(ip)                      @ go to proper extended handler
-
+/* File: armv5te/alt_stub.S */
+/*
+ * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
+ * any interesting requests and then jump to the real instruction
+ * handler.  Note that the call to dvmCheckInst is done as a tail call.
+ */
+    adrl   lr, dvmAsmInstructionStart + (255 * 64)
+    mov    r0, rPC              @ arg0
+    mov    r1, rSELF            @ arg1
+    b      dvmCheckInst         @ (dPC,self) tail call to instruction checker
 
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CONST_CLASS_JUMBO: /* 0x100 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16686,7 +16691,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_CHECK_CAST_JUMBO: /* 0x101 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16700,7 +16705,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INSTANCE_OF_JUMBO: /* 0x102 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16714,7 +16719,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEW_INSTANCE_JUMBO: /* 0x103 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16728,7 +16733,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_NEW_ARRAY_JUMBO: /* 0x104 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16742,7 +16747,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_FILLED_NEW_ARRAY_JUMBO: /* 0x105 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16756,7 +16761,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_JUMBO: /* 0x106 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16770,7 +16775,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_WIDE_JUMBO: /* 0x107 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16784,7 +16789,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_OBJECT_JUMBO: /* 0x108 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16798,7 +16803,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_BOOLEAN_JUMBO: /* 0x109 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16812,7 +16817,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_BYTE_JUMBO: /* 0x10a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16826,7 +16831,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_CHAR_JUMBO: /* 0x10b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16840,7 +16845,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IGET_SHORT_JUMBO: /* 0x10c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16854,7 +16859,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_JUMBO: /* 0x10d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16868,7 +16873,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_WIDE_JUMBO: /* 0x10e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16882,7 +16887,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_OBJECT_JUMBO: /* 0x10f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16896,7 +16901,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_BOOLEAN_JUMBO: /* 0x110 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16910,7 +16915,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_BYTE_JUMBO: /* 0x111 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16924,7 +16929,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_CHAR_JUMBO: /* 0x112 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16938,7 +16943,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_IPUT_SHORT_JUMBO: /* 0x113 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16952,7 +16957,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_JUMBO: /* 0x114 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16966,7 +16971,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_WIDE_JUMBO: /* 0x115 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16980,7 +16985,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_OBJECT_JUMBO: /* 0x116 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16994,7 +16999,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_BOOLEAN_JUMBO: /* 0x117 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17008,7 +17013,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_BYTE_JUMBO: /* 0x118 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17022,7 +17027,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_CHAR_JUMBO: /* 0x119 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17036,7 +17041,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SGET_SHORT_JUMBO: /* 0x11a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17050,7 +17055,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_JUMBO: /* 0x11b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17064,7 +17069,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_WIDE_JUMBO: /* 0x11c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17078,7 +17083,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_OBJECT_JUMBO: /* 0x11d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17092,7 +17097,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_BOOLEAN_JUMBO: /* 0x11e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17106,7 +17111,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_BYTE_JUMBO: /* 0x11f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17120,7 +17125,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_CHAR_JUMBO: /* 0x120 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17134,7 +17139,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_SPUT_SHORT_JUMBO: /* 0x121 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17148,7 +17153,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_VIRTUAL_JUMBO: /* 0x122 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17162,7 +17167,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_SUPER_JUMBO: /* 0x123 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17176,7 +17181,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_DIRECT_JUMBO: /* 0x124 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17190,7 +17195,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_STATIC_JUMBO: /* 0x125 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17204,7 +17209,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_INVOKE_INTERFACE_JUMBO: /* 0x126 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17218,7 +17223,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_27FF: /* 0x127 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17232,7 +17237,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_28FF: /* 0x128 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17246,7 +17251,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_29FF: /* 0x129 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17260,7 +17265,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_2AFF: /* 0x12a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17274,7 +17279,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_2BFF: /* 0x12b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17288,7 +17293,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_2CFF: /* 0x12c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17302,7 +17307,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_2DFF: /* 0x12d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17316,7 +17321,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_2EFF: /* 0x12e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17330,7 +17335,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_2FFF: /* 0x12f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17344,7 +17349,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_30FF: /* 0x130 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17358,7 +17363,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_31FF: /* 0x131 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17372,7 +17377,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_32FF: /* 0x132 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17386,7 +17391,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_33FF: /* 0x133 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17400,7 +17405,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_34FF: /* 0x134 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17414,7 +17419,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_35FF: /* 0x135 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17428,7 +17433,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_36FF: /* 0x136 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17442,7 +17447,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_37FF: /* 0x137 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17456,7 +17461,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_38FF: /* 0x138 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17470,7 +17475,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_39FF: /* 0x139 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17484,7 +17489,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3AFF: /* 0x13a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17498,7 +17503,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3BFF: /* 0x13b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17512,7 +17517,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3CFF: /* 0x13c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17526,7 +17531,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3DFF: /* 0x13d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17540,7 +17545,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3EFF: /* 0x13e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17554,7 +17559,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_3FFF: /* 0x13f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17568,7 +17573,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_40FF: /* 0x140 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17582,7 +17587,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_41FF: /* 0x141 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17596,7 +17601,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_42FF: /* 0x142 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17610,7 +17615,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_43FF: /* 0x143 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17624,7 +17629,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_44FF: /* 0x144 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17638,7 +17643,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_45FF: /* 0x145 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17652,7 +17657,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_46FF: /* 0x146 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17666,7 +17671,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_47FF: /* 0x147 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17680,7 +17685,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_48FF: /* 0x148 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17694,7 +17699,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_49FF: /* 0x149 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17708,7 +17713,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_4AFF: /* 0x14a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17722,7 +17727,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_4BFF: /* 0x14b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17736,7 +17741,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_4CFF: /* 0x14c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17750,7 +17755,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_4DFF: /* 0x14d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17764,7 +17769,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_4EFF: /* 0x14e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17778,7 +17783,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_4FFF: /* 0x14f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17792,7 +17797,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_50FF: /* 0x150 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17806,7 +17811,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_51FF: /* 0x151 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17820,7 +17825,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_52FF: /* 0x152 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17834,7 +17839,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_53FF: /* 0x153 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17848,7 +17853,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_54FF: /* 0x154 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17862,7 +17867,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_55FF: /* 0x155 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17876,7 +17881,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_56FF: /* 0x156 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17890,7 +17895,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_57FF: /* 0x157 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17904,7 +17909,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_58FF: /* 0x158 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17918,7 +17923,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_59FF: /* 0x159 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17932,7 +17937,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_5AFF: /* 0x15a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17946,7 +17951,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_5BFF: /* 0x15b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17960,7 +17965,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_5CFF: /* 0x15c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17974,7 +17979,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_5DFF: /* 0x15d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17988,7 +17993,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_5EFF: /* 0x15e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18002,7 +18007,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_5FFF: /* 0x15f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18016,7 +18021,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_60FF: /* 0x160 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18030,7 +18035,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_61FF: /* 0x161 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18044,7 +18049,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_62FF: /* 0x162 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18058,7 +18063,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_63FF: /* 0x163 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18072,7 +18077,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_64FF: /* 0x164 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18086,7 +18091,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_65FF: /* 0x165 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18100,7 +18105,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_66FF: /* 0x166 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18114,7 +18119,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_67FF: /* 0x167 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18128,7 +18133,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_68FF: /* 0x168 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18142,7 +18147,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_69FF: /* 0x169 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18156,7 +18161,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_6AFF: /* 0x16a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18170,7 +18175,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_6BFF: /* 0x16b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18184,7 +18189,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_6CFF: /* 0x16c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18198,7 +18203,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_6DFF: /* 0x16d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18212,7 +18217,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_6EFF: /* 0x16e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18226,7 +18231,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_6FFF: /* 0x16f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18240,7 +18245,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_70FF: /* 0x170 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18254,7 +18259,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_71FF: /* 0x171 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18268,7 +18273,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_72FF: /* 0x172 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18282,7 +18287,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_73FF: /* 0x173 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18296,7 +18301,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_74FF: /* 0x174 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18310,7 +18315,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_75FF: /* 0x175 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18324,7 +18329,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_76FF: /* 0x176 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18338,7 +18343,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_77FF: /* 0x177 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18352,7 +18357,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_78FF: /* 0x178 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18366,7 +18371,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_79FF: /* 0x179 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18380,7 +18385,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_7AFF: /* 0x17a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18394,7 +18399,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_7BFF: /* 0x17b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18408,7 +18413,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_7CFF: /* 0x17c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18422,7 +18427,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_7DFF: /* 0x17d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18436,7 +18441,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_7EFF: /* 0x17e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18450,7 +18455,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_7FFF: /* 0x17f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18464,7 +18469,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_80FF: /* 0x180 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18478,7 +18483,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_81FF: /* 0x181 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18492,7 +18497,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_82FF: /* 0x182 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18506,7 +18511,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_83FF: /* 0x183 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18520,7 +18525,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_84FF: /* 0x184 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18534,7 +18539,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_85FF: /* 0x185 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18548,7 +18553,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_86FF: /* 0x186 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18562,7 +18567,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_87FF: /* 0x187 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18576,7 +18581,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_88FF: /* 0x188 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18590,7 +18595,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_89FF: /* 0x189 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18604,7 +18609,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_8AFF: /* 0x18a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18618,7 +18623,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_8BFF: /* 0x18b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18632,7 +18637,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_8CFF: /* 0x18c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18646,7 +18651,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_8DFF: /* 0x18d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18660,7 +18665,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_8EFF: /* 0x18e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18674,7 +18679,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_8FFF: /* 0x18f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18688,7 +18693,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_90FF: /* 0x190 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18702,7 +18707,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_91FF: /* 0x191 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18716,7 +18721,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_92FF: /* 0x192 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18730,7 +18735,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_93FF: /* 0x193 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18744,7 +18749,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_94FF: /* 0x194 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18758,7 +18763,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_95FF: /* 0x195 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18772,7 +18777,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_96FF: /* 0x196 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18786,7 +18791,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_97FF: /* 0x197 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18800,7 +18805,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_98FF: /* 0x198 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18814,7 +18819,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_99FF: /* 0x199 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18828,7 +18833,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_9AFF: /* 0x19a */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18842,7 +18847,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_9BFF: /* 0x19b */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18856,7 +18861,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_9CFF: /* 0x19c */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18870,7 +18875,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_9DFF: /* 0x19d */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18884,7 +18889,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_9EFF: /* 0x19e */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18898,7 +18903,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_9FFF: /* 0x19f */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18912,7 +18917,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A0FF: /* 0x1a0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18926,7 +18931,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A1FF: /* 0x1a1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18940,7 +18945,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A2FF: /* 0x1a2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18954,7 +18959,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A3FF: /* 0x1a3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18968,7 +18973,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A4FF: /* 0x1a4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18982,7 +18987,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A5FF: /* 0x1a5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18996,7 +19001,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A6FF: /* 0x1a6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19010,7 +19015,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A7FF: /* 0x1a7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19024,7 +19029,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A8FF: /* 0x1a8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19038,7 +19043,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_A9FF: /* 0x1a9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19052,7 +19057,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_AAFF: /* 0x1aa */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19066,7 +19071,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_ABFF: /* 0x1ab */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19080,7 +19085,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_ACFF: /* 0x1ac */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19094,7 +19099,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_ADFF: /* 0x1ad */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19108,7 +19113,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_AEFF: /* 0x1ae */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19122,7 +19127,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_AFFF: /* 0x1af */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19136,7 +19141,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B0FF: /* 0x1b0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19150,7 +19155,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B1FF: /* 0x1b1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19164,7 +19169,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B2FF: /* 0x1b2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19178,7 +19183,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B3FF: /* 0x1b3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19192,7 +19197,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B4FF: /* 0x1b4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19206,7 +19211,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B5FF: /* 0x1b5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19220,7 +19225,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B6FF: /* 0x1b6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19234,7 +19239,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B7FF: /* 0x1b7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19248,7 +19253,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B8FF: /* 0x1b8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19262,7 +19267,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_B9FF: /* 0x1b9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19276,7 +19281,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_BAFF: /* 0x1ba */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19290,7 +19295,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_BBFF: /* 0x1bb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19304,7 +19309,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_BCFF: /* 0x1bc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19318,7 +19323,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_BDFF: /* 0x1bd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19332,7 +19337,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_BEFF: /* 0x1be */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19346,7 +19351,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_BFFF: /* 0x1bf */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19360,7 +19365,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C0FF: /* 0x1c0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19374,7 +19379,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C1FF: /* 0x1c1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19388,7 +19393,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C2FF: /* 0x1c2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19402,7 +19407,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C3FF: /* 0x1c3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19416,7 +19421,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C4FF: /* 0x1c4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19430,7 +19435,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C5FF: /* 0x1c5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19444,7 +19449,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C6FF: /* 0x1c6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19458,7 +19463,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C7FF: /* 0x1c7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19472,7 +19477,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C8FF: /* 0x1c8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19486,7 +19491,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_C9FF: /* 0x1c9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19500,7 +19505,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_CAFF: /* 0x1ca */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19514,7 +19519,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_CBFF: /* 0x1cb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19528,7 +19533,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_CCFF: /* 0x1cc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19542,7 +19547,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_CDFF: /* 0x1cd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19556,7 +19561,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_CEFF: /* 0x1ce */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19570,7 +19575,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_CFFF: /* 0x1cf */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19584,7 +19589,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D0FF: /* 0x1d0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19598,7 +19603,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D1FF: /* 0x1d1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19612,7 +19617,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D2FF: /* 0x1d2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19626,7 +19631,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D3FF: /* 0x1d3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19640,7 +19645,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D4FF: /* 0x1d4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19654,7 +19659,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D5FF: /* 0x1d5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19668,7 +19673,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D6FF: /* 0x1d6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19682,7 +19687,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D7FF: /* 0x1d7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19696,7 +19701,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D8FF: /* 0x1d8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19710,7 +19715,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_D9FF: /* 0x1d9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19724,7 +19729,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_DAFF: /* 0x1da */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19738,7 +19743,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_DBFF: /* 0x1db */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19752,7 +19757,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_DCFF: /* 0x1dc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19766,7 +19771,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_DDFF: /* 0x1dd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19780,7 +19785,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_DEFF: /* 0x1de */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19794,7 +19799,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_DFFF: /* 0x1df */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19808,7 +19813,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E0FF: /* 0x1e0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19822,7 +19827,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E1FF: /* 0x1e1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19836,7 +19841,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E2FF: /* 0x1e2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19850,7 +19855,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E3FF: /* 0x1e3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19864,7 +19869,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E4FF: /* 0x1e4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19878,7 +19883,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E5FF: /* 0x1e5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19892,7 +19897,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E6FF: /* 0x1e6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19906,7 +19911,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E7FF: /* 0x1e7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19920,7 +19925,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E8FF: /* 0x1e8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19934,7 +19939,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_E9FF: /* 0x1e9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19948,7 +19953,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_EAFF: /* 0x1ea */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19962,7 +19967,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_EBFF: /* 0x1eb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19976,7 +19981,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_ECFF: /* 0x1ec */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19990,7 +19995,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_EDFF: /* 0x1ed */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20004,7 +20009,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_EEFF: /* 0x1ee */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20018,7 +20023,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_EFFF: /* 0x1ef */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20032,7 +20037,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F0FF: /* 0x1f0 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20046,7 +20051,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F1FF: /* 0x1f1 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20060,7 +20065,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F2FF: /* 0x1f2 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20074,7 +20079,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F3FF: /* 0x1f3 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20088,7 +20093,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F4FF: /* 0x1f4 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20102,7 +20107,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F5FF: /* 0x1f5 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20116,7 +20121,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F6FF: /* 0x1f6 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20130,7 +20135,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F7FF: /* 0x1f7 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20144,7 +20149,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F8FF: /* 0x1f8 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20158,7 +20163,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_F9FF: /* 0x1f9 */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20172,7 +20177,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_FAFF: /* 0x1fa */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20186,7 +20191,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_FBFF: /* 0x1fb */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20200,7 +20205,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_FCFF: /* 0x1fc */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20214,7 +20219,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_FDFF: /* 0x1fd */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20228,7 +20233,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_UNUSED_FEFF: /* 0x1fe */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20242,7 +20247,7 @@
 /* ------------------------------ */
     .balign 64
 .L_ALT_OP_THROW_VERIFICATION_ERROR_JUMBO: /* 0x1ff */
-/* File: armv5te/ALT_STUB.S */
+/* File: armv5te/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
diff --git a/vm/mterp/out/InterpAsm-x86.S b/vm/mterp/out/InterpAsm-x86.S
index 6698447..4e2fadb 100644
--- a/vm/mterp/out/InterpAsm-x86.S
+++ b/vm/mterp/out/InterpAsm-x86.S
@@ -11448,7 +11448,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_NOP: /* 0x00 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11465,7 +11465,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_MOVE: /* 0x01 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11482,7 +11482,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_MOVE_FROM16: /* 0x02 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11499,7 +11499,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_MOVE_16: /* 0x03 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11516,7 +11516,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_MOVE_WIDE: /* 0x04 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11533,7 +11533,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_MOVE_WIDE_FROM16: /* 0x05 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11550,7 +11550,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_MOVE_WIDE_16: /* 0x06 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11567,7 +11567,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_MOVE_OBJECT: /* 0x07 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11584,7 +11584,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_MOVE_OBJECT_FROM16: /* 0x08 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11601,7 +11601,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_MOVE_OBJECT_16: /* 0x09 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11618,7 +11618,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_MOVE_RESULT: /* 0x0a */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11635,7 +11635,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_MOVE_RESULT_WIDE: /* 0x0b */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11652,7 +11652,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_MOVE_RESULT_OBJECT: /* 0x0c */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11669,7 +11669,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_MOVE_EXCEPTION: /* 0x0d */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11686,7 +11686,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_RETURN_VOID: /* 0x0e */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11703,7 +11703,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_RETURN: /* 0x0f */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11720,7 +11720,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_RETURN_WIDE: /* 0x10 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11737,7 +11737,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_RETURN_OBJECT: /* 0x11 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11754,7 +11754,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_CONST_4: /* 0x12 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11771,7 +11771,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_CONST_16: /* 0x13 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11788,7 +11788,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_CONST: /* 0x14 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11805,7 +11805,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_CONST_HIGH16: /* 0x15 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11822,7 +11822,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_CONST_WIDE_16: /* 0x16 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11839,7 +11839,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_CONST_WIDE_32: /* 0x17 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11856,7 +11856,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_CONST_WIDE: /* 0x18 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11873,7 +11873,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_CONST_WIDE_HIGH16: /* 0x19 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11890,7 +11890,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_CONST_STRING: /* 0x1a */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11907,7 +11907,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_CONST_STRING_JUMBO: /* 0x1b */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11924,7 +11924,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_CONST_CLASS: /* 0x1c */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11941,7 +11941,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_MONITOR_ENTER: /* 0x1d */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11958,7 +11958,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_MONITOR_EXIT: /* 0x1e */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11975,7 +11975,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_CHECK_CAST: /* 0x1f */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -11992,7 +11992,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_INSTANCE_OF: /* 0x20 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12009,7 +12009,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_ARRAY_LENGTH: /* 0x21 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12026,7 +12026,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_NEW_INSTANCE: /* 0x22 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12043,7 +12043,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_NEW_ARRAY: /* 0x23 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12060,7 +12060,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_FILLED_NEW_ARRAY: /* 0x24 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12077,7 +12077,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_FILLED_NEW_ARRAY_RANGE: /* 0x25 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12094,7 +12094,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_FILL_ARRAY_DATA: /* 0x26 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12111,7 +12111,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_THROW: /* 0x27 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12128,7 +12128,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_GOTO: /* 0x28 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12145,7 +12145,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_GOTO_16: /* 0x29 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12162,7 +12162,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_GOTO_32: /* 0x2a */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12179,7 +12179,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_PACKED_SWITCH: /* 0x2b */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12196,7 +12196,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SPARSE_SWITCH: /* 0x2c */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12213,7 +12213,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_CMPL_FLOAT: /* 0x2d */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12230,7 +12230,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_CMPG_FLOAT: /* 0x2e */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12247,7 +12247,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_CMPL_DOUBLE: /* 0x2f */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12264,7 +12264,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_CMPG_DOUBLE: /* 0x30 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12281,7 +12281,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_CMP_LONG: /* 0x31 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12298,7 +12298,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IF_EQ: /* 0x32 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12315,7 +12315,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IF_NE: /* 0x33 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12332,7 +12332,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IF_LT: /* 0x34 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12349,7 +12349,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IF_GE: /* 0x35 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12366,7 +12366,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IF_GT: /* 0x36 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12383,7 +12383,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IF_LE: /* 0x37 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12400,7 +12400,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IF_EQZ: /* 0x38 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12417,7 +12417,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IF_NEZ: /* 0x39 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12434,7 +12434,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IF_LTZ: /* 0x3a */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12451,7 +12451,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IF_GEZ: /* 0x3b */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12468,7 +12468,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IF_GTZ: /* 0x3c */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12485,7 +12485,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IF_LEZ: /* 0x3d */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12502,7 +12502,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_3E: /* 0x3e */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12519,7 +12519,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_3F: /* 0x3f */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12536,7 +12536,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_40: /* 0x40 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12553,7 +12553,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_41: /* 0x41 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12570,7 +12570,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_42: /* 0x42 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12587,7 +12587,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_43: /* 0x43 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12604,7 +12604,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_AGET: /* 0x44 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12621,7 +12621,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_AGET_WIDE: /* 0x45 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12638,7 +12638,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_AGET_OBJECT: /* 0x46 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12655,7 +12655,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_AGET_BOOLEAN: /* 0x47 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12672,7 +12672,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_AGET_BYTE: /* 0x48 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12689,7 +12689,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_AGET_CHAR: /* 0x49 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12706,7 +12706,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_AGET_SHORT: /* 0x4a */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12723,7 +12723,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_APUT: /* 0x4b */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12740,7 +12740,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_APUT_WIDE: /* 0x4c */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12757,7 +12757,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_APUT_OBJECT: /* 0x4d */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12774,7 +12774,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_APUT_BOOLEAN: /* 0x4e */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12791,7 +12791,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_APUT_BYTE: /* 0x4f */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12808,7 +12808,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_APUT_CHAR: /* 0x50 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12825,7 +12825,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_APUT_SHORT: /* 0x51 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12842,7 +12842,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IGET: /* 0x52 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12859,7 +12859,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IGET_WIDE: /* 0x53 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12876,7 +12876,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IGET_OBJECT: /* 0x54 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12893,7 +12893,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IGET_BOOLEAN: /* 0x55 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12910,7 +12910,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IGET_BYTE: /* 0x56 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12927,7 +12927,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IGET_CHAR: /* 0x57 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12944,7 +12944,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IGET_SHORT: /* 0x58 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12961,7 +12961,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IPUT: /* 0x59 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12978,7 +12978,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IPUT_WIDE: /* 0x5a */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -12995,7 +12995,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IPUT_OBJECT: /* 0x5b */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13012,7 +13012,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IPUT_BOOLEAN: /* 0x5c */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13029,7 +13029,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IPUT_BYTE: /* 0x5d */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13046,7 +13046,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IPUT_CHAR: /* 0x5e */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13063,7 +13063,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IPUT_SHORT: /* 0x5f */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13080,7 +13080,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SGET: /* 0x60 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13097,7 +13097,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SGET_WIDE: /* 0x61 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13114,7 +13114,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SGET_OBJECT: /* 0x62 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13131,7 +13131,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SGET_BOOLEAN: /* 0x63 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13148,7 +13148,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SGET_BYTE: /* 0x64 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13165,7 +13165,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SGET_CHAR: /* 0x65 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13182,7 +13182,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SGET_SHORT: /* 0x66 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13199,7 +13199,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SPUT: /* 0x67 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13216,7 +13216,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SPUT_WIDE: /* 0x68 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13233,7 +13233,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SPUT_OBJECT: /* 0x69 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13250,7 +13250,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SPUT_BOOLEAN: /* 0x6a */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13267,7 +13267,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SPUT_BYTE: /* 0x6b */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13284,7 +13284,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SPUT_CHAR: /* 0x6c */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13301,7 +13301,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SPUT_SHORT: /* 0x6d */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13318,7 +13318,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_INVOKE_VIRTUAL: /* 0x6e */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13335,7 +13335,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_INVOKE_SUPER: /* 0x6f */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13352,7 +13352,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_INVOKE_DIRECT: /* 0x70 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13369,7 +13369,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_INVOKE_STATIC: /* 0x71 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13386,7 +13386,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_INVOKE_INTERFACE: /* 0x72 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13403,7 +13403,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_73: /* 0x73 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13420,7 +13420,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_INVOKE_VIRTUAL_RANGE: /* 0x74 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13437,7 +13437,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_INVOKE_SUPER_RANGE: /* 0x75 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13454,7 +13454,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_INVOKE_DIRECT_RANGE: /* 0x76 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13471,7 +13471,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_INVOKE_STATIC_RANGE: /* 0x77 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13488,7 +13488,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_INVOKE_INTERFACE_RANGE: /* 0x78 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13505,7 +13505,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_79: /* 0x79 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13522,7 +13522,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_7A: /* 0x7a */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13539,7 +13539,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_NEG_INT: /* 0x7b */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13556,7 +13556,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_NOT_INT: /* 0x7c */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13573,7 +13573,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_NEG_LONG: /* 0x7d */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13590,7 +13590,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_NOT_LONG: /* 0x7e */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13607,7 +13607,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_NEG_FLOAT: /* 0x7f */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13624,7 +13624,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_NEG_DOUBLE: /* 0x80 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13641,7 +13641,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_INT_TO_LONG: /* 0x81 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13658,7 +13658,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_INT_TO_FLOAT: /* 0x82 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13675,7 +13675,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_INT_TO_DOUBLE: /* 0x83 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13692,7 +13692,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_LONG_TO_INT: /* 0x84 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13709,7 +13709,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_LONG_TO_FLOAT: /* 0x85 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13726,7 +13726,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_LONG_TO_DOUBLE: /* 0x86 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13743,7 +13743,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_FLOAT_TO_INT: /* 0x87 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13760,7 +13760,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_FLOAT_TO_LONG: /* 0x88 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13777,7 +13777,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_FLOAT_TO_DOUBLE: /* 0x89 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13794,7 +13794,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_DOUBLE_TO_INT: /* 0x8a */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13811,7 +13811,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_DOUBLE_TO_LONG: /* 0x8b */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13828,7 +13828,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_DOUBLE_TO_FLOAT: /* 0x8c */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13845,7 +13845,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_INT_TO_BYTE: /* 0x8d */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13862,7 +13862,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_INT_TO_CHAR: /* 0x8e */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13879,7 +13879,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_INT_TO_SHORT: /* 0x8f */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13896,7 +13896,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_ADD_INT: /* 0x90 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13913,7 +13913,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SUB_INT: /* 0x91 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13930,7 +13930,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_MUL_INT: /* 0x92 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13947,7 +13947,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_DIV_INT: /* 0x93 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13964,7 +13964,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_REM_INT: /* 0x94 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13981,7 +13981,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_AND_INT: /* 0x95 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -13998,7 +13998,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_OR_INT: /* 0x96 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14015,7 +14015,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_XOR_INT: /* 0x97 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14032,7 +14032,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SHL_INT: /* 0x98 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14049,7 +14049,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SHR_INT: /* 0x99 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14066,7 +14066,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_USHR_INT: /* 0x9a */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14083,7 +14083,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_ADD_LONG: /* 0x9b */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14100,7 +14100,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SUB_LONG: /* 0x9c */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14117,7 +14117,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_MUL_LONG: /* 0x9d */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14134,7 +14134,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_DIV_LONG: /* 0x9e */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14151,7 +14151,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_REM_LONG: /* 0x9f */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14168,7 +14168,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_AND_LONG: /* 0xa0 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14185,7 +14185,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_OR_LONG: /* 0xa1 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14202,7 +14202,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_XOR_LONG: /* 0xa2 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14219,7 +14219,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SHL_LONG: /* 0xa3 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14236,7 +14236,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SHR_LONG: /* 0xa4 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14253,7 +14253,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_USHR_LONG: /* 0xa5 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14270,7 +14270,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_ADD_FLOAT: /* 0xa6 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14287,7 +14287,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SUB_FLOAT: /* 0xa7 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14304,7 +14304,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_MUL_FLOAT: /* 0xa8 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14321,7 +14321,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_DIV_FLOAT: /* 0xa9 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14338,7 +14338,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_REM_FLOAT: /* 0xaa */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14355,7 +14355,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_ADD_DOUBLE: /* 0xab */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14372,7 +14372,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SUB_DOUBLE: /* 0xac */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14389,7 +14389,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_MUL_DOUBLE: /* 0xad */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14406,7 +14406,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_DIV_DOUBLE: /* 0xae */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14423,7 +14423,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_REM_DOUBLE: /* 0xaf */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14440,7 +14440,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_ADD_INT_2ADDR: /* 0xb0 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14457,7 +14457,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SUB_INT_2ADDR: /* 0xb1 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14474,7 +14474,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_MUL_INT_2ADDR: /* 0xb2 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14491,7 +14491,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_DIV_INT_2ADDR: /* 0xb3 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14508,7 +14508,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_REM_INT_2ADDR: /* 0xb4 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14525,7 +14525,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_AND_INT_2ADDR: /* 0xb5 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14542,7 +14542,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_OR_INT_2ADDR: /* 0xb6 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14559,7 +14559,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_XOR_INT_2ADDR: /* 0xb7 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14576,7 +14576,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SHL_INT_2ADDR: /* 0xb8 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14593,7 +14593,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SHR_INT_2ADDR: /* 0xb9 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14610,7 +14610,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_USHR_INT_2ADDR: /* 0xba */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14627,7 +14627,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_ADD_LONG_2ADDR: /* 0xbb */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14644,7 +14644,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SUB_LONG_2ADDR: /* 0xbc */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14661,7 +14661,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_MUL_LONG_2ADDR: /* 0xbd */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14678,7 +14678,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_DIV_LONG_2ADDR: /* 0xbe */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14695,7 +14695,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_REM_LONG_2ADDR: /* 0xbf */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14712,7 +14712,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_AND_LONG_2ADDR: /* 0xc0 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14729,7 +14729,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_OR_LONG_2ADDR: /* 0xc1 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14746,7 +14746,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_XOR_LONG_2ADDR: /* 0xc2 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14763,7 +14763,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SHL_LONG_2ADDR: /* 0xc3 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14780,7 +14780,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SHR_LONG_2ADDR: /* 0xc4 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14797,7 +14797,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_USHR_LONG_2ADDR: /* 0xc5 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14814,7 +14814,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_ADD_FLOAT_2ADDR: /* 0xc6 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14831,7 +14831,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SUB_FLOAT_2ADDR: /* 0xc7 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14848,7 +14848,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_MUL_FLOAT_2ADDR: /* 0xc8 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14865,7 +14865,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_DIV_FLOAT_2ADDR: /* 0xc9 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14882,7 +14882,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_REM_FLOAT_2ADDR: /* 0xca */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14899,7 +14899,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_ADD_DOUBLE_2ADDR: /* 0xcb */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14916,7 +14916,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SUB_DOUBLE_2ADDR: /* 0xcc */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14933,7 +14933,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_MUL_DOUBLE_2ADDR: /* 0xcd */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14950,7 +14950,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_DIV_DOUBLE_2ADDR: /* 0xce */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14967,7 +14967,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_REM_DOUBLE_2ADDR: /* 0xcf */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -14984,7 +14984,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_ADD_INT_LIT16: /* 0xd0 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15001,7 +15001,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_RSUB_INT: /* 0xd1 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15018,7 +15018,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_MUL_INT_LIT16: /* 0xd2 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15035,7 +15035,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_DIV_INT_LIT16: /* 0xd3 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15052,7 +15052,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_REM_INT_LIT16: /* 0xd4 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15069,7 +15069,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_AND_INT_LIT16: /* 0xd5 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15086,7 +15086,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_OR_INT_LIT16: /* 0xd6 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15103,7 +15103,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_XOR_INT_LIT16: /* 0xd7 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15120,7 +15120,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_ADD_INT_LIT8: /* 0xd8 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15137,7 +15137,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_RSUB_INT_LIT8: /* 0xd9 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15154,7 +15154,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_MUL_INT_LIT8: /* 0xda */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15171,7 +15171,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_DIV_INT_LIT8: /* 0xdb */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15188,7 +15188,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_REM_INT_LIT8: /* 0xdc */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15205,7 +15205,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_AND_INT_LIT8: /* 0xdd */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15222,7 +15222,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_OR_INT_LIT8: /* 0xde */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15239,7 +15239,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_XOR_INT_LIT8: /* 0xdf */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15256,7 +15256,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SHL_INT_LIT8: /* 0xe0 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15273,7 +15273,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SHR_INT_LIT8: /* 0xe1 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15290,7 +15290,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_USHR_INT_LIT8: /* 0xe2 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15307,7 +15307,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IGET_VOLATILE: /* 0xe3 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15324,7 +15324,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IPUT_VOLATILE: /* 0xe4 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15341,7 +15341,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SGET_VOLATILE: /* 0xe5 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15358,7 +15358,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SPUT_VOLATILE: /* 0xe6 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15375,7 +15375,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IGET_OBJECT_VOLATILE: /* 0xe7 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15392,7 +15392,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IGET_WIDE_VOLATILE: /* 0xe8 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15409,7 +15409,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IPUT_WIDE_VOLATILE: /* 0xe9 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15426,7 +15426,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SGET_WIDE_VOLATILE: /* 0xea */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15443,7 +15443,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SPUT_WIDE_VOLATILE: /* 0xeb */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15460,7 +15460,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_BREAKPOINT: /* 0xec */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15477,7 +15477,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_THROW_VERIFICATION_ERROR: /* 0xed */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15494,7 +15494,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_EXECUTE_INLINE: /* 0xee */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15511,7 +15511,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_EXECUTE_INLINE_RANGE: /* 0xef */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15528,7 +15528,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_INVOKE_OBJECT_INIT: /* 0xf0 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15545,7 +15545,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_RETURN_VOID_BARRIER: /* 0xf1 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15562,7 +15562,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IGET_QUICK: /* 0xf2 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15579,7 +15579,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IGET_WIDE_QUICK: /* 0xf3 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15596,7 +15596,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IGET_OBJECT_QUICK: /* 0xf4 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15613,7 +15613,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IPUT_QUICK: /* 0xf5 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15630,7 +15630,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IPUT_WIDE_QUICK: /* 0xf6 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15647,7 +15647,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IPUT_OBJECT_QUICK: /* 0xf7 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15664,7 +15664,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_INVOKE_VIRTUAL_QUICK: /* 0xf8 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15681,7 +15681,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_INVOKE_VIRTUAL_QUICK_RANGE: /* 0xf9 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15698,7 +15698,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_INVOKE_SUPER_QUICK: /* 0xfa */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15715,7 +15715,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_INVOKE_SUPER_QUICK_RANGE: /* 0xfb */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15732,7 +15732,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IPUT_OBJECT_VOLATILE: /* 0xfc */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15749,7 +15749,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SGET_OBJECT_VOLATILE: /* 0xfd */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15766,7 +15766,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SPUT_OBJECT_VOLATILE: /* 0xfe */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15783,13 +15783,24 @@
 
 /* ------------------------------ */
 .L_ALT_OP_DISPATCH_FF: /* 0xff */
-/* File: x86/ALT_OP_DISPATCH_FF.S */
-    leal      256(rINST),%ecx
-    GOTO_NEXT_JUMBO_R %ecx
+/* File: x86/alt_stub.S */
+/*
+ * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
+ * any interesting requests and then jump to the real instruction
+ * handler.  Unlike the Arm handler, we can't do this as a tail call
+ * because rIBASE is caller save and we need to reload it.
+ */
+    movl   rSELF, %eax
+    movl   rPC, OUT_ARG0(%esp)
+    movl   %eax, OUT_ARG1(%esp)
+    call   dvmCheckInst                            # (dPC, self)
+    movl   rSELF, %ecx
+    movl   offThread_curHandlerTable(%ecx), rIBASE # reload rIBASE
+    jmp    *dvmAsmInstructionStart+(255*4)
 
 /* ------------------------------ */
 .L_ALT_OP_CONST_CLASS_JUMBO: /* 0x100 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15806,7 +15817,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_CHECK_CAST_JUMBO: /* 0x101 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15823,7 +15834,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_INSTANCE_OF_JUMBO: /* 0x102 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15840,7 +15851,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_NEW_INSTANCE_JUMBO: /* 0x103 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15857,7 +15868,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_NEW_ARRAY_JUMBO: /* 0x104 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15874,7 +15885,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_FILLED_NEW_ARRAY_JUMBO: /* 0x105 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15891,7 +15902,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IGET_JUMBO: /* 0x106 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15908,7 +15919,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IGET_WIDE_JUMBO: /* 0x107 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15925,7 +15936,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IGET_OBJECT_JUMBO: /* 0x108 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15942,7 +15953,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IGET_BOOLEAN_JUMBO: /* 0x109 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15959,7 +15970,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IGET_BYTE_JUMBO: /* 0x10a */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15976,7 +15987,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IGET_CHAR_JUMBO: /* 0x10b */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -15993,7 +16004,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IGET_SHORT_JUMBO: /* 0x10c */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16010,7 +16021,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IPUT_JUMBO: /* 0x10d */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16027,7 +16038,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IPUT_WIDE_JUMBO: /* 0x10e */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16044,7 +16055,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IPUT_OBJECT_JUMBO: /* 0x10f */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16061,7 +16072,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IPUT_BOOLEAN_JUMBO: /* 0x110 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16078,7 +16089,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IPUT_BYTE_JUMBO: /* 0x111 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16095,7 +16106,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IPUT_CHAR_JUMBO: /* 0x112 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16112,7 +16123,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_IPUT_SHORT_JUMBO: /* 0x113 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16129,7 +16140,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SGET_JUMBO: /* 0x114 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16146,7 +16157,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SGET_WIDE_JUMBO: /* 0x115 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16163,7 +16174,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SGET_OBJECT_JUMBO: /* 0x116 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16180,7 +16191,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SGET_BOOLEAN_JUMBO: /* 0x117 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16197,7 +16208,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SGET_BYTE_JUMBO: /* 0x118 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16214,7 +16225,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SGET_CHAR_JUMBO: /* 0x119 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16231,7 +16242,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SGET_SHORT_JUMBO: /* 0x11a */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16248,7 +16259,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SPUT_JUMBO: /* 0x11b */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16265,7 +16276,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SPUT_WIDE_JUMBO: /* 0x11c */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16282,7 +16293,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SPUT_OBJECT_JUMBO: /* 0x11d */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16299,7 +16310,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SPUT_BOOLEAN_JUMBO: /* 0x11e */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16316,7 +16327,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SPUT_BYTE_JUMBO: /* 0x11f */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16333,7 +16344,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SPUT_CHAR_JUMBO: /* 0x120 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16350,7 +16361,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_SPUT_SHORT_JUMBO: /* 0x121 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16367,7 +16378,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_INVOKE_VIRTUAL_JUMBO: /* 0x122 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16384,7 +16395,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_INVOKE_SUPER_JUMBO: /* 0x123 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16401,7 +16412,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_INVOKE_DIRECT_JUMBO: /* 0x124 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16418,7 +16429,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_INVOKE_STATIC_JUMBO: /* 0x125 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16435,7 +16446,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_INVOKE_INTERFACE_JUMBO: /* 0x126 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16452,7 +16463,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_27FF: /* 0x127 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16469,7 +16480,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_28FF: /* 0x128 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16486,7 +16497,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_29FF: /* 0x129 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16503,7 +16514,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_2AFF: /* 0x12a */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16520,7 +16531,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_2BFF: /* 0x12b */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16537,7 +16548,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_2CFF: /* 0x12c */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16554,7 +16565,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_2DFF: /* 0x12d */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16571,7 +16582,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_2EFF: /* 0x12e */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16588,7 +16599,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_2FFF: /* 0x12f */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16605,7 +16616,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_30FF: /* 0x130 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16622,7 +16633,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_31FF: /* 0x131 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16639,7 +16650,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_32FF: /* 0x132 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16656,7 +16667,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_33FF: /* 0x133 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16673,7 +16684,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_34FF: /* 0x134 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16690,7 +16701,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_35FF: /* 0x135 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16707,7 +16718,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_36FF: /* 0x136 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16724,7 +16735,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_37FF: /* 0x137 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16741,7 +16752,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_38FF: /* 0x138 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16758,7 +16769,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_39FF: /* 0x139 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16775,7 +16786,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_3AFF: /* 0x13a */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16792,7 +16803,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_3BFF: /* 0x13b */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16809,7 +16820,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_3CFF: /* 0x13c */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16826,7 +16837,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_3DFF: /* 0x13d */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16843,7 +16854,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_3EFF: /* 0x13e */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16860,7 +16871,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_3FFF: /* 0x13f */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16877,7 +16888,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_40FF: /* 0x140 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16894,7 +16905,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_41FF: /* 0x141 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16911,7 +16922,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_42FF: /* 0x142 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16928,7 +16939,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_43FF: /* 0x143 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16945,7 +16956,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_44FF: /* 0x144 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16962,7 +16973,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_45FF: /* 0x145 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16979,7 +16990,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_46FF: /* 0x146 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -16996,7 +17007,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_47FF: /* 0x147 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17013,7 +17024,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_48FF: /* 0x148 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17030,7 +17041,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_49FF: /* 0x149 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17047,7 +17058,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_4AFF: /* 0x14a */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17064,7 +17075,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_4BFF: /* 0x14b */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17081,7 +17092,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_4CFF: /* 0x14c */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17098,7 +17109,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_4DFF: /* 0x14d */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17115,7 +17126,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_4EFF: /* 0x14e */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17132,7 +17143,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_4FFF: /* 0x14f */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17149,7 +17160,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_50FF: /* 0x150 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17166,7 +17177,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_51FF: /* 0x151 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17183,7 +17194,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_52FF: /* 0x152 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17200,7 +17211,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_53FF: /* 0x153 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17217,7 +17228,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_54FF: /* 0x154 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17234,7 +17245,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_55FF: /* 0x155 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17251,7 +17262,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_56FF: /* 0x156 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17268,7 +17279,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_57FF: /* 0x157 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17285,7 +17296,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_58FF: /* 0x158 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17302,7 +17313,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_59FF: /* 0x159 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17319,7 +17330,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_5AFF: /* 0x15a */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17336,7 +17347,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_5BFF: /* 0x15b */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17353,7 +17364,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_5CFF: /* 0x15c */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17370,7 +17381,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_5DFF: /* 0x15d */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17387,7 +17398,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_5EFF: /* 0x15e */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17404,7 +17415,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_5FFF: /* 0x15f */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17421,7 +17432,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_60FF: /* 0x160 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17438,7 +17449,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_61FF: /* 0x161 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17455,7 +17466,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_62FF: /* 0x162 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17472,7 +17483,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_63FF: /* 0x163 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17489,7 +17500,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_64FF: /* 0x164 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17506,7 +17517,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_65FF: /* 0x165 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17523,7 +17534,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_66FF: /* 0x166 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17540,7 +17551,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_67FF: /* 0x167 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17557,7 +17568,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_68FF: /* 0x168 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17574,7 +17585,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_69FF: /* 0x169 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17591,7 +17602,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_6AFF: /* 0x16a */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17608,7 +17619,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_6BFF: /* 0x16b */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17625,7 +17636,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_6CFF: /* 0x16c */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17642,7 +17653,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_6DFF: /* 0x16d */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17659,7 +17670,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_6EFF: /* 0x16e */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17676,7 +17687,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_6FFF: /* 0x16f */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17693,7 +17704,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_70FF: /* 0x170 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17710,7 +17721,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_71FF: /* 0x171 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17727,7 +17738,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_72FF: /* 0x172 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17744,7 +17755,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_73FF: /* 0x173 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17761,7 +17772,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_74FF: /* 0x174 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17778,7 +17789,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_75FF: /* 0x175 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17795,7 +17806,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_76FF: /* 0x176 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17812,7 +17823,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_77FF: /* 0x177 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17829,7 +17840,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_78FF: /* 0x178 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17846,7 +17857,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_79FF: /* 0x179 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17863,7 +17874,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_7AFF: /* 0x17a */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17880,7 +17891,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_7BFF: /* 0x17b */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17897,7 +17908,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_7CFF: /* 0x17c */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17914,7 +17925,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_7DFF: /* 0x17d */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17931,7 +17942,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_7EFF: /* 0x17e */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17948,7 +17959,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_7FFF: /* 0x17f */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17965,7 +17976,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_80FF: /* 0x180 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17982,7 +17993,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_81FF: /* 0x181 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -17999,7 +18010,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_82FF: /* 0x182 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18016,7 +18027,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_83FF: /* 0x183 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18033,7 +18044,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_84FF: /* 0x184 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18050,7 +18061,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_85FF: /* 0x185 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18067,7 +18078,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_86FF: /* 0x186 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18084,7 +18095,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_87FF: /* 0x187 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18101,7 +18112,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_88FF: /* 0x188 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18118,7 +18129,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_89FF: /* 0x189 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18135,7 +18146,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_8AFF: /* 0x18a */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18152,7 +18163,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_8BFF: /* 0x18b */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18169,7 +18180,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_8CFF: /* 0x18c */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18186,7 +18197,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_8DFF: /* 0x18d */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18203,7 +18214,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_8EFF: /* 0x18e */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18220,7 +18231,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_8FFF: /* 0x18f */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18237,7 +18248,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_90FF: /* 0x190 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18254,7 +18265,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_91FF: /* 0x191 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18271,7 +18282,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_92FF: /* 0x192 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18288,7 +18299,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_93FF: /* 0x193 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18305,7 +18316,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_94FF: /* 0x194 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18322,7 +18333,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_95FF: /* 0x195 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18339,7 +18350,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_96FF: /* 0x196 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18356,7 +18367,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_97FF: /* 0x197 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18373,7 +18384,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_98FF: /* 0x198 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18390,7 +18401,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_99FF: /* 0x199 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18407,7 +18418,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_9AFF: /* 0x19a */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18424,7 +18435,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_9BFF: /* 0x19b */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18441,7 +18452,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_9CFF: /* 0x19c */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18458,7 +18469,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_9DFF: /* 0x19d */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18475,7 +18486,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_9EFF: /* 0x19e */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18492,7 +18503,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_9FFF: /* 0x19f */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18509,7 +18520,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_A0FF: /* 0x1a0 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18526,7 +18537,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_A1FF: /* 0x1a1 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18543,7 +18554,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_A2FF: /* 0x1a2 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18560,7 +18571,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_A3FF: /* 0x1a3 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18577,7 +18588,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_A4FF: /* 0x1a4 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18594,7 +18605,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_A5FF: /* 0x1a5 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18611,7 +18622,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_A6FF: /* 0x1a6 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18628,7 +18639,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_A7FF: /* 0x1a7 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18645,7 +18656,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_A8FF: /* 0x1a8 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18662,7 +18673,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_A9FF: /* 0x1a9 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18679,7 +18690,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_AAFF: /* 0x1aa */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18696,7 +18707,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_ABFF: /* 0x1ab */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18713,7 +18724,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_ACFF: /* 0x1ac */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18730,7 +18741,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_ADFF: /* 0x1ad */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18747,7 +18758,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_AEFF: /* 0x1ae */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18764,7 +18775,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_AFFF: /* 0x1af */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18781,7 +18792,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_B0FF: /* 0x1b0 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18798,7 +18809,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_B1FF: /* 0x1b1 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18815,7 +18826,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_B2FF: /* 0x1b2 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18832,7 +18843,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_B3FF: /* 0x1b3 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18849,7 +18860,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_B4FF: /* 0x1b4 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18866,7 +18877,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_B5FF: /* 0x1b5 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18883,7 +18894,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_B6FF: /* 0x1b6 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18900,7 +18911,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_B7FF: /* 0x1b7 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18917,7 +18928,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_B8FF: /* 0x1b8 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18934,7 +18945,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_B9FF: /* 0x1b9 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18951,7 +18962,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_BAFF: /* 0x1ba */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18968,7 +18979,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_BBFF: /* 0x1bb */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -18985,7 +18996,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_BCFF: /* 0x1bc */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19002,7 +19013,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_BDFF: /* 0x1bd */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19019,7 +19030,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_BEFF: /* 0x1be */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19036,7 +19047,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_BFFF: /* 0x1bf */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19053,7 +19064,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_C0FF: /* 0x1c0 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19070,7 +19081,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_C1FF: /* 0x1c1 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19087,7 +19098,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_C2FF: /* 0x1c2 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19104,7 +19115,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_C3FF: /* 0x1c3 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19121,7 +19132,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_C4FF: /* 0x1c4 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19138,7 +19149,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_C5FF: /* 0x1c5 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19155,7 +19166,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_C6FF: /* 0x1c6 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19172,7 +19183,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_C7FF: /* 0x1c7 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19189,7 +19200,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_C8FF: /* 0x1c8 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19206,7 +19217,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_C9FF: /* 0x1c9 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19223,7 +19234,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_CAFF: /* 0x1ca */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19240,7 +19251,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_CBFF: /* 0x1cb */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19257,7 +19268,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_CCFF: /* 0x1cc */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19274,7 +19285,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_CDFF: /* 0x1cd */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19291,7 +19302,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_CEFF: /* 0x1ce */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19308,7 +19319,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_CFFF: /* 0x1cf */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19325,7 +19336,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_D0FF: /* 0x1d0 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19342,7 +19353,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_D1FF: /* 0x1d1 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19359,7 +19370,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_D2FF: /* 0x1d2 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19376,7 +19387,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_D3FF: /* 0x1d3 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19393,7 +19404,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_D4FF: /* 0x1d4 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19410,7 +19421,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_D5FF: /* 0x1d5 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19427,7 +19438,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_D6FF: /* 0x1d6 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19444,7 +19455,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_D7FF: /* 0x1d7 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19461,7 +19472,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_D8FF: /* 0x1d8 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19478,7 +19489,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_D9FF: /* 0x1d9 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19495,7 +19506,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_DAFF: /* 0x1da */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19512,7 +19523,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_DBFF: /* 0x1db */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19529,7 +19540,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_DCFF: /* 0x1dc */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19546,7 +19557,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_DDFF: /* 0x1dd */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19563,7 +19574,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_DEFF: /* 0x1de */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19580,7 +19591,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_DFFF: /* 0x1df */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19597,7 +19608,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_E0FF: /* 0x1e0 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19614,7 +19625,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_E1FF: /* 0x1e1 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19631,7 +19642,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_E2FF: /* 0x1e2 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19648,7 +19659,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_E3FF: /* 0x1e3 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19665,7 +19676,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_E4FF: /* 0x1e4 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19682,7 +19693,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_E5FF: /* 0x1e5 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19699,7 +19710,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_E6FF: /* 0x1e6 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19716,7 +19727,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_E7FF: /* 0x1e7 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19733,7 +19744,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_E8FF: /* 0x1e8 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19750,7 +19761,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_E9FF: /* 0x1e9 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19767,7 +19778,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_EAFF: /* 0x1ea */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19784,7 +19795,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_EBFF: /* 0x1eb */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19801,7 +19812,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_ECFF: /* 0x1ec */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19818,7 +19829,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_EDFF: /* 0x1ed */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19835,7 +19846,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_EEFF: /* 0x1ee */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19852,7 +19863,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_EFFF: /* 0x1ef */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19869,7 +19880,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_F0FF: /* 0x1f0 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19886,7 +19897,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_F1FF: /* 0x1f1 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19903,7 +19914,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_F2FF: /* 0x1f2 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19920,7 +19931,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_F3FF: /* 0x1f3 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19937,7 +19948,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_F4FF: /* 0x1f4 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19954,7 +19965,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_F5FF: /* 0x1f5 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19971,7 +19982,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_F6FF: /* 0x1f6 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -19988,7 +19999,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_F7FF: /* 0x1f7 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20005,7 +20016,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_F8FF: /* 0x1f8 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20022,7 +20033,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_F9FF: /* 0x1f9 */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20039,7 +20050,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_FAFF: /* 0x1fa */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20056,7 +20067,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_FBFF: /* 0x1fb */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20073,7 +20084,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_FCFF: /* 0x1fc */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20090,7 +20101,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_FDFF: /* 0x1fd */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20107,7 +20118,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_UNUSED_FEFF: /* 0x1fe */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
@@ -20124,7 +20135,7 @@
 
 /* ------------------------------ */
 .L_ALT_OP_THROW_VERIFICATION_ERROR_JUMBO: /* 0x1ff */
-/* File: x86/ALT_STUB.S */
+/* File: x86/alt_stub.S */
 /*
  * Inter-instruction transfer stub.  Call out to dvmCheckInst to handle
  * any interesting requests and then jump to the real instruction
diff --git a/vm/mterp/x86/ALT_OP_DISPATCH_FF.S b/vm/mterp/x86/ALT_OP_DISPATCH_FF.S
deleted file mode 100644
index fbd5a3d..0000000
--- a/vm/mterp/x86/ALT_OP_DISPATCH_FF.S
+++ /dev/null
@@ -1,3 +0,0 @@
-%verify "executed"
-    leal      256(rINST),%ecx
-    GOTO_NEXT_JUMBO_R %ecx
diff --git a/vm/mterp/x86/ALT_STUB.S b/vm/mterp/x86/alt_stub.S
similarity index 100%
rename from vm/mterp/x86/ALT_STUB.S
rename to vm/mterp/x86/alt_stub.S