Changeset 2717 for extracted

Timestamp:

Feb 23, 2013, 1:16:55 AM (8 years ago)

Author:

sacerdot

Message:

Extracted code for the whole compiler.
The space cost model is not there yet.

I have fixed by hand the few extraction problems
(i.e. composed coercions not extracted and type
definitions with wrong syntax).

I have also changed all axioms to be implemented
so that they do not fail at initialization time.

Location:

extracted

Files:

• aSM.ml (modified) (95 diffs)
• aSM.mli (modified) (28 diffs)
• aSMCosts.ml (modified) (7 diffs)
• aSMCosts.mli (modified) (2 diffs)
• aSMCostsSplit.ml (modified) (3 diffs)
• aSMCostsSplit.mli (modified) (2 diffs)
• aST.ml (modified) (22 diffs)
• aST.mli (modified) (1 diff)
• abstractStatus.ml (modified) (4 diffs)
• abstractStatus.mli (modified) (2 diffs)
• arithmetic.ml (modified) (1 diff)
• arithmetic.mli (modified) (1 diff)
• assembly.ml (added)
• assembly.mli (added)
• assocList.ml (added)
• assocList.mli (added)
• backEndOps.ml (added)
• backEndOps.mli (added)
• bindLists.ml (added)
• bindLists.mli (added)
• bind_new.ml (added)
• bind_new.mli (added)
• bitVectorTrie.ml (modified) (5 diffs)
• bitVectorTrieSet.ml (added)
• bitVectorTrieSet.mli (added)
• bitVectorZ.ml (modified) (1 diff)
• bitVectorZ.mli (modified) (1 diff)
• blocks.ml (added)
• blocks.mli (added)
• byteValues.ml (modified) (20 diffs)
• byteValues.mli (modified) (1 diff)
• casts.ml (modified) (1 diff)
• casts.mli (modified) (1 diff)
• cexec.ml (modified) (10 diffs)
• cexec.mli (modified) (3 diffs)
• cexecInd.ml (modified) (2 diffs)
• cexecInd.mli (modified) (2 diffs)
• cexecSound.ml (modified) (2 diffs)
• cexecSound.mli (modified) (2 diffs)
• classifyOp.ml (modified) (32 diffs)
• classifyOp.mli (modified) (2 diffs)
• cminor_syntax.ml (modified) (18 diffs)
• cminor_syntax.mli (modified) (2 diffs)
• compiler.ml (modified) (6 diffs)
• compiler.mli (modified) (6 diffs)
• costLabel.ml (modified) (3 diffs)
• costLabel.mli (modified) (2 diffs)
• csem.ml (modified) (21 diffs)
• csem.mli (modified) (4 diffs)
• csyntax.ml (modified) (20 diffs)
• csyntax.mli (modified) (2 diffs)
• deqsets.ml (modified) (1 diff)
• deqsets_extras.ml (added)
• deqsets_extras.mli (added)
• division.ml (modified) (1 diff)
• eRTL.ml (added)
• eRTL.mli (added)
• eRTLToERTLptr.ml (added)
• eRTLToERTLptr.mli (added)
• eRTLptr.ml (added)
• eRTLptr.mli (added)
• eRTLptrToLTL.ml (added)
• eRTLptrToLTL.mli (added)
• errorMessages.ml (modified) (13 diffs)
• errorMessages.mli (modified) (7 diffs)
• errors.ml (modified) (7 diffs)
• events.ml (modified) (9 diffs)
• events.mli (modified) (2 diffs)
• exp.ml (added)
• exp.mli (added)
• fetch.ml (modified) (5 diffs)
• fetch.mli (modified) (1 diff)
• fixpoints.ml (added)
• fixpoints.mli (added)
• fresh.ml (modified) (2 diffs)
• fresh.mli (modified) (2 diffs)
• frontEndMem.ml (modified) (1 diff)
• frontEndMem.mli (modified) (1 diff)
• frontEndOps.ml (modified) (20 diffs)
• frontEndOps.mli (modified) (1 diff)
• frontEndVal.ml (modified) (1 diff)
• frontEndVal.mli (modified) (1 diff)
• frontend_misc.ml (modified) (2 diffs)
• frontend_misc.mli (modified) (2 diffs)
• genMem.ml (modified) (3 diffs)
• genMem.mli (modified) (1 diff)
• globalenvs.ml (modified) (9 diffs)
• globalenvs.mli (modified) (1 diff)
• graphs.ml (modified) (1 diff)
• graphs.mli (modified) (1 diff)
• i8051.ml (added)
• i8051.mli (added)
• iO.ml (modified) (8 diffs)
• iO.mli (modified) (2 diffs)
• iOMonad.ml (modified) (5 diffs)
• identifiers.ml (modified) (2 diffs)
• initialisation.ml (modified) (2 diffs)
• initialisation.mli (modified) (2 diffs)
• integers.ml (modified) (1 diff)
• integers.mli (modified) (1 diff)
• interference.ml (added)
• interference.mli (added)
• interpret.ml (modified) (7 diffs)
• interpret.mli (modified) (1 diff)
• joint.ml (added)
• joint.mli (added)
• joint_LTL_LIN.ml (added)
• joint_LTL_LIN.mli (added)
• lIN.ml (added)
• lIN.mli (added)
• lINToASM.ml (added)
• lINToASM.mli (added)
• lTL.ml (added)
• lTL.mli (added)
• lTLToLIN.ml (added)
• lTLToLIN.mli (added)
• label.ml (modified) (2 diffs)
• label.mli (modified) (2 diffs)
• linearise.ml (added)
• linearise.mli (added)
• liveness.ml (added)
• liveness.mli (added)
• memProperties.ml (modified) (2 diffs)
• memProperties.mli (modified) (2 diffs)
• memoryInjections.ml (modified) (1 diff)
• memoryInjections.mli (modified) (8 diffs)
• pointers.ml (modified) (4 diffs)
• pointers.mli (modified) (1 diff)
• policy.ml (added)
• policy.mli (added)
• policyFront.ml (added)
• policyFront.mli (added)
• policyStep.ml (added)
• policyStep.mli (added)
• positiveMap.ml (modified) (7 diffs)
• positiveMap.mli (modified) (2 diffs)
• preIdentifiers.ml (modified) (1 diff)
• rTL.ml (added)
• rTL.mli (added)
• rTLToERTL.ml (added)
• rTLToERTL.mli (added)
• rTLabsToRTL.ml (added)
• rTLabsToRTL.mli (added)
• rTLabs_syntax.ml (modified) (15 diffs)
• rTLabs_syntax.mli (modified) (3 diffs)
• registerSet.ml (added)
• registerSet.mli (added)
• set_adt.ml (added)
• set_adt.mli (added)
• simplifyCasts.ml (modified) (10 diffs)
• simplifyCasts.mli (modified) (2 diffs)
• smallstep.ml (modified) (16 diffs)
• smallstep.mli (modified) (2 diffs)
• smallstepExec.ml (modified) (22 diffs)
• smallstepExec.mli (modified) (4 diffs)
• state.ml (added)
• state.mli (added)
• status.ml (modified) (27 diffs)
• status.mli (modified) (2 diffs)
• statusProofs.ml (modified) (1 diff)
• statusProofs.mli (modified) (1 diff)
• structuredTraces.ml (modified) (21 diffs)
• structuredTraces.mli (modified) (2 diffs)
• switchRemoval.ml (modified) (15 diffs)
• switchRemoval.mli (modified) (4 diffs)
• toCminor.ml (modified) (33 diffs)
• toCminor.mli (modified) (2 diffs)
• toRTLabs.ml (modified) (29 diffs)
• toRTLabs.mli (modified) (3 diffs)
• translateUtils.ml (added)
• translateUtils.mli (added)
• typeComparison.ml (modified) (2 diffs)
• typeComparison.mli (modified) (2 diffs)
• util.ml (modified) (2 diffs)
• util.mli (modified) (1 diff)
• utilBranch.ml (modified) (1 diff)
• utilBranch.mli (modified) (1 diff)
• values.ml (modified) (7 diffs)
• values.mli (modified) (1 diff)
• z.ml (modified) (6 diffs)

extracted/aSM.ml

@@ -60 +60 @@
 
 open Identifiers
+
+open BitVectorTrie
+
+open Exp
 
 open Arithmetic
@@ -109 +113 @@
     -> 'a1) -> addressing_mode -> 'a1 **)
 let rec addressing_mode_rect_Type4 h_DIRECT h_INDIRECT h_EXT_INDIRECT h_REGISTER h_ACC_A h_ACC_B h_DPTR h_DATA h_DATA16 h_ACC_DPTR h_ACC_PC h_EXT_INDIRECT_DPTR h_INDIRECT_DPTR h_CARRY h_BIT_ADDR h_N_BIT_ADDR h_RELATIVE h_ADDR11 h_ADDR16 = function
-| DIRECT x_59 -> h_DIRECT x_59
-| INDIRECT x_60 -> h_INDIRECT x_60
-| EXT_INDIRECT x_61 -> h_EXT_INDIRECT x_61
-| REGISTER x_62 -> h_REGISTER x_62
+| DIRECT x_18716 -> h_DIRECT x_18716
+| INDIRECT x_18717 -> h_INDIRECT x_18717
+| EXT_INDIRECT x_18718 -> h_EXT_INDIRECT x_18718
+| REGISTER x_18719 -> h_REGISTER x_18719
 | ACC_A -> h_ACC_A
 | ACC_B -> h_ACC_B
 | DPTR -> h_DPTR
-| DATA x_63 -> h_DATA x_63
-| DATA16 x_64 -> h_DATA16 x_64
+| DATA x_18720 -> h_DATA x_18720
+| DATA16 x_18721 -> h_DATA16 x_18721
 | ACC_DPTR -> h_ACC_DPTR
 | ACC_PC -> h_ACC_PC
@@ -123 +127 @@
 | INDIRECT_DPTR -> h_INDIRECT_DPTR
 | CARRY -> h_CARRY
-| BIT_ADDR x_65 -> h_BIT_ADDR x_65
-| N_BIT_ADDR x_66 -> h_N_BIT_ADDR x_66
-| RELATIVE x_67 -> h_RELATIVE x_67
-| ADDR11 x_68 -> h_ADDR11 x_68
-| ADDR16 x_69 -> h_ADDR16 x_69
+| BIT_ADDR x_18722 -> h_BIT_ADDR x_18722
+| N_BIT_ADDR x_18723 -> h_N_BIT_ADDR x_18723
+| RELATIVE x_18724 -> h_RELATIVE x_18724
+| ADDR11 x_18725 -> h_ADDR11 x_18725
+| ADDR16 x_18726 -> h_ADDR16 x_18726
 
 (** val addressing_mode_rect_Type5 :
@@ -137 +141 @@
     -> 'a1) -> addressing_mode -> 'a1 **)
 let rec addressing_mode_rect_Type5 h_DIRECT h_INDIRECT h_EXT_INDIRECT h_REGISTER h_ACC_A h_ACC_B h_DPTR h_DATA h_DATA16 h_ACC_DPTR h_ACC_PC h_EXT_INDIRECT_DPTR h_INDIRECT_DPTR h_CARRY h_BIT_ADDR h_N_BIT_ADDR h_RELATIVE h_ADDR11 h_ADDR16 = function
-| DIRECT x_90 -> h_DIRECT x_90
-| INDIRECT x_91 -> h_INDIRECT x_91
-| EXT_INDIRECT x_92 -> h_EXT_INDIRECT x_92
-| REGISTER x_93 -> h_REGISTER x_93
+| DIRECT x_18747 -> h_DIRECT x_18747
+| INDIRECT x_18748 -> h_INDIRECT x_18748
+| EXT_INDIRECT x_18749 -> h_EXT_INDIRECT x_18749
+| REGISTER x_18750 -> h_REGISTER x_18750
 | ACC_A -> h_ACC_A
 | ACC_B -> h_ACC_B
 | DPTR -> h_DPTR
-| DATA x_94 -> h_DATA x_94
-| DATA16 x_95 -> h_DATA16 x_95
+| DATA x_18751 -> h_DATA x_18751
+| DATA16 x_18752 -> h_DATA16 x_18752
 | ACC_DPTR -> h_ACC_DPTR
 | ACC_PC -> h_ACC_PC
@@ -151 +155 @@
 | INDIRECT_DPTR -> h_INDIRECT_DPTR
 | CARRY -> h_CARRY
-| BIT_ADDR x_96 -> h_BIT_ADDR x_96
-| N_BIT_ADDR x_97 -> h_N_BIT_ADDR x_97
-| RELATIVE x_98 -> h_RELATIVE x_98
-| ADDR11 x_99 -> h_ADDR11 x_99
-| ADDR16 x_100 -> h_ADDR16 x_100
+| BIT_ADDR x_18753 -> h_BIT_ADDR x_18753
+| N_BIT_ADDR x_18754 -> h_N_BIT_ADDR x_18754
+| RELATIVE x_18755 -> h_RELATIVE x_18755
+| ADDR11 x_18756 -> h_ADDR11 x_18756
+| ADDR16 x_18757 -> h_ADDR16 x_18757
 
 (** val addressing_mode_rect_Type3 :
@@ -165 +169 @@
     -> 'a1) -> addressing_mode -> 'a1 **)
 let rec addressing_mode_rect_Type3 h_DIRECT h_INDIRECT h_EXT_INDIRECT h_REGISTER h_ACC_A h_ACC_B h_DPTR h_DATA h_DATA16 h_ACC_DPTR h_ACC_PC h_EXT_INDIRECT_DPTR h_INDIRECT_DPTR h_CARRY h_BIT_ADDR h_N_BIT_ADDR h_RELATIVE h_ADDR11 h_ADDR16 = function
-| DIRECT x_121 -> h_DIRECT x_121
-| INDIRECT x_122 -> h_INDIRECT x_122
-| EXT_INDIRECT x_123 -> h_EXT_INDIRECT x_123
-| REGISTER x_124 -> h_REGISTER x_124
+| DIRECT x_18778 -> h_DIRECT x_18778
+| INDIRECT x_18779 -> h_INDIRECT x_18779
+| EXT_INDIRECT x_18780 -> h_EXT_INDIRECT x_18780
+| REGISTER x_18781 -> h_REGISTER x_18781
 | ACC_A -> h_ACC_A
 | ACC_B -> h_ACC_B
 | DPTR -> h_DPTR
-| DATA x_125 -> h_DATA x_125
-| DATA16 x_126 -> h_DATA16 x_126
+| DATA x_18782 -> h_DATA x_18782
+| DATA16 x_18783 -> h_DATA16 x_18783
 | ACC_DPTR -> h_ACC_DPTR
 | ACC_PC -> h_ACC_PC
@@ -179 +183 @@
 | INDIRECT_DPTR -> h_INDIRECT_DPTR
 | CARRY -> h_CARRY
-| BIT_ADDR x_127 -> h_BIT_ADDR x_127
-| N_BIT_ADDR x_128 -> h_N_BIT_ADDR x_128
-| RELATIVE x_129 -> h_RELATIVE x_129
-| ADDR11 x_130 -> h_ADDR11 x_130
-| ADDR16 x_131 -> h_ADDR16 x_131
+| BIT_ADDR x_18784 -> h_BIT_ADDR x_18784
+| N_BIT_ADDR x_18785 -> h_N_BIT_ADDR x_18785
+| RELATIVE x_18786 -> h_RELATIVE x_18786
+| ADDR11 x_18787 -> h_ADDR11 x_18787
+| ADDR16 x_18788 -> h_ADDR16 x_18788
 
 (** val addressing_mode_rect_Type2 :
@@ -193 +197 @@
     -> 'a1) -> addressing_mode -> 'a1 **)
 let rec addressing_mode_rect_Type2 h_DIRECT h_INDIRECT h_EXT_INDIRECT h_REGISTER h_ACC_A h_ACC_B h_DPTR h_DATA h_DATA16 h_ACC_DPTR h_ACC_PC h_EXT_INDIRECT_DPTR h_INDIRECT_DPTR h_CARRY h_BIT_ADDR h_N_BIT_ADDR h_RELATIVE h_ADDR11 h_ADDR16 = function
-| DIRECT x_152 -> h_DIRECT x_152
-| INDIRECT x_153 -> h_INDIRECT x_153
-| EXT_INDIRECT x_154 -> h_EXT_INDIRECT x_154
-| REGISTER x_155 -> h_REGISTER x_155
+| DIRECT x_18809 -> h_DIRECT x_18809
+| INDIRECT x_18810 -> h_INDIRECT x_18810
+| EXT_INDIRECT x_18811 -> h_EXT_INDIRECT x_18811
+| REGISTER x_18812 -> h_REGISTER x_18812
 | ACC_A -> h_ACC_A
 | ACC_B -> h_ACC_B
 | DPTR -> h_DPTR
-| DATA x_156 -> h_DATA x_156
-| DATA16 x_157 -> h_DATA16 x_157
+| DATA x_18813 -> h_DATA x_18813
+| DATA16 x_18814 -> h_DATA16 x_18814
 | ACC_DPTR -> h_ACC_DPTR
 | ACC_PC -> h_ACC_PC
@@ -207 +211 @@
 | INDIRECT_DPTR -> h_INDIRECT_DPTR
 | CARRY -> h_CARRY
-| BIT_ADDR x_158 -> h_BIT_ADDR x_158
-| N_BIT_ADDR x_159 -> h_N_BIT_ADDR x_159
-| RELATIVE x_160 -> h_RELATIVE x_160
-| ADDR11 x_161 -> h_ADDR11 x_161
-| ADDR16 x_162 -> h_ADDR16 x_162
+| BIT_ADDR x_18815 -> h_BIT_ADDR x_18815
+| N_BIT_ADDR x_18816 -> h_N_BIT_ADDR x_18816
+| RELATIVE x_18817 -> h_RELATIVE x_18817
+| ADDR11 x_18818 -> h_ADDR11 x_18818
+| ADDR16 x_18819 -> h_ADDR16 x_18819
 
 (** val addressing_mode_rect_Type1 :
@@ -221 +225 @@
     -> 'a1) -> addressing_mode -> 'a1 **)
 let rec addressing_mode_rect_Type1 h_DIRECT h_INDIRECT h_EXT_INDIRECT h_REGISTER h_ACC_A h_ACC_B h_DPTR h_DATA h_DATA16 h_ACC_DPTR h_ACC_PC h_EXT_INDIRECT_DPTR h_INDIRECT_DPTR h_CARRY h_BIT_ADDR h_N_BIT_ADDR h_RELATIVE h_ADDR11 h_ADDR16 = function
-| DIRECT x_183 -> h_DIRECT x_183
-| INDIRECT x_184 -> h_INDIRECT x_184
-| EXT_INDIRECT x_185 -> h_EXT_INDIRECT x_185
-| REGISTER x_186 -> h_REGISTER x_186
+| DIRECT x_18840 -> h_DIRECT x_18840
+| INDIRECT x_18841 -> h_INDIRECT x_18841
+| EXT_INDIRECT x_18842 -> h_EXT_INDIRECT x_18842
+| REGISTER x_18843 -> h_REGISTER x_18843
 | ACC_A -> h_ACC_A
 | ACC_B -> h_ACC_B
 | DPTR -> h_DPTR
-| DATA x_187 -> h_DATA x_187
-| DATA16 x_188 -> h_DATA16 x_188
+| DATA x_18844 -> h_DATA x_18844
+| DATA16 x_18845 -> h_DATA16 x_18845
 | ACC_DPTR -> h_ACC_DPTR
 | ACC_PC -> h_ACC_PC
@@ -235 +239 @@
 | INDIRECT_DPTR -> h_INDIRECT_DPTR
 | CARRY -> h_CARRY
-| BIT_ADDR x_189 -> h_BIT_ADDR x_189
-| N_BIT_ADDR x_190 -> h_N_BIT_ADDR x_190
-| RELATIVE x_191 -> h_RELATIVE x_191
-| ADDR11 x_192 -> h_ADDR11 x_192
-| ADDR16 x_193 -> h_ADDR16 x_193
+| BIT_ADDR x_18846 -> h_BIT_ADDR x_18846
+| N_BIT_ADDR x_18847 -> h_N_BIT_ADDR x_18847
+| RELATIVE x_18848 -> h_RELATIVE x_18848
+| ADDR11 x_18849 -> h_ADDR11 x_18849
+| ADDR16 x_18850 -> h_ADDR16 x_18850
 
 (** val addressing_mode_rect_Type0 :
@@ -249 +253 @@
     -> 'a1) -> addressing_mode -> 'a1 **)
 let rec addressing_mode_rect_Type0 h_DIRECT h_INDIRECT h_EXT_INDIRECT h_REGISTER h_ACC_A h_ACC_B h_DPTR h_DATA h_DATA16 h_ACC_DPTR h_ACC_PC h_EXT_INDIRECT_DPTR h_INDIRECT_DPTR h_CARRY h_BIT_ADDR h_N_BIT_ADDR h_RELATIVE h_ADDR11 h_ADDR16 = function
-| DIRECT x_214 -> h_DIRECT x_214
-| INDIRECT x_215 -> h_INDIRECT x_215
-| EXT_INDIRECT x_216 -> h_EXT_INDIRECT x_216
-| REGISTER x_217 -> h_REGISTER x_217
+| DIRECT x_18871 -> h_DIRECT x_18871
+| INDIRECT x_18872 -> h_INDIRECT x_18872
+| EXT_INDIRECT x_18873 -> h_EXT_INDIRECT x_18873
+| REGISTER x_18874 -> h_REGISTER x_18874
 | ACC_A -> h_ACC_A
 | ACC_B -> h_ACC_B
 | DPTR -> h_DPTR
-| DATA x_218 -> h_DATA x_218
-| DATA16 x_219 -> h_DATA16 x_219
+| DATA x_18875 -> h_DATA x_18875
+| DATA16 x_18876 -> h_DATA16 x_18876
 | ACC_DPTR -> h_ACC_DPTR
 | ACC_PC -> h_ACC_PC
@@ -263 +267 @@
 | INDIRECT_DPTR -> h_INDIRECT_DPTR
 | CARRY -> h_CARRY
-| BIT_ADDR x_220 -> h_BIT_ADDR x_220
-| N_BIT_ADDR x_221 -> h_N_BIT_ADDR x_221
-| RELATIVE x_222 -> h_RELATIVE x_222
-| ADDR11 x_223 -> h_ADDR11 x_223
-| ADDR16 x_224 -> h_ADDR16 x_224
+| BIT_ADDR x_18877 -> h_BIT_ADDR x_18877
+| N_BIT_ADDR x_18878 -> h_N_BIT_ADDR x_18878
+| RELATIVE x_18879 -> h_RELATIVE x_18879
+| ADDR11 x_18880 -> h_ADDR11 x_18880
+| ADDR16 x_18881 -> h_ADDR16 x_18881
 
 (** val addressing_mode_inv_rect_Type4 :
@@ -1924 +1928 @@
     Nat.nat -> addressing_mode_tag Vector.vector -> (addressing_mode -> __ ->
     'a1) -> subaddressing_mode -> 'a1 **)
-let rec subaddressing_mode_rect_Type4 n l h_mk_subaddressing_mode x_692 =
-  let subaddressing_modeel = x_692 in
+let rec subaddressing_mode_rect_Type4 n l h_mk_subaddressing_mode x_19349 =
+  let subaddressing_modeel = x_19349 in
   h_mk_subaddressing_mode subaddressing_modeel __
 
@@ -1931 +1935 @@
     Nat.nat -> addressing_mode_tag Vector.vector -> (addressing_mode -> __ ->
     'a1) -> subaddressing_mode -> 'a1 **)
-let rec subaddressing_mode_rect_Type5 n l h_mk_subaddressing_mode x_694 =
-  let subaddressing_modeel = x_694 in
+let rec subaddressing_mode_rect_Type5 n l h_mk_subaddressing_mode x_19351 =
+  let subaddressing_modeel = x_19351 in
   h_mk_subaddressing_mode subaddressing_modeel __
 
@@ -1938 +1942 @@
     Nat.nat -> addressing_mode_tag Vector.vector -> (addressing_mode -> __ ->
     'a1) -> subaddressing_mode -> 'a1 **)
-let rec subaddressing_mode_rect_Type3 n l h_mk_subaddressing_mode x_696 =
-  let subaddressing_modeel = x_696 in
+let rec subaddressing_mode_rect_Type3 n l h_mk_subaddressing_mode x_19353 =
+  let subaddressing_modeel = x_19353 in
   h_mk_subaddressing_mode subaddressing_modeel __
 
@@ -1945 +1949 @@
     Nat.nat -> addressing_mode_tag Vector.vector -> (addressing_mode -> __ ->
     'a1) -> subaddressing_mode -> 'a1 **)
-let rec subaddressing_mode_rect_Type2 n l h_mk_subaddressing_mode x_698 =
-  let subaddressing_modeel = x_698 in
+let rec subaddressing_mode_rect_Type2 n l h_mk_subaddressing_mode x_19355 =
+  let subaddressing_modeel = x_19355 in
   h_mk_subaddressing_mode subaddressing_modeel __
 
@@ -1952 +1956 @@
     Nat.nat -> addressing_mode_tag Vector.vector -> (addressing_mode -> __ ->
     'a1) -> subaddressing_mode -> 'a1 **)
-let rec subaddressing_mode_rect_Type1 n l h_mk_subaddressing_mode x_700 =
-  let subaddressing_modeel = x_700 in
+let rec subaddressing_mode_rect_Type1 n l h_mk_subaddressing_mode x_19357 =
+  let subaddressing_modeel = x_19357 in
   h_mk_subaddressing_mode subaddressing_modeel __
 
@@ -1959 +1963 @@
     Nat.nat -> addressing_mode_tag Vector.vector -> (addressing_mode -> __ ->
     'a1) -> subaddressing_mode -> 'a1 **)
-let rec subaddressing_mode_rect_Type0 n l h_mk_subaddressing_mode x_702 =
-  let subaddressing_modeel = x_702 in
+let rec subaddressing_mode_rect_Type0 n l h_mk_subaddressing_mode x_19359 =
+  let subaddressing_modeel = x_19359 in
   h_mk_subaddressing_mode subaddressing_modeel __
 
@@ -2094 +2098 @@
 | RETI
 | NOP
+| JMP of subaddressing_mode
 
 (** val preinstruction_rect_Type4 :
@@ -2129 +2134 @@
     (subaddressing_mode -> 'a2) -> (subaddressing_mode -> subaddressing_mode
     -> 'a2) -> (subaddressing_mode -> subaddressing_mode -> 'a2) -> 'a2 ->
-    'a2 -> 'a2 -> 'a1 preinstruction -> 'a2 **)
-let rec preinstruction_rect_Type4 h_ADD h_ADDC h_SUBB h_INC h_DEC h_MUL h_DIV h_DA h_JC h_JNC h_JB h_JNB h_JBC h_JZ h_JNZ h_CJNE h_DJNZ h_ANL h_ORL h_XRL h_CLR h_CPL h_RL h_RLC h_RR h_RRC h_SWAP h_MOV h_MOVX h_SETB h_PUSH h_POP h_XCH h_XCHD h_RET h_RETI h_NOP = function
-| ADD (x_802, x_801) -> h_ADD x_802 x_801
-| ADDC (x_804, x_803) -> h_ADDC x_804 x_803
-| SUBB (x_806, x_805) -> h_SUBB x_806 x_805
-| INC x_807 -> h_INC x_807
-| DEC x_808 -> h_DEC x_808
-| MUL (x_810, x_809) -> h_MUL x_810 x_809
-| DIV (x_812, x_811) -> h_DIV x_812 x_811
-| DA x_813 -> h_DA x_813
-| JC x_814 -> h_JC x_814
-| JNC x_815 -> h_JNC x_815
-| JB (x_817, x_816) -> h_JB x_817 x_816
-| JNB (x_819, x_818) -> h_JNB x_819 x_818
-| JBC (x_821, x_820) -> h_JBC x_821 x_820
-| JZ x_822 -> h_JZ x_822
-| JNZ x_823 -> h_JNZ x_823
-| CJNE (x_825, x_824) -> h_CJNE x_825 x_824
-| DJNZ (x_827, x_826) -> h_DJNZ x_827 x_826
-| ANL x_828 -> h_ANL x_828
-| ORL x_829 -> h_ORL x_829
-| XRL x_830 -> h_XRL x_830
-| CLR x_831 -> h_CLR x_831
-| CPL x_832 -> h_CPL x_832
-| RL x_833 -> h_RL x_833
-| RLC x_834 -> h_RLC x_834
-| RR x_835 -> h_RR x_835
-| RRC x_836 -> h_RRC x_836
-| SWAP x_837 -> h_SWAP x_837
-| MOV x_838 -> h_MOV x_838
-| MOVX x_839 -> h_MOVX x_839
-| SETB x_840 -> h_SETB x_840
-| PUSH x_841 -> h_PUSH x_841
-| POP x_842 -> h_POP x_842
-| XCH (x_844, x_843) -> h_XCH x_844 x_843
-| XCHD (x_846, x_845) -> h_XCHD x_846 x_845
+    'a2 -> 'a2 -> (subaddressing_mode -> 'a2) -> 'a1 preinstruction -> 'a2 **)
+let rec preinstruction_rect_Type4 h_ADD h_ADDC h_SUBB h_INC h_DEC h_MUL h_DIV h_DA h_JC h_JNC h_JB h_JNB h_JBC h_JZ h_JNZ h_CJNE h_DJNZ h_ANL h_ORL h_XRL h_CLR h_CPL h_RL h_RLC h_RR h_RRC h_SWAP h_MOV h_MOVX h_SETB h_PUSH h_POP h_XCH h_XCHD h_RET h_RETI h_NOP h_JMP = function
+| ADD (x_19461, x_19460) -> h_ADD x_19461 x_19460
+| ADDC (x_19463, x_19462) -> h_ADDC x_19463 x_19462
+| SUBB (x_19465, x_19464) -> h_SUBB x_19465 x_19464
+| INC x_19466 -> h_INC x_19466
+| DEC x_19467 -> h_DEC x_19467
+| MUL (x_19469, x_19468) -> h_MUL x_19469 x_19468
+| DIV (x_19471, x_19470) -> h_DIV x_19471 x_19470
+| DA x_19472 -> h_DA x_19472
+| JC x_19473 -> h_JC x_19473
+| JNC x_19474 -> h_JNC x_19474
+| JB (x_19476, x_19475) -> h_JB x_19476 x_19475
+| JNB (x_19478, x_19477) -> h_JNB x_19478 x_19477
+| JBC (x_19480, x_19479) -> h_JBC x_19480 x_19479
+| JZ x_19481 -> h_JZ x_19481
+| JNZ x_19482 -> h_JNZ x_19482
+| CJNE (x_19484, x_19483) -> h_CJNE x_19484 x_19483
+| DJNZ (x_19486, x_19485) -> h_DJNZ x_19486 x_19485
+| ANL x_19487 -> h_ANL x_19487
+| ORL x_19488 -> h_ORL x_19488
+| XRL x_19489 -> h_XRL x_19489
+| CLR x_19490 -> h_CLR x_19490
+| CPL x_19491 -> h_CPL x_19491
+| RL x_19492 -> h_RL x_19492
+| RLC x_19493 -> h_RLC x_19493
+| RR x_19494 -> h_RR x_19494
+| RRC x_19495 -> h_RRC x_19495
+| SWAP x_19496 -> h_SWAP x_19496
+| MOV x_19497 -> h_MOV x_19497
+| MOVX x_19498 -> h_MOVX x_19498
+| SETB x_19499 -> h_SETB x_19499
+| PUSH x_19500 -> h_PUSH x_19500
+| POP x_19501 -> h_POP x_19501
+| XCH (x_19503, x_19502) -> h_XCH x_19503 x_19502
+| XCHD (x_19505, x_19504) -> h_XCHD x_19505 x_19504
 | RET -> h_RET
 | RETI -> h_RETI
 | NOP -> h_NOP
+| JMP x_19506 -> h_JMP x_19506
 
 (** val preinstruction_rect_Type5 :
@@ -2203 +2209 @@
     (subaddressing_mode -> 'a2) -> (subaddressing_mode -> subaddressing_mode
     -> 'a2) -> (subaddressing_mode -> subaddressing_mode -> 'a2) -> 'a2 ->
-    'a2 -> 'a2 -> 'a1 preinstruction -> 'a2 **)
-let rec preinstruction_rect_Type5 h_ADD h_ADDC h_SUBB h_INC h_DEC h_MUL h_DIV h_DA h_JC h_JNC h_JB h_JNB h_JBC h_JZ h_JNZ h_CJNE h_DJNZ h_ANL h_ORL h_XRL h_CLR h_CPL h_RL h_RLC h_RR h_RRC h_SWAP h_MOV h_MOVX h_SETB h_PUSH h_POP h_XCH h_XCHD h_RET h_RETI h_NOP = function
-| ADD (x_886, x_885) -> h_ADD x_886 x_885
-| ADDC (x_888, x_887) -> h_ADDC x_888 x_887
-| SUBB (x_890, x_889) -> h_SUBB x_890 x_889
-| INC x_891 -> h_INC x_891
-| DEC x_892 -> h_DEC x_892
-| MUL (x_894, x_893) -> h_MUL x_894 x_893
-| DIV (x_896, x_895) -> h_DIV x_896 x_895
-| DA x_897 -> h_DA x_897
-| JC x_898 -> h_JC x_898
-| JNC x_899 -> h_JNC x_899
-| JB (x_901, x_900) -> h_JB x_901 x_900
-| JNB (x_903, x_902) -> h_JNB x_903 x_902
-| JBC (x_905, x_904) -> h_JBC x_905 x_904
-| JZ x_906 -> h_JZ x_906
-| JNZ x_907 -> h_JNZ x_907
-| CJNE (x_909, x_908) -> h_CJNE x_909 x_908
-| DJNZ (x_911, x_910) -> h_DJNZ x_911 x_910
-| ANL x_912 -> h_ANL x_912
-| ORL x_913 -> h_ORL x_913
-| XRL x_914 -> h_XRL x_914
-| CLR x_915 -> h_CLR x_915
-| CPL x_916 -> h_CPL x_916
-| RL x_917 -> h_RL x_917
-| RLC x_918 -> h_RLC x_918
-| RR x_919 -> h_RR x_919
-| RRC x_920 -> h_RRC x_920
-| SWAP x_921 -> h_SWAP x_921
-| MOV x_922 -> h_MOV x_922
-| MOVX x_923 -> h_MOVX x_923
-| SETB x_924 -> h_SETB x_924
-| PUSH x_925 -> h_PUSH x_925
-| POP x_926 -> h_POP x_926
-| XCH (x_928, x_927) -> h_XCH x_928 x_927
-| XCHD (x_930, x_929) -> h_XCHD x_930 x_929
+    'a2 -> 'a2 -> (subaddressing_mode -> 'a2) -> 'a1 preinstruction -> 'a2 **)
+let rec preinstruction_rect_Type5 h_ADD h_ADDC h_SUBB h_INC h_DEC h_MUL h_DIV h_DA h_JC h_JNC h_JB h_JNB h_JBC h_JZ h_JNZ h_CJNE h_DJNZ h_ANL h_ORL h_XRL h_CLR h_CPL h_RL h_RLC h_RR h_RRC h_SWAP h_MOV h_MOVX h_SETB h_PUSH h_POP h_XCH h_XCHD h_RET h_RETI h_NOP h_JMP = function
+| ADD (x_19547, x_19546) -> h_ADD x_19547 x_19546
+| ADDC (x_19549, x_19548) -> h_ADDC x_19549 x_19548
+| SUBB (x_19551, x_19550) -> h_SUBB x_19551 x_19550
+| INC x_19552 -> h_INC x_19552
+| DEC x_19553 -> h_DEC x_19553
+| MUL (x_19555, x_19554) -> h_MUL x_19555 x_19554
+| DIV (x_19557, x_19556) -> h_DIV x_19557 x_19556
+| DA x_19558 -> h_DA x_19558
+| JC x_19559 -> h_JC x_19559
+| JNC x_19560 -> h_JNC x_19560
+| JB (x_19562, x_19561) -> h_JB x_19562 x_19561
+| JNB (x_19564, x_19563) -> h_JNB x_19564 x_19563
+| JBC (x_19566, x_19565) -> h_JBC x_19566 x_19565
+| JZ x_19567 -> h_JZ x_19567
+| JNZ x_19568 -> h_JNZ x_19568
+| CJNE (x_19570, x_19569) -> h_CJNE x_19570 x_19569
+| DJNZ (x_19572, x_19571) -> h_DJNZ x_19572 x_19571
+| ANL x_19573 -> h_ANL x_19573
+| ORL x_19574 -> h_ORL x_19574
+| XRL x_19575 -> h_XRL x_19575
+| CLR x_19576 -> h_CLR x_19576
+| CPL x_19577 -> h_CPL x_19577
+| RL x_19578 -> h_RL x_19578
+| RLC x_19579 -> h_RLC x_19579
+| RR x_19580 -> h_RR x_19580
+| RRC x_19581 -> h_RRC x_19581
+| SWAP x_19582 -> h_SWAP x_19582
+| MOV x_19583 -> h_MOV x_19583
+| MOVX x_19584 -> h_MOVX x_19584
+| SETB x_19585 -> h_SETB x_19585
+| PUSH x_19586 -> h_PUSH x_19586
+| POP x_19587 -> h_POP x_19587
+| XCH (x_19589, x_19588) -> h_XCH x_19589 x_19588
+| XCHD (x_19591, x_19590) -> h_XCHD x_19591 x_19590
 | RET -> h_RET
 | RETI -> h_RETI
 | NOP -> h_NOP
+| JMP x_19592 -> h_JMP x_19592
 
 (** val preinstruction_rect_Type3 :
@@ -2277 +2284 @@
     (subaddressing_mode -> 'a2) -> (subaddressing_mode -> subaddressing_mode
     -> 'a2) -> (subaddressing_mode -> subaddressing_mode -> 'a2) -> 'a2 ->
-    'a2 -> 'a2 -> 'a1 preinstruction -> 'a2 **)
-let rec preinstruction_rect_Type3 h_ADD h_ADDC h_SUBB h_INC h_DEC h_MUL h_DIV h_DA h_JC h_JNC h_JB h_JNB h_JBC h_JZ h_JNZ h_CJNE h_DJNZ h_ANL h_ORL h_XRL h_CLR h_CPL h_RL h_RLC h_RR h_RRC h_SWAP h_MOV h_MOVX h_SETB h_PUSH h_POP h_XCH h_XCHD h_RET h_RETI h_NOP = function
-| ADD (x_970, x_969) -> h_ADD x_970 x_969
-| ADDC (x_972, x_971) -> h_ADDC x_972 x_971
-| SUBB (x_974, x_973) -> h_SUBB x_974 x_973
-| INC x_975 -> h_INC x_975
-| DEC x_976 -> h_DEC x_976
-| MUL (x_978, x_977) -> h_MUL x_978 x_977
-| DIV (x_980, x_979) -> h_DIV x_980 x_979
-| DA x_981 -> h_DA x_981
-| JC x_982 -> h_JC x_982
-| JNC x_983 -> h_JNC x_983
-| JB (x_985, x_984) -> h_JB x_985 x_984
-| JNB (x_987, x_986) -> h_JNB x_987 x_986
-| JBC (x_989, x_988) -> h_JBC x_989 x_988
-| JZ x_990 -> h_JZ x_990
-| JNZ x_991 -> h_JNZ x_991
-| CJNE (x_993, x_992) -> h_CJNE x_993 x_992
-| DJNZ (x_995, x_994) -> h_DJNZ x_995 x_994
-| ANL x_996 -> h_ANL x_996
-| ORL x_997 -> h_ORL x_997
-| XRL x_998 -> h_XRL x_998
-| CLR x_999 -> h_CLR x_999
-| CPL x_1000 -> h_CPL x_1000
-| RL x_1001 -> h_RL x_1001
-| RLC x_1002 -> h_RLC x_1002
-| RR x_1003 -> h_RR x_1003
-| RRC x_1004 -> h_RRC x_1004
-| SWAP x_1005 -> h_SWAP x_1005
-| MOV x_1006 -> h_MOV x_1006
-| MOVX x_1007 -> h_MOVX x_1007
-| SETB x_1008 -> h_SETB x_1008
-| PUSH x_1009 -> h_PUSH x_1009
-| POP x_1010 -> h_POP x_1010
-| XCH (x_1012, x_1011) -> h_XCH x_1012 x_1011
-| XCHD (x_1014, x_1013) -> h_XCHD x_1014 x_1013
+    'a2 -> 'a2 -> (subaddressing_mode -> 'a2) -> 'a1 preinstruction -> 'a2 **)
+let rec preinstruction_rect_Type3 h_ADD h_ADDC h_SUBB h_INC h_DEC h_MUL h_DIV h_DA h_JC h_JNC h_JB h_JNB h_JBC h_JZ h_JNZ h_CJNE h_DJNZ h_ANL h_ORL h_XRL h_CLR h_CPL h_RL h_RLC h_RR h_RRC h_SWAP h_MOV h_MOVX h_SETB h_PUSH h_POP h_XCH h_XCHD h_RET h_RETI h_NOP h_JMP = function
+| ADD (x_19633, x_19632) -> h_ADD x_19633 x_19632
+| ADDC (x_19635, x_19634) -> h_ADDC x_19635 x_19634
+| SUBB (x_19637, x_19636) -> h_SUBB x_19637 x_19636
+| INC x_19638 -> h_INC x_19638
+| DEC x_19639 -> h_DEC x_19639
+| MUL (x_19641, x_19640) -> h_MUL x_19641 x_19640
+| DIV (x_19643, x_19642) -> h_DIV x_19643 x_19642
+| DA x_19644 -> h_DA x_19644
+| JC x_19645 -> h_JC x_19645
+| JNC x_19646 -> h_JNC x_19646
+| JB (x_19648, x_19647) -> h_JB x_19648 x_19647
+| JNB (x_19650, x_19649) -> h_JNB x_19650 x_19649
+| JBC (x_19652, x_19651) -> h_JBC x_19652 x_19651
+| JZ x_19653 -> h_JZ x_19653
+| JNZ x_19654 -> h_JNZ x_19654
+| CJNE (x_19656, x_19655) -> h_CJNE x_19656 x_19655
+| DJNZ (x_19658, x_19657) -> h_DJNZ x_19658 x_19657
+| ANL x_19659 -> h_ANL x_19659
+| ORL x_19660 -> h_ORL x_19660
+| XRL x_19661 -> h_XRL x_19661
+| CLR x_19662 -> h_CLR x_19662
+| CPL x_19663 -> h_CPL x_19663
+| RL x_19664 -> h_RL x_19664
+| RLC x_19665 -> h_RLC x_19665
+| RR x_19666 -> h_RR x_19666
+| RRC x_19667 -> h_RRC x_19667
+| SWAP x_19668 -> h_SWAP x_19668
+| MOV x_19669 -> h_MOV x_19669
+| MOVX x_19670 -> h_MOVX x_19670
+| SETB x_19671 -> h_SETB x_19671
+| PUSH x_19672 -> h_PUSH x_19672
+| POP x_19673 -> h_POP x_19673
+| XCH (x_19675, x_19674) -> h_XCH x_19675 x_19674
+| XCHD (x_19677, x_19676) -> h_XCHD x_19677 x_19676
 | RET -> h_RET
 | RETI -> h_RETI
 | NOP -> h_NOP
+| JMP x_19678 -> h_JMP x_19678
 
 (** val preinstruction_rect_Type2 :
@@ -2351 +2359 @@
     (subaddressing_mode -> 'a2) -> (subaddressing_mode -> subaddressing_mode
     -> 'a2) -> (subaddressing_mode -> subaddressing_mode -> 'a2) -> 'a2 ->
-    'a2 -> 'a2 -> 'a1 preinstruction -> 'a2 **)
-let rec preinstruction_rect_Type2 h_ADD h_ADDC h_SUBB h_INC h_DEC h_MUL h_DIV h_DA h_JC h_JNC h_JB h_JNB h_JBC h_JZ h_JNZ h_CJNE h_DJNZ h_ANL h_ORL h_XRL h_CLR h_CPL h_RL h_RLC h_RR h_RRC h_SWAP h_MOV h_MOVX h_SETB h_PUSH h_POP h_XCH h_XCHD h_RET h_RETI h_NOP = function
-| ADD (x_1054, x_1053) -> h_ADD x_1054 x_1053
-| ADDC (x_1056, x_1055) -> h_ADDC x_1056 x_1055
-| SUBB (x_1058, x_1057) -> h_SUBB x_1058 x_1057
-| INC x_1059 -> h_INC x_1059
-| DEC x_1060 -> h_DEC x_1060
-| MUL (x_1062, x_1061) -> h_MUL x_1062 x_1061
-| DIV (x_1064, x_1063) -> h_DIV x_1064 x_1063
-| DA x_1065 -> h_DA x_1065
-| JC x_1066 -> h_JC x_1066
-| JNC x_1067 -> h_JNC x_1067
-| JB (x_1069, x_1068) -> h_JB x_1069 x_1068
-| JNB (x_1071, x_1070) -> h_JNB x_1071 x_1070
-| JBC (x_1073, x_1072) -> h_JBC x_1073 x_1072
-| JZ x_1074 -> h_JZ x_1074
-| JNZ x_1075 -> h_JNZ x_1075
-| CJNE (x_1077, x_1076) -> h_CJNE x_1077 x_1076
-| DJNZ (x_1079, x_1078) -> h_DJNZ x_1079 x_1078
-| ANL x_1080 -> h_ANL x_1080
-| ORL x_1081 -> h_ORL x_1081
-| XRL x_1082 -> h_XRL x_1082
-| CLR x_1083 -> h_CLR x_1083
-| CPL x_1084 -> h_CPL x_1084
-| RL x_1085 -> h_RL x_1085
-| RLC x_1086 -> h_RLC x_1086
-| RR x_1087 -> h_RR x_1087
-| RRC x_1088 -> h_RRC x_1088
-| SWAP x_1089 -> h_SWAP x_1089
-| MOV x_1090 -> h_MOV x_1090
-| MOVX x_1091 -> h_MOVX x_1091
-| SETB x_1092 -> h_SETB x_1092
-| PUSH x_1093 -> h_PUSH x_1093
-| POP x_1094 -> h_POP x_1094
-| XCH (x_1096, x_1095) -> h_XCH x_1096 x_1095
-| XCHD (x_1098, x_1097) -> h_XCHD x_1098 x_1097
+    'a2 -> 'a2 -> (subaddressing_mode -> 'a2) -> 'a1 preinstruction -> 'a2 **)
+let rec preinstruction_rect_Type2 h_ADD h_ADDC h_SUBB h_INC h_DEC h_MUL h_DIV h_DA h_JC h_JNC h_JB h_JNB h_JBC h_JZ h_JNZ h_CJNE h_DJNZ h_ANL h_ORL h_XRL h_CLR h_CPL h_RL h_RLC h_RR h_RRC h_SWAP h_MOV h_MOVX h_SETB h_PUSH h_POP h_XCH h_XCHD h_RET h_RETI h_NOP h_JMP = function
+| ADD (x_19719, x_19718) -> h_ADD x_19719 x_19718
+| ADDC (x_19721, x_19720) -> h_ADDC x_19721 x_19720
+| SUBB (x_19723, x_19722) -> h_SUBB x_19723 x_19722
+| INC x_19724 -> h_INC x_19724
+| DEC x_19725 -> h_DEC x_19725
+| MUL (x_19727, x_19726) -> h_MUL x_19727 x_19726
+| DIV (x_19729, x_19728) -> h_DIV x_19729 x_19728
+| DA x_19730 -> h_DA x_19730
+| JC x_19731 -> h_JC x_19731
+| JNC x_19732 -> h_JNC x_19732
+| JB (x_19734, x_19733) -> h_JB x_19734 x_19733
+| JNB (x_19736, x_19735) -> h_JNB x_19736 x_19735
+| JBC (x_19738, x_19737) -> h_JBC x_19738 x_19737
+| JZ x_19739 -> h_JZ x_19739
+| JNZ x_19740 -> h_JNZ x_19740
+| CJNE (x_19742, x_19741) -> h_CJNE x_19742 x_19741
+| DJNZ (x_19744, x_19743) -> h_DJNZ x_19744 x_19743
+| ANL x_19745 -> h_ANL x_19745
+| ORL x_19746 -> h_ORL x_19746
+| XRL x_19747 -> h_XRL x_19747
+| CLR x_19748 -> h_CLR x_19748
+| CPL x_19749 -> h_CPL x_19749
+| RL x_19750 -> h_RL x_19750
+| RLC x_19751 -> h_RLC x_19751
+| RR x_19752 -> h_RR x_19752
+| RRC x_19753 -> h_RRC x_19753
+| SWAP x_19754 -> h_SWAP x_19754
+| MOV x_19755 -> h_MOV x_19755
+| MOVX x_19756 -> h_MOVX x_19756
+| SETB x_19757 -> h_SETB x_19757
+| PUSH x_19758 -> h_PUSH x_19758
+| POP x_19759 -> h_POP x_19759
+| XCH (x_19761, x_19760) -> h_XCH x_19761 x_19760
+| XCHD (x_19763, x_19762) -> h_XCHD x_19763 x_19762
 | RET -> h_RET
 | RETI -> h_RETI
 | NOP -> h_NOP
+| JMP x_19764 -> h_JMP x_19764
 
 (** val preinstruction_rect_Type1 :
@@ -2425 +2434 @@
     (subaddressing_mode -> 'a2) -> (subaddressing_mode -> subaddressing_mode
     -> 'a2) -> (subaddressing_mode -> subaddressing_mode -> 'a2) -> 'a2 ->
-    'a2 -> 'a2 -> 'a1 preinstruction -> 'a2 **)
-let rec preinstruction_rect_Type1 h_ADD h_ADDC h_SUBB h_INC h_DEC h_MUL h_DIV h_DA h_JC h_JNC h_JB h_JNB h_JBC h_JZ h_JNZ h_CJNE h_DJNZ h_ANL h_ORL h_XRL h_CLR h_CPL h_RL h_RLC h_RR h_RRC h_SWAP h_MOV h_MOVX h_SETB h_PUSH h_POP h_XCH h_XCHD h_RET h_RETI h_NOP = function
-| ADD (x_1138, x_1137) -> h_ADD x_1138 x_1137
-| ADDC (x_1140, x_1139) -> h_ADDC x_1140 x_1139
-| SUBB (x_1142, x_1141) -> h_SUBB x_1142 x_1141
-| INC x_1143 -> h_INC x_1143
-| DEC x_1144 -> h_DEC x_1144
-| MUL (x_1146, x_1145) -> h_MUL x_1146 x_1145
-| DIV (x_1148, x_1147) -> h_DIV x_1148 x_1147
-| DA x_1149 -> h_DA x_1149
-| JC x_1150 -> h_JC x_1150
-| JNC x_1151 -> h_JNC x_1151
-| JB (x_1153, x_1152) -> h_JB x_1153 x_1152
-| JNB (x_1155, x_1154) -> h_JNB x_1155 x_1154
-| JBC (x_1157, x_1156) -> h_JBC x_1157 x_1156
-| JZ x_1158 -> h_JZ x_1158
-| JNZ x_1159 -> h_JNZ x_1159
-| CJNE (x_1161, x_1160) -> h_CJNE x_1161 x_1160
-| DJNZ (x_1163, x_1162) -> h_DJNZ x_1163 x_1162
-| ANL x_1164 -> h_ANL x_1164
-| ORL x_1165 -> h_ORL x_1165
-| XRL x_1166 -> h_XRL x_1166
-| CLR x_1167 -> h_CLR x_1167
-| CPL x_1168 -> h_CPL x_1168
-| RL x_1169 -> h_RL x_1169
-| RLC x_1170 -> h_RLC x_1170
-| RR x_1171 -> h_RR x_1171
-| RRC x_1172 -> h_RRC x_1172
-| SWAP x_1173 -> h_SWAP x_1173
-| MOV x_1174 -> h_MOV x_1174
-| MOVX x_1175 -> h_MOVX x_1175
-| SETB x_1176 -> h_SETB x_1176
-| PUSH x_1177 -> h_PUSH x_1177
-| POP x_1178 -> h_POP x_1178
-| XCH (x_1180, x_1179) -> h_XCH x_1180 x_1179
-| XCHD (x_1182, x_1181) -> h_XCHD x_1182 x_1181
+    'a2 -> 'a2 -> (subaddressing_mode -> 'a2) -> 'a1 preinstruction -> 'a2 **)
+let rec preinstruction_rect_Type1 h_ADD h_ADDC h_SUBB h_INC h_DEC h_MUL h_DIV h_DA h_JC h_JNC h_JB h_JNB h_JBC h_JZ h_JNZ h_CJNE h_DJNZ h_ANL h_ORL h_XRL h_CLR h_CPL h_RL h_RLC h_RR h_RRC h_SWAP h_MOV h_MOVX h_SETB h_PUSH h_POP h_XCH h_XCHD h_RET h_RETI h_NOP h_JMP = function
+| ADD (x_19805, x_19804) -> h_ADD x_19805 x_19804
+| ADDC (x_19807, x_19806) -> h_ADDC x_19807 x_19806
+| SUBB (x_19809, x_19808) -> h_SUBB x_19809 x_19808
+| INC x_19810 -> h_INC x_19810
+| DEC x_19811 -> h_DEC x_19811
+| MUL (x_19813, x_19812) -> h_MUL x_19813 x_19812
+| DIV (x_19815, x_19814) -> h_DIV x_19815 x_19814
+| DA x_19816 -> h_DA x_19816
+| JC x_19817 -> h_JC x_19817
+| JNC x_19818 -> h_JNC x_19818
+| JB (x_19820, x_19819) -> h_JB x_19820 x_19819
+| JNB (x_19822, x_19821) -> h_JNB x_19822 x_19821
+| JBC (x_19824, x_19823) -> h_JBC x_19824 x_19823
+| JZ x_19825 -> h_JZ x_19825
+| JNZ x_19826 -> h_JNZ x_19826
+| CJNE (x_19828, x_19827) -> h_CJNE x_19828 x_19827
+| DJNZ (x_19830, x_19829) -> h_DJNZ x_19830 x_19829
+| ANL x_19831 -> h_ANL x_19831
+| ORL x_19832 -> h_ORL x_19832
+| XRL x_19833 -> h_XRL x_19833
+| CLR x_19834 -> h_CLR x_19834
+| CPL x_19835 -> h_CPL x_19835
+| RL x_19836 -> h_RL x_19836
+| RLC x_19837 -> h_RLC x_19837
+| RR x_19838 -> h_RR x_19838
+| RRC x_19839 -> h_RRC x_19839
+| SWAP x_19840 -> h_SWAP x_19840
+| MOV x_19841 -> h_MOV x_19841
+| MOVX x_19842 -> h_MOVX x_19842
+| SETB x_19843 -> h_SETB x_19843
+| PUSH x_19844 -> h_PUSH x_19844
+| POP x_19845 -> h_POP x_19845
+| XCH (x_19847, x_19846) -> h_XCH x_19847 x_19846
+| XCHD (x_19849, x_19848) -> h_XCHD x_19849 x_19848
 | RET -> h_RET
 | RETI -> h_RETI
 | NOP -> h_NOP
+| JMP x_19850 -> h_JMP x_19850
 
 (** val preinstruction_rect_Type0 :
@@ -2499 +2509 @@
     (subaddressing_mode -> 'a2) -> (subaddressing_mode -> subaddressing_mode
     -> 'a2) -> (subaddressing_mode -> subaddressing_mode -> 'a2) -> 'a2 ->
-    'a2 -> 'a2 -> 'a1 preinstruction -> 'a2 **)
-let rec preinstruction_rect_Type0 h_ADD h_ADDC h_SUBB h_INC h_DEC h_MUL h_DIV h_DA h_JC h_JNC h_JB h_JNB h_JBC h_JZ h_JNZ h_CJNE h_DJNZ h_ANL h_ORL h_XRL h_CLR h_CPL h_RL h_RLC h_RR h_RRC h_SWAP h_MOV h_MOVX h_SETB h_PUSH h_POP h_XCH h_XCHD h_RET h_RETI h_NOP = function
-| ADD (x_1222, x_1221) -> h_ADD x_1222 x_1221
-| ADDC (x_1224, x_1223) -> h_ADDC x_1224 x_1223
-| SUBB (x_1226, x_1225) -> h_SUBB x_1226 x_1225
-| INC x_1227 -> h_INC x_1227
-| DEC x_1228 -> h_DEC x_1228
-| MUL (x_1230, x_1229) -> h_MUL x_1230 x_1229
-| DIV (x_1232, x_1231) -> h_DIV x_1232 x_1231
-| DA x_1233 -> h_DA x_1233
-| JC x_1234 -> h_JC x_1234
-| JNC x_1235 -> h_JNC x_1235
-| JB (x_1237, x_1236) -> h_JB x_1237 x_1236
-| JNB (x_1239, x_1238) -> h_JNB x_1239 x_1238
-| JBC (x_1241, x_1240) -> h_JBC x_1241 x_1240
-| JZ x_1242 -> h_JZ x_1242
-| JNZ x_1243 -> h_JNZ x_1243
-| CJNE (x_1245, x_1244) -> h_CJNE x_1245 x_1244
-| DJNZ (x_1247, x_1246) -> h_DJNZ x_1247 x_1246
-| ANL x_1248 -> h_ANL x_1248
-| ORL x_1249 -> h_ORL x_1249
-| XRL x_1250 -> h_XRL x_1250
-| CLR x_1251 -> h_CLR x_1251
-| CPL x_1252 -> h_CPL x_1252
-| RL x_1253 -> h_RL x_1253
-| RLC x_1254 -> h_RLC x_1254
-| RR x_1255 -> h_RR x_1255
-| RRC x_1256 -> h_RRC x_1256
-| SWAP x_1257 -> h_SWAP x_1257
-| MOV x_1258 -> h_MOV x_1258
-| MOVX x_1259 -> h_MOVX x_1259
-| SETB x_1260 -> h_SETB x_1260
-| PUSH x_1261 -> h_PUSH x_1261
-| POP x_1262 -> h_POP x_1262
-| XCH (x_1264, x_1263) -> h_XCH x_1264 x_1263
-| XCHD (x_1266, x_1265) -> h_XCHD x_1266 x_1265
+    'a2 -> 'a2 -> (subaddressing_mode -> 'a2) -> 'a1 preinstruction -> 'a2 **)
+let rec preinstruction_rect_Type0 h_ADD h_ADDC h_SUBB h_INC h_DEC h_MUL h_DIV h_DA h_JC h_JNC h_JB h_JNB h_JBC h_JZ h_JNZ h_CJNE h_DJNZ h_ANL h_ORL h_XRL h_CLR h_CPL h_RL h_RLC h_RR h_RRC h_SWAP h_MOV h_MOVX h_SETB h_PUSH h_POP h_XCH h_XCHD h_RET h_RETI h_NOP h_JMP = function
+| ADD (x_19891, x_19890) -> h_ADD x_19891 x_19890
+| ADDC (x_19893, x_19892) -> h_ADDC x_19893 x_19892
+| SUBB (x_19895, x_19894) -> h_SUBB x_19895 x_19894
+| INC x_19896 -> h_INC x_19896
+| DEC x_19897 -> h_DEC x_19897
+| MUL (x_19899, x_19898) -> h_MUL x_19899 x_19898
+| DIV (x_19901, x_19900) -> h_DIV x_19901 x_19900
+| DA x_19902 -> h_DA x_19902
+| JC x_19903 -> h_JC x_19903
+| JNC x_19904 -> h_JNC x_19904
+| JB (x_19906, x_19905) -> h_JB x_19906 x_19905
+| JNB (x_19908, x_19907) -> h_JNB x_19908 x_19907
+| JBC (x_19910, x_19909) -> h_JBC x_19910 x_19909
+| JZ x_19911 -> h_JZ x_19911
+| JNZ x_19912 -> h_JNZ x_19912
+| CJNE (x_19914, x_19913) -> h_CJNE x_19914 x_19913
+| DJNZ (x_19916, x_19915) -> h_DJNZ x_19916 x_19915
+| ANL x_19917 -> h_ANL x_19917
+| ORL x_19918 -> h_ORL x_19918
+| XRL x_19919 -> h_XRL x_19919
+| CLR x_19920 -> h_CLR x_19920
+| CPL x_19921 -> h_CPL x_19921
+| RL x_19922 -> h_RL x_19922
+| RLC x_19923 -> h_RLC x_19923
+| RR x_19924 -> h_RR x_19924
+| RRC x_19925 -> h_RRC x_19925
+| SWAP x_19926 -> h_SWAP x_19926
+| MOV x_19927 -> h_MOV x_19927
+| MOVX x_19928 -> h_MOVX x_19928
+| SETB x_19929 -> h_SETB x_19929
+| PUSH x_19930 -> h_PUSH x_19930
+| POP x_19931 -> h_POP x_19931
+| XCH (x_19933, x_19932) -> h_XCH x_19933 x_19932
+| XCHD (x_19935, x_19934) -> h_XCHD x_19935 x_19934
 | RET -> h_RET
 | RETI -> h_RETI
 | NOP -> h_NOP
+| JMP x_19936 -> h_JMP x_19936
 
 (** val preinstruction_inv_rect_Type4 :
@@ -2575 +2586 @@
     -> (subaddressing_mode -> subaddressing_mode -> __ -> 'a2) ->
     (subaddressing_mode -> subaddressing_mode -> __ -> 'a2) -> (__ -> 'a2) ->
-    (__ -> 'a2) -> (__ -> 'a2) -> 'a2 **)
-let preinstruction_inv_rect_Type4 hterm h1 h2 h3 h4 h5 h6 h7 h8 h9 h10 h11 h12 h13 h14 h15 h16 h17 h18 h19 h20 h21 h22 h23 h24 h25 h26 h27 h28 h29 h30 h31 h32 h33 h34 h35 h36 h37 =
+    (__ -> 'a2) -> (__ -> 'a2) -> (subaddressing_mode -> __ -> 'a2) -> 'a2 **)
+let preinstruction_inv_rect_Type4 hterm h1 h2 h3 h4 h5 h6 h7 h8 h9 h10 h11 h12 h13 h14 h15 h16 h17 h18 h19 h20 h21 h22 h23 h24 h25 h26 h27 h28 h29 h30 h31 h32 h33 h34 h35 h36 h37 h38 =
   let hcut =
     preinstruction_rect_Type4 h1 h2 h3 h4 h5 h6 h7 h8 h9 h10 h11 h12 h13 h14
       h15 h16 h17 h18 h19 h20 h21 h22 h23 h24 h25 h26 h27 h28 h29 h30 h31 h32
-      h33 h34 h35 h36 h37 hterm
+      h33 h34 h35 h36 h37 h38 hterm
   in
   hcut __
@@ -2620 +2631 @@
     -> (subaddressing_mode -> subaddressing_mode -> __ -> 'a2) ->
     (subaddressing_mode -> subaddressing_mode -> __ -> 'a2) -> (__ -> 'a2) ->
-    (__ -> 'a2) -> (__ -> 'a2) -> 'a2 **)
-let preinstruction_inv_rect_Type3 hterm h1 h2 h3 h4 h5 h6 h7 h8 h9 h10 h11 h12 h13 h14 h15 h16 h17 h18 h19 h20 h21 h22 h23 h24 h25 h26 h27 h28 h29 h30 h31 h32 h33 h34 h35 h36 h37 =
+    (__ -> 'a2) -> (__ -> 'a2) -> (subaddressing_mode -> __ -> 'a2) -> 'a2 **)
+let preinstruction_inv_rect_Type3 hterm h1 h2 h3 h4 h5 h6 h7 h8 h9 h10 h11 h12 h13 h14 h15 h16 h17 h18 h19 h20 h21 h22 h23 h24 h25 h26 h27 h28 h29 h30 h31 h32 h33 h34 h35 h36 h37 h38 =
   let hcut =
     preinstruction_rect_Type3 h1 h2 h3 h4 h5 h6 h7 h8 h9 h10 h11 h12 h13 h14
       h15 h16 h17 h18 h19 h20 h21 h22 h23 h24 h25 h26 h27 h28 h29 h30 h31 h32
-      h33 h34 h35 h36 h37 hterm
+      h33 h34 h35 h36 h37 h38 hterm
   in
   hcut __
@@ -2665 +2676 @@
     -> (subaddressing_mode -> subaddressing_mode -> __ -> 'a2) ->
     (subaddressing_mode -> subaddressing_mode -> __ -> 'a2) -> (__ -> 'a2) ->
-    (__ -> 'a2) -> (__ -> 'a2) -> 'a2 **)
-let preinstruction_inv_rect_Type2 hterm h1 h2 h3 h4 h5 h6 h7 h8 h9 h10 h11 h12 h13 h14 h15 h16 h17 h18 h19 h20 h21 h22 h23 h24 h25 h26 h27 h28 h29 h30 h31 h32 h33 h34 h35 h36 h37 =
+    (__ -> 'a2) -> (__ -> 'a2) -> (subaddressing_mode -> __ -> 'a2) -> 'a2 **)
+let preinstruction_inv_rect_Type2 hterm h1 h2 h3 h4 h5 h6 h7 h8 h9 h10 h11 h12 h13 h14 h15 h16 h17 h18 h19 h20 h21 h22 h23 h24 h25 h26 h27 h28 h29 h30 h31 h32 h33 h34 h35 h36 h37 h38 =
   let hcut =
     preinstruction_rect_Type2 h1 h2 h3 h4 h5 h6 h7 h8 h9 h10 h11 h12 h13 h14
       h15 h16 h17 h18 h19 h20 h21 h22 h23 h24 h25 h26 h27 h28 h29 h30 h31 h32
-      h33 h34 h35 h36 h37 hterm
+      h33 h34 h35 h36 h37 h38 hterm
   in
   hcut __
@@ -2710 +2721 @@
     -> (subaddressing_mode -> subaddressing_mode -> __ -> 'a2) ->
     (subaddressing_mode -> subaddressing_mode -> __ -> 'a2) -> (__ -> 'a2) ->
-    (__ -> 'a2) -> (__ -> 'a2) -> 'a2 **)
-let preinstruction_inv_rect_Type1 hterm h1 h2 h3 h4 h5 h6 h7 h8 h9 h10 h11 h12 h13 h14 h15 h16 h17 h18 h19 h20 h21 h22 h23 h24 h25 h26 h27 h28 h29 h30 h31 h32 h33 h34 h35 h36 h37 =
+    (__ -> 'a2) -> (__ -> 'a2) -> (subaddressing_mode -> __ -> 'a2) -> 'a2 **)
+let preinstruction_inv_rect_Type1 hterm h1 h2 h3 h4 h5 h6 h7 h8 h9 h10 h11 h12 h13 h14 h15 h16 h17 h18 h19 h20 h21 h22 h23 h24 h25 h26 h27 h28 h29 h30 h31 h32 h33 h34 h35 h36 h37 h38 =
   let hcut =
     preinstruction_rect_Type1 h1 h2 h3 h4 h5 h6 h7 h8 h9 h10 h11 h12 h13 h14
       h15 h16 h17 h18 h19 h20 h21 h22 h23 h24 h25 h26 h27 h28 h29 h30 h31 h32
-      h33 h34 h35 h36 h37 hterm
+      h33 h34 h35 h36 h37 h38 hterm
   in
   hcut __
@@ -2755 +2766 @@
     -> (subaddressing_mode -> subaddressing_mode -> __ -> 'a2) ->
     (subaddressing_mode -> subaddressing_mode -> __ -> 'a2) -> (__ -> 'a2) ->
-    (__ -> 'a2) -> (__ -> 'a2) -> 'a2 **)
-let preinstruction_inv_rect_Type0 hterm h1 h2 h3 h4 h5 h6 h7 h8 h9 h10 h11 h12 h13 h14 h15 h16 h17 h18 h19 h20 h21 h22 h23 h24 h25 h26 h27 h28 h29 h30 h31 h32 h33 h34 h35 h36 h37 =
+    (__ -> 'a2) -> (__ -> 'a2) -> (subaddressing_mode -> __ -> 'a2) -> 'a2 **)
+let preinstruction_inv_rect_Type0 hterm h1 h2 h3 h4 h5 h6 h7 h8 h9 h10 h11 h12 h13 h14 h15 h16 h17 h18 h19 h20 h21 h22 h23 h24 h25 h26 h27 h28 h29 h30 h31 h32 h33 h34 h35 h36 h37 h38 =
   let hcut =
     preinstruction_rect_Type0 h1 h2 h3 h4 h5 h6 h7 h8 h9 h10 h11 h12 h13 h14
       h15 h16 h17 h18 h19 h20 h21 h22 h23 h24 h25 h26 h27 h28 h29 h30 h31 h32
-      h33 h34 h35 h36 h37 hterm
+      h33 h34 h35 h36 h37 h38 hterm
   in
   hcut __
@@ -2805 +2816 @@
      | RET -> Obj.magic (fun _ dH -> dH)
      | RETI -> Obj.magic (fun _ dH -> dH)
-     | NOP -> Obj.magic (fun _ dH -> dH)) y
+     | NOP -> Obj.magic (fun _ dH -> dH)
+     | JMP a0 -> Obj.magic (fun _ dH -> dH __)) y
 
 (** val preinstruction_jmdiscr :
@@ -2848 +2860 @@
      | RET -> Obj.magic (fun _ dH -> dH)
      | RETI -> Obj.magic (fun _ dH -> dH)
-     | NOP -> Obj.magic (fun _ dH -> dH)) y
+     | NOP -> Obj.magic (fun _ dH -> dH)
+     | JMP a0 -> Obj.magic (fun _ dH -> dH __)) y
 
 (** val eq_preinstruction :
@@ -2908 +2921 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | ADDC (arg1, arg2) ->
     (match j with
@@ -2962 +2976 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | SUBB (arg1, arg2) ->
     (match j with
@@ -3016 +3031 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | INC arg ->
     (match j with
@@ -3068 +3084 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | DEC arg ->
     (match j with
@@ -3116 +3133 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | MUL (arg1, arg2) ->
     (match j with
@@ -3166 +3184 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | DIV (arg1, arg2) ->
     (match j with
@@ -3216 +3235 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | DA arg ->
     (match j with
@@ -3260 +3280 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | JC arg ->
     (match j with
@@ -3304 +3325 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | JNC arg ->
     (match j with
@@ -3348 +3370 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | JB (arg1, arg2) ->
     (match j with
@@ -3398 +3421 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | JNB (arg1, arg2) ->
     (match j with
@@ -3448 +3472 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | JBC (arg1, arg2) ->
     (match j with
@@ -3498 +3523 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | JZ arg ->
     (match j with
@@ -3542 +3568 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | JNZ arg ->
     (match j with
@@ -3586 +3613 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | CJNE (arg1, arg2) ->
     (match j with
@@ -3662 +3690 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | DJNZ (arg1, arg2) ->
     (match j with
@@ -3712 +3741 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | ANL arg ->
     (match j with
@@ -3802 +3832 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | ORL arg ->
     (match j with
@@ -3892 +3923 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | XRL arg ->
     (match j with
@@ -3966 +3998 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | CLR arg ->
     (match j with
@@ -4012 +4045 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | CPL arg ->
     (match j with
@@ -4058 +4092 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | RL arg ->
     (match j with
@@ -4102 +4137 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | RLC arg ->
     (match j with
@@ -4146 +4182 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | RR arg ->
     (match j with
@@ -4190 +4227 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | RRC arg ->
     (match j with
@@ -4234 +4272 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | SWAP arg ->
     (match j with
@@ -4278 +4317 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | MOV arg ->
     (match j with
@@ -4418 +4458 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | MOVX arg ->
     (match j with
@@ -4488 +4529 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | SETB arg ->
     (match j with
@@ -4532 +4574 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | PUSH arg ->
     (match j with
@@ -4576 +4619 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | POP arg ->
     (match j with
@@ -4620 +4664 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | XCH (arg1, arg2) ->
     (match j with
@@ -4672 +4717 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | XCHD (arg1, arg2) ->
     (match j with
@@ -4722 +4768 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | RET ->
     (match j with
@@ -4761 +4808 @@
      | RET -> Bool.True
      | RETI -> Bool.False
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | RETI ->
     (match j with
@@ -4800 +4848 @@
      | RET -> Bool.False
      | RETI -> Bool.True
-     | NOP -> Bool.False)
+     | NOP -> Bool.False
+     | JMP x -> Bool.False)
   | NOP ->
     (match j with
@@ -4839 +4888 @@
      | RET -> Bool.False
      | RETI -> Bool.False
-     | NOP -> Bool.True)
+     | NOP -> Bool.True
+     | JMP x -> Bool.False)
+  | JMP arg ->
+    (match j with
+     | ADD (x, x0) -> Bool.False
+     | ADDC (x, x0) -> Bool.False
+     | SUBB (x, x0) -> Bool.False
+     | INC x -> Bool.False
+     | DEC x -> Bool.False
+     | MUL (x, x0) -> Bool.False
+     | DIV (x, x0) -> Bool.False
+     | DA x -> Bool.False
+     | JC x -> Bool.False
+     | JNC x -> Bool.False
+     | JB (x, x0) -> Bool.False
+     | JNB (x, x0) -> Bool.False
+     | JBC (x, x0) -> Bool.False
+     | JZ x -> Bool.False
+     | JNZ x -> Bool.False
+     | CJNE (x, x0) -> Bool.False
+     | DJNZ (x, x0) -> Bool.False
+     | ANL x -> Bool.False
+     | ORL x -> Bool.False
+     | XRL x -> Bool.False
+     | CLR x -> Bool.False
+     | CPL x -> Bool.False
+     | RL x -> Bool.False
+     | RLC x -> Bool.False
+     | RR x -> Bool.False
+     | RRC x -> Bool.False
+     | SWAP x -> Bool.False
+     | MOV x -> Bool.False
+     | MOVX x -> Bool.False
+     | SETB x -> Bool.False
+     | PUSH x -> Bool.False
+     | POP x -> Bool.False
+     | XCH (x, x0) -> Bool.False
+     | XCHD (x, x0) -> Bool.False
+     | RET -> Bool.False
+     | RETI -> Bool.False
+     | NOP -> Bool.False
+     | JMP arg' ->
+       eq_addressing_mode
+         (subaddressing_modeel Nat.O (Vector.VCons (Nat.O, Indirect_dptr,
+           Vector.VEmpty)) arg)
+         (subaddressing_modeel Nat.O (Vector.VCons (Nat.O, Indirect_dptr,
+           Vector.VEmpty)) arg'))
 
 type instruction =
@@ -4847 +4942 @@
 | LJMP of subaddressing_mode
 | SJMP of subaddressing_mode
-| JMP of subaddressing_mode
 | MOVC of subaddressing_mode * subaddressing_mode
 | RealInstruction of subaddressing_mode preinstruction
@@ -4854 +4948 @@
     (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
     (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
-    (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
-    (subaddressing_mode -> subaddressing_mode -> 'a1) -> (subaddressing_mode
-    preinstruction -> 'a1) -> instruction -> 'a1 **)
-let rec instruction_rect_Type4 h_ACALL h_LCALL h_AJMP h_LJMP h_SJMP h_JMP h_MOVC h_RealInstruction = function
-| ACALL x_1827 -> h_ACALL x_1827
-| LCALL x_1828 -> h_LCALL x_1828
-| AJMP x_1829 -> h_AJMP x_1829
-| LJMP x_1830 -> h_LJMP x_1830
-| SJMP x_1831 -> h_SJMP x_1831
-| JMP x_1832 -> h_JMP x_1832
-| MOVC (x_1834, x_1833) -> h_MOVC x_1834 x_1833
-| RealInstruction x_1835 -> h_RealInstruction x_1835
+    (subaddressing_mode -> 'a1) -> (subaddressing_mode -> subaddressing_mode
+    -> 'a1) -> (subaddressing_mode preinstruction -> 'a1) -> instruction ->
+    'a1 **)
+let rec instruction_rect_Type4 h_ACALL h_LCALL h_AJMP h_LJMP h_SJMP h_MOVC h_RealInstruction = function
+| ACALL x_20508 -> h_ACALL x_20508
+| LCALL x_20509 -> h_LCALL x_20509
+| AJMP x_20510 -> h_AJMP x_20510
+| LJMP x_20511 -> h_LJMP x_20511
+| SJMP x_20512 -> h_SJMP x_20512
+| MOVC (x_20514, x_20513) -> h_MOVC x_20514 x_20513
+| RealInstruction x_20515 -> h_RealInstruction x_20515
 
 (** val instruction_rect_Type5 :
     (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
     (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
-    (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
-    (subaddressing_mode -> subaddressing_mode -> 'a1) -> (subaddressing_mode
-    preinstruction -> 'a1) -> instruction -> 'a1 **)
-let rec instruction_rect_Type5 h_ACALL h_LCALL h_AJMP h_LJMP h_SJMP h_JMP h_MOVC h_RealInstruction = function
-| ACALL x_1845 -> h_ACALL x_1845
-| LCALL x_1846 -> h_LCALL x_1846
-| AJMP x_1847 -> h_AJMP x_1847
-| LJMP x_1848 -> h_LJMP x_1848
-| SJMP x_1849 -> h_SJMP x_1849
-| JMP x_1850 -> h_JMP x_1850
-| MOVC (x_1852, x_1851) -> h_MOVC x_1852 x_1851
-| RealInstruction x_1853 -> h_RealInstruction x_1853
+    (subaddressing_mode -> 'a1) -> (subaddressing_mode -> subaddressing_mode
+    -> 'a1) -> (subaddressing_mode preinstruction -> 'a1) -> instruction ->
+    'a1 **)
+let rec instruction_rect_Type5 h_ACALL h_LCALL h_AJMP h_LJMP h_SJMP h_MOVC h_RealInstruction = function
+| ACALL x_20524 -> h_ACALL x_20524
+| LCALL x_20525 -> h_LCALL x_20525
+| AJMP x_20526 -> h_AJMP x_20526
+| LJMP x_20527 -> h_LJMP x_20527
+| SJMP x_20528 -> h_SJMP x_20528
+| MOVC (x_20530, x_20529) -> h_MOVC x_20530 x_20529
+| RealInstruction x_20531 -> h_RealInstruction x_20531
 
 (** val instruction_rect_Type3 :
     (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
     (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
-    (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
-    (subaddressing_mode -> subaddressing_mode -> 'a1) -> (subaddressing_mode
-    preinstruction -> 'a1) -> instruction -> 'a1 **)
-let rec instruction_rect_Type3 h_ACALL h_LCALL h_AJMP h_LJMP h_SJMP h_JMP h_MOVC h_RealInstruction = function
-| ACALL x_1863 -> h_ACALL x_1863
-| LCALL x_1864 -> h_LCALL x_1864
-| AJMP x_1865 -> h_AJMP x_1865
-| LJMP x_1866 -> h_LJMP x_1866
-| SJMP x_1867 -> h_SJMP x_1867
-| JMP x_1868 -> h_JMP x_1868
-| MOVC (x_1870, x_1869) -> h_MOVC x_1870 x_1869
-| RealInstruction x_1871 -> h_RealInstruction x_1871
+    (subaddressing_mode -> 'a1) -> (subaddressing_mode -> subaddressing_mode
+    -> 'a1) -> (subaddressing_mode preinstruction -> 'a1) -> instruction ->
+    'a1 **)
+let rec instruction_rect_Type3 h_ACALL h_LCALL h_AJMP h_LJMP h_SJMP h_MOVC h_RealInstruction = function
+| ACALL x_20540 -> h_ACALL x_20540
+| LCALL x_20541 -> h_LCALL x_20541
+| AJMP x_20542 -> h_AJMP x_20542
+| LJMP x_20543 -> h_LJMP x_20543
+| SJMP x_20544 -> h_SJMP x_20544
+| MOVC (x_20546, x_20545) -> h_MOVC x_20546 x_20545
+| RealInstruction x_20547 -> h_RealInstruction x_20547
 
 (** val instruction_rect_Type2 :
     (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
     (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
-    (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
-    (subaddressing_mode -> subaddressing_mode -> 'a1) -> (subaddressing_mode
-    preinstruction -> 'a1) -> instruction -> 'a1 **)
-let rec instruction_rect_Type2 h_ACALL h_LCALL h_AJMP h_LJMP h_SJMP h_JMP h_MOVC h_RealInstruction = function
-| ACALL x_1881 -> h_ACALL x_1881
-| LCALL x_1882 -> h_LCALL x_1882
-| AJMP x_1883 -> h_AJMP x_1883
-| LJMP x_1884 -> h_LJMP x_1884
-| SJMP x_1885 -> h_SJMP x_1885
-| JMP x_1886 -> h_JMP x_1886
-| MOVC (x_1888, x_1887) -> h_MOVC x_1888 x_1887
-| RealInstruction x_1889 -> h_RealInstruction x_1889
+    (subaddressing_mode -> 'a1) -> (subaddressing_mode -> subaddressing_mode
+    -> 'a1) -> (subaddressing_mode preinstruction -> 'a1) -> instruction ->
+    'a1 **)
+let rec instruction_rect_Type2 h_ACALL h_LCALL h_AJMP h_LJMP h_SJMP h_MOVC h_RealInstruction = function
+| ACALL x_20556 -> h_ACALL x_20556
+| LCALL x_20557 -> h_LCALL x_20557
+| AJMP x_20558 -> h_AJMP x_20558
+| LJMP x_20559 -> h_LJMP x_20559
+| SJMP x_20560 -> h_SJMP x_20560
+| MOVC (x_20562, x_20561) -> h_MOVC x_20562 x_20561
+| RealInstruction x_20563 -> h_RealInstruction x_20563
 
 (** val instruction_rect_Type1 :
     (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
     (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
-    (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
-    (subaddressing_mode -> subaddressing_mode -> 'a1) -> (subaddressing_mode
-    preinstruction -> 'a1) -> instruction -> 'a1 **)
-let rec instruction_rect_Type1 h_ACALL h_LCALL h_AJMP h_LJMP h_SJMP h_JMP h_MOVC h_RealInstruction = function
-| ACALL x_1899 -> h_ACALL x_1899
-| LCALL x_1900 -> h_LCALL x_1900
-| AJMP x_1901 -> h_AJMP x_1901
-| LJMP x_1902 -> h_LJMP x_1902
-| SJMP x_1903 -> h_SJMP x_1903
-| JMP x_1904 -> h_JMP x_1904
-| MOVC (x_1906, x_1905) -> h_MOVC x_1906 x_1905
-| RealInstruction x_1907 -> h_RealInstruction x_1907
+    (subaddressing_mode -> 'a1) -> (subaddressing_mode -> subaddressing_mode
+    -> 'a1) -> (subaddressing_mode preinstruction -> 'a1) -> instruction ->
+    'a1 **)
+let rec instruction_rect_Type1 h_ACALL h_LCALL h_AJMP h_LJMP h_SJMP h_MOVC h_RealInstruction = function
+| ACALL x_20572 -> h_ACALL x_20572
+| LCALL x_20573 -> h_LCALL x_20573
+| AJMP x_20574 -> h_AJMP x_20574
+| LJMP x_20575 -> h_LJMP x_20575
+| SJMP x_20576 -> h_SJMP x_20576
+| MOVC (x_20578, x_20577) -> h_MOVC x_20578 x_20577
+| RealInstruction x_20579 -> h_RealInstruction x_20579
 
 (** val instruction_rect_Type0 :
     (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
     (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
-    (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
-    (subaddressing_mode -> subaddressing_mode -> 'a1) -> (subaddressing_mode
-    preinstruction -> 'a1) -> instruction -> 'a1 **)
-let rec instruction_rect_Type0 h_ACALL h_LCALL h_AJMP h_LJMP h_SJMP h_JMP h_MOVC h_RealInstruction = function
-| ACALL x_1917 -> h_ACALL x_1917
-| LCALL x_1918 -> h_LCALL x_1918
-| AJMP x_1919 -> h_AJMP x_1919
-| LJMP x_1920 -> h_LJMP x_1920
-| SJMP x_1921 -> h_SJMP x_1921
-| JMP x_1922 -> h_JMP x_1922
-| MOVC (x_1924, x_1923) -> h_MOVC x_1924 x_1923
-| RealInstruction x_1925 -> h_RealInstruction x_1925
+    (subaddressing_mode -> 'a1) -> (subaddressing_mode -> subaddressing_mode
+    -> 'a1) -> (subaddressing_mode preinstruction -> 'a1) -> instruction ->
+    'a1 **)
+let rec instruction_rect_Type0 h_ACALL h_LCALL h_AJMP h_LJMP h_SJMP h_MOVC h_RealInstruction = function
+| ACALL x_20588 -> h_ACALL x_20588
+| LCALL x_20589 -> h_LCALL x_20589
+| AJMP x_20590 -> h_AJMP x_20590
+| LJMP x_20591 -> h_LJMP x_20591
+| SJMP x_20592 -> h_SJMP x_20592
+| MOVC (x_20594, x_20593) -> h_MOVC x_20594 x_20593
+| RealInstruction x_20595 -> h_RealInstruction x_20595
 
 (** val instruction_inv_rect_Type4 :
@@ -4951 +5039 @@
     -> __ -> 'a1) -> (subaddressing_mode -> __ -> 'a1) -> (subaddressing_mode
     -> __ -> 'a1) -> (subaddressing_mode -> __ -> 'a1) -> (subaddressing_mode
-    -> __ -> 'a1) -> (subaddressing_mode -> subaddressing_mode -> __ -> 'a1)
-    -> (subaddressing_mode preinstruction -> __ -> 'a1) -> 'a1 **)
-let instruction_inv_rect_Type4 hterm h1 h2 h3 h4 h5 h6 h7 h8 =
-  let hcut = instruction_rect_Type4 h1 h2 h3 h4 h5 h6 h7 h8 hterm in hcut __
+    -> subaddressing_mode -> __ -> 'a1) -> (subaddressing_mode preinstruction
+    -> __ -> 'a1) -> 'a1 **)
+let instruction_inv_rect_Type4 hterm h1 h2 h3 h4 h5 h6 h7 =
+  let hcut = instruction_rect_Type4 h1 h2 h3 h4 h5 h6 h7 hterm in hcut __
 
 (** val instruction_inv_rect_Type3 :
@@ -4960 +5048 @@
     -> __ -> 'a1) -> (subaddressing_mode -> __ -> 'a1) -> (subaddressing_mode
     -> __ -> 'a1) -> (subaddressing_mode -> __ -> 'a1) -> (subaddressing_mode
-    -> __ -> 'a1) -> (subaddressing_mode -> subaddressing_mode -> __ -> 'a1)
-    -> (subaddressing_mode preinstruction -> __ -> 'a1) -> 'a1 **)
-let instruction_inv_rect_Type3 hterm h1 h2 h3 h4 h5 h6 h7 h8 =
-  let hcut = instruction_rect_Type3 h1 h2 h3 h4 h5 h6 h7 h8 hterm in hcut __
+    -> subaddressing_mode -> __ -> 'a1) -> (subaddressing_mode preinstruction
+    -> __ -> 'a1) -> 'a1 **)
+let instruction_inv_rect_Type3 hterm h1 h2 h3 h4 h5 h6 h7 =
+  let hcut = instruction_rect_Type3 h1 h2 h3 h4 h5 h6 h7 hterm in hcut __
 
 (** val instruction_inv_rect_Type2 :
@@ -4969 +5057 @@
     -> __ -> 'a1) -> (subaddressing_mode -> __ -> 'a1) -> (subaddressing_mode
     -> __ -> 'a1) -> (subaddressing_mode -> __ -> 'a1) -> (subaddressing_mode
-    -> __ -> 'a1) -> (subaddressing_mode -> subaddressing_mode -> __ -> 'a1)
-    -> (subaddressing_mode preinstruction -> __ -> 'a1) -> 'a1 **)
-let instruction_inv_rect_Type2 hterm h1 h2 h3 h4 h5 h6 h7 h8 =
-  let hcut = instruction_rect_Type2 h1 h2 h3 h4 h5 h6 h7 h8 hterm in hcut __
+    -> subaddressing_mode -> __ -> 'a1) -> (subaddressing_mode preinstruction
+    -> __ -> 'a1) -> 'a1 **)
+let instruction_inv_rect_Type2 hterm h1 h2 h3 h4 h5 h6 h7 =
+  let hcut = instruction_rect_Type2 h1 h2 h3 h4 h5 h6 h7 hterm in hcut __
 
 (** val instruction_inv_rect_Type1 :
@@ -4978 +5066 @@
     -> __ -> 'a1) -> (subaddressing_mode -> __ -> 'a1) -> (subaddressing_mode
     -> __ -> 'a1) -> (subaddressing_mode -> __ -> 'a1) -> (subaddressing_mode
-    -> __ -> 'a1) -> (subaddressing_mode -> subaddressing_mode -> __ -> 'a1)
-    -> (subaddressing_mode preinstruction -> __ -> 'a1) -> 'a1 **)
-let instruction_inv_rect_Type1 hterm h1 h2 h3 h4 h5 h6 h7 h8 =
-  let hcut = instruction_rect_Type1 h1 h2 h3 h4 h5 h6 h7 h8 hterm in hcut __
+    -> subaddressing_mode -> __ -> 'a1) -> (subaddressing_mode preinstruction
+    -> __ -> 'a1) -> 'a1 **)
+let instruction_inv_rect_Type1 hterm h1 h2 h3 h4 h5 h6 h7 =
+  let hcut = instruction_rect_Type1 h1 h2 h3 h4 h5 h6 h7 hterm in hcut __
 
 (** val instruction_inv_rect_Type0 :
@@ -4987 +5075 @@
     -> __ -> 'a1) -> (subaddressing_mode -> __ -> 'a1) -> (subaddressing_mode
     -> __ -> 'a1) -> (subaddressing_mode -> __ -> 'a1) -> (subaddressing_mode
-    -> __ -> 'a1) -> (subaddressing_mode -> subaddressing_mode -> __ -> 'a1)
-    -> (subaddressing_mode preinstruction -> __ -> 'a1) -> 'a1 **)
-let instruction_inv_rect_Type0 hterm h1 h2 h3 h4 h5 h6 h7 h8 =
-  let hcut = instruction_rect_Type0 h1 h2 h3 h4 h5 h6 h7 h8 hterm in hcut __
+    -> subaddressing_mode -> __ -> 'a1) -> (subaddressing_mode preinstruction
+    -> __ -> 'a1) -> 'a1 **)
+let instruction_inv_rect_Type0 hterm h1 h2 h3 h4 h5 h6 h7 =
+  let hcut = instruction_rect_Type0 h1 h2 h3 h4 h5 h6 h7 hterm in hcut __
 
 (** val instruction_discr : instruction -> instruction -> __ **)
@@ -5001 +5089 @@
      | LJMP a0 -> Obj.magic (fun _ dH -> dH __)
      | SJMP a0 -> Obj.magic (fun _ dH -> dH __)
-     | JMP a0 -> Obj.magic (fun _ dH -> dH __)
      | MOVC (a0, a1) -> Obj.magic (fun _ dH -> dH __ __)
      | RealInstruction a0 -> Obj.magic (fun _ dH -> dH __)) y
@@ -5014 +5101 @@
      | LJMP a0 -> Obj.magic (fun _ dH -> dH __)
      | SJMP a0 -> Obj.magic (fun _ dH -> dH __)
-     | JMP a0 -> Obj.magic (fun _ dH -> dH __)
      | MOVC (a0, a1) -> Obj.magic (fun _ dH -> dH __ __)
      | RealInstruction a0 -> Obj.magic (fun _ dH -> dH __)) y
@@ -5033 +5119 @@
      | LJMP x -> Bool.False
      | SJMP x -> Bool.False
-     | JMP x -> Bool.False
      | MOVC (x, x0) -> Bool.False
      | RealInstruction x -> Bool.False)
@@ -5048 +5133 @@
      | LJMP x -> Bool.False
      | SJMP x -> Bool.False
-     | JMP x -> Bool.False
      | MOVC (x, x0) -> Bool.False
      | RealInstruction x -> Bool.False)
@@ -5063 +5147 @@
      | LJMP x -> Bool.False
      | SJMP x -> Bool.False
-     | JMP x -> Bool.False
      | MOVC (x, x0) -> Bool.False
      | RealInstruction x -> Bool.False)
@@ -5078 +5161 @@
            Vector.VEmpty)) arg')
      | SJMP x -> Bool.False
-     | JMP x -> Bool.False
      | MOVC (x, x0) -> Bool.False
      | RealInstruction x -> Bool.False)
@@ -5093 +5175 @@
          (subaddressing_modeel Nat.O (Vector.VCons (Nat.O, Relative,
            Vector.VEmpty)) arg')
-     | JMP x -> Bool.False
-     | MOVC (x, x0) -> Bool.False
-     | RealInstruction x -> Bool.False)
-  | JMP arg ->
-    (match j with
-     | ACALL x -> Bool.False
-     | LCALL x -> Bool.False
-     | AJMP x -> Bool.False
-     | LJMP x -> Bool.False
-     | SJMP x -> Bool.False
-     | JMP arg' ->
-       eq_addressing_mode
-         (subaddressing_modeel Nat.O (Vector.VCons (Nat.O, Indirect_dptr,
-           Vector.VEmpty)) arg)
-         (subaddressing_modeel Nat.O (Vector.VCons (Nat.O, Indirect_dptr,
-           Vector.VEmpty)) arg')
      | MOVC (x, x0) -> Bool.False
      | RealInstruction x -> Bool.False)
@@ -5118 +5184 @@
      | LJMP x -> Bool.False
      | SJMP x -> Bool.False
-     | JMP x -> Bool.False
      | MOVC (arg1', arg2') ->
        Bool.andb
@@ -5139 +5204 @@
      | LJMP x -> Bool.False
      | SJMP x -> Bool.False
-     | JMP x -> Bool.False
      | MOVC (x, x0) -> Bool.False
      | RealInstruction instr' -> eq_preinstruction instr instr')
+
+type word_side =
+| HIGH
+| LOW
+
+(** val word_side_rect_Type4 : 'a1 -> 'a1 -> word_side -> 'a1 **)
+let rec word_side_rect_Type4 h_HIGH h_LOW = function
+| HIGH -> h_HIGH
+| LOW -> h_LOW
+
+(** val word_side_rect_Type5 : 'a1 -> 'a1 -> word_side -> 'a1 **)
+let rec word_side_rect_Type5 h_HIGH h_LOW = function
+| HIGH -> h_HIGH
+| LOW -> h_LOW
+
+(** val word_side_rect_Type3 : 'a1 -> 'a1 -> word_side -> 'a1 **)
+let rec word_side_rect_Type3 h_HIGH h_LOW = function
+| HIGH -> h_HIGH
+| LOW -> h_LOW
+
+(** val word_side_rect_Type2 : 'a1 -> 'a1 -> word_side -> 'a1 **)
+let rec word_side_rect_Type2 h_HIGH h_LOW = function
+| HIGH -> h_HIGH
+| LOW -> h_LOW
+
+(** val word_side_rect_Type1 : 'a1 -> 'a1 -> word_side -> 'a1 **)
+let rec word_side_rect_Type1 h_HIGH h_LOW = function
+| HIGH -> h_HIGH
+| LOW -> h_LOW
+
+(** val word_side_rect_Type0 : 'a1 -> 'a1 -> word_side -> 'a1 **)
+let rec word_side_rect_Type0 h_HIGH h_LOW = function
+| HIGH -> h_HIGH
+| LOW -> h_LOW
+
+(** val word_side_inv_rect_Type4 :
+    word_side -> (__ -> 'a1) -> (__ -> 'a1) -> 'a1 **)
+let word_side_inv_rect_Type4 hterm h1 h2 =
+  let hcut = word_side_rect_Type4 h1 h2 hterm in hcut __
+
+(** val word_side_inv_rect_Type3 :
+    word_side -> (__ -> 'a1) -> (__ -> 'a1) -> 'a1 **)
+let word_side_inv_rect_Type3 hterm h1 h2 =
+  let hcut = word_side_rect_Type3 h1 h2 hterm in hcut __
+
+(** val word_side_inv_rect_Type2 :
+    word_side -> (__ -> 'a1) -> (__ -> 'a1) -> 'a1 **)
+let word_side_inv_rect_Type2 hterm h1 h2 =
+  let hcut = word_side_rect_Type2 h1 h2 hterm in hcut __
+
+(** val word_side_inv_rect_Type1 :
+    word_side -> (__ -> 'a1) -> (__ -> 'a1) -> 'a1 **)
+let word_side_inv_rect_Type1 hterm h1 h2 =
+  let hcut = word_side_rect_Type1 h1 h2 hterm in hcut __
+
+(** val word_side_inv_rect_Type0 :
+    word_side -> (__ -> 'a1) -> (__ -> 'a1) -> 'a1 **)
+let word_side_inv_rect_Type0 hterm h1 h2 =
+  let hcut = word_side_rect_Type0 h1 h2 hterm in hcut __
+
+(** val word_side_discr : word_side -> word_side -> __ **)
+let word_side_discr x y =
+  Logic.eq_rect_Type2 x
+    (match x with
+     | HIGH -> Obj.magic (fun _ dH -> dH)
+     | LOW -> Obj.magic (fun _ dH -> dH)) y
+
+(** val word_side_jmdiscr : word_side -> word_side -> __ **)
+let word_side_jmdiscr x y =
+  Logic.eq_rect_Type2 x
+    (match x with
+     | HIGH -> Obj.magic (fun _ dH -> dH)
+     | LOW -> Obj.magic (fun _ dH -> dH)) y
 
 type pseudo_instruction =
@@ -5148 +5285 @@
 | Cost of CostLabel.costlabel
 | Jmp of identifier0
+| Jnz of subaddressing_mode * identifier0 * identifier0
+| MovSuccessor of subaddressing_mode * word_side * identifier0
 | Call of identifier0
 | Mov of subaddressing_mode * identifier0
@@ -5153 +5292 @@
 (** val pseudo_instruction_rect_Type4 :
     (identifier0 preinstruction -> 'a1) -> (String.string -> 'a1) ->
-    (CostLabel.costlabel -> 'a1) -> (identifier0 -> 'a1) -> (identifier0 ->
-    'a1) -> (subaddressing_mode -> identifier0 -> 'a1) -> pseudo_instruction
-    -> 'a1 **)
-let rec pseudo_instruction_rect_Type4 h_Instruction h_Comment h_Cost h_Jmp h_Call h_Mov = function
-| Instruction x_2057 -> h_Instruction x_2057
-| Comment x_2058 -> h_Comment x_2058
-| Cost x_2059 -> h_Cost x_2059
-| Jmp x_2060 -> h_Jmp x_2060
-| Call x_2061 -> h_Call x_2061
-| Mov (x_2063, x_2062) -> h_Mov x_2063 x_2062
+    (CostLabel.costlabel -> 'a1) -> (identifier0 -> 'a1) ->
+    (subaddressing_mode -> identifier0 -> identifier0 -> 'a1) ->
+    (subaddressing_mode -> word_side -> identifier0 -> 'a1) -> (identifier0
+    -> 'a1) -> (subaddressing_mode -> identifier0 -> 'a1) ->
+    pseudo_instruction -> 'a1 **)
+let rec pseudo_instruction_rect_Type4 h_Instruction h_Comment h_Cost h_Jmp h_Jnz h_MovSuccessor h_Call h_Mov = function
+| Instruction x_20761 -> h_Instruction x_20761
+| Comment x_20762 -> h_Comment x_20762
+| Cost x_20763 -> h_Cost x_20763
+| Jmp x_20764 -> h_Jmp x_20764
+| Jnz (x_20767, x_20766, x_20765) -> h_Jnz x_20767 x_20766 x_20765
+| MovSuccessor (x_20770, x_20769, x_20768) ->
+  h_MovSuccessor x_20770 x_20769 x_20768
+| Call x_20771 -> h_Call x_20771
+| Mov (x_20773, x_20772) -> h_Mov x_20773 x_20772
 
 (** val pseudo_instruction_rect_Type5 :
     (identifier0 preinstruction -> 'a1) -> (String.string -> 'a1) ->
-    (CostLabel.costlabel -> 'a1) -> (identifier0 -> 'a1) -> (identifier0 ->
-    'a1) -> (subaddressing_mode -> identifier0 -> 'a1) -> pseudo_instruction
-    -> 'a1 **)
-let rec pseudo_instruction_rect_Type5 h_Instruction h_Comment h_Cost h_Jmp h_Call h_Mov = function
-| Instruction x_2071 -> h_Instruction x_2071
-| Comment x_2072 -> h_Comment x_2072
-| Cost x_2073 -> h_Cost x_2073
-| Jmp x_2074 -> h_Jmp x_2074
-| Call x_2075 -> h_Call x_2075
-| Mov (x_2077, x_2076) -> h_Mov x_2077 x_2076
+    (CostLabel.costlabel -> 'a1) -> (identifier0 -> 'a1) ->
+    (subaddressing_mode -> identifier0 -> identifier0 -> 'a1) ->
+    (subaddressing_mode -> word_side -> identifier0 -> 'a1) -> (identifier0
+    -> 'a1) -> (subaddressing_mode -> identifier0 -> 'a1) ->
+    pseudo_instruction -> 'a1 **)
+let rec pseudo_instruction_rect_Type5 h_Instruction h_Comment h_Cost h_Jmp h_Jnz h_MovSuccessor h_Call h_Mov = function
+| Instruction x_20783 -> h_Instruction x_20783
+| Comment x_20784 -> h_Comment x_20784
+| Cost x_20785 -> h_Cost x_20785
+| Jmp x_20786 -> h_Jmp x_20786
+| Jnz (x_20789, x_20788, x_20787) -> h_Jnz x_20789 x_20788 x_20787
+| MovSuccessor (x_20792, x_20791, x_20790) ->
+  h_MovSuccessor x_20792 x_20791 x_20790
+| Call x_20793 -> h_Call x_20793
+| Mov (x_20795, x_20794) -> h_Mov x_20795 x_20794
 
 (** val pseudo_instruction_rect_Type3 :
     (identifier0 preinstruction -> 'a1) -> (String.string -> 'a1) ->
-    (CostLabel.costlabel -> 'a1) -> (identifier0 -> 'a1) -> (identifier0 ->
-    'a1) -> (subaddressing_mode -> identifier0 -> 'a1) -> pseudo_instruction
-    -> 'a1 **)
-let rec pseudo_instruction_rect_Type3 h_Instruction h_Comment h_Cost h_Jmp h_Call h_Mov = function
-| Instruction x_2085 -> h_Instruction x_2085
-| Comment x_2086 -> h_Comment x_2086
-| Cost x_2087 -> h_Cost x_2087
-| Jmp x_2088 -> h_Jmp x_2088
-| Call x_2089 -> h_Call x_2089
-| Mov (x_2091, x_2090) -> h_Mov x_2091 x_2090
+    (CostLabel.costlabel -> 'a1) -> (identifier0 -> 'a1) ->
+    (subaddressing_mode -> identifier0 -> identifier0 -> 'a1) ->
+    (subaddressing_mode -> word_side -> identifier0 -> 'a1) -> (identifier0
+    -> 'a1) -> (subaddressing_mode -> identifier0 -> 'a1) ->
+    pseudo_instruction -> 'a1 **)
+let rec pseudo_instruction_rect_Type3 h_Instruction h_Comment h_Cost h_Jmp h_Jnz h_MovSuccessor h_Call h_Mov = function
+| Instruction x_20805 -> h_Instruction x_20805
+| Comment x_20806 -> h_Comment x_20806
+| Cost x_20807 -> h_Cost x_20807
+| Jmp x_20808 -> h_Jmp x_20808
+| Jnz (x_20811, x_20810, x_20809) -> h_Jnz x_20811 x_20810 x_20809
+| MovSuccessor (x_20814, x_20813, x_20812) ->
+  h_MovSuccessor x_20814 x_20813 x_20812
+| Call x_20815 -> h_Call x_20815
+| Mov (x_20817, x_20816) -> h_Mov x_20817 x_20816
 
 (** val pseudo_instruction_rect_Type2 :
     (identifier0 preinstruction -> 'a1) -> (String.string -> 'a1) ->
-    (CostLabel.costlabel -> 'a1) -> (identifier0 -> 'a1) -> (identifier0 ->
-    'a1) -> (subaddressing_mode -> identifier0 -> 'a1) -> pseudo_instruction
-    -> 'a1 **)
-let rec pseudo_instruction_rect_Type2 h_Instruction h_Comment h_Cost h_Jmp h_Call h_Mov = function
-| Instruction x_2099 -> h_Instruction x_2099
-| Comment x_2100 -> h_Comment x_2100
-| Cost x_2101 -> h_Cost x_2101
-| Jmp x_2102 -> h_Jmp x_2102
-| Call x_2103 -> h_Call x_2103
-| Mov (x_2105, x_2104) -> h_Mov x_2105 x_2104
+    (CostLabel.costlabel -> 'a1) -> (identifier0 -> 'a1) ->
+    (subaddressing_mode -> identifier0 -> identifier0 -> 'a1) ->
+    (subaddressing_mode -> word_side -> identifier0 -> 'a1) -> (identifier0
+    -> 'a1) -> (subaddressing_mode -> identifier0 -> 'a1) ->
+    pseudo_instruction -> 'a1 **)
+let rec pseudo_instruction_rect_Type2 h_Instruction h_Comment h_Cost h_Jmp h_Jnz h_MovSuccessor h_Call h_Mov = function
+| Instruction x_20827 -> h_Instruction x_20827
+| Comment x_20828 -> h_Comment x_20828
+| Cost x_20829 -> h_Cost x_20829
+| Jmp x_20830 -> h_Jmp x_20830
+| Jnz (x_20833, x_20832, x_20831) -> h_Jnz x_20833 x_20832 x_20831
+| MovSuccessor (x_20836, x_20835, x_20834) ->
+  h_MovSuccessor x_20836 x_20835 x_20834
+| Call x_20837 -> h_Call x_20837
+| Mov (x_20839, x_20838) -> h_Mov x_20839 x_20838
 
 (** val pseudo_instruction_rect_Type1 :
     (identifier0 preinstruction -> 'a1) -> (String.string -> 'a1) ->
-    (CostLabel.costlabel -> 'a1) -> (identifier0 -> 'a1) -> (identifier0 ->
-    'a1) -> (subaddressing_mode -> identifier0 -> 'a1) -> pseudo_instruction
-    -> 'a1 **)
-let rec pseudo_instruction_rect_Type1 h_Instruction h_Comment h_Cost h_Jmp h_Call h_Mov = function
-| Instruction x_2113 -> h_Instruction x_2113
-| Comment x_2114 -> h_Comment x_2114
-| Cost x_2115 -> h_Cost x_2115
-| Jmp x_2116 -> h_Jmp x_2116
-| Call x_2117 -> h_Call x_2117
-| Mov (x_2119, x_2118) -> h_Mov x_2119 x_2118
+    (CostLabel.costlabel -> 'a1) -> (identifier0 -> 'a1) ->
+    (subaddressing_mode -> identifier0 -> identifier0 -> 'a1) ->
+    (subaddressing_mode -> word_side -> identifier0 -> 'a1) -> (identifier0
+    -> 'a1) -> (subaddressing_mode -> identifier0 -> 'a1) ->
+    pseudo_instruction -> 'a1 **)
+let rec pseudo_instruction_rect_Type1 h_Instruction h_Comment h_Cost h_Jmp h_Jnz h_MovSuccessor h_Call h_Mov = function
+| Instruction x_20849 -> h_Instruction x_20849
+| Comment x_20850 -> h_Comment x_20850
+| Cost x_20851 -> h_Cost x_20851
+| Jmp x_20852 -> h_Jmp x_20852
+| Jnz (x_20855, x_20854, x_20853) -> h_Jnz x_20855 x_20854 x_20853
+| MovSuccessor (x_20858, x_20857, x_20856) ->
+  h_MovSuccessor x_20858 x_20857 x_20856
+| Call x_20859 -> h_Call x_20859
+| Mov (x_20861, x_20860) -> h_Mov x_20861 x_20860
 
 (** val pseudo_instruction_rect_Type0 :
     (identifier0 preinstruction -> 'a1) -> (String.string -> 'a1) ->
-    (CostLabel.costlabel -> 'a1) -> (identifier0 -> 'a1) -> (identifier0 ->
-    'a1) -> (subaddressing_mode -> identifier0 -> 'a1) -> pseudo_instruction
-    -> 'a1 **)
-let rec pseudo_instruction_rect_Type0 h_Instruction h_Comment h_Cost h_Jmp h_Call h_Mov = function
-| Instruction x_2127 -> h_Instruction x_2127
-| Comment x_2128 -> h_Comment x_2128
-| Cost x_2129 -> h_Cost x_2129
-| Jmp x_2130 -> h_Jmp x_2130
-| Call x_2131 -> h_Call x_2131
-| Mov (x_2133, x_2132) -> h_Mov x_2133 x_2132
+    (CostLabel.costlabel -> 'a1) -> (identifier0 -> 'a1) ->
+    (subaddressing_mode -> identifier0 -> identifier0 -> 'a1) ->
+    (subaddressing_mode -> word_side -> identifier0 -> 'a1) -> (identifier0
+    -> 'a1) -> (subaddressing_mode -> identifier0 -> 'a1) ->
+    pseudo_instruction -> 'a1 **)
+let rec pseudo_instruction_rect_Type0 h_Instruction h_Comment h_Cost h_Jmp h_Jnz h_MovSuccessor h_Call h_Mov = function
+| Instruction x_20871 -> h_Instruction x_20871
+| Comment x_20872 -> h_Comment x_20872
+| Cost x_20873 -> h_Cost x_20873
+| Jmp x_20874 -> h_Jmp x_20874
+| Jnz (x_20877, x_20876, x_20875) -> h_Jnz x_20877 x_20876 x_20875
+| MovSuccessor (x_20880, x_20879, x_20878) ->
+  h_MovSuccessor x_20880 x_20879 x_20878
+| Call x_20881 -> h_Call x_20881
+| Mov (x_20883, x_20882) -> h_Mov x_20883 x_20882
 
 (** val pseudo_instruction_inv_rect_Type4 :
     pseudo_instruction -> (identifier0 preinstruction -> __ -> 'a1) ->
     (String.string -> __ -> 'a1) -> (CostLabel.costlabel -> __ -> 'a1) ->
-    (identifier0 -> __ -> 'a1) -> (identifier0 -> __ -> 'a1) ->
+    (identifier0 -> __ -> 'a1) -> (subaddressing_mode -> identifier0 ->
+    identifier0 -> __ -> 'a1) -> (subaddressing_mode -> word_side ->
+    identifier0 -> __ -> 'a1) -> (identifier0 -> __ -> 'a1) ->
     (subaddressing_mode -> identifier0 -> __ -> 'a1) -> 'a1 **)
-let pseudo_instruction_inv_rect_Type4 hterm h1 h2 h3 h4 h5 h6 =
-  let hcut = pseudo_instruction_rect_Type4 h1 h2 h3 h4 h5 h6 hterm in hcut __
+let pseudo_instruction_inv_rect_Type4 hterm h1 h2 h3 h4 h5 h6 h7 h8 =
+  let hcut = pseudo_instruction_rect_Type4 h1 h2 h3 h4 h5 h6 h7 h8 hterm in
+  hcut __
 
 (** val pseudo_instruction_inv_rect_Type3 :
     pseudo_instruction -> (identifier0 preinstruction -> __ -> 'a1) ->
     (String.string -> __ -> 'a1) -> (CostLabel.costlabel -> __ -> 'a1) ->
-    (identifier0 -> __ -> 'a1) -> (identifier0 -> __ -> 'a1) ->
+    (identifier0 -> __ -> 'a1) -> (subaddressing_mode -> identifier0 ->
+    identifier0 -> __ -> 'a1) -> (subaddressing_mode -> word_side ->
+    identifier0 -> __ -> 'a1) -> (identifier0 -> __ -> 'a1) ->
     (subaddressing_mode -> identifier0 -> __ -> 'a1) -> 'a1 **)
-let pseudo_instruction_inv_rect_Type3 hterm h1 h2 h3 h4 h5 h6 =
-  let hcut = pseudo_instruction_rect_Type3 h1 h2 h3 h4 h5 h6 hterm in hcut __
+let pseudo_instruction_inv_rect_Type3 hterm h1 h2 h3 h4 h5 h6 h7 h8 =
+  let hcut = pseudo_instruction_rect_Type3 h1 h2 h3 h4 h5 h6 h7 h8 hterm in
+  hcut __
 
 (** val pseudo_instruction_inv_rect_Type2 :
     pseudo_instruction -> (identifier0 preinstruction -> __ -> 'a1) ->
     (String.string -> __ -> 'a1) -> (CostLabel.costlabel -> __ -> 'a1) ->
-    (identifier0 -> __ -> 'a1) -> (identifier0 -> __ -> 'a1) ->
+    (identifier0 -> __ -> 'a1) -> (subaddressing_mode -> identifier0 ->
+    identifier0 -> __ -> 'a1) -> (subaddressing_mode -> word_side ->
+    identifier0 -> __ -> 'a1) -> (identifier0 -> __ -> 'a1) ->
     (subaddressing_mode -> identifier0 -> __ -> 'a1) -> 'a1 **)
-let pseudo_instruction_inv_rect_Type2 hterm h1 h2 h3 h4 h5 h6 =
-  let hcut = pseudo_instruction_rect_Type2 h1 h2 h3 h4 h5 h6 hterm in hcut __
+let pseudo_instruction_inv_rect_Type2 hterm h1 h2 h3 h4 h5 h6 h7 h8 =
+  let hcut = pseudo_instruction_rect_Type2 h1 h2 h3 h4 h5 h6 h7 h8 hterm in
+  hcut __
 
 (** val pseudo_instruction_inv_rect_Type1 :
     pseudo_instruction -> (identifier0 preinstruction -> __ -> 'a1) ->
     (String.string -> __ -> 'a1) -> (CostLabel.costlabel -> __ -> 'a1) ->
-    (identifier0 -> __ -> 'a1) -> (identifier0 -> __ -> 'a1) ->
+    (identifier0 -> __ -> 'a1) -> (subaddressing_mode -> identifier0 ->
+    identifier0 -> __ -> 'a1) -> (subaddressing_mode -> word_side ->
+    identifier0 -> __ -> 'a1) -> (identifier0 -> __ -> 'a1) ->
     (subaddressing_mode -> identifier0 -> __ -> 'a1) -> 'a1 **)
-let pseudo_instruction_inv_rect_Type1 hterm h1 h2 h3 h4 h5 h6 =
-  let hcut = pseudo_instruction_rect_Type1 h1 h2 h3 h4 h5 h6 hterm in hcut __
+let pseudo_instruction_inv_rect_Type1 hterm h1 h2 h3 h4 h5 h6 h7 h8 =
+  let hcut = pseudo_instruction_rect_Type1 h1 h2 h3 h4 h5 h6 h7 h8 hterm in
+  hcut __
 
 (** val pseudo_instruction_inv_rect_Type0 :
     pseudo_instruction -> (identifier0 preinstruction -> __ -> 'a1) ->
     (String.string -> __ -> 'a1) -> (CostLabel.costlabel -> __ -> 'a1) ->
-    (identifier0 -> __ -> 'a1) -> (identifier0 -> __ -> 'a1) ->
+    (identifier0 -> __ -> 'a1) -> (subaddressing_mode -> identifier0 ->
+    identifier0 -> __ -> 'a1) -> (subaddressing_mode -> word_side ->
+    identifier0 -> __ -> 'a1) -> (identifier0 -> __ -> 'a1) ->
     (subaddressing_mode -> identifier0 -> __ -> 'a1) -> 'a1 **)
-let pseudo_instruction_inv_rect_Type0 hterm h1 h2 h3 h4 h5 h6 =
-  let hcut = pseudo_instruction_rect_Type0 h1 h2 h3 h4 h5 h6 hterm in hcut __
+let pseudo_instruction_inv_rect_Type0 hterm h1 h2 h3 h4 h5 h6 h7 h8 =
+  let hcut = pseudo_instruction_rect_Type0 h1 h2 h3 h4 h5 h6 h7 h8 hterm in
+  hcut __
 
 (** val pseudo_instruction_discr :
@@ -5278 +5462 @@
      | Cost a0 -> Obj.magic (fun _ dH -> dH __)
      | Jmp a0 -> Obj.magic (fun _ dH -> dH __)
+     | Jnz (a0, a1, a2) -> Obj.magic (fun _ dH -> dH __ __ __)
+     | MovSuccessor (a0, a1, a2) -> Obj.magic (fun _ dH -> dH __ __ __)
      | Call a0 -> Obj.magic (fun _ dH -> dH __)
      | Mov (a0, a1) -> Obj.magic (fun _ dH -> dH __ __)) y
@@ -5290 +5476 @@
      | Cost a0 -> Obj.magic (fun _ dH -> dH __)
      | Jmp a0 -> Obj.magic (fun _ dH -> dH __)
+     | Jnz (a0, a1, a2) -> Obj.magic (fun _ dH -> dH __ __ __)
+     | MovSuccessor (a0, a1, a2) -> Obj.magic (fun _ dH -> dH __ __ __)
      | Call a0 -> Obj.magic (fun _ dH -> dH __)
      | Mov (a0, a1) -> Obj.magic (fun _ dH -> dH __ __)) y
@@ -5295 +5483 @@
 type labelled_instruction = pseudo_instruction LabelledObjects.labelled_obj
 
-type preamble =
-  (Nat.nat Identifiers.identifier_map, (identifier0, BitVector.word)
-  Types.prod List.list) Types.prod
+type preamble = (identifier0, BitVector.word) Types.prod List.list
 
 type assembly_program = instruction List.list
@@ -5343 +5529 @@
 | RETI -> Bool.False
 | NOP -> Bool.False
+| JMP x0 -> Bool.False
 
 (** val is_relative_jump : pseudo_instruction -> Bool.bool **)
@@ -5350 +5537 @@
 | Cost x -> Bool.False
 | Jmp x -> Bool.False
+| Jnz (x, x0, x1) -> Bool.False
+| MovSuccessor (x, x0, x1) -> Bool.False
 | Call x -> Bool.False
 | Mov (x, x0) -> Bool.False
@@ -5359 +5548 @@
 | Cost x -> Bool.False
 | Jmp x -> Bool.True
+| Jnz (x, x0, x1) -> Bool.False
+| MovSuccessor (x, x0, x1) -> Bool.False
 | Call x -> Bool.True
 | Mov (x, x0) -> Bool.False
@@ -5368 +5559 @@
 | Cost x -> Bool.False
 | Jmp x -> Bool.False
+| Jnz (x, x0, x1) -> Bool.False
+| MovSuccessor (x, x0, x1) -> Bool.False
 | Call x -> Bool.True
 | Mov (x, x0) -> Bool.False

extracted/aSM.mli

@@ -60 +60 @@
 
 open Identifiers
+
+open BitVectorTrie
+
+open Exp
 
 open Arithmetic
@@ -433 +437 @@
 | RETI
 | NOP
+| JMP of subaddressing_mode
 
 val preinstruction_rect_Type4 :
@@ -466 +471 @@
   'a2) -> (subaddressing_mode -> 'a2) -> (subaddressing_mode -> 'a2) ->
   (subaddressing_mode -> subaddressing_mode -> 'a2) -> (subaddressing_mode ->
-  subaddressing_mode -> 'a2) -> 'a2 -> 'a2 -> 'a2 -> 'a1 preinstruction ->
-  'a2
+  subaddressing_mode -> 'a2) -> 'a2 -> 'a2 -> 'a2 -> (subaddressing_mode ->
+  'a2) -> 'a1 preinstruction -> 'a2
 
 val preinstruction_rect_Type5 :
@@ -501 +506 @@
   'a2) -> (subaddressing_mode -> 'a2) -> (subaddressing_mode -> 'a2) ->
   (subaddressing_mode -> subaddressing_mode -> 'a2) -> (subaddressing_mode ->
-  subaddressing_mode -> 'a2) -> 'a2 -> 'a2 -> 'a2 -> 'a1 preinstruction ->
-  'a2
+  subaddressing_mode -> 'a2) -> 'a2 -> 'a2 -> 'a2 -> (subaddressing_mode ->
+  'a2) -> 'a1 preinstruction -> 'a2
 
 val preinstruction_rect_Type3 :
@@ -536 +541 @@
   'a2) -> (subaddressing_mode -> 'a2) -> (subaddressing_mode -> 'a2) ->
   (subaddressing_mode -> subaddressing_mode -> 'a2) -> (subaddressing_mode ->
-  subaddressing_mode -> 'a2) -> 'a2 -> 'a2 -> 'a2 -> 'a1 preinstruction ->
-  'a2
+  subaddressing_mode -> 'a2) -> 'a2 -> 'a2 -> 'a2 -> (subaddressing_mode ->
+  'a2) -> 'a1 preinstruction -> 'a2
 
 val preinstruction_rect_Type2 :
@@ -571 +576 @@
   'a2) -> (subaddressing_mode -> 'a2) -> (subaddressing_mode -> 'a2) ->
   (subaddressing_mode -> subaddressing_mode -> 'a2) -> (subaddressing_mode ->
-  subaddressing_mode -> 'a2) -> 'a2 -> 'a2 -> 'a2 -> 'a1 preinstruction ->
-  'a2
+  subaddressing_mode -> 'a2) -> 'a2 -> 'a2 -> 'a2 -> (subaddressing_mode ->
+  'a2) -> 'a1 preinstruction -> 'a2
 
 val preinstruction_rect_Type1 :
@@ -606 +611 @@
   'a2) -> (subaddressing_mode -> 'a2) -> (subaddressing_mode -> 'a2) ->
   (subaddressing_mode -> subaddressing_mode -> 'a2) -> (subaddressing_mode ->
-  subaddressing_mode -> 'a2) -> 'a2 -> 'a2 -> 'a2 -> 'a1 preinstruction ->
-  'a2
+  subaddressing_mode -> 'a2) -> 'a2 -> 'a2 -> 'a2 -> (subaddressing_mode ->
+  'a2) -> 'a1 preinstruction -> 'a2
 
 val preinstruction_rect_Type0 :
@@ -641 +646 @@
   'a2) -> (subaddressing_mode -> 'a2) -> (subaddressing_mode -> 'a2) ->
   (subaddressing_mode -> subaddressing_mode -> 'a2) -> (subaddressing_mode ->
-  subaddressing_mode -> 'a2) -> 'a2 -> 'a2 -> 'a2 -> 'a1 preinstruction ->
-  'a2
+  subaddressing_mode -> 'a2) -> 'a2 -> 'a2 -> 'a2 -> (subaddressing_mode ->
+  'a2) -> 'a1 preinstruction -> 'a2
 
 val preinstruction_inv_rect_Type4 :
@@ -680 +685 @@
   subaddressing_mode -> __ -> 'a2) -> (subaddressing_mode ->
   subaddressing_mode -> __ -> 'a2) -> (__ -> 'a2) -> (__ -> 'a2) -> (__ ->
-  'a2) -> 'a2
+  'a2) -> (subaddressing_mode -> __ -> 'a2) -> 'a2
 
 val preinstruction_inv_rect_Type3 :
@@ -718 +723 @@
   subaddressing_mode -> __ -> 'a2) -> (subaddressing_mode ->
   subaddressing_mode -> __ -> 'a2) -> (__ -> 'a2) -> (__ -> 'a2) -> (__ ->
-  'a2) -> 'a2
+  'a2) -> (subaddressing_mode -> __ -> 'a2) -> 'a2
 
 val preinstruction_inv_rect_Type2 :
@@ -756 +761 @@
   subaddressing_mode -> __ -> 'a2) -> (subaddressing_mode ->
   subaddressing_mode -> __ -> 'a2) -> (__ -> 'a2) -> (__ -> 'a2) -> (__ ->
-  'a2) -> 'a2
+  'a2) -> (subaddressing_mode -> __ -> 'a2) -> 'a2
 
 val preinstruction_inv_rect_Type1 :
@@ -794 +799 @@
   subaddressing_mode -> __ -> 'a2) -> (subaddressing_mode ->
   subaddressing_mode -> __ -> 'a2) -> (__ -> 'a2) -> (__ -> 'a2) -> (__ ->
-  'a2) -> 'a2
+  'a2) -> (subaddressing_mode -> __ -> 'a2) -> 'a2
 
 val preinstruction_inv_rect_Type0 :
@@ -832 +837 @@
   subaddressing_mode -> __ -> 'a2) -> (subaddressing_mode ->
   subaddressing_mode -> __ -> 'a2) -> (__ -> 'a2) -> (__ -> 'a2) -> (__ ->
-  'a2) -> 'a2
+  'a2) -> (subaddressing_mode -> __ -> 'a2) -> 'a2
 
 val preinstruction_discr : 'a1 preinstruction -> 'a1 preinstruction -> __
@@ -848 +853 @@
 | LJMP of subaddressing_mode
 | SJMP of subaddressing_mode
-| JMP of subaddressing_mode
 | MOVC of subaddressing_mode * subaddressing_mode
 | RealInstruction of subaddressing_mode preinstruction
@@ -855 +859 @@
   (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
   (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
-  (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
-  (subaddressing_mode -> subaddressing_mode -> 'a1) -> (subaddressing_mode
-  preinstruction -> 'a1) -> instruction -> 'a1
+  (subaddressing_mode -> 'a1) -> (subaddressing_mode -> subaddressing_mode ->
+  'a1) -> (subaddressing_mode preinstruction -> 'a1) -> instruction -> 'a1
 
 val instruction_rect_Type5 :
   (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
   (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
-  (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
-  (subaddressing_mode -> subaddressing_mode -> 'a1) -> (subaddressing_mode
-  preinstruction -> 'a1) -> instruction -> 'a1
+  (subaddressing_mode -> 'a1) -> (subaddressing_mode -> subaddressing_mode ->
+  'a1) -> (subaddressing_mode preinstruction -> 'a1) -> instruction -> 'a1
 
 val instruction_rect_Type3 :
   (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
   (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
-  (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
-  (subaddressing_mode -> subaddressing_mode -> 'a1) -> (subaddressing_mode
-  preinstruction -> 'a1) -> instruction -> 'a1
+  (subaddressing_mode -> 'a1) -> (subaddressing_mode -> subaddressing_mode ->
+  'a1) -> (subaddressing_mode preinstruction -> 'a1) -> instruction -> 'a1
 
 val instruction_rect_Type2 :
   (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
   (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
-  (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
-  (subaddressing_mode -> subaddressing_mode -> 'a1) -> (subaddressing_mode
-  preinstruction -> 'a1) -> instruction -> 'a1
+  (subaddressing_mode -> 'a1) -> (subaddressing_mode -> subaddressing_mode ->
+  'a1) -> (subaddressing_mode preinstruction -> 'a1) -> instruction -> 'a1
 
 val instruction_rect_Type1 :
   (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
   (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
-  (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
-  (subaddressing_mode -> subaddressing_mode -> 'a1) -> (subaddressing_mode
-  preinstruction -> 'a1) -> instruction -> 'a1
+  (subaddressing_mode -> 'a1) -> (subaddressing_mode -> subaddressing_mode ->
+  'a1) -> (subaddressing_mode preinstruction -> 'a1) -> instruction -> 'a1
 
 val instruction_rect_Type0 :
   (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
   (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
-  (subaddressing_mode -> 'a1) -> (subaddressing_mode -> 'a1) ->
-  (subaddressing_mode -> subaddressing_mode -> 'a1) -> (subaddressing_mode
-  preinstruction -> 'a1) -> instruction -> 'a1
+  (subaddressing_mode -> 'a1) -> (subaddressing_mode -> subaddressing_mode ->
+  'a1) -> (subaddressing_mode preinstruction -> 'a1) -> instruction -> 'a1
 
 val instruction_inv_rect_Type4 :
@@ -898 +896 @@
   __ -> 'a1) -> (subaddressing_mode -> __ -> 'a1) -> (subaddressing_mode ->
   __ -> 'a1) -> (subaddressing_mode -> __ -> 'a1) -> (subaddressing_mode ->
-  __ -> 'a1) -> (subaddressing_mode -> subaddressing_mode -> __ -> 'a1) ->
-  (subaddressing_mode preinstruction -> __ -> 'a1) -> 'a1
+  subaddressing_mode -> __ -> 'a1) -> (subaddressing_mode preinstruction ->
+  __ -> 'a1) -> 'a1
 
 val instruction_inv_rect_Type3 :
@@ -905 +903 @@
   __ -> 'a1) -> (subaddressing_mode -> __ -> 'a1) -> (subaddressing_mode ->
   __ -> 'a1) -> (subaddressing_mode -> __ -> 'a1) -> (subaddressing_mode ->
-  __ -> 'a1) -> (subaddressing_mode -> subaddressing_mode -> __ -> 'a1) ->
-  (subaddressing_mode preinstruction -> __ -> 'a1) -> 'a1
+  subaddressing_mode -> __ -> 'a1) -> (subaddressing_mode preinstruction ->
+  __ -> 'a1) -> 'a1
 
 val instruction_inv_rect_Type2 :
@@ -912 +910 @@
   __ -> 'a1) -> (subaddressing_mode -> __ -> 'a1) -> (subaddressing_mode ->
   __ -> 'a1) -> (subaddressing_mode -> __ -> 'a1) -> (subaddressing_mode ->
-  __ -> 'a1) -> (subaddressing_mode -> subaddressing_mode -> __ -> 'a1) ->
-  (subaddressing_mode preinstruction -> __ -> 'a1) -> 'a1
+  subaddressing_mode -> __ -> 'a1) -> (subaddressing_mode preinstruction ->
+  __ -> 'a1) -> 'a1
 
 val instruction_inv_rect_Type1 :
@@ -919 +917 @@
   __ -> 'a1) -> (subaddressing_mode -> __ -> 'a1) -> (subaddressing_mode ->
   __ -> 'a1) -> (subaddressing_mode -> __ -> 'a1) -> (subaddressing_mode ->
-  __ -> 'a1) -> (subaddressing_mode -> subaddressing_mode -> __ -> 'a1) ->
-  (subaddressing_mode preinstruction -> __ -> 'a1) -> 'a1
+  subaddressing_mode -> __ -> 'a1) -> (subaddressing_mode preinstruction ->
+  __ -> 'a1) -> 'a1
 
 val instruction_inv_rect_Type0 :
@@ -926 +924 @@
   __ -> 'a1) -> (subaddressing_mode -> __ -> 'a1) -> (subaddressing_mode ->
   __ -> 'a1) -> (subaddressing_mode -> __ -> 'a1) -> (subaddressing_mode ->
-  __ -> 'a1) -> (subaddressing_mode -> subaddressing_mode -> __ -> 'a1) ->
-  (subaddressing_mode preinstruction -> __ -> 'a1) -> 'a1
+  subaddressing_mode -> __ -> 'a1) -> (subaddressing_mode preinstruction ->
+  __ -> 'a1) -> 'a1
 
 val instruction_discr : instruction -> instruction -> __
@@ -934 +932 @@
 
 val eq_instruction : instruction -> instruction -> Bool.bool
+
+type word_side =
+| HIGH
+| LOW
+
+val word_side_rect_Type4 : 'a1 -> 'a1 -> word_side -> 'a1
+
+val word_side_rect_Type5 : 'a1 -> 'a1 -> word_side -> 'a1
+
+val word_side_rect_Type3 : 'a1 -> 'a1 -> word_side -> 'a1
+
+val word_side_rect_Type2 : 'a1 -> 'a1 -> word_side -> 'a1
+
+val word_side_rect_Type1 : 'a1 -> 'a1 -> word_side -> 'a1
+
+val word_side_rect_Type0 : 'a1 -> 'a1 -> word_side -> 'a1
+
+val word_side_inv_rect_Type4 : word_side -> (__ -> 'a1) -> (__ -> 'a1) -> 'a1
+
+val word_side_inv_rect_Type3 : word_side -> (__ -> 'a1) -> (__ -> 'a1) -> 'a1
+
+val word_side_inv_rect_Type2 : word_side -> (__ -> 'a1) -> (__ -> 'a1) -> 'a1
+
+val word_side_inv_rect_Type1 : word_side -> (__ -> 'a1) -> (__ -> 'a1) -> 'a1
+
+val word_side_inv_rect_Type0 : word_side -> (__ -> 'a1) -> (__ -> 'a1) -> 'a1
+
+val word_side_discr : word_side -> word_side -> __
+
+val word_side_jmdiscr : word_side -> word_side -> __
 
 type pseudo_instruction =
@@ -940 +968 @@
 | Cost of CostLabel.costlabel
 | Jmp of identifier0
+| Jnz of subaddressing_mode * identifier0 * identifier0
+| MovSuccessor of subaddressing_mode * word_side * identifier0
 | Call of identifier0
 | Mov of subaddressing_mode * identifier0
@@ -945 +975 @@
 val pseudo_instruction_rect_Type4 :
   (identifier0 preinstruction -> 'a1) -> (String.string -> 'a1) ->
-  (CostLabel.costlabel -> 'a1) -> (identifier0 -> 'a1) -> (identifier0 ->
-  'a1) -> (subaddressing_mode -> identifier0 -> 'a1) -> pseudo_instruction ->
-  'a1
+  (CostLabel.costlabel -> 'a1) -> (identifier0 -> 'a1) -> (subaddressing_mode
+  -> identifier0 -> identifier0 -> 'a1) -> (subaddressing_mode -> word_side
+  -> identifier0 -> 'a1) -> (identifier0 -> 'a1) -> (subaddressing_mode ->
+  identifier0 -> 'a1) -> pseudo_instruction -> 'a1
 
 val pseudo_instruction_rect_Type5 :
   (identifier0 preinstruction -> 'a1) -> (String.string -> 'a1) ->
-  (CostLabel.costlabel -> 'a1) -> (identifier0 -> 'a1) -> (identifier0 ->
-  'a1) -> (subaddressing_mode -> identifier0 -> 'a1) -> pseudo_instruction ->
-  'a1
+  (CostLabel.costlabel -> 'a1) -> (identifier0 -> 'a1) -> (subaddressing_mode
+  -> identifier0 -> identifier0 -> 'a1) -> (subaddressing_mode -> word_side
+  -> identifier0 -> 'a1) -> (identifier0 -> 'a1) -> (subaddressing_mode ->
+  identifier0 -> 'a1) -> pseudo_instruction -> 'a1
 
 val pseudo_instruction_rect_Type3 :
   (identifier0 preinstruction -> 'a1) -> (String.string -> 'a1) ->
-  (CostLabel.costlabel -> 'a1) -> (identifier0 -> 'a1) -> (identifier0 ->
-  'a1) -> (subaddressing_mode -> identifier0 -> 'a1) -> pseudo_instruction ->
-  'a1
+  (CostLabel.costlabel -> 'a1) -> (identifier0 -> 'a1) -> (subaddressing_mode
+  -> identifier0 -> identifier0 -> 'a1) -> (subaddressing_mode -> word_side
+  -> identifier0 -> 'a1) -> (identifier0 -> 'a1) -> (subaddressing_mode ->
+  identifier0 -> 'a1) -> pseudo_instruction -> 'a1
 
 val pseudo_instruction_rect_Type2 :
   (identifier0 preinstruction -> 'a1) -> (String.string -> 'a1) ->
-  (CostLabel.costlabel -> 'a1) -> (identifier0 -> 'a1) -> (identifier0 ->
-  'a1) -> (subaddressing_mode -> identifier0 -> 'a1) -> pseudo_instruction ->
-  'a1
+  (CostLabel.costlabel -> 'a1) -> (identifier0 -> 'a1) -> (subaddressing_mode
+  -> identifier0 -> identifier0 -> 'a1) -> (subaddressing_mode -> word_side
+  -> identifier0 -> 'a1) -> (identifier0 -> 'a1) -> (subaddressing_mode ->
+  identifier0 -> 'a1) -> pseudo_instruction -> 'a1
 
 val pseudo_instruction_rect_Type1 :
   (identifier0 preinstruction -> 'a1) -> (String.string -> 'a1) ->
-  (CostLabel.costlabel -> 'a1) -> (identifier0 -> 'a1) -> (identifier0 ->
-  'a1) -> (subaddressing_mode -> identifier0 -> 'a1) -> pseudo_instruction ->
-  'a1
+  (CostLabel.costlabel -> 'a1) -> (identifier0 -> 'a1) -> (subaddressing_mode
+  -> identifier0 -> identifier0 -> 'a1) -> (subaddressing_mode -> word_side
+  -> identifier0 -> 'a1) -> (identifier0 -> 'a1) -> (subaddressing_mode ->
+  identifier0 -> 'a1) -> pseudo_instruction -> 'a1
 
 val pseudo_instruction_rect_Type0 :
   (identifier0 preinstruction -> 'a1) -> (String.string -> 'a1) ->
-  (CostLabel.costlabel -> 'a1) -> (identifier0 -> 'a1) -> (identifier0 ->
-  'a1) -> (subaddressing_mode -> identifier0 -> 'a1) -> pseudo_instruction ->
-  'a1
+  (CostLabel.costlabel -> 'a1) -> (identifier0 -> 'a1) -> (subaddressing_mode
+  -> identifier0 -> identifier0 -> 'a1) -> (subaddressing_mode -> word_side
+  -> identifier0 -> 'a1) -> (identifier0 -> 'a1) -> (subaddressing_mode ->
+  identifier0 -> 'a1) -> pseudo_instruction -> 'a1
 
 val pseudo_instruction_inv_rect_Type4 :
   pseudo_instruction -> (identifier0 preinstruction -> __ -> 'a1) ->
   (String.string -> __ -> 'a1) -> (CostLabel.costlabel -> __ -> 'a1) ->
-  (identifier0 -> __ -> 'a1) -> (identifier0 -> __ -> 'a1) ->
+  (identifier0 -> __ -> 'a1) -> (subaddressing_mode -> identifier0 ->
+  identifier0 -> __ -> 'a1) -> (subaddressing_mode -> word_side ->
+  identifier0 -> __ -> 'a1) -> (identifier0 -> __ -> 'a1) ->
   (subaddressing_mode -> identifier0 -> __ -> 'a1) -> 'a1
 
@@ -988 +1026 @@
   pseudo_instruction -> (identifier0 preinstruction -> __ -> 'a1) ->
   (String.string -> __ -> 'a1) -> (CostLabel.costlabel -> __ -> 'a1) ->
-  (identifier0 -> __ -> 'a1) -> (identifier0 -> __ -> 'a1) ->
+  (identifier0 -> __ -> 'a1) -> (subaddressing_mode -> identifier0 ->
+  identifier0 -> __ -> 'a1) -> (subaddressing_mode -> word_side ->
+  identifier0 -> __ -> 'a1) -> (identifier0 -> __ -> 'a1) ->
   (subaddressing_mode -> identifier0 -> __ -> 'a1) -> 'a1
 
@@ -994 +1034 @@
   pseudo_instruction -> (identifier0 preinstruction -> __ -> 'a1) ->
   (String.string -> __ -> 'a1) -> (CostLabel.costlabel -> __ -> 'a1) ->
-  (identifier0 -> __ -> 'a1) -> (identifier0 -> __ -> 'a1) ->
+  (identifier0 -> __ -> 'a1) -> (subaddressing_mode -> identifier0 ->
+  identifier0 -> __ -> 'a1) -> (subaddressing_mode -> word_side ->
+  identifier0 -> __ -> 'a1) -> (identifier0 -> __ -> 'a1) ->
   (subaddressing_mode -> identifier0 -> __ -> 'a1) -> 'a1
 
@@ -1000 +1042 @@
   pseudo_instruction -> (identifier0 preinstruction -> __ -> 'a1) ->
   (String.string -> __ -> 'a1) -> (CostLabel.costlabel -> __ -> 'a1) ->
-  (identifier0 -> __ -> 'a1) -> (identifier0 -> __ -> 'a1) ->
+  (identifier0 -> __ -> 'a1) -> (subaddressing_mode -> identifier0 ->
+  identifier0 -> __ -> 'a1) -> (subaddressing_mode -> word_side ->
+  identifier0 -> __ -> 'a1) -> (identifier0 -> __ -> 'a1) ->
   (subaddressing_mode -> identifier0 -> __ -> 'a1) -> 'a1
 
@@ -1006 +1050 @@
   pseudo_instruction -> (identifier0 preinstruction -> __ -> 'a1) ->
   (String.string -> __ -> 'a1) -> (CostLabel.costlabel -> __ -> 'a1) ->
-  (identifier0 -> __ -> 'a1) -> (identifier0 -> __ -> 'a1) ->
+  (identifier0 -> __ -> 'a1) -> (subaddressing_mode -> identifier0 ->
+  identifier0 -> __ -> 'a1) -> (subaddressing_mode -> word_side ->
+  identifier0 -> __ -> 'a1) -> (identifier0 -> __ -> 'a1) ->
   (subaddressing_mode -> identifier0 -> __ -> 'a1) -> 'a1
 
@@ -1016 +1062 @@
 type labelled_instruction = pseudo_instruction LabelledObjects.labelled_obj
 
-type preamble =
-  (Nat.nat Identifiers.identifier_map, (identifier0, BitVector.word)
-  Types.prod List.list) Types.prod
+type preamble = (identifier0, BitVector.word) Types.prod List.list
 
 type assembly_program = instruction List.list

extracted/aSMCosts.ml

@@ -5 +5 @@
 open LabelledObjects
 
+open BitVectorTrie
+
+open Exp
+
 open Arithmetic
 
@@ -74 +78 @@
 
 open ASM
-
-open BitVectorTrie
 
 open Fetch
@@ -141 +143 @@
 | StructuredTraces.Tal_base_call (pre_fun_call, start_fun_call, final, x2) ->
   Interpret.current_instruction_cost code_memory (Obj.magic pre_fun_call)
-| StructuredTraces.Tal_base_tailcall (x, x0, x1, x4) ->
-  assert false (* absurd case *)
+| StructuredTraces.Tal_base_tailcall
+    (pre_fun_call, start_fun_call, final, x1) ->
+  Interpret.current_instruction_cost code_memory (Obj.magic pre_fun_call)
 | StructuredTraces.Tal_step_call
     (end_flag, pre_fun_call, start_fun_call, after_fun_call, final,
@@ -184 +187 @@
    | Nat.S program_size' ->
      (fun _ ->
-       (let { Types.fst = eta24805; Types.snd = ticks } =
+       (let { Types.fst = eta31521; Types.snd = ticks } =
           Fetch.fetch code_memory' program_counter'
         in
        let { Types.fst = instruction0; Types.snd = program_counter'' } =
-         eta24805
+         eta31521
        in
        (fun _ ->
@@ -247 +250 @@
                           (block_cost' code_memory' jump_target program_size'
                             cost_labels Bool.False)))
-                  | ASM.JMP addr ->
-                    (fun _ ->
-                      Nat.plus ticks
-                        (Types.pi1
-                          (block_cost' code_memory' program_counter''
-                            program_size' cost_labels Bool.False)))
                   | ASM.MOVC (src, trgt) ->
                     (fun _ ->
@@ -428 +425 @@
                              (Types.pi1
                                (block_cost' code_memory' program_counter''
+                                 program_size' cost_labels Bool.False)))
+                       | ASM.JMP addr ->
+                         (fun _ ->
+                           Nat.plus ticks
+                             (Types.pi1
+                               (block_cost' code_memory' program_counter''
                                  program_size' cost_labels Bool.False)))) __))
                   __))
@@ -440 +443 @@
   let cost_of_block =
     block_cost' code_memory program_counter0
-      (Util.exponential (Nat.S (Nat.S Nat.O)) (Nat.S (Nat.S (Nat.S (Nat.S
+      (Exp.exp (Nat.S (Nat.S Nat.O)) (Nat.S (Nat.S (Nat.S (Nat.S (Nat.S
         (Nat.S (Nat.S (Nat.S (Nat.S (Nat.S (Nat.S (Nat.S (Nat.S (Nat.S (Nat.S
-        (Nat.S (Nat.S Nat.O))))))))))))))))) cost_labels Bool.True
+        (Nat.S Nat.O))))))))))))))))) cost_labels Bool.True
   in
   cost_of_block

extracted/aSMCosts.mli

@@ -4 +4 @@
 
 open LabelledObjects
+
+open BitVectorTrie
+
+open Exp
 
 open Arithmetic
@@ -75 +79 @@
 open ASM
 
-open BitVectorTrie
-
 open Fetch
 

extracted/aSMCostsSplit.ml

@@ -15 +15 @@
 open Interpret
 
-open BitVectorTrie
-
 open Fetch
 
@@ -22 +20 @@
 
 open LabelledObjects
+
+open BitVectorTrie
+
+open Exp
 
 open Arithmetic
@@ -142 +144 @@
         (Nat.S (Nat.S (Nat.S (Nat.S (Nat.S (Nat.S (Nat.S (Nat.S
         Nat.O)))))))))))))))))
-      (Util.exponential (Nat.S (Nat.S Nat.O)) (Nat.S (Nat.S (Nat.S (Nat.S
+      (Exp.exp (Nat.S (Nat.S Nat.O)) (Nat.S (Nat.S (Nat.S (Nat.S (Nat.S
         (Nat.S (Nat.S (Nat.S (Nat.S (Nat.S (Nat.S (Nat.S (Nat.S (Nat.S (Nat.S
-        (Nat.S (Nat.S Nat.O))))))))))))))))))
+        (Nat.S Nat.O))))))))))))))))))
 
 (** val compute_costs :

extracted/aSMCostsSplit.mli

@@ -15 +15 @@
 open Interpret
 
-open BitVectorTrie
-
 open Fetch
 
@@ -22 +20 @@
 
 open LabelledObjects
+
+open BitVectorTrie
+
+open Exp
 
 open Arithmetic

extracted/aST.ml

@@ -10 +10 @@
 
 open Types
+
+open Exp
 
 open Arithmetic
@@ -416 +418 @@
     (intsize -> signedness -> 'a1) -> 'a1 -> typ -> 'a1 **)
 let rec typ_rect_Type4 h_ASTint h_ASTptr = function
-| ASTint (x_1373, x_1372) -> h_ASTint x_1373 x_1372
+| ASTint (x_3480, x_3479) -> h_ASTint x_3480 x_3479
 | ASTptr -> h_ASTptr
 
@@ -422 +424 @@
     (intsize -> signedness -> 'a1) -> 'a1 -> typ -> 'a1 **)
 let rec typ_rect_Type5 h_ASTint h_ASTptr = function
-| ASTint (x_1378, x_1377) -> h_ASTint x_1378 x_1377
+| ASTint (x_3485, x_3484) -> h_ASTint x_3485 x_3484
 | ASTptr -> h_ASTptr
 
@@ -428 +430 @@
     (intsize -> signedness -> 'a1) -> 'a1 -> typ -> 'a1 **)
 let rec typ_rect_Type3 h_ASTint h_ASTptr = function
-| ASTint (x_1383, x_1382) -> h_ASTint x_1383 x_1382
+| ASTint (x_3490, x_3489) -> h_ASTint x_3490 x_3489
 | ASTptr -> h_ASTptr
 
@@ -434 +436 @@
     (intsize -> signedness -> 'a1) -> 'a1 -> typ -> 'a1 **)
 let rec typ_rect_Type2 h_ASTint h_ASTptr = function
-| ASTint (x_1388, x_1387) -> h_ASTint x_1388 x_1387
+| ASTint (x_3495, x_3494) -> h_ASTint x_3495 x_3494
 | ASTptr -> h_ASTptr
 
@@ -440 +442 @@
     (intsize -> signedness -> 'a1) -> 'a1 -> typ -> 'a1 **)
 let rec typ_rect_Type1 h_ASTint h_ASTptr = function
-| ASTint (x_1393, x_1392) -> h_ASTint x_1393 x_1392
+| ASTint (x_3500, x_3499) -> h_ASTint x_3500 x_3499
 | ASTptr -> h_ASTptr
 
@@ -446 +448 @@
     (intsize -> signedness -> 'a1) -> 'a1 -> typ -> 'a1 **)
 let rec typ_rect_Type0 h_ASTint h_ASTptr = function
-| ASTint (x_1398, x_1397) -> h_ASTint x_1398 x_1397
+| ASTint (x_3505, x_3504) -> h_ASTint x_3505 x_3504
 | ASTptr -> h_ASTptr
 
@@ -875 +877 @@
 (** val signature_rect_Type4 :
     (typ List.list -> typ Types.option -> 'a1) -> signature -> 'a1 **)
-let rec signature_rect_Type4 h_mk_signature x_1433 =
-  let { sig_args = sig_args0; sig_res = sig_res0 } = x_1433 in
+let rec signature_rect_Type4 h_mk_signature x_3540 =
+  let { sig_args = sig_args0; sig_res = sig_res0 } = x_3540 in
   h_mk_signature sig_args0 sig_res0
 
 (** val signature_rect_Type5 :
     (typ List.list -> typ Types.option -> 'a1) -> signature -> 'a1 **)
-let rec signature_rect_Type5 h_mk_signature x_1435 =
-  let { sig_args = sig_args0; sig_res = sig_res0 } = x_1435 in
+let rec signature_rect_Type5 h_mk_signature x_3542 =
+  let { sig_args = sig_args0; sig_res = sig_res0 } = x_3542 in
   h_mk_signature sig_args0 sig_res0
 
 (** val signature_rect_Type3 :
     (typ List.list -> typ Types.option -> 'a1) -> signature -> 'a1 **)
-let rec signature_rect_Type3 h_mk_signature x_1437 =
-  let { sig_args = sig_args0; sig_res = sig_res0 } = x_1437 in
+let rec signature_rect_Type3 h_mk_signature x_3544 =
+  let { sig_args = sig_args0; sig_res = sig_res0 } = x_3544 in
   h_mk_signature sig_args0 sig_res0
 
 (** val signature_rect_Type2 :
     (typ List.list -> typ Types.option -> 'a1) -> signature -> 'a1 **)
-let rec signature_rect_Type2 h_mk_signature x_1439 =
-  let { sig_args = sig_args0; sig_res = sig_res0 } = x_1439 in
+let rec signature_rect_Type2 h_mk_signature x_3546 =
+  let { sig_args = sig_args0; sig_res = sig_res0 } = x_3546 in
   h_mk_signature sig_args0 sig_res0
 
 (** val signature_rect_Type1 :
     (typ List.list -> typ Types.option -> 'a1) -> signature -> 'a1 **)
-let rec signature_rect_Type1 h_mk_signature x_1441 =
-  let { sig_args = sig_args0; sig_res = sig_res0 } = x_1441 in
+let rec signature_rect_Type1 h_mk_signature x_3548 =
+  let { sig_args = sig_args0; sig_res = sig_res0 } = x_3548 in
   h_mk_signature sig_args0 sig_res0
 
 (** val signature_rect_Type0 :
     (typ List.list -> typ Types.option -> 'a1) -> signature -> 'a1 **)
-let rec signature_rect_Type0 h_mk_signature x_1443 =
-  let { sig_args = sig_args0; sig_res = sig_res0 } = x_1443 in
+let rec signature_rect_Type0 h_mk_signature x_3550 =
+  let { sig_args = sig_args0; sig_res = sig_res0 } = x_3550 in
   h_mk_signature sig_args0 sig_res0
 
@@ -982 +984 @@
     'a1 -> (ident -> Nat.nat -> 'a1) -> init_data -> 'a1 **)
 let rec init_data_rect_Type4 h_Init_int8 h_Init_int16 h_Init_int32 h_Init_space h_Init_null h_Init_addrof = function
-| Init_int8 x_1471 -> h_Init_int8 x_1471
-| Init_int16 x_1472 -> h_Init_int16 x_1472
-| Init_int32 x_1473 -> h_Init_int32 x_1473
-| Init_space x_1474 -> h_Init_space x_1474
+| Init_int8 x_3578 -> h_Init_int8 x_3578
+| Init_int16 x_3579 -> h_Init_int16 x_3579
+| Init_int32 x_3580 -> h_Init_int32 x_3580
+| Init_space x_3581 -> h_Init_space x_3581
 | Init_null -> h_Init_null
-| Init_addrof (x_1476, x_1475) -> h_Init_addrof x_1476 x_1475
+| Init_addrof (x_3583, x_3582) -> h_Init_addrof x_3583 x_3582
 
 (** val init_data_rect_Type5 :
@@ -993 +995 @@
     'a1 -> (ident -> Nat.nat -> 'a1) -> init_data -> 'a1 **)
 let rec init_data_rect_Type5 h_Init_int8 h_Init_int16 h_Init_int32 h_Init_space h_Init_null h_Init_addrof = function
-| Init_int8 x_1484 -> h_Init_int8 x_1484
-| Init_int16 x_1485 -> h_Init_int16 x_1485
-| Init_int32 x_1486 -> h_Init_int32 x_1486
-| Init_space x_1487 -> h_Init_space x_1487
+| Init_int8 x_3591 -> h_Init_int8 x_3591
+| Init_int16 x_3592 -> h_Init_int16 x_3592
+| Init_int32 x_3593 -> h_Init_int32 x_3593
+| Init_space x_3594 -> h_Init_space x_3594
 | Init_null -> h_Init_null
-| Init_addrof (x_1489, x_1488) -> h_Init_addrof x_1489 x_1488
+| Init_addrof (x_3596, x_3595) -> h_Init_addrof x_3596 x_3595
 
 (** val init_data_rect_Type3 :
@@ -1004 +1006 @@
     'a1 -> (ident -> Nat.nat -> 'a1) -> init_data -> 'a1 **)
 let rec init_data_rect_Type3 h_Init_int8 h_Init_int16 h_Init_int32 h_Init_space h_Init_null h_Init_addrof = function
-| Init_int8 x_1497 -> h_Init_int8 x_1497
-| Init_int16 x_1498 -> h_Init_int16 x_1498
-| Init_int32 x_1499 -> h_Init_int32 x_1499
-| Init_space x_1500 -> h_Init_space x_1500
+| Init_int8 x_3604 -> h_Init_int8 x_3604
+| Init_int16 x_3605 -> h_Init_int16 x_3605
+| Init_int32 x_3606 -> h_Init_int32 x_3606
+| Init_space x_3607 -> h_Init_space x_3607
 | Init_null -> h_Init_null
-| Init_addrof (x_1502, x_1501) -> h_Init_addrof x_1502 x_1501
+| Init_addrof (x_3609, x_3608) -> h_Init_addrof x_3609 x_3608
 
 (** val init_data_rect_Type2 :
@@ -1015 +1017 @@
     'a1 -> (ident -> Nat.nat -> 'a1) -> init_data -> 'a1 **)
 let rec init_data_rect_Type2 h_Init_int8 h_Init_int16 h_Init_int32 h_Init_space h_Init_null h_Init_addrof = function
-| Init_int8 x_1510 -> h_Init_int8 x_1510
-| Init_int16 x_1511 -> h_Init_int16 x_1511
-| Init_int32 x_1512 -> h_Init_int32 x_1512
-| Init_space x_1513 -> h_Init_space x_1513
+| Init_int8 x_3617 -> h_Init_int8 x_3617
+| Init_int16 x_3618 -> h_Init_int16 x_3618
+| Init_int32 x_3619 -> h_Init_int32 x_3619
+| Init_space x_3620 -> h_Init_space x_3620
 | Init_null -> h_Init_null
-| Init_addrof (x_1515, x_1514) -> h_Init_addrof x_1515 x_1514
+| Init_addrof (x_3622, x_3621) -> h_Init_addrof x_3622 x_3621
 
 (** val init_data_rect_Type1 :
@@ -1026 +1028 @@
     'a1 -> (ident -> Nat.nat -> 'a1) -> init_data -> 'a1 **)
 let rec init_data_rect_Type1 h_Init_int8 h_Init_int16 h_Init_int32 h_Init_space h_Init_null h_Init_addrof = function
-| Init_int8 x_1523 -> h_Init_int8 x_1523
-| Init_int16 x_1524 -> h_Init_int16 x_1524
-| Init_int32 x_1525 -> h_Init_int32 x_1525
-| Init_space x_1526 -> h_Init_space x_1526
+| Init_int8 x_3630 -> h_Init_int8 x_3630
+| Init_int16 x_3631 -> h_Init_int16 x_3631
+| Init_int32 x_3632 -> h_Init_int32 x_3632
+| Init_space x_3633 -> h_Init_space x_3633
 | Init_null -> h_Init_null
-| Init_addrof (x_1528, x_1527) -> h_Init_addrof x_1528 x_1527
+| Init_addrof (x_3635, x_3634) -> h_Init_addrof x_3635 x_3634
 
 (** val init_data_rect_Type0 :
@@ -1037 +1039 @@
     'a1 -> (ident -> Nat.nat -> 'a1) -> init_data -> 'a1 **)
 let rec init_data_rect_Type0 h_Init_int8 h_Init_int16 h_Init_int32 h_Init_space h_Init_null h_Init_addrof = function
-| Init_int8 x_1536 -> h_Init_int8 x_1536
-| Init_int16 x_1537 -> h_Init_int16 x_1537
-| Init_int32 x_1538 -> h_Init_int32 x_1538
-| Init_space x_1539 -> h_Init_space x_1539
+| Init_int8 x_3643 -> h_Init_int8 x_3643
+| Init_int16 x_3644 -> h_Init_int16 x_3644
+| Init_int32 x_3645 -> h_Init_int32 x_3645
+| Init_space x_3646 -> h_Init_space x_3646
 | Init_null -> h_Init_null
-| Init_addrof (x_1541, x_1540) -> h_Init_addrof x_1541 x_1540
+| Init_addrof (x_3648, x_3647) -> h_Init_addrof x_3648 x_3647
 
 (** val init_data_inv_rect_Type4 :
@@ -1109 +1111 @@
     (((ident, region) Types.prod, 'a2) Types.prod List.list -> (ident, 'a1)
     Types.prod List.list -> ident -> 'a3) -> ('a1, 'a2) program -> 'a3 **)
-let rec program_rect_Type4 h_mk_program x_1628 =
+let rec program_rect_Type4 h_mk_program x_3735 =
   let { prog_vars = prog_vars0; prog_funct = prog_funct0; prog_main =
-    prog_main0 } = x_1628
+    prog_main0 } = x_3735
   in
   h_mk_program prog_vars0 prog_funct0 prog_main0
@@ -1118 +1120 @@
     (((ident, region) Types.prod, 'a2) Types.prod List.list -> (ident, 'a1)
     Types.prod List.list -> ident -> 'a3) -> ('a1, 'a2) program -> 'a3 **)
-let rec program_rect_Type5 h_mk_program x_1630 =
+let rec program_rect_Type5 h_mk_program x_3737 =
   let { prog_vars = prog_vars0; prog_funct = prog_funct0; prog_main =
-    prog_main0 } = x_1630
+    prog_main0 } = x_3737
   in
   h_mk_program prog_vars0 prog_funct0 prog_main0
@@ -1127 +1129 @@
     (((ident, region) Types.prod, 'a2) Types.prod List.list -> (ident, 'a1)
     Types.prod List.list -> ident -> 'a3) -> ('a1, 'a2) program -> 'a3 **)
-let rec program_rect_Type3 h_mk_program x_1632 =
+let rec program_rect_Type3 h_mk_program x_3739 =
   let { prog_vars = prog_vars0; prog_funct = prog_funct0; prog_main =
-    prog_main0 } = x_1632
+    prog_main0 } = x_3739
   in
   h_mk_program prog_vars0 prog_funct0 prog_main0
@@ -1136 +1138 @@
     (((ident, region) Types.prod, 'a2) Types.prod List.list -> (ident, 'a1)
     Types.prod List.list -> ident -> 'a3) -> ('a1, 'a2) program -> 'a3 **)
-let rec program_rect_Type2 h_mk_program x_1634 =
+let rec program_rect_Type2 h_mk_program x_3741 =
   let { prog_vars = prog_vars0; prog_funct = prog_funct0; prog_main =
-    prog_main0 } = x_1634
+    prog_main0 } = x_3741
   in
   h_mk_program prog_vars0 prog_funct0 prog_main0
@@ -1145 +1147 @@
     (((ident, region) Types.prod, 'a2) Types.prod List.list -> (ident, 'a1)
     Types.prod List.list -> ident -> 'a3) -> ('a1, 'a2) program -> 'a3 **)
-let rec program_rect_Type1 h_mk_program x_1636 =
+let rec program_rect_Type1 h_mk_program x_3743 =
   let { prog_vars = prog_vars0; prog_funct = prog_funct0; prog_main =
-    prog_main0 } = x_1636
+    prog_main0 } = x_3743
   in
   h_mk_program prog_vars0 prog_funct0 prog_main0
@@ -1154 +1156 @@
     (((ident, region) Types.prod, 'a2) Types.prod List.list -> (ident, 'a1)
     Types.prod List.list -> ident -> 'a3) -> ('a1, 'a2) program -> 'a3 **)
-let rec program_rect_Type0 h_mk_program x_1638 =
+let rec program_rect_Type0 h_mk_program x_3745 =
   let { prog_vars = prog_vars0; prog_funct = prog_funct0; prog_main =
-    prog_main0 } = x_1638
+    prog_main0 } = x_3745
   in
   h_mk_program prog_vars0 prog_funct0 prog_main0
@@ -1479 +1481 @@
 (** val external_function_rect_Type4 :
     (ident -> signature -> 'a1) -> external_function -> 'a1 **)
-let rec external_function_rect_Type4 h_mk_external_function x_1842 =
-  let { ef_id = ef_id0; ef_sig = ef_sig0 } = x_1842 in
+let rec external_function_rect_Type4 h_mk_external_function x_3949 =
+  let { ef_id = ef_id0; ef_sig = ef_sig0 } = x_3949 in
   h_mk_external_function ef_id0 ef_sig0
 
 (** val external_function_rect_Type5 :
     (ident -> signature -> 'a1) -> external_function -> 'a1 **)
-let rec external_function_rect_Type5 h_mk_external_function x_1844 =
-  let { ef_id = ef_id0; ef_sig = ef_sig0 } = x_1844 in
+let rec external_function_rect_Type5 h_mk_external_function x_3951 =
+  let { ef_id = ef_id0; ef_sig = ef_sig0 } = x_3951 in
   h_mk_external_function ef_id0 ef_sig0
 
 (** val external_function_rect_Type3 :
     (ident -> signature -> 'a1) -> external_function -> 'a1 **)
-let rec external_function_rect_Type3 h_mk_external_function x_1846 =
-  let { ef_id = ef_id0; ef_sig = ef_sig0 } = x_1846 in
+let rec external_function_rect_Type3 h_mk_external_function x_3953 =
+  let { ef_id = ef_id0; ef_sig = ef_sig0 } = x_3953 in
   h_mk_external_function ef_id0 ef_sig0
 
 (** val external_function_rect_Type2 :
     (ident -> signature -> 'a1) -> external_function -> 'a1 **)
-let rec external_function_rect_Type2 h_mk_external_function x_1848 =
-  let { ef_id = ef_id0; ef_sig = ef_sig0 } = x_1848 in
+let rec external_function_rect_Type2 h_mk_external_function x_3955 =
+  let { ef_id = ef_id0; ef_sig = ef_sig0 } = x_3955 in
   h_mk_external_function ef_id0 ef_sig0
 
 (** val external_function_rect_Type1 :
     (ident -> signature -> 'a1) -> external_function -> 'a1 **)
-let rec external_function_rect_Type1 h_mk_external_function x_1850 =
-  let { ef_id = ef_id0; ef_sig = ef_sig0 } = x_1850 in
+let rec external_function_rect_Type1 h_mk_external_function x_3957 =
+  let { ef_id = ef_id0; ef_sig = ef_sig0 } = x_3957 in
   h_mk_external_function ef_id0 ef_sig0
 
 (** val external_function_rect_Type0 :
     (ident -> signature -> 'a1) -> external_function -> 'a1 **)
-let rec external_function_rect_Type0 h_mk_external_function x_1852 =
-  let { ef_id = ef_id0; ef_sig = ef_sig0 } = x_1852 in
+let rec external_function_rect_Type0 h_mk_external_function x_3959 =
+  let { ef_id = ef_id0; ef_sig = ef_sig0 } = x_3959 in
   h_mk_external_function ef_id0 ef_sig0
 
@@ -1577 +1579 @@
     ('a1 -> 'a2) -> (external_function -> 'a2) -> 'a1 fundef -> 'a2 **)
 let rec fundef_rect_Type4 h_Internal h_External = function
-| Internal x_1872 -> h_Internal x_1872
-| External x_1873 -> h_External x_1873
+| Internal x_3979 -> h_Internal x_3979
+| External x_3980 -> h_External x_3980
 
 (** val fundef_rect_Type5 :
     ('a1 -> 'a2) -> (external_function -> 'a2) -> 'a1 fundef -> 'a2 **)
 let rec fundef_rect_Type5 h_Internal h_External = function
-| Internal x_1877 -> h_Internal x_1877
-| External x_1878 -> h_External x_1878
+| Internal x_3984 -> h_Internal x_3984
+| External x_3985 -> h_External x_3985
 
 (** val fundef_rect_Type3 :
     ('a1 -> 'a2) -> (external_function -> 'a2) -> 'a1 fundef -> 'a2 **)
 let rec fundef_rect_Type3 h_Internal h_External = function
-| Internal x_1882 -> h_Internal x_1882
-| External x_1883 -> h_External x_1883
+| Internal x_3989 -> h_Internal x_3989
+| External x_3990 -> h_External x_3990
 
 (** val fundef_rect_Type2 :
     ('a1 -> 'a2) -> (external_function -> 'a2) -> 'a1 fundef -> 'a2 **)
 let rec fundef_rect_Type2 h_Internal h_External = function
-| Internal x_1887 -> h_Internal x_1887
-| External x_1888 -> h_External x_1888
+| Internal x_3994 -> h_Internal x_3994
+| External x_3995 -> h_External x_3995
 
 (** val fundef_rect_Type1 :
     ('a1 -> 'a2) -> (external_function -> 'a2) -> 'a1 fundef -> 'a2 **)
 let rec fundef_rect_Type1 h_Internal h_External = function
-| Internal x_1892 -> h_Internal x_1892
-| External x_1893 -> h_External x_1893
+| Internal x_3999 -> h_Internal x_3999
+| External x_4000 -> h_External x_4000
 
 (** val fundef_rect_Type0 :
     ('a1 -> 'a2) -> (external_function -> 'a2) -> 'a1 fundef -> 'a2 **)
 let rec fundef_rect_Type0 h_Internal h_External = function
-| Internal x_1897 -> h_Internal x_1897
-| External x_1898 -> h_External x_1898
+| Internal x_4004 -> h_Internal x_4004
+| External x_4005 -> h_External x_4005
 
 (** val fundef_inv_rect_Type4 :

extracted/aST.mli

@@ -10 +10 @@
 
 open Types
+
+open Exp
 
 open Arithmetic

extracted/abstractStatus.ml

@@ -4 +4 @@
 
 open LabelledObjects
+
+open BitVectorTrie
+
+open Exp
 
 open Arithmetic
@@ -75 +79 @@
 open ASM
 
-open BitVectorTrie
-
 open Status
 
@@ -127 +129 @@
 | ASM.RETI -> StructuredTraces.Cl_return
 | ASM.NOP -> StructuredTraces.Cl_other
+| ASM.JMP x -> StructuredTraces.Cl_call
 
 (** val aSM_classify0 : ASM.instruction -> StructuredTraces.status_class **)
@@ -135 +138 @@
 | ASM.LJMP x -> StructuredTraces.Cl_other
 | ASM.SJMP x -> StructuredTraces.Cl_other
-| ASM.JMP x -> StructuredTraces.Cl_call
 | ASM.MOVC (x, x0) -> StructuredTraces.Cl_other
 | ASM.RealInstruction pre -> aSM_classify00 pre

extracted/abstractStatus.mli

@@ -4 +4 @@
 
 open LabelledObjects
+
+open BitVectorTrie
+
+open Exp
 
 open Arithmetic
@@ -75 +79 @@
 open ASM
 
-open BitVectorTrie
-
 open Status
 

extracted/arithmetic.ml

@@ -34 +34 @@
 
 open BitVector
+
+open Exp
 
 (** val addr16_of_addr11 :

extracted/arithmetic.mli

@@ -34 +34 @@
 
 open BitVector
+
+open Exp
 
 val addr16_of_addr11 : BitVector.word -> BitVector.word11 -> BitVector.word

extracted/bitVectorTrie.ml

@@ -43 +43 @@
     ('a1 -> 'a2) -> (Nat.nat -> 'a1 bitVectorTrie -> 'a1 bitVectorTrie -> 'a2
     -> 'a2 -> 'a2) -> (Nat.nat -> 'a2) -> Nat.nat -> 'a1 bitVectorTrie -> 'a2 **)
-let rec bitVectorTrie_rect_Type4 h_Leaf h_Node h_Stub x_14569 = function
-| Leaf x_14571 -> h_Leaf x_14571
-| Node (n, x_14573, x_14572) ->
-  h_Node n x_14573 x_14572
-    (bitVectorTrie_rect_Type4 h_Leaf h_Node h_Stub n x_14573)
-    (bitVectorTrie_rect_Type4 h_Leaf h_Node h_Stub n x_14572)
+let rec bitVectorTrie_rect_Type4 h_Leaf h_Node h_Stub x_4046 = function
+| Leaf x_4048 -> h_Leaf x_4048
+| Node (n, x_4050, x_4049) ->
+  h_Node n x_4050 x_4049
+    (bitVectorTrie_rect_Type4 h_Leaf h_Node h_Stub n x_4050)
+    (bitVectorTrie_rect_Type4 h_Leaf h_Node h_Stub n x_4049)
 | Stub n -> h_Stub n
 
@@ -54 +54 @@
     ('a1 -> 'a2) -> (Nat.nat -> 'a1 bitVectorTrie -> 'a1 bitVectorTrie -> 'a2
     -> 'a2 -> 'a2) -> (Nat.nat -> 'a2) -> Nat.nat -> 'a1 bitVectorTrie -> 'a2 **)
-let rec bitVectorTrie_rect_Type3 h_Leaf h_Node h_Stub x_14585 = function
-| Leaf x_14587 -> h_Leaf x_14587
-| Node (n, x_14589, x_14588) ->
-  h_Node n x_14589 x_14588
-    (bitVectorTrie_rect_Type3 h_Leaf h_Node h_Stub n x_14589)
-    (bitVectorTrie_rect_Type3 h_Leaf h_Node h_Stub n x_14588)
+let rec bitVectorTrie_rect_Type3 h_Leaf h_Node h_Stub x_4062 = function
+| Leaf x_4064 -> h_Leaf x_4064
+| Node (n, x_4066, x_4065) ->
+  h_Node n x_4066 x_4065
+    (bitVectorTrie_rect_Type3 h_Leaf h_Node h_Stub n x_4066)
+    (bitVectorTrie_rect_Type3 h_Leaf h_Node h_Stub n x_4065)
 | Stub n -> h_Stub n
 
@@ -65 +65 @@
     ('a1 -> 'a2) -> (Nat.nat -> 'a1 bitVectorTrie -> 'a1 bitVectorTrie -> 'a2
     -> 'a2 -> 'a2) -> (Nat.nat -> 'a2) -> Nat.nat -> 'a1 bitVectorTrie -> 'a2 **)
-let rec bitVectorTrie_rect_Type2 h_Leaf h_Node h_Stub x_14593 = function
-| Leaf x_14595 -> h_Leaf x_14595
-| Node (n, x_14597, x_14596) ->
-  h_Node n x_14597 x_14596
-    (bitVectorTrie_rect_Type2 h_Leaf h_Node h_Stub n x_14597)
-    (bitVectorTrie_rect_Type2 h_Leaf h_Node h_Stub n x_14596)
+let rec bitVectorTrie_rect_Type2 h_Leaf h_Node h_Stub x_4070 = function
+| Leaf x_4072 -> h_Leaf x_4072
+| Node (n, x_4074, x_4073) ->
+  h_Node n x_4074 x_4073
+    (bitVectorTrie_rect_Type2 h_Leaf h_Node h_Stub n x_4074)
+    (bitVectorTrie_rect_Type2 h_Leaf h_Node h_Stub n x_4073)
 | Stub n -> h_Stub n
 
@@ -76 +76 @@
     ('a1 -> 'a2) -> (Nat.nat -> 'a1 bitVectorTrie -> 'a1 bitVectorTrie -> 'a2
     -> 'a2 -> 'a2) -> (Nat.nat -> 'a2) -> Nat.nat -> 'a1 bitVectorTrie -> 'a2 **)
-let rec bitVectorTrie_rect_Type1 h_Leaf h_Node h_Stub x_14601 = function
-| Leaf x_14603 -> h_Leaf x_14603
-| Node (n, x_14605, x_14604) ->
-  h_Node n x_14605 x_14604
-    (bitVectorTrie_rect_Type1 h_Leaf h_Node h_Stub n x_14605)
-    (bitVectorTrie_rect_Type1 h_Leaf h_Node h_Stub n x_14604)
+let rec bitVectorTrie_rect_Type1 h_Leaf h_Node h_Stub x_4078 = function
+| Leaf x_4080 -> h_Leaf x_4080
+| Node (n, x_4082, x_4081) ->
+  h_Node n x_4082 x_4081
+    (bitVectorTrie_rect_Type1 h_Leaf h_Node h_Stub n x_4082)
+    (bitVectorTrie_rect_Type1 h_Leaf h_Node h_Stub n x_4081)
 | Stub n -> h_Stub n
 
@@ -87 +87 @@
     ('a1 -> 'a2) -> (Nat.nat -> 'a1 bitVectorTrie -> 'a1 bitVectorTrie -> 'a2
     -> 'a2 -> 'a2) -> (Nat.nat -> 'a2) -> Nat.nat -> 'a1 bitVectorTrie -> 'a2 **)
-let rec bitVectorTrie_rect_Type0 h_Leaf h_Node h_Stub x_14609 = function
-| Leaf x_14611 -> h_Leaf x_14611
-| Node (n, x_14613, x_14612) ->
-  h_Node n x_14613 x_14612
-    (bitVectorTrie_rect_Type0 h_Leaf h_Node h_Stub n x_14613)
-    (bitVectorTrie_rect_Type0 h_Leaf h_Node h_Stub n x_14612)
+let rec bitVectorTrie_rect_Type0 h_Leaf h_Node h_Stub x_4086 = function
+| Leaf x_4088 -> h_Leaf x_4088
+| Node (n, x_4090, x_4089) ->
+  h_Node n x_4090 x_4089
+    (bitVectorTrie_rect_Type0 h_Leaf h_Node h_Stub n x_4090)
+    (bitVectorTrie_rect_Type0 h_Leaf h_Node h_Stub n x_4089)
 | Stub n -> h_Stub n
 

extracted/bitVectorZ.ml

@@ -38 +38 @@
 
 open BitVector
+
+open Exp
 
 open Arithmetic

extracted/bitVectorZ.mli

@@ -39 +39 @@
 open BitVector
 
+open Exp
+
 open Arithmetic
 

extracted/byteValues.ml

@@ -30 +30 @@
 
 open Division
+
+open Exp
 
 open Arithmetic
@@ -87 +89 @@
     (Pointers.block Types.sig0 -> Positive.pos -> 'a1) -> program_counter ->
     'a1 **)
-let rec program_counter_rect_Type4 h_mk_program_counter x_4510 =
-  let { pc_block = pc_block0; pc_offset = pc_offset0 } = x_4510 in
+let rec program_counter_rect_Type4 h_mk_program_counter x_6074 =
+  let { pc_block = pc_block0; pc_offset = pc_offset0 } = x_6074 in
   h_mk_program_counter pc_block0 pc_offset0
 
@@ -94 +96 @@
     (Pointers.block Types.sig0 -> Positive.pos -> 'a1) -> program_counter ->
     'a1 **)
-let rec program_counter_rect_Type5 h_mk_program_counter x_4512 =
-  let { pc_block = pc_block0; pc_offset = pc_offset0 } = x_4512 in
+let rec program_counter_rect_Type5 h_mk_program_counter x_6076 =
+  let { pc_block = pc_block0; pc_offset = pc_offset0 } = x_6076 in
   h_mk_program_counter pc_block0 pc_offset0
 
@@ -101 +103 @@
     (Pointers.block Types.sig0 -> Positive.pos -> 'a1) -> program_counter ->
     'a1 **)
-let rec program_counter_rect_Type3 h_mk_program_counter x_4514 =
-  let { pc_block = pc_block0; pc_offset = pc_offset0 } = x_4514 in
+let rec program_counter_rect_Type3 h_mk_program_counter x_6078 =
+  let { pc_block = pc_block0; pc_offset = pc_offset0 } = x_6078 in
   h_mk_program_counter pc_block0 pc_offset0
 
@@ -108 +110 @@
     (Pointers.block Types.sig0 -> Positive.pos -> 'a1) -> program_counter ->
     'a1 **)
-let rec program_counter_rect_Type2 h_mk_program_counter x_4516 =
-  let { pc_block = pc_block0; pc_offset = pc_offset0 } = x_4516 in
+let rec program_counter_rect_Type2 h_mk_program_counter x_6080 =
+  let { pc_block = pc_block0; pc_offset = pc_offset0 } = x_6080 in
   h_mk_program_counter pc_block0 pc_offset0
 
@@ -115 +117 @@
     (Pointers.block Types.sig0 -> Positive.pos -> 'a1) -> program_counter ->
     'a1 **)
-let rec program_counter_rect_Type1 h_mk_program_counter x_4518 =
-  let { pc_block = pc_block0; pc_offset = pc_offset0 } = x_4518 in
+let rec program_counter_rect_Type1 h_mk_program_counter x_6082 =
+  let { pc_block = pc_block0; pc_offset = pc_offset0 } = x_6082 in
   h_mk_program_counter pc_block0 pc_offset0
 
@@ -122 +124 @@
     (Pointers.block Types.sig0 -> Positive.pos -> 'a1) -> program_counter ->
     'a1 **)
-let rec program_counter_rect_Type0 h_mk_program_counter x_4520 =
-  let { pc_block = pc_block0; pc_offset = pc_offset0 } = x_4520 in
+let rec program_counter_rect_Type0 h_mk_program_counter x_6084 =
+  let { pc_block = pc_block0; pc_offset = pc_offset0 } = x_6084 in
   h_mk_program_counter pc_block0 pc_offset0
 
@@ -213 +215 @@
 
 (** val part_rect_Type4 : (Nat.nat -> __ -> 'a1) -> part -> 'a1 **)
-let rec part_rect_Type4 h_mk_part x_4536 =
-  let part_no = x_4536 in h_mk_part part_no __
+let rec part_rect_Type4 h_mk_part x_6100 =
+  let part_no = x_6100 in h_mk_part part_no __
 
 (** val part_rect_Type5 : (Nat.nat -> __ -> 'a1) -> part -> 'a1 **)
-let rec part_rect_Type5 h_mk_part x_4538 =
-  let part_no = x_4538 in h_mk_part part_no __
+let rec part_rect_Type5 h_mk_part x_6102 =
+  let part_no = x_6102 in h_mk_part part_no __
 
 (** val part_rect_Type3 : (Nat.nat -> __ -> 'a1) -> part -> 'a1 **)
-let rec part_rect_Type3 h_mk_part x_4540 =
-  let part_no = x_4540 in h_mk_part part_no __
+let rec part_rect_Type3 h_mk_part x_6104 =
+  let part_no = x_6104 in h_mk_part part_no __
 
 (** val part_rect_Type2 : (Nat.nat -> __ -> 'a1) -> part -> 'a1 **)
-let rec part_rect_Type2 h_mk_part x_4542 =
-  let part_no = x_4542 in h_mk_part part_no __
+let rec part_rect_Type2 h_mk_part x_6106 =
+  let part_no = x_6106 in h_mk_part part_no __
 
 (** val part_rect_Type1 : (Nat.nat -> __ -> 'a1) -> part -> 'a1 **)
-let rec part_rect_Type1 h_mk_part x_4544 =
-  let part_no = x_4544 in h_mk_part part_no __
+let rec part_rect_Type1 h_mk_part x_6108 =
+  let part_no = x_6108 in h_mk_part part_no __
 
 (** val part_rect_Type0 : (Nat.nat -> __ -> 'a1) -> part -> 'a1 **)
-let rec part_rect_Type0 h_mk_part x_4546 =
-  let part_no = x_4546 in h_mk_part part_no __
+let rec part_rect_Type0 h_mk_part x_6110 =
+  let part_no = x_6110 in h_mk_part part_no __
 
 (** val part_no : part -> Nat.nat **)
@@ -324 +326 @@
 | BVundef -> h_BVundef
 | BVnonzero -> h_BVnonzero
-| BVXor (x_4580, x_4579, x_4578) -> h_BVXor x_4580 x_4579 x_4578
-| BVByte x_4581 -> h_BVByte x_4581
-| BVnull x_4582 -> h_BVnull x_4582
-| BVptr (x_4584, x_4583) -> h_BVptr x_4584 x_4583
-| BVpc (x_4586, x_4585) -> h_BVpc x_4586 x_4585
+| BVXor (x_6144, x_6143, x_6142) -> h_BVXor x_6144 x_6143 x_6142
+| BVByte x_6145 -> h_BVByte x_6145
+| BVnull x_6146 -> h_BVnull x_6146
+| BVptr (x_6148, x_6147) -> h_BVptr x_6148 x_6147
+| BVpc (x_6150, x_6149) -> h_BVpc x_6150 x_6149
 
 (** val beval_rect_Type5 :
@@ -338 +340 @@
 | BVundef -> h_BVundef
 | BVnonzero -> h_BVnonzero
-| BVXor (x_4597, x_4596, x_4595) -> h_BVXor x_4597 x_4596 x_4595
-| BVByte x_4598 -> h_BVByte x_4598
-| BVnull x_4599 -> h_BVnull x_4599
-| BVptr (x_4601, x_4600) -> h_BVptr x_4601 x_4600
-| BVpc (x_4603, x_4602) -> h_BVpc x_4603 x_4602
+| BVXor (x_6161, x_6160, x_6159) -> h_BVXor x_6161 x_6160 x_6159
+| BVByte x_6162 -> h_BVByte x_6162
+| BVnull x_6163 -> h_BVnull x_6163
+| BVptr (x_6165, x_6164) -> h_BVptr x_6165 x_6164
+| BVpc (x_6167, x_6166) -> h_BVpc x_6167 x_6166
 
 (** val beval_rect_Type3 :
@@ -352 +354 @@
 | BVundef -> h_BVundef
 | BVnonzero -> h_BVnonzero
-| BVXor (x_4614, x_4613, x_4612) -> h_BVXor x_4614 x_4613 x_4612
-| BVByte x_4615 -> h_BVByte x_4615
-| BVnull x_4616 -> h_BVnull x_4616
-| BVptr (x_4618, x_4617) -> h_BVptr x_4618 x_4617
-| BVpc (x_4620, x_4619) -> h_BVpc x_4620 x_4619
+| BVXor (x_6178, x_6177, x_6176) -> h_BVXor x_6178 x_6177 x_6176
+| BVByte x_6179 -> h_BVByte x_6179
+| BVnull x_6180 -> h_BVnull x_6180
+| BVptr (x_6182, x_6181) -> h_BVptr x_6182 x_6181
+| BVpc (x_6184, x_6183) -> h_BVpc x_6184 x_6183
 
 (** val beval_rect_Type2 :
@@ -366 +368 @@
 | BVundef -> h_BVundef
 | BVnonzero -> h_BVnonzero
-| BVXor (x_4631, x_4630, x_4629) -> h_BVXor x_4631 x_4630 x_4629
-| BVByte x_4632 -> h_BVByte x_4632
-| BVnull x_4633 -> h_BVnull x_4633
-| BVptr (x_4635, x_4634) -> h_BVptr x_4635 x_4634
-| BVpc (x_4637, x_4636) -> h_BVpc x_4637 x_4636
+| BVXor (x_6195, x_6194, x_6193) -> h_BVXor x_6195 x_6194 x_6193
+| BVByte x_6196 -> h_BVByte x_6196
+| BVnull x_6197 -> h_BVnull x_6197
+| BVptr (x_6199, x_6198) -> h_BVptr x_6199 x_6198
+| BVpc (x_6201, x_6200) -> h_BVpc x_6201 x_6200
 
 (** val beval_rect_Type1 :
@@ -380 +382 @@
 | BVundef -> h_BVundef
 | BVnonzero -> h_BVnonzero
-| BVXor (x_4648, x_4647, x_4646) -> h_BVXor x_4648 x_4647 x_4646
-| BVByte x_4649 -> h_BVByte x_4649
-| BVnull x_4650 -> h_BVnull x_4650
-| BVptr (x_4652, x_4651) -> h_BVptr x_4652 x_4651
-| BVpc (x_4654, x_4653) -> h_BVpc x_4654 x_4653
+| BVXor (x_6212, x_6211, x_6210) -> h_BVXor x_6212 x_6211 x_6210
+| BVByte x_6213 -> h_BVByte x_6213
+| BVnull x_6214 -> h_BVnull x_6214
+| BVptr (x_6216, x_6215) -> h_BVptr x_6216 x_6215
+| BVpc (x_6218, x_6217) -> h_BVpc x_6218 x_6217
 
 (** val beval_rect_Type0 :
@@ -394 +396 @@
 | BVundef -> h_BVundef
 | BVnonzero -> h_BVnonzero
-| BVXor (x_4665, x_4664, x_4663) -> h_BVXor x_4665 x_4664 x_4663
-| BVByte x_4666 -> h_BVByte x_4666
-| BVnull x_4667 -> h_BVnull x_4667
-| BVptr (x_4669, x_4668) -> h_BVptr x_4669 x_4668
-| BVpc (x_4671, x_4670) -> h_BVpc x_4671 x_4670
+| BVXor (x_6229, x_6228, x_6227) -> h_BVXor x_6229 x_6228 x_6227
+| BVByte x_6230 -> h_BVByte x_6230
+| BVnull x_6231 -> h_BVnull x_6231
+| BVptr (x_6233, x_6232) -> h_BVptr x_6233 x_6232
+| BVpc (x_6235, x_6234) -> h_BVpc x_6235 x_6234
 
 (** val beval_inv_rect_Type4 :
@@ -737 +739 @@
     BitVector.bitVector -> 'a1) -> bebit -> 'a1 **)
 let rec bebit_rect_Type4 h_BBbit h_BBundef h_BBptrcarry = function
-| BBbit x_4790 -> h_BBbit x_4790
+| BBbit x_6354 -> h_BBbit x_6354
 | BBundef -> h_BBundef
-| BBptrcarry (x_4793, x_4792, p, x_4791) ->
-  h_BBptrcarry x_4793 x_4792 p x_4791
+| BBptrcarry (x_6357, x_6356, p, x_6355) ->
+  h_BBptrcarry x_6357 x_6356 p x_6355
 
 (** val bebit_rect_Type5 :
@@ -746 +748 @@
     BitVector.bitVector -> 'a1) -> bebit -> 'a1 **)
 let rec bebit_rect_Type5 h_BBbit h_BBundef h_BBptrcarry = function
-| BBbit x_4798 -> h_BBbit x_4798
+| BBbit x_6362 -> h_BBbit x_6362
 | BBundef -> h_BBundef
-| BBptrcarry (x_4801, x_4800, p, x_4799) ->
-  h_BBptrcarry x_4801 x_4800 p x_4799
+| BBptrcarry (x_6365, x_6364, p, x_6363) ->
+  h_BBptrcarry x_6365 x_6364 p x_6363
 
 (** val bebit_rect_Type3 :
@@ -755 +757 @@
     BitVector.bitVector -> 'a1) -> bebit -> 'a1 **)
 let rec bebit_rect_Type3 h_BBbit h_BBundef h_BBptrcarry = function
-| BBbit x_4806 -> h_BBbit x_4806
+| BBbit x_6370 -> h_BBbit x_6370
 | BBundef -> h_BBundef
-| BBptrcarry (x_4809, x_4808, p, x_4807) ->
-  h_BBptrcarry x_4809 x_4808 p x_4807
+| BBptrcarry (x_6373, x_6372, p, x_6371) ->
+  h_BBptrcarry x_6373 x_6372 p x_6371
 
 (** val bebit_rect_Type2 :
@@ -764 +766 @@
     BitVector.bitVector -> 'a1) -> bebit -> 'a1 **)
 let rec bebit_rect_Type2 h_BBbit h_BBundef h_BBptrcarry = function
-| BBbit x_4814 -> h_BBbit x_4814
+| BBbit x_6378 -> h_BBbit x_6378
 | BBundef -> h_BBundef
-| BBptrcarry (x_4817, x_4816, p, x_4815) ->
-  h_BBptrcarry x_4817 x_4816 p x_4815
+| BBptrcarry (x_6381, x_6380, p, x_6379) ->
+  h_BBptrcarry x_6381 x_6380 p x_6379
 
 (** val bebit_rect_Type1 :
@@ -773 +775 @@
     BitVector.bitVector -> 'a1) -> bebit -> 'a1 **)
 let rec bebit_rect_Type1 h_BBbit h_BBundef h_BBptrcarry = function
-| BBbit x_4822 -> h_BBbit x_4822
+| BBbit x_6386 -> h_BBbit x_6386
 | BBundef -> h_BBundef
-| BBptrcarry (x_4825, x_4824, p, x_4823) ->
-  h_BBptrcarry x_4825 x_4824 p x_4823
+| BBptrcarry (x_6389, x_6388, p, x_6387) ->
+  h_BBptrcarry x_6389 x_6388 p x_6387
 
 (** val bebit_rect_Type0 :
@@ -782 +784 @@
     BitVector.bitVector -> 'a1) -> bebit -> 'a1 **)
 let rec bebit_rect_Type0 h_BBbit h_BBundef h_BBptrcarry = function
-| BBbit x_4830 -> h_BBbit x_4830
+| BBbit x_6394 -> h_BBbit x_6394
 | BBundef -> h_BBundef
-| BBptrcarry (x_4833, x_4832, p, x_4831) ->
-  h_BBptrcarry x_4833 x_4832 p x_4831
+| BBptrcarry (x_6397, x_6396, p, x_6395) ->
+  h_BBptrcarry x_6397 x_6396 p x_6395
 
 (** val bebit_inv_rect_Type4 :

extracted/byteValues.mli

@@ -30 +30 @@
 
 open Division
+
+open Exp
 
 open Arithmetic

extracted/casts.ml

@@ -18 +18 @@
 
 open Division
+
+open Exp
 
 open Arithmetic

extracted/casts.mli

@@ -18 +18 @@
 
 open Division
+
+open Exp
 
 open Arithmetic

extracted/cexec.ml

@@ -29 +29 @@
 open Extralib
 
+open BitVectorTrie
+
 open CostLabel
 
@@ -44 +46 @@
 
 open Division
+
+open Exp
 
 open Arithmetic
@@ -805 +809 @@
                  Obj.magic
                    (IO.ret { Types.fst = (Events.eapp tr2 tr3); Types.snd =
-                     (Csem.Callstate (fd, vargs, (Csem.Kcall (Types.None, f,
-                     e1, k)), m)) })
+                     (Csem.Callstate (vf, fd, vargs, (Csem.Kcall (Types.None,
+                     f, e1, k)), m)) })
                | Types.Some lhs' ->
                  Monad.m_bind2 (Monad.max_def IOMonad.iOMonad)
@@ -814 +818 @@
                      (IO.ret { Types.fst =
                        (Events.eapp tr1 (Events.eapp tr2 tr3)); Types.snd =
-                       (Csem.Callstate (fd, vargs, (Csem.Kcall ((Types.Some
-                       { Types.fst = locofs; Types.snd =
+                       (Csem.Callstate (vf, fd, vargs, (Csem.Kcall
+                       ((Types.Some { Types.fst = locofs; Types.snd =
                        (Csyntax.typeof lhs') }), f, e1, k)), m)) })))))))
    | Csyntax.Ssequence (s1, s2) ->
@@ -1035 +1039 @@
      IO.ret { Types.fst = (Events.echarge lbl); Types.snd = (Csem.State (f,
        s', k, e1, m)) })
-| Csem.Callstate (f0, vargs, k, m) ->
+| Csem.Callstate (x, f0, vargs, k, m) ->
   (match f0 with
    | Csyntax.CL_Internal f ->
@@ -1044 +1048 @@
      Obj.magic
        (Monad.m_bind0 (Monad.max_def IOMonad.iOMonad)
-         (let x =
+         (let x0 =
             IOMonad.err_to_io
               (exec_bind_parameters e1 m1 f.Csyntax.fn_params vargs)
           in
-         Obj.magic x) (fun m2 ->
+         Obj.magic x0) (fun m2 ->
          Obj.magic
            (IO.ret { Types.fst = Events.e0; Types.snd = (Csem.State (f,
@@ -1055 +1059 @@
      Obj.magic
        (Monad.m_bind0 (Monad.max_def IOMonad.iOMonad)
-         (let x =
+         (let x0 =
             IOMonad.err_to_io
               (IO.check_eventval_list vargs
                 (Csyntax.typlist_of_typelist argtys))
           in
-         Obj.magic x) (fun evargs ->
+         Obj.magic x0) (fun evargs ->
          Monad.m_bind0 (Monad.max_def IOMonad.iOMonad)
            (Obj.magic
@@ -1143 +1147 @@
             (Errors.opt_to_res (Errors.msg ErrorMessages.MainMissing)
               (Globalenvs.find_funct_ptr ge0 b))) (fun f ->
-          Obj.magic (Errors.OK (Csem.Callstate (f, List.Nil, Csem.Kstop,
-            m0)))))))
+          Obj.magic (Errors.OK (Csem.Callstate ((Values.Vptr
+            { Pointers.pblock = b; Pointers.poff = Pointers.zero_offset }),
+            f, List.Nil, Csem.Kstop, m0)))))))
 
 (** val is_final0 : Csem.state0 -> Integers.int Types.option **)
 let rec is_final0 = function
 | Csem.State (x, x0, x1, x2, x3) -> Types.None
-| Csem.Callstate (x, x0, x1, x2) -> Types.None
+| Csem.Callstate (x, x0, x1, x2, x3) -> Types.None
 | Csem.Returnstate (x, x0, x1) -> Types.None
 | Csem.Finalstate r -> Types.Some r
@@ -1156 +1161 @@
     Csem.state0 -> (Integers.int Types.sig0, __) Types.sum **)
 let is_final_state st =
-  Csem.state_rect_Type0 (fun f s k e1 m -> Types.Inr __) (fun f l k m ->
+  Csem.state_rect_Type0 (fun f s k e1 m -> Types.Inr __) (fun vf f l k m ->
     Types.Inr __) (fun v k m -> Types.Inr __) (fun r -> Types.Inl r) st
 
-(** val exec_steps :
+(** val exec_steps0 :
     Nat.nat -> Csem.genv0 -> Csem.state0 -> (IO.io_out, IO.io_in,
     (Events.trace, Csem.state0) Types.prod) IOMonad.iO **)
-let rec exec_steps n ge0 s =
+let rec exec_steps0 n ge0 s =
   match is_final_state s with
   | Types.Inl x -> IO.ret { Types.fst = Events.e0; Types.snd = s }
@@ -1173 +1178 @@
            (Obj.magic (exec_step ge0 s)) (fun t s' ->
            Monad.m_bind2 (Monad.max_def IOMonad.iOMonad)
-             (Obj.magic (exec_steps n' ge0 s')) (fun t' s'' ->
+             (Obj.magic (exec_steps0 n' ge0 s')) (fun t' s'' ->
              Obj.magic
                (IO.ret { Types.fst = (Events.eapp t t'); Types.snd = s'' })))))

extracted/cexec.mli

@@ -29 +29 @@
 open Extralib
 
+open BitVectorTrie
+
 open CostLabel
 
@@ -44 +46 @@
 
 open Division
+
+open Exp
 
 open Arithmetic
@@ -174 +178 @@
 val is_final_state : Csem.state0 -> (Integers.int Types.sig0, __) Types.sum
 
-val exec_steps :
+val exec_steps0 :
   Nat.nat -> Csem.genv0 -> Csem.state0 -> (IO.io_out, IO.io_in,
   (Events.trace, Csem.state0) Types.prod) IOMonad.iO

extracted/cexecInd.ml

@@ -1 +1 @@
 open Preamble
+
+open BitVectorTrie
 
 open CostLabel
@@ -30 +32 @@
 
 open Identifiers
+
+open Exp
 
 open Arithmetic

extracted/cexecInd.mli

@@ -1 +1 @@
 open Preamble
+
+open BitVectorTrie
 
 open CostLabel
@@ -30 +32 @@
 
 open Identifiers
+
+open Exp
 
 open Arithmetic

extracted/cexecSound.ml

@@ -27 +27 @@
 open SmallstepExec
 
+open BitVectorTrie
+
 open CostLabel
 
@@ -42 +44 @@
 
 open Division
+
+open Exp
 
 open Arithmetic

extracted/cexecSound.mli

@@ -27 +27 @@
 open SmallstepExec
 
+open BitVectorTrie
+
 open CostLabel
 
@@ -42 +44 @@
 
 open Division
+
+open Exp
 
 open Arithmetic

extracted/classifyOp.ml

@@ -1 +1 @@
 open Preamble
 
+open BitVectorTrie
+
 open CostLabel
 
@@ -30 +32 @@
 
 open Identifiers
+
+open Exp
 
 open Arithmetic
@@ -94 +98 @@
     (Csyntax.type0 -> Csyntax.type0 -> 'a1) -> Csyntax.type0 -> Csyntax.type0
     -> classify_add_cases -> 'a1 **)
-let rec classify_add_cases_rect_Type4 h_add_case_ii h_add_case_pi h_add_case_ip h_add_default x_3395 x_3394 = function
+let rec classify_add_cases_rect_Type4 h_add_case_ii h_add_case_pi h_add_case_ip h_add_default x_7324 x_7323 = function
 | Add_case_ii (sz, sg) -> h_add_case_ii sz sg
 | Add_case_pi (n, ty, sz, sg) -> h_add_case_pi n ty sz sg
@@ -106 +110 @@
     (Csyntax.type0 -> Csyntax.type0 -> 'a1) -> Csyntax.type0 -> Csyntax.type0
     -> classify_add_cases -> 'a1 **)
-let rec classify_add_cases_rect_Type5 h_add_case_ii h_add_case_pi h_add_case_ip h_add_default x_3402 x_3401 = function
+let rec classify_add_cases_rect_Type5 h_add_case_ii h_add_case_pi h_add_case_ip h_add_default x_7331 x_7330 = function
 | Add_case_ii (sz, sg) -> h_add_case_ii sz sg
 | Add_case_pi (n, ty, sz, sg) -> h_add_case_pi n ty sz sg
@@ -118 +122 @@
     (Csyntax.type0 -> Csyntax.type0 -> 'a1) -> Csyntax.type0 -> Csyntax.type0
     -> classify_add_cases -> 'a1 **)
-let rec classify_add_cases_rect_Type3 h_add_case_ii h_add_case_pi h_add_case_ip h_add_default x_3409 x_3408 = function
+let rec classify_add_cases_rect_Type3 h_add_case_ii h_add_case_pi h_add_case_ip h_add_default x_7338 x_7337 = function
 | Add_case_ii (sz, sg) -> h_add_case_ii sz sg
 | Add_case_pi (n, ty, sz, sg) -> h_add_case_pi n ty sz sg
@@ -130 +134 @@
     (Csyntax.type0 -> Csyntax.type0 -> 'a1) -> Csyntax.type0 -> Csyntax.type0
     -> classify_add_cases -> 'a1 **)
-let rec classify_add_cases_rect_Type2 h_add_case_ii h_add_case_pi h_add_case_ip h_add_default x_3416 x_3415 = function
+let rec classify_add_cases_rect_Type2 h_add_case_ii h_add_case_pi h_add_case_ip h_add_default x_7345 x_7344 = function
 | Add_case_ii (sz, sg) -> h_add_case_ii sz sg
 | Add_case_pi (n, ty, sz, sg) -> h_add_case_pi n ty sz sg
@@ -142 +146 @@
     (Csyntax.type0 -> Csyntax.type0 -> 'a1) -> Csyntax.type0 -> Csyntax.type0
     -> classify_add_cases -> 'a1 **)
-let rec classify_add_cases_rect_Type1 h_add_case_ii h_add_case_pi h_add_case_ip h_add_default x_3423 x_3422 = function
+let rec classify_add_cases_rect_Type1 h_add_case_ii h_add_case_pi h_add_case_ip h_add_default x_7352 x_7351 = function
 | Add_case_ii (sz, sg) -> h_add_case_ii sz sg
 | Add_case_pi (n, ty, sz, sg) -> h_add_case_pi n ty sz sg
@@ -154 +158 @@
     (Csyntax.type0 -> Csyntax.type0 -> 'a1) -> Csyntax.type0 -> Csyntax.type0
     -> classify_add_cases -> 'a1 **)
-let rec classify_add_cases_rect_Type0 h_add_case_ii h_add_case_pi h_add_case_ip h_add_default x_3430 x_3429 = function
+let rec classify_add_cases_rect_Type0 h_add_case_ii h_add_case_pi h_add_case_ip h_add_default x_7359 x_7358 = function
 | Add_case_ii (sz, sg) -> h_add_case_ii sz sg
 | Add_case_pi (n, ty, sz, sg) -> h_add_case_pi n ty sz sg
@@ -317 +321 @@
     'a1) -> (Csyntax.type0 -> Csyntax.type0 -> 'a1) -> Csyntax.type0 ->
     Csyntax.type0 -> classify_sub_cases -> 'a1 **)
-let rec classify_sub_cases_rect_Type4 h_sub_case_ii h_sub_case_pi h_sub_case_pp h_sub_default x_3486 x_3485 = function
+let rec classify_sub_cases_rect_Type4 h_sub_case_ii h_sub_case_pi h_sub_case_pp h_sub_default x_7415 x_7414 = function
 | Sub_case_ii (sz, sg) -> h_sub_case_ii sz sg
 | Sub_case_pi (n, ty, sz, sg) -> h_sub_case_pi n ty sz sg
@@ -329 +333 @@
     'a1) -> (Csyntax.type0 -> Csyntax.type0 -> 'a1) -> Csyntax.type0 ->
     Csyntax.type0 -> classify_sub_cases -> 'a1 **)
-let rec classify_sub_cases_rect_Type5 h_sub_case_ii h_sub_case_pi h_sub_case_pp h_sub_default x_3493 x_3492 = function
+let rec classify_sub_cases_rect_Type5 h_sub_case_ii h_sub_case_pi h_sub_case_pp h_sub_default x_7422 x_7421 = function
 | Sub_case_ii (sz, sg) -> h_sub_case_ii sz sg
 | Sub_case_pi (n, ty, sz, sg) -> h_sub_case_pi n ty sz sg
@@ -341 +345 @@
     'a1) -> (Csyntax.type0 -> Csyntax.type0 -> 'a1) -> Csyntax.type0 ->
     Csyntax.type0 -> classify_sub_cases -> 'a1 **)
-let rec classify_sub_cases_rect_Type3 h_sub_case_ii h_sub_case_pi h_sub_case_pp h_sub_default x_3500 x_3499 = function
+let rec classify_sub_cases_rect_Type3 h_sub_case_ii h_sub_case_pi h_sub_case_pp h_sub_default x_7429 x_7428 = function
 | Sub_case_ii (sz, sg) -> h_sub_case_ii sz sg
 | Sub_case_pi (n, ty, sz, sg) -> h_sub_case_pi n ty sz sg
@@ -353 +357 @@
     'a1) -> (Csyntax.type0 -> Csyntax.type0 -> 'a1) -> Csyntax.type0 ->
     Csyntax.type0 -> classify_sub_cases -> 'a1 **)
-let rec classify_sub_cases_rect_Type2 h_sub_case_ii h_sub_case_pi h_sub_case_pp h_sub_default x_3507 x_3506 = function
+let rec classify_sub_cases_rect_Type2 h_sub_case_ii h_sub_case_pi h_sub_case_pp h_sub_default x_7436 x_7435 = function
 | Sub_case_ii (sz, sg) -> h_sub_case_ii sz sg
 | Sub_case_pi (n, ty, sz, sg) -> h_sub_case_pi n ty sz sg
@@ -365 +369 @@
     'a1) -> (Csyntax.type0 -> Csyntax.type0 -> 'a1) -> Csyntax.type0 ->
     Csyntax.type0 -> classify_sub_cases -> 'a1 **)
-let rec classify_sub_cases_rect_Type1 h_sub_case_ii h_sub_case_pi h_sub_case_pp h_sub_default x_3514 x_3513 = function
+let rec classify_sub_cases_rect_Type1 h_sub_case_ii h_sub_case_pi h_sub_case_pp h_sub_default x_7443 x_7442 = function
 | Sub_case_ii (sz, sg) -> h_sub_case_ii sz sg
 | Sub_case_pi (n, ty, sz, sg) -> h_sub_case_pi n ty sz sg
@@ -377 +381 @@
     'a1) -> (Csyntax.type0 -> Csyntax.type0 -> 'a1) -> Csyntax.type0 ->
     Csyntax.type0 -> classify_sub_cases -> 'a1 **)
-let rec classify_sub_cases_rect_Type0 h_sub_case_ii h_sub_case_pi h_sub_case_pp h_sub_default x_3521 x_3520 = function
+let rec classify_sub_cases_rect_Type0 h_sub_case_ii h_sub_case_pi h_sub_case_pp h_sub_default x_7450 x_7449 = function
 | Sub_case_ii (sz, sg) -> h_sub_case_ii sz sg
 | Sub_case_pi (n, ty, sz, sg) -> h_sub_case_pi n ty sz sg
@@ -517 +521 @@
     (AST.intsize -> AST.signedness -> 'a1) -> (Csyntax.type0 -> Csyntax.type0
     -> 'a1) -> Csyntax.type0 -> Csyntax.type0 -> classify_aop_cases -> 'a1 **)
-let rec classify_aop_cases_rect_Type4 h_aop_case_ii h_aop_default x_3575 x_3574 = function
+let rec classify_aop_cases_rect_Type4 h_aop_case_ii h_aop_default x_7504 x_7503 = function
 | Aop_case_ii (sz, sg) -> h_aop_case_ii sz sg
 | Aop_default (ty, ty') -> h_aop_default ty ty'
@@ -524 +528 @@
     (AST.intsize -> AST.signedness -> 'a1) -> (Csyntax.type0 -> Csyntax.type0
     -> 'a1) -> Csyntax.type0 -> Csyntax.type0 -> classify_aop_cases -> 'a1 **)
-let rec classify_aop_cases_rect_Type5 h_aop_case_ii h_aop_default x_3580 x_3579 = function
+let rec classify_aop_cases_rect_Type5 h_aop_case_ii h_aop_default x_7509 x_7508 = function
 | Aop_case_ii (sz, sg) -> h_aop_case_ii sz sg
 | Aop_default (ty, ty') -> h_aop_default ty ty'
@@ -531 +535 @@
     (AST.intsize -> AST.signedness -> 'a1) -> (Csyntax.type0 -> Csyntax.type0
     -> 'a1) -> Csyntax.type0 -> Csyntax.type0 -> classify_aop_cases -> 'a1 **)
-let rec classify_aop_cases_rect_Type3 h_aop_case_ii h_aop_default x_3585 x_3584 = function
+let rec classify_aop_cases_rect_Type3 h_aop_case_ii h_aop_default x_7514 x_7513 = function
 | Aop_case_ii (sz, sg) -> h_aop_case_ii sz sg
 | Aop_default (ty, ty') -> h_aop_default ty ty'
@@ -538 +542 @@
     (AST.intsize -> AST.signedness -> 'a1) -> (Csyntax.type0 -> Csyntax.type0
     -> 'a1) -> Csyntax.type0 -> Csyntax.type0 -> classify_aop_cases -> 'a1 **)
-let rec classify_aop_cases_rect_Type2 h_aop_case_ii h_aop_default x_3590 x_3589 = function
+let rec classify_aop_cases_rect_Type2 h_aop_case_ii h_aop_default x_7519 x_7518 = function
 | Aop_case_ii (sz, sg) -> h_aop_case_ii sz sg
 | Aop_default (ty, ty') -> h_aop_default ty ty'
@@ -545 +549 @@
     (AST.intsize -> AST.signedness -> 'a1) -> (Csyntax.type0 -> Csyntax.type0
     -> 'a1) -> Csyntax.type0 -> Csyntax.type0 -> classify_aop_cases -> 'a1 **)
-let rec classify_aop_cases_rect_Type1 h_aop_case_ii h_aop_default x_3595 x_3594 = function
+let rec classify_aop_cases_rect_Type1 h_aop_case_ii h_aop_default x_7524 x_7523 = function
 | Aop_case_ii (sz, sg) -> h_aop_case_ii sz sg
 | Aop_default (ty, ty') -> h_aop_default ty ty'
@@ -552 +556 @@
     (AST.intsize -> AST.signedness -> 'a1) -> (Csyntax.type0 -> Csyntax.type0
     -> 'a1) -> Csyntax.type0 -> Csyntax.type0 -> classify_aop_cases -> 'a1 **)
-let rec classify_aop_cases_rect_Type0 h_aop_case_ii h_aop_default x_3600 x_3599 = function
+let rec classify_aop_cases_rect_Type0 h_aop_case_ii h_aop_default x_7529 x_7528 = function
 | Aop_case_ii (sz, sg) -> h_aop_case_ii sz sg
 | Aop_default (ty, ty') -> h_aop_default ty ty'
@@ -634 +638 @@
     Csyntax.type0 -> 'a1) -> (Csyntax.type0 -> Csyntax.type0 -> 'a1) ->
     Csyntax.type0 -> Csyntax.type0 -> classify_cmp_cases -> 'a1 **)
-let rec classify_cmp_cases_rect_Type4 h_cmp_case_ii h_cmp_case_pp h_cmp_default x_3641 x_3640 = function
+let rec classify_cmp_cases_rect_Type4 h_cmp_case_ii h_cmp_case_pp h_cmp_default x_7570 x_7569 = function
 | Cmp_case_ii (sz, sg) -> h_cmp_case_ii sz sg
 | Cmp_case_pp (n, ty) -> h_cmp_case_pp n ty
@@ -643 +647 @@
     Csyntax.type0 -> 'a1) -> (Csyntax.type0 -> Csyntax.type0 -> 'a1) ->
     Csyntax.type0 -> Csyntax.type0 -> classify_cmp_cases -> 'a1 **)
-let rec classify_cmp_cases_rect_Type5 h_cmp_case_ii h_cmp_case_pp h_cmp_default x_3647 x_3646 = function
+let rec classify_cmp_cases_rect_Type5 h_cmp_case_ii h_cmp_case_pp h_cmp_default x_7576 x_7575 = function
 | Cmp_case_ii (sz, sg) -> h_cmp_case_ii sz sg
 | Cmp_case_pp (n, ty) -> h_cmp_case_pp n ty
@@ -652 +656 @@
     Csyntax.type0 -> 'a1) -> (Csyntax.type0 -> Csyntax.type0 -> 'a1) ->
     Csyntax.type0 -> Csyntax.type0 -> classify_cmp_cases -> 'a1 **)
-let rec classify_cmp_cases_rect_Type3 h_cmp_case_ii h_cmp_case_pp h_cmp_default x_3653 x_3652 = function
+let rec classify_cmp_cases_rect_Type3 h_cmp_case_ii h_cmp_case_pp h_cmp_default x_7582 x_7581 = function
 | Cmp_case_ii (sz, sg) -> h_cmp_case_ii sz sg
 | Cmp_case_pp (n, ty) -> h_cmp_case_pp n ty
@@ -661 +665 @@
     Csyntax.type0 -> 'a1) -> (Csyntax.type0 -> Csyntax.type0 -> 'a1) ->
     Csyntax.type0 -> Csyntax.type0 -> classify_cmp_cases -> 'a1 **)
-let rec classify_cmp_cases_rect_Type2 h_cmp_case_ii h_cmp_case_pp h_cmp_default x_3659 x_3658 = function
+let rec classify_cmp_cases_rect_Type2 h_cmp_case_ii h_cmp_case_pp h_cmp_default x_7588 x_7587 = function
 | Cmp_case_ii (sz, sg) -> h_cmp_case_ii sz sg
 | Cmp_case_pp (n, ty) -> h_cmp_case_pp n ty
@@ -670 +674 @@
     Csyntax.type0 -> 'a1) -> (Csyntax.type0 -> Csyntax.type0 -> 'a1) ->
     Csyntax.type0 -> Csyntax.type0 -> classify_cmp_cases -> 'a1 **)
-let rec classify_cmp_cases_rect_Type1 h_cmp_case_ii h_cmp_case_pp h_cmp_default x_3665 x_3664 = function
+let rec classify_cmp_cases_rect_Type1 h_cmp_case_ii h_cmp_case_pp h_cmp_default x_7594 x_7593 = function
 | Cmp_case_ii (sz, sg) -> h_cmp_case_ii sz sg
 | Cmp_case_pp (n, ty) -> h_cmp_case_pp n ty
@@ -679 +683 @@
     Csyntax.type0 -> 'a1) -> (Csyntax.type0 -> Csyntax.type0 -> 'a1) ->
     Csyntax.type0 -> Csyntax.type0 -> classify_cmp_cases -> 'a1 **)
-let rec classify_cmp_cases_rect_Type0 h_cmp_case_ii h_cmp_case_pp h_cmp_default x_3671 x_3670 = function
+let rec classify_cmp_cases_rect_Type0 h_cmp_case_ii h_cmp_case_pp h_cmp_default x_7600 x_7599 = function
 | Cmp_case_ii (sz, sg) -> h_cmp_case_ii sz sg
 | Cmp_case_pp (n, ty) -> h_cmp_case_pp n ty
@@ -778 +782 @@
     -> 'a1 **)
 let rec classify_fun_cases_rect_Type4 h_fun_case_f h_fun_default = function
-| Fun_case_f (x_3719, x_3718) -> h_fun_case_f x_3719 x_3718
+| Fun_case_f (x_7648, x_7647) -> h_fun_case_f x_7648 x_7647
 | Fun_default -> h_fun_default
 
@@ -785 +789 @@
     -> 'a1 **)
 let rec classify_fun_cases_rect_Type5 h_fun_case_f h_fun_default = function
-| Fun_case_f (x_3724, x_3723) -> h_fun_case_f x_3724 x_3723
+| Fun_case_f (x_7653, x_7652) -> h_fun_case_f x_7653 x_7652
 | Fun_default -> h_fun_default
 
@@ -792 +796 @@
     -> 'a1 **)
 let rec classify_fun_cases_rect_Type3 h_fun_case_f h_fun_default = function
-| Fun_case_f (x_3729, x_3728) -> h_fun_case_f x_3729 x_3728
+| Fun_case_f (x_7658, x_7657) -> h_fun_case_f x_7658 x_7657
 | Fun_default -> h_fun_default
 
@@ -799 +803 @@
     -> 'a1 **)
 let rec classify_fun_cases_rect_Type2 h_fun_case_f h_fun_default = function
-| Fun_case_f (x_3734, x_3733) -> h_fun_case_f x_3734 x_3733
+| Fun_case_f (x_7663, x_7662) -> h_fun_case_f x_7663 x_7662
 | Fun_default -> h_fun_default
 
@@ -806 +810 @@
     -> 'a1 **)
 let rec classify_fun_cases_rect_Type1 h_fun_case_f h_fun_default = function
-| Fun_case_f (x_3739, x_3738) -> h_fun_case_f x_3739 x_3738
+| Fun_case_f (x_7668, x_7667) -> h_fun_case_f x_7668 x_7667
 | Fun_default -> h_fun_default
 
@@ -813 +817 @@
     -> 'a1 **)
 let rec classify_fun_cases_rect_Type0 h_fun_case_f h_fun_default = function
-| Fun_case_f (x_3744, x_3743) -> h_fun_case_f x_3744 x_3743
+| Fun_case_f (x_7673, x_7672) -> h_fun_case_f x_7673 x_7672
 | Fun_default -> h_fun_default
 

extracted/classifyOp.mli

@@ -1 +1 @@
 open Preamble
 
+open BitVectorTrie
+
 open CostLabel
 
@@ -30 +32 @@
 
 open Identifiers
+
+open Exp
 
 open Arithmetic

extracted/cminor_syntax.ml

@@ -29 +29 @@
 open Division
 
+open Exp
+
 open Arithmetic
 
@@ -90 +92 @@
 
 open FrontEndOps
+
+open BitVectorTrie
 
 open CostLabel
@@ -111 +115 @@
     -> 'a1 -> 'a1 -> 'a1) -> (AST.typ -> CostLabel.costlabel -> expr -> 'a1
     -> 'a1) -> AST.typ -> expr -> 'a1 **)
-let rec expr_rect_Type4 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost x_10365 = function
-| Id (t, x_10367) -> h_Id t x_10367
-| Cst (t, x_10368) -> h_Cst t x_10368
-| Op1 (t, t', x_10370, x_10369) ->
-  h_Op1 t t' x_10370 x_10369
-    (expr_rect_Type4 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_10369)
-| Op2 (t1, t2, t', x_10373, x_10372, x_10371) ->
-  h_Op2 t1 t2 t' x_10373 x_10372 x_10371
-    (expr_rect_Type4 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t1 x_10372)
-    (expr_rect_Type4 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t2 x_10371)
-| Mem (t, x_10374) ->
-  h_Mem t x_10374
+let rec expr_rect_Type4 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost x_13681 = function
+| Id (t, x_13683) -> h_Id t x_13683
+| Cst (t, x_13684) -> h_Cst t x_13684
+| Op1 (t, t', x_13686, x_13685) ->
+  h_Op1 t t' x_13686 x_13685
+    (expr_rect_Type4 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_13685)
+| Op2 (t1, t2, t', x_13689, x_13688, x_13687) ->
+  h_Op2 t1 t2 t' x_13689 x_13688 x_13687
+    (expr_rect_Type4 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t1 x_13688)
+    (expr_rect_Type4 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t2 x_13687)
+| Mem (t, x_13690) ->
+  h_Mem t x_13690
     (expr_rect_Type4 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost AST.ASTptr
-      x_10374)
-| Cond (sz, sg, t, x_10377, x_10376, x_10375) ->
-  h_Cond sz sg t x_10377 x_10376 x_10375
+      x_13690)
+| Cond (sz, sg, t, x_13693, x_13692, x_13691) ->
+  h_Cond sz sg t x_13693 x_13692 x_13691
     (expr_rect_Type4 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost (AST.ASTint
-      (sz, sg)) x_10377)
-    (expr_rect_Type4 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_10376)
-    (expr_rect_Type4 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_10375)
-| Ecost (t, x_10379, x_10378) ->
-  h_Ecost t x_10379 x_10378
-    (expr_rect_Type4 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_10378)
+      (sz, sg)) x_13693)
+    (expr_rect_Type4 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_13692)
+    (expr_rect_Type4 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_13691)
+| Ecost (t, x_13695, x_13694) ->
+  h_Ecost t x_13695 x_13694
+    (expr_rect_Type4 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_13694)
 
 (** val expr_rect_Type3 :
@@ -143 +147 @@
     -> 'a1 -> 'a1 -> 'a1) -> (AST.typ -> CostLabel.costlabel -> expr -> 'a1
     -> 'a1) -> AST.typ -> expr -> 'a1 **)
-let rec expr_rect_Type3 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost x_10409 = function
-| Id (t, x_10411) -> h_Id t x_10411
-| Cst (t, x_10412) -> h_Cst t x_10412
-| Op1 (t, t', x_10414, x_10413) ->
-  h_Op1 t t' x_10414 x_10413
-    (expr_rect_Type3 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_10413)
-| Op2 (t1, t2, t', x_10417, x_10416, x_10415) ->
-  h_Op2 t1 t2 t' x_10417 x_10416 x_10415
-    (expr_rect_Type3 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t1 x_10416)
-    (expr_rect_Type3 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t2 x_10415)
-| Mem (t, x_10418) ->
-  h_Mem t x_10418
+let rec expr_rect_Type3 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost x_13725 = function
+| Id (t, x_13727) -> h_Id t x_13727
+| Cst (t, x_13728) -> h_Cst t x_13728
+| Op1 (t, t', x_13730, x_13729) ->
+  h_Op1 t t' x_13730 x_13729
+    (expr_rect_Type3 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_13729)
+| Op2 (t1, t2, t', x_13733, x_13732, x_13731) ->
+  h_Op2 t1 t2 t' x_13733 x_13732 x_13731
+    (expr_rect_Type3 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t1 x_13732)
+    (expr_rect_Type3 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t2 x_13731)
+| Mem (t, x_13734) ->
+  h_Mem t x_13734
     (expr_rect_Type3 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost AST.ASTptr
-      x_10418)
-| Cond (sz, sg, t, x_10421, x_10420, x_10419) ->
-  h_Cond sz sg t x_10421 x_10420 x_10419
+      x_13734)
+| Cond (sz, sg, t, x_13737, x_13736, x_13735) ->
+  h_Cond sz sg t x_13737 x_13736 x_13735
     (expr_rect_Type3 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost (AST.ASTint
-      (sz, sg)) x_10421)
-    (expr_rect_Type3 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_10420)
-    (expr_rect_Type3 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_10419)
-| Ecost (t, x_10423, x_10422) ->
-  h_Ecost t x_10423 x_10422
-    (expr_rect_Type3 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_10422)
+      (sz, sg)) x_13737)
+    (expr_rect_Type3 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_13736)
+    (expr_rect_Type3 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_13735)
+| Ecost (t, x_13739, x_13738) ->
+  h_Ecost t x_13739 x_13738
+    (expr_rect_Type3 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_13738)
 
 (** val expr_rect_Type2 :
@@ -175 +179 @@
     -> 'a1 -> 'a1 -> 'a1) -> (AST.typ -> CostLabel.costlabel -> expr -> 'a1
     -> 'a1) -> AST.typ -> expr -> 'a1 **)
-let rec expr_rect_Type2 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost x_10431 = function
-| Id (t, x_10433) -> h_Id t x_10433
-| Cst (t, x_10434) -> h_Cst t x_10434
-| Op1 (t, t', x_10436, x_10435) ->
-  h_Op1 t t' x_10436 x_10435
-    (expr_rect_Type2 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_10435)
-| Op2 (t1, t2, t', x_10439, x_10438, x_10437) ->
-  h_Op2 t1 t2 t' x_10439 x_10438 x_10437
-    (expr_rect_Type2 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t1 x_10438)
-    (expr_rect_Type2 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t2 x_10437)
-| Mem (t, x_10440) ->
-  h_Mem t x_10440
+let rec expr_rect_Type2 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost x_13747 = function
+| Id (t, x_13749) -> h_Id t x_13749
+| Cst (t, x_13750) -> h_Cst t x_13750
+| Op1 (t, t', x_13752, x_13751) ->
+  h_Op1 t t' x_13752 x_13751
+    (expr_rect_Type2 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_13751)
+| Op2 (t1, t2, t', x_13755, x_13754, x_13753) ->
+  h_Op2 t1 t2 t' x_13755 x_13754 x_13753
+    (expr_rect_Type2 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t1 x_13754)
+    (expr_rect_Type2 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t2 x_13753)
+| Mem (t, x_13756) ->
+  h_Mem t x_13756
     (expr_rect_Type2 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost AST.ASTptr
-      x_10440)
-| Cond (sz, sg, t, x_10443, x_10442, x_10441) ->
-  h_Cond sz sg t x_10443 x_10442 x_10441
+      x_13756)
+| Cond (sz, sg, t, x_13759, x_13758, x_13757) ->
+  h_Cond sz sg t x_13759 x_13758 x_13757
     (expr_rect_Type2 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost (AST.ASTint
-      (sz, sg)) x_10443)
-    (expr_rect_Type2 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_10442)
-    (expr_rect_Type2 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_10441)
-| Ecost (t, x_10445, x_10444) ->
-  h_Ecost t x_10445 x_10444
-    (expr_rect_Type2 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_10444)
+      (sz, sg)) x_13759)
+    (expr_rect_Type2 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_13758)
+    (expr_rect_Type2 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_13757)
+| Ecost (t, x_13761, x_13760) ->
+  h_Ecost t x_13761 x_13760
+    (expr_rect_Type2 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_13760)
 
 (** val expr_rect_Type1 :
@@ -207 +211 @@
     -> 'a1 -> 'a1 -> 'a1) -> (AST.typ -> CostLabel.costlabel -> expr -> 'a1
     -> 'a1) -> AST.typ -> expr -> 'a1 **)
-let rec expr_rect_Type1 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost x_10453 = function
-| Id (t, x_10455) -> h_Id t x_10455
-| Cst (t, x_10456) -> h_Cst t x_10456
-| Op1 (t, t', x_10458, x_10457) ->
-  h_Op1 t t' x_10458 x_10457
-    (expr_rect_Type1 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_10457)
-| Op2 (t1, t2, t', x_10461, x_10460, x_10459) ->
-  h_Op2 t1 t2 t' x_10461 x_10460 x_10459
-    (expr_rect_Type1 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t1 x_10460)
-    (expr_rect_Type1 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t2 x_10459)
-| Mem (t, x_10462) ->
-  h_Mem t x_10462
+let rec expr_rect_Type1 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost x_13769 = function
+| Id (t, x_13771) -> h_Id t x_13771
+| Cst (t, x_13772) -> h_Cst t x_13772
+| Op1 (t, t', x_13774, x_13773) ->
+  h_Op1 t t' x_13774 x_13773
+    (expr_rect_Type1 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_13773)
+| Op2 (t1, t2, t', x_13777, x_13776, x_13775) ->
+  h_Op2 t1 t2 t' x_13777 x_13776 x_13775
+    (expr_rect_Type1 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t1 x_13776)
+    (expr_rect_Type1 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t2 x_13775)
+| Mem (t, x_13778) ->
+  h_Mem t x_13778
     (expr_rect_Type1 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost AST.ASTptr
-      x_10462)
-| Cond (sz, sg, t, x_10465, x_10464, x_10463) ->
-  h_Cond sz sg t x_10465 x_10464 x_10463
+      x_13778)
+| Cond (sz, sg, t, x_13781, x_13780, x_13779) ->
+  h_Cond sz sg t x_13781 x_13780 x_13779
     (expr_rect_Type1 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost (AST.ASTint
-      (sz, sg)) x_10465)
-    (expr_rect_Type1 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_10464)
-    (expr_rect_Type1 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_10463)
-| Ecost (t, x_10467, x_10466) ->
-  h_Ecost t x_10467 x_10466
-    (expr_rect_Type1 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_10466)
+      (sz, sg)) x_13781)
+    (expr_rect_Type1 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_13780)
+    (expr_rect_Type1 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_13779)
+| Ecost (t, x_13783, x_13782) ->
+  h_Ecost t x_13783 x_13782
+    (expr_rect_Type1 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_13782)
 
 (** val expr_rect_Type0 :
@@ -239 +243 @@
     -> 'a1 -> 'a1 -> 'a1) -> (AST.typ -> CostLabel.costlabel -> expr -> 'a1
     -> 'a1) -> AST.typ -> expr -> 'a1 **)
-let rec expr_rect_Type0 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost x_10475 = function
-| Id (t, x_10477) -> h_Id t x_10477
-| Cst (t, x_10478) -> h_Cst t x_10478
-| Op1 (t, t', x_10480, x_10479) ->
-  h_Op1 t t' x_10480 x_10479
-    (expr_rect_Type0 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_10479)
-| Op2 (t1, t2, t', x_10483, x_10482, x_10481) ->
-  h_Op2 t1 t2 t' x_10483 x_10482 x_10481
-    (expr_rect_Type0 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t1 x_10482)
-    (expr_rect_Type0 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t2 x_10481)
-| Mem (t, x_10484) ->
-  h_Mem t x_10484
+let rec expr_rect_Type0 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost x_13791 = function
+| Id (t, x_13793) -> h_Id t x_13793
+| Cst (t, x_13794) -> h_Cst t x_13794
+| Op1 (t, t', x_13796, x_13795) ->
+  h_Op1 t t' x_13796 x_13795
+    (expr_rect_Type0 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_13795)
+| Op2 (t1, t2, t', x_13799, x_13798, x_13797) ->
+  h_Op2 t1 t2 t' x_13799 x_13798 x_13797
+    (expr_rect_Type0 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t1 x_13798)
+    (expr_rect_Type0 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t2 x_13797)
+| Mem (t, x_13800) ->
+  h_Mem t x_13800
     (expr_rect_Type0 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost AST.ASTptr
-      x_10484)
-| Cond (sz, sg, t, x_10487, x_10486, x_10485) ->
-  h_Cond sz sg t x_10487 x_10486 x_10485
+      x_13800)
+| Cond (sz, sg, t, x_13803, x_13802, x_13801) ->
+  h_Cond sz sg t x_13803 x_13802 x_13801
     (expr_rect_Type0 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost (AST.ASTint
-      (sz, sg)) x_10487)
-    (expr_rect_Type0 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_10486)
-    (expr_rect_Type0 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_10485)
-| Ecost (t, x_10489, x_10488) ->
-  h_Ecost t x_10489 x_10488
-    (expr_rect_Type0 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_10488)
+      (sz, sg)) x_13803)
+    (expr_rect_Type0 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_13802)
+    (expr_rect_Type0 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_13801)
+| Ecost (t, x_13805, x_13804) ->
+  h_Ecost t x_13805 x_13804
+    (expr_rect_Type0 h_Id h_Cst h_Op1 h_Op2 h_Mem h_Cond h_Ecost t x_13804)
 
 (** val expr_inv_rect_Type4 :
@@ -373 +377 @@
 let rec stmt_rect_Type4 h_St_skip h_St_assign h_St_store h_St_call h_St_seq h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost = function
 | St_skip -> h_St_skip
-| St_assign (t, x_10660, x_10659) -> h_St_assign t x_10660 x_10659
-| St_store (t, x_10662, x_10661) -> h_St_store t x_10662 x_10661
-| St_call (x_10665, x_10664, x_10663) -> h_St_call x_10665 x_10664 x_10663
-| St_seq (x_10667, x_10666) ->
-  h_St_seq x_10667 x_10666
+| St_assign (t, x_13976, x_13975) -> h_St_assign t x_13976 x_13975
+| St_store (t, x_13978, x_13977) -> h_St_store t x_13978 x_13977
+| St_call (x_13981, x_13980, x_13979) -> h_St_call x_13981 x_13980 x_13979
+| St_seq (x_13983, x_13982) ->
+  h_St_seq x_13983 x_13982
     (stmt_rect_Type4 h_St_skip h_St_assign h_St_store h_St_call h_St_seq
-      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_10667)
+      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_13983)
     (stmt_rect_Type4 h_St_skip h_St_assign h_St_store h_St_call h_St_seq
-      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_10666)
-| St_ifthenelse (sz, sg, x_10670, x_10669, x_10668) ->
-  h_St_ifthenelse sz sg x_10670 x_10669 x_10668
+      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_13982)
+| St_ifthenelse (sz, sg, x_13986, x_13985, x_13984) ->
+  h_St_ifthenelse sz sg x_13986 x_13985 x_13984
     (stmt_rect_Type4 h_St_skip h_St_assign h_St_store h_St_call h_St_seq
-      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_10669)
+      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_13985)
     (stmt_rect_Type4 h_St_skip h_St_assign h_St_store h_St_call h_St_seq
-      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_10668)
-| St_return x_10671 -> h_St_return x_10671
-| St_label (x_10673, x_10672) ->
-  h_St_label x_10673 x_10672
+      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_13984)
+| St_return x_13987 -> h_St_return x_13987
+| St_label (x_13989, x_13988) ->
+  h_St_label x_13989 x_13988
     (stmt_rect_Type4 h_St_skip h_St_assign h_St_store h_St_call h_St_seq
-      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_10672)
-| St_goto x_10674 -> h_St_goto x_10674
-| St_cost (x_10676, x_10675) ->
-  h_St_cost x_10676 x_10675
+      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_13988)
+| St_goto x_13990 -> h_St_goto x_13990
+| St_cost (x_13992, x_13991) ->
+  h_St_cost x_13992 x_13991
     (stmt_rect_Type4 h_St_skip h_St_assign h_St_store h_St_call h_St_seq
-      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_10675)
+      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_13991)
 
 (** val stmt_rect_Type3 :
@@ -410 +414 @@
 let rec stmt_rect_Type3 h_St_skip h_St_assign h_St_store h_St_call h_St_seq h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost = function
 | St_skip -> h_St_skip
-| St_assign (t, x_10718, x_10717) -> h_St_assign t x_10718 x_10717
-| St_store (t, x_10720, x_10719) -> h_St_store t x_10720 x_10719
-| St_call (x_10723, x_10722, x_10721) -> h_St_call x_10723 x_10722 x_10721
-| St_seq (x_10725, x_10724) ->
-  h_St_seq x_10725 x_10724
+| St_assign (t, x_14034, x_14033) -> h_St_assign t x_14034 x_14033
+| St_store (t, x_14036, x_14035) -> h_St_store t x_14036 x_14035
+| St_call (x_14039, x_14038, x_14037) -> h_St_call x_14039 x_14038 x_14037
+| St_seq (x_14041, x_14040) ->
+  h_St_seq x_14041 x_14040
     (stmt_rect_Type3 h_St_skip h_St_assign h_St_store h_St_call h_St_seq
-      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_10725)
+      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_14041)
     (stmt_rect_Type3 h_St_skip h_St_assign h_St_store h_St_call h_St_seq
-      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_10724)
-| St_ifthenelse (sz, sg, x_10728, x_10727, x_10726) ->
-  h_St_ifthenelse sz sg x_10728 x_10727 x_10726
+      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_14040)
+| St_ifthenelse (sz, sg, x_14044, x_14043, x_14042) ->
+  h_St_ifthenelse sz sg x_14044 x_14043 x_14042
     (stmt_rect_Type3 h_St_skip h_St_assign h_St_store h_St_call h_St_seq
-      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_10727)
+      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_14043)
     (stmt_rect_Type3 h_St_skip h_St_assign h_St_store h_St_call h_St_seq
-      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_10726)
-| St_return x_10729 -> h_St_return x_10729
-| St_label (x_10731, x_10730) ->
-  h_St_label x_10731 x_10730
+      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_14042)
+| St_return x_14045 -> h_St_return x_14045
+| St_label (x_14047, x_14046) ->
+  h_St_label x_14047 x_14046
     (stmt_rect_Type3 h_St_skip h_St_assign h_St_store h_St_call h_St_seq
-      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_10730)
-| St_goto x_10732 -> h_St_goto x_10732
-| St_cost (x_10734, x_10733) ->
-  h_St_cost x_10734 x_10733
+      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_14046)
+| St_goto x_14048 -> h_St_goto x_14048
+| St_cost (x_14050, x_14049) ->
+  h_St_cost x_14050 x_14049
     (stmt_rect_Type3 h_St_skip h_St_assign h_St_store h_St_call h_St_seq
-      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_10733)
+      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_14049)
 
 (** val stmt_rect_Type2 :
@@ -447 +451 @@
 let rec stmt_rect_Type2 h_St_skip h_St_assign h_St_store h_St_call h_St_seq h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost = function
 | St_skip -> h_St_skip
-| St_assign (t, x_10747, x_10746) -> h_St_assign t x_10747 x_10746
-| St_store (t, x_10749, x_10748) -> h_St_store t x_10749 x_10748
-| St_call (x_10752, x_10751, x_10750) -> h_St_call x_10752 x_10751 x_10750
-| St_seq (x_10754, x_10753) ->
-  h_St_seq x_10754 x_10753
+| St_assign (t, x_14063, x_14062) -> h_St_assign t x_14063 x_14062
+| St_store (t, x_14065, x_14064) -> h_St_store t x_14065 x_14064
+| St_call (x_14068, x_14067, x_14066) -> h_St_call x_14068 x_14067 x_14066
+| St_seq (x_14070, x_14069) ->
+  h_St_seq x_14070 x_14069
     (stmt_rect_Type2 h_St_skip h_St_assign h_St_store h_St_call h_St_seq
-      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_10754)
+      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_14070)
     (stmt_rect_Type2 h_St_skip h_St_assign h_St_store h_St_call h_St_seq
-      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_10753)
-| St_ifthenelse (sz, sg, x_10757, x_10756, x_10755) ->
-  h_St_ifthenelse sz sg x_10757 x_10756 x_10755
+      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_14069)
+| St_ifthenelse (sz, sg, x_14073, x_14072, x_14071) ->
+  h_St_ifthenelse sz sg x_14073 x_14072 x_14071
     (stmt_rect_Type2 h_St_skip h_St_assign h_St_store h_St_call h_St_seq
-      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_10756)
+      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_14072)
     (stmt_rect_Type2 h_St_skip h_St_assign h_St_store h_St_call h_St_seq
-      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_10755)
-| St_return x_10758 -> h_St_return x_10758
-| St_label (x_10760, x_10759) ->
-  h_St_label x_10760 x_10759
+      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_14071)
+| St_return x_14074 -> h_St_return x_14074
+| St_label (x_14076, x_14075) ->
+  h_St_label x_14076 x_14075
     (stmt_rect_Type2 h_St_skip h_St_assign h_St_store h_St_call h_St_seq
-      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_10759)
-| St_goto x_10761 -> h_St_goto x_10761
-| St_cost (x_10763, x_10762) ->
-  h_St_cost x_10763 x_10762
+      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_14075)
+| St_goto x_14077 -> h_St_goto x_14077
+| St_cost (x_14079, x_14078) ->
+  h_St_cost x_14079 x_14078
     (stmt_rect_Type2 h_St_skip h_St_assign h_St_store h_St_call h_St_seq
-      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_10762)
+      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_14078)
 
 (** val stmt_rect_Type1 :
@@ -484 +488 @@
 let rec stmt_rect_Type1 h_St_skip h_St_assign h_St_store h_St_call h_St_seq h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost = function
 | St_skip -> h_St_skip
-| St_assign (t, x_10776, x_10775) -> h_St_assign t x_10776 x_10775
-| St_store (t, x_10778, x_10777) -> h_St_store t x_10778 x_10777
-| St_call (x_10781, x_10780, x_10779) -> h_St_call x_10781 x_10780 x_10779
-| St_seq (x_10783, x_10782) ->
-  h_St_seq x_10783 x_10782
+| St_assign (t, x_14092, x_14091) -> h_St_assign t x_14092 x_14091
+| St_store (t, x_14094, x_14093) -> h_St_store t x_14094 x_14093
+| St_call (x_14097, x_14096, x_14095) -> h_St_call x_14097 x_14096 x_14095
+| St_seq (x_14099, x_14098) ->
+  h_St_seq x_14099 x_14098
     (stmt_rect_Type1 h_St_skip h_St_assign h_St_store h_St_call h_St_seq
-      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_10783)
+      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_14099)
     (stmt_rect_Type1 h_St_skip h_St_assign h_St_store h_St_call h_St_seq
-      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_10782)
-| St_ifthenelse (sz, sg, x_10786, x_10785, x_10784) ->
-  h_St_ifthenelse sz sg x_10786 x_10785 x_10784
+      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_14098)
+| St_ifthenelse (sz, sg, x_14102, x_14101, x_14100) ->
+  h_St_ifthenelse sz sg x_14102 x_14101 x_14100
     (stmt_rect_Type1 h_St_skip h_St_assign h_St_store h_St_call h_St_seq
-      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_10785)
+      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_14101)
     (stmt_rect_Type1 h_St_skip h_St_assign h_St_store h_St_call h_St_seq
-      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_10784)
-| St_return x_10787 -> h_St_return x_10787
-| St_label (x_10789, x_10788) ->
-  h_St_label x_10789 x_10788
+      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_14100)
+| St_return x_14103 -> h_St_return x_14103
+| St_label (x_14105, x_14104) ->
+  h_St_label x_14105 x_14104
     (stmt_rect_Type1 h_St_skip h_St_assign h_St_store h_St_call h_St_seq
-      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_10788)
-| St_goto x_10790 -> h_St_goto x_10790
-| St_cost (x_10792, x_10791) ->
-  h_St_cost x_10792 x_10791
+      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_14104)
+| St_goto x_14106 -> h_St_goto x_14106
+| St_cost (x_14108, x_14107) ->
+  h_St_cost x_14108 x_14107
     (stmt_rect_Type1 h_St_skip h_St_assign h_St_store h_St_call h_St_seq
-      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_10791)
+      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_14107)
 
 (** val stmt_rect_Type0 :
@@ -521 +525 @@
 let rec stmt_rect_Type0 h_St_skip h_St_assign h_St_store h_St_call h_St_seq h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost = function
 | St_skip -> h_St_skip
-| St_assign (t, x_10805, x_10804) -> h_St_assign t x_10805 x_10804
-| St_store (t, x_10807, x_10806) -> h_St_store t x_10807 x_10806
-| St_call (x_10810, x_10809, x_10808) -> h_St_call x_10810 x_10809 x_10808
-| St_seq (x_10812, x_10811) ->
-  h_St_seq x_10812 x_10811
+| St_assign (t, x_14121, x_14120) -> h_St_assign t x_14121 x_14120
+| St_store (t, x_14123, x_14122) -> h_St_store t x_14123 x_14122
+| St_call (x_14126, x_14125, x_14124) -> h_St_call x_14126 x_14125 x_14124
+| St_seq (x_14128, x_14127) ->
+  h_St_seq x_14128 x_14127
     (stmt_rect_Type0 h_St_skip h_St_assign h_St_store h_St_call h_St_seq
-      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_10812)
+      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_14128)
     (stmt_rect_Type0 h_St_skip h_St_assign h_St_store h_St_call h_St_seq
-      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_10811)
-| St_ifthenelse (sz, sg, x_10815, x_10814, x_10813) ->
-  h_St_ifthenelse sz sg x_10815 x_10814 x_10813
+      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_14127)
+| St_ifthenelse (sz, sg, x_14131, x_14130, x_14129) ->
+  h_St_ifthenelse sz sg x_14131 x_14130 x_14129
     (stmt_rect_Type0 h_St_skip h_St_assign h_St_store h_St_call h_St_seq
-      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_10814)
+      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_14130)
     (stmt_rect_Type0 h_St_skip h_St_assign h_St_store h_St_call h_St_seq
-      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_10813)
-| St_return x_10816 -> h_St_return x_10816
-| St_label (x_10818, x_10817) ->
-  h_St_label x_10818 x_10817
+      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_14129)
+| St_return x_14132 -> h_St_return x_14132
+| St_label (x_14134, x_14133) ->
+  h_St_label x_14134 x_14133
     (stmt_rect_Type0 h_St_skip h_St_assign h_St_store h_St_call h_St_seq
-      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_10817)
-| St_goto x_10819 -> h_St_goto x_10819
-| St_cost (x_10821, x_10820) ->
-  h_St_cost x_10821 x_10820
+      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_14133)
+| St_goto x_14135 -> h_St_goto x_14135
+| St_cost (x_14137, x_14136) ->
+  h_St_cost x_14137 x_14136
     (stmt_rect_Type0 h_St_skip h_St_assign h_St_store h_St_call h_St_seq
-      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_10820)
+      h_St_ifthenelse h_St_return h_St_label h_St_goto h_St_cost x_14136)
 
 (** val stmt_inv_rect_Type4 :
@@ -759 +763 @@
     (AST.ident, AST.typ) Types.prod List.list -> __ -> Nat.nat -> stmt -> __
     -> 'a1) -> internal_function -> 'a1 **)
-let rec internal_function_rect_Type4 h_mk_internal_function x_11116 =
+let rec internal_function_rect_Type4 h_mk_internal_function x_14432 =
   let { f_return = f_return0; f_params = f_params0; f_vars = f_vars0;
-    f_stacksize = f_stacksize0; f_body = f_body0 } = x_11116
+    f_stacksize = f_stacksize0; f_body = f_body0 } = x_14432
   in
   h_mk_internal_function f_return0 f_params0 f_vars0 __ f_stacksize0 f_body0
@@ -770 +774 @@
     (AST.ident, AST.typ) Types.prod List.list -> __ -> Nat.nat -> stmt -> __
     -> 'a1) -> internal_function -> 'a1 **)
-let rec internal_function_rect_Type5 h_mk_internal_function x_11118 =
+let rec internal_function_rect_Type5 h_mk_internal_function x_14434 =
   let { f_return = f_return0; f_params = f_params0; f_vars = f_vars0;
-    f_stacksize = f_stacksize0; f_body = f_body0 } = x_11118
+    f_stacksize = f_stacksize0; f_body = f_body0 } = x_14434
   in
   h_mk_internal_function f_return0 f_params0 f_vars0 __ f_stacksize0 f_body0
@@ -781 +785 @@
     (AST.ident, AST.typ) Types.prod List.list -> __ -> Nat.nat -> stmt -> __
     -> 'a1) -> internal_function -> 'a1 **)
-let rec internal_function_rect_Type3 h_mk_internal_function x_11120 =
+let rec internal_function_rect_Type3 h_mk_internal_function x_14436 =
   let { f_return = f_return0; f_params = f_params0; f_vars = f_vars0;
-    f_stacksize = f_stacksize0; f_body = f_body0 } = x_11120
+    f_stacksize = f_stacksize0; f_body = f_body0 } = x_14436
   in
   h_mk_internal_function f_return0 f_params0 f_vars0 __ f_stacksize0 f_body0
@@ -792 +796 @@
     (AST.ident, AST.typ) Types.prod List.list -> __ -> Nat.nat -> stmt -> __
     -> 'a1) -> internal_function -> 'a1 **)
-let rec internal_function_rect_Type2 h_mk_internal_function x_11122 =
+let rec internal_function_rect_Type2 h_mk_internal_function x_14438 =
   let { f_return = f_return0; f_params = f_params0; f_vars = f_vars0;
-    f_stacksize = f_stacksize0; f_body = f_body0 } = x_11122
+    f_stacksize = f_stacksize0; f_body = f_body0 } = x_14438
   in
   h_mk_internal_function f_return0 f_params0 f_vars0 __ f_stacksize0 f_body0
@@ -803 +807 @@
     (AST.ident, AST.typ) Types.prod List.list -> __ -> Nat.nat -> stmt -> __
     -> 'a1) -> internal_function -> 'a1 **)
-let rec internal_function_rect_Type1 h_mk_internal_function x_11124 =
+let rec internal_function_rect_Type1 h_mk_internal_function x_14440 =
   let { f_return = f_return0; f_params = f_params0; f_vars = f_vars0;
-    f_stacksize = f_stacksize0; f_body = f_body0 } = x_11124
+    f_stacksize = f_stacksize0; f_body = f_body0 } = x_14440
   in
   h_mk_internal_function f_return0 f_params0 f_vars0 __ f_stacksize0 f_body0
@@ -814 +818 @@
     (AST.ident, AST.typ) Types.prod List.list -> __ -> Nat.nat -> stmt -> __
     -> 'a1) -> internal_function -> 'a1 **)
-let rec internal_function_rect_Type0 h_mk_internal_function x_11126 =
+let rec internal_function_rect_Type0 h_mk_internal_function x_14442 =
   let { f_return = f_return0; f_params = f_params0; f_vars = f_vars0;
-    f_stacksize = f_stacksize0; f_body = f_body0 } = x_11126
+    f_stacksize = f_stacksize0; f_body = f_body0 } = x_14442
   in
   h_mk_internal_function f_return0 f_params0 f_vars0 __ f_stacksize0 f_body0

extracted/cminor_syntax.mli

@@ -29 +29 @@
 open Division
 
+open Exp
+
 open Arithmetic
 
@@ -90 +92 @@
 
 open FrontEndOps
+
+open BitVectorTrie
 
 open CostLabel

extracted/compiler.ml

@@ -1 +1 @@
 open Preamble
 
+open BitVectorTrie
+
 open CostLabel
 
@@ -31 +33 @@
 open Identifiers
 
+open Exp
+
 open Arithmetic
 
@@ -148 +152 @@
 
 open Initialisation
-
-open BitVectorTrie
 
 open Graphs
@@ -175 +177 @@
         init_cost; Types.snd = p' }; Types.snd = p5 }))
 
+open Deqsets
+
+open State
+
+open Bind_new
+
+open BindLists
+
+open Blocks
+
+open TranslateUtils
+
+open AssocList
+
 open String
 
 open LabelledObjects
 
+open I8051
+
+open BackEndOps
+
+open Joint
+
+open RTL
+
+open RTLabsToRTL
+
+open ERTL
+
+open RegisterSet
+
+open RTLToERTL
+
+open ERTLptr
+
+open ERTLToERTLptr
+
+open Fixpoints
+
+open Set_adt
+
+open Liveness
+
+open Interference
+
+open Joint_LTL_LIN
+
+open LTL
+
+open ERTLptrToLTL
+
+open LIN
+
+open Linearise
+
+open LTLToLIN
+
 open ASM
+
+open BitVectorTrieSet
+
+open LINToASM
+
+(** val compute_fixpoint : Fixpoints.fixpoint_computer **)
+let compute_fixpoint _ =
+  failwith "AXIOM TO BE REALIZED"
+
+(** val colour_graph : Interference.coloured_graph_computer **)
+let colour_graph _ =
+  failwith "AXIOM TO BE REALIZED"
 
 (** val back_end :
     RTLabs_syntax.rTLabs_program -> ASM.pseudo_assembly_program **)
-let back_end x =
-  failwith "AXIOM TO BE REALIZED"
+let back_end p =
+  let p0 = RTLabsToRTL.rtlabs_to_rtl p in
+  let p3 = RTLToERTL.rtl_to_ertl p0 in
+  let p4 = ERTLToERTLptr.ertl_to_ertlptr p3 in
+  let p5 = ERTLptrToLTL.ertlptr_to_ltl compute_fixpoint colour_graph p4 in
+  let p6 = LTLToLIN.ltl_to_lin p5 in LINToASM.lin_to_asm p6
 
 type object_code = BitVector.byte List.list
 
-type costlabel_map = CostLabel.costlabel BitVectorTrie.bitVectorTrie
+type costlabel_map1 = CostLabel.costlabel BitVectorTrie.bitVectorTrie
+
+open Assembly
+
+open Status
+
+open Fetch
+
+open PolicyFront
+
+open PolicyStep
+
+open Policy
 
 (** val assembler :
-    ASM.pseudo_assembly_program -> (object_code, costlabel_map) Types.prod
+    ASM.pseudo_assembly_program -> (object_code, costlabel_map1) Types.prod
     Errors.res **)
-let assembler x =
-  failwith "AXIOM TO BE REALIZED"
+let assembler p =
+  let { Types.fst = preamble0; Types.snd = list_instr } = p in
+  let p' = { Types.fst = preamble0; Types.snd = list_instr } in
+  Obj.magic
+    (Monad.m_bind0 (Monad.max_def Errors.res0)
+      (Obj.magic
+        (Errors.opt_to_res (Errors.msg ErrorMessages.Jump_expansion_failed)
+          (Policy.jump_expansion' (Types.coerc_pair_sigma p'))))
+      (fun sigma_pol ->
+      let sigma0 = fun ppc -> (Types.pi1 sigma_pol).Types.fst ppc in
+      let pol = fun ppc -> (Types.pi1 sigma_pol).Types.snd ppc in
+      Obj.magic (Errors.OK (Types.pi1 (Assembly.assembly p sigma0 pol)))))
 
 open StructuredTraces
@@ -200 +294 @@
 open AbstractStatus
 
-open Status
-
 open StatusProofs
 
 open Interpret
-
-open Fetch
 
 open ASMCosts
@@ -223 +313 @@
 
 (** val compile :
-    Csyntax.clight_program -> ((object_code, costlabel_map) Types.prod,
+    Csyntax.clight_program -> ((object_code, costlabel_map1) Types.prod,
     (Csyntax.clight_program, Label.clight_cost_map) Types.dPair) Types.prod
     Errors.res **)

extracted/compiler.mli

@@ -1 +1 @@
 open Preamble
 
+open BitVectorTrie
+
 open CostLabel
 
@@ -31 +33 @@
 open Identifiers
 
+open Exp
+
 open Arithmetic
 
@@ -148 +152 @@
 
 open Initialisation
-
-open BitVectorTrie
 
 open Graphs
@@ -165 +167 @@
   Types.prod, RTLabs_syntax.rTLabs_program) Types.prod Errors.res
 
+open Deqsets
+
+open State
+
+open Bind_new
+
+open BindLists
+
+open Blocks
+
+open TranslateUtils
+
+open AssocList
+
 open String
 
 open LabelledObjects
 
+open I8051
+
+open BackEndOps
+
+open Joint
+
+open RTL
+
+open RTLabsToRTL
+
+open ERTL
+
+open RegisterSet
+
+open RTLToERTL
+
+open ERTLptr
+
+open ERTLToERTLptr
+
+open Fixpoints
+
+open Set_adt
+
+open Liveness
+
+open Interference
+
+open Joint_LTL_LIN
+
+open LTL
+
+open ERTLptrToLTL
+
+open LIN
+
+open Linearise
+
+open LTLToLIN
+
 open ASM
 
+open BitVectorTrieSet
+
+open LINToASM
+
+val compute_fixpoint : Fixpoints.fixpoint_computer
+
+val colour_graph : Interference.coloured_graph_computer
+
 val back_end : RTLabs_syntax.rTLabs_program -> ASM.pseudo_assembly_program
 
 type object_code = BitVector.byte List.list
 
-type costlabel_map = CostLabel.costlabel BitVectorTrie.bitVectorTrie
+type costlabel_map1 = CostLabel.costlabel BitVectorTrie.bitVectorTrie
+
+open Assembly
+
+open Status
+
+open Fetch
+
+open PolicyFront
+
+open PolicyStep
+
+open Policy
 
 val assembler :
-  ASM.pseudo_assembly_program -> (object_code, costlabel_map) Types.prod
+  ASM.pseudo_assembly_program -> (object_code, costlabel_map1) Types.prod
   Errors.res
 
@@ -185 +261 @@
 open AbstractStatus
 
-open Status
-
 open StatusProofs
 
 open Interpret
-
-open Fetch
 
 open ASMCosts
@@ -206 +278 @@
 
 val compile :
-  Csyntax.clight_program -> ((object_code, costlabel_map) Types.prod,
+  Csyntax.clight_program -> ((object_code, costlabel_map1) Types.prod,
   (Csyntax.clight_program, Label.clight_cost_map) Types.dPair) Types.prod
   Errors.res

extracted/costLabel.ml

@@ -26 +26 @@
 
 open Identifiers
+
+open Exp
 
 open Arithmetic
@@ -67 +69 @@
 open AST
 
+open BitVectorTrie
+
 type costlabel = PreIdentifiers.identifier
 
@@ -73 +77 @@
   Identifiers.identifier_of_nat PreIdentifiers.CostTag
 
+type costlabel_map = costlabel BitVectorTrie.bitVectorTrie
+
+(** val costlabel_map0 : costlabel_map **)
+let costlabel_map0 =
+  BitVectorTrie.Stub (Nat.S (Nat.S (Nat.S (Nat.S (Nat.S (Nat.S (Nat.S (Nat.S
+    (Nat.S (Nat.S (Nat.S (Nat.S (Nat.S (Nat.S (Nat.S (Nat.S
+    Nat.O))))))))))))))))
+

extracted/costLabel.mli

@@ -26 +26 @@
 
 open Identifiers
+
+open Exp
 
 open Arithmetic
@@ -67 +69 @@
 open AST
 
+open BitVectorTrie
+
 type costlabel = PreIdentifiers.identifier
 
 val costlabel_of_nat : Nat.nat -> costlabel
 
+type costlabel_map = costlabel BitVectorTrie.bitVectorTrie
+
+val costlabel_map0 : costlabel_map
+

extracted/csem.ml

@@ -37 +37 @@
 open Identifiers
 
+open Exp
+
 open Arithmetic
 
@@ -92 +94 @@
 
 open Globalenvs
+
+open BitVectorTrie
 
 open CostLabel
@@ -776 +780 @@
 let rec cont_rect_Type4 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3 h_Kswitch h_Kcall = function
 | Kstop -> h_Kstop
-| Kseq (x_5937, x_5936) ->
-  h_Kseq x_5937 x_5936
+| Kseq (x_8622, x_8621) ->
+  h_Kseq x_8622 x_8621
     (cont_rect_Type4 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_5936)
-| Kwhile (x_5940, x_5939, x_5938) ->
-  h_Kwhile x_5940 x_5939 x_5938
+      h_Kswitch h_Kcall x_8621)
+| Kwhile (x_8625, x_8624, x_8623) ->
+  h_Kwhile x_8625 x_8624 x_8623
     (cont_rect_Type4 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_5938)
-| Kdowhile (x_5943, x_5942, x_5941) ->
-  h_Kdowhile x_5943 x_5942 x_5941
+      h_Kswitch h_Kcall x_8623)
+| Kdowhile (x_8628, x_8627, x_8626) ->
+  h_Kdowhile x_8628 x_8627 x_8626
     (cont_rect_Type4 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_5941)
-| Kfor2 (x_5947, x_5946, x_5945, x_5944) ->
-  h_Kfor2 x_5947 x_5946 x_5945 x_5944
+      h_Kswitch h_Kcall x_8626)
+| Kfor2 (x_8632, x_8631, x_8630, x_8629) ->
+  h_Kfor2 x_8632 x_8631 x_8630 x_8629
     (cont_rect_Type4 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_5944)
-| Kfor3 (x_5951, x_5950, x_5949, x_5948) ->
-  h_Kfor3 x_5951 x_5950 x_5949 x_5948
+      h_Kswitch h_Kcall x_8629)
+| Kfor3 (x_8636, x_8635, x_8634, x_8633) ->
+  h_Kfor3 x_8636 x_8635 x_8634 x_8633
     (cont_rect_Type4 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_5948)
-| Kswitch x_5952 ->
-  h_Kswitch x_5952
+      h_Kswitch h_Kcall x_8633)
+| Kswitch x_8637 ->
+  h_Kswitch x_8637
     (cont_rect_Type4 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_5952)
-| Kcall (x_5956, x_5955, x_5954, x_5953) ->
-  h_Kcall x_5956 x_5955 x_5954 x_5953
+      h_Kswitch h_Kcall x_8637)
+| Kcall (x_8641, x_8640, x_8639, x_8638) ->
+  h_Kcall x_8641 x_8640 x_8639 x_8638
     (cont_rect_Type4 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_5953)
+      h_Kswitch h_Kcall x_8638)
 
 (** val cont_rect_Type3 :
@@ -816 +820 @@
 let rec cont_rect_Type3 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3 h_Kswitch h_Kcall = function
 | Kstop -> h_Kstop
-| Kseq (x_5997, x_5996) ->
-  h_Kseq x_5997 x_5996
+| Kseq (x_8682, x_8681) ->
+  h_Kseq x_8682 x_8681
     (cont_rect_Type3 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_5996)
-| Kwhile (x_6000, x_5999, x_5998) ->
-  h_Kwhile x_6000 x_5999 x_5998
+      h_Kswitch h_Kcall x_8681)
+| Kwhile (x_8685, x_8684, x_8683) ->
+  h_Kwhile x_8685 x_8684 x_8683
     (cont_rect_Type3 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_5998)
-| Kdowhile (x_6003, x_6002, x_6001) ->
-  h_Kdowhile x_6003 x_6002 x_6001
+      h_Kswitch h_Kcall x_8683)
+| Kdowhile (x_8688, x_8687, x_8686) ->
+  h_Kdowhile x_8688 x_8687 x_8686
     (cont_rect_Type3 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_6001)
-| Kfor2 (x_6007, x_6006, x_6005, x_6004) ->
-  h_Kfor2 x_6007 x_6006 x_6005 x_6004
+      h_Kswitch h_Kcall x_8686)
+| Kfor2 (x_8692, x_8691, x_8690, x_8689) ->
+  h_Kfor2 x_8692 x_8691 x_8690 x_8689
     (cont_rect_Type3 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_6004)
-| Kfor3 (x_6011, x_6010, x_6009, x_6008) ->
-  h_Kfor3 x_6011 x_6010 x_6009 x_6008
+      h_Kswitch h_Kcall x_8689)
+| Kfor3 (x_8696, x_8695, x_8694, x_8693) ->
+  h_Kfor3 x_8696 x_8695 x_8694 x_8693
     (cont_rect_Type3 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_6008)
-| Kswitch x_6012 ->
-  h_Kswitch x_6012
+      h_Kswitch h_Kcall x_8693)
+| Kswitch x_8697 ->
+  h_Kswitch x_8697
     (cont_rect_Type3 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_6012)
-| Kcall (x_6016, x_6015, x_6014, x_6013) ->
-  h_Kcall x_6016 x_6015 x_6014 x_6013
+      h_Kswitch h_Kcall x_8697)
+| Kcall (x_8701, x_8700, x_8699, x_8698) ->
+  h_Kcall x_8701 x_8700 x_8699 x_8698
     (cont_rect_Type3 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_6013)
+      h_Kswitch h_Kcall x_8698)
 
 (** val cont_rect_Type2 :
@@ -856 +860 @@
 let rec cont_rect_Type2 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3 h_Kswitch h_Kcall = function
 | Kstop -> h_Kstop
-| Kseq (x_6027, x_6026) ->
-  h_Kseq x_6027 x_6026
+| Kseq (x_8712, x_8711) ->
+  h_Kseq x_8712 x_8711
     (cont_rect_Type2 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_6026)
-| Kwhile (x_6030, x_6029, x_6028) ->
-  h_Kwhile x_6030 x_6029 x_6028
+      h_Kswitch h_Kcall x_8711)
+| Kwhile (x_8715, x_8714, x_8713) ->
+  h_Kwhile x_8715 x_8714 x_8713
     (cont_rect_Type2 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_6028)
-| Kdowhile (x_6033, x_6032, x_6031) ->
-  h_Kdowhile x_6033 x_6032 x_6031
+      h_Kswitch h_Kcall x_8713)
+| Kdowhile (x_8718, x_8717, x_8716) ->
+  h_Kdowhile x_8718 x_8717 x_8716
     (cont_rect_Type2 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_6031)
-| Kfor2 (x_6037, x_6036, x_6035, x_6034) ->
-  h_Kfor2 x_6037 x_6036 x_6035 x_6034
+      h_Kswitch h_Kcall x_8716)
+| Kfor2 (x_8722, x_8721, x_8720, x_8719) ->
+  h_Kfor2 x_8722 x_8721 x_8720 x_8719
     (cont_rect_Type2 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_6034)
-| Kfor3 (x_6041, x_6040, x_6039, x_6038) ->
-  h_Kfor3 x_6041 x_6040 x_6039 x_6038
+      h_Kswitch h_Kcall x_8719)
+| Kfor3 (x_8726, x_8725, x_8724, x_8723) ->
+  h_Kfor3 x_8726 x_8725 x_8724 x_8723
     (cont_rect_Type2 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_6038)
-| Kswitch x_6042 ->
-  h_Kswitch x_6042
+      h_Kswitch h_Kcall x_8723)
+| Kswitch x_8727 ->
+  h_Kswitch x_8727
     (cont_rect_Type2 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_6042)
-| Kcall (x_6046, x_6045, x_6044, x_6043) ->
-  h_Kcall x_6046 x_6045 x_6044 x_6043
+      h_Kswitch h_Kcall x_8727)
+| Kcall (x_8731, x_8730, x_8729, x_8728) ->
+  h_Kcall x_8731 x_8730 x_8729 x_8728
     (cont_rect_Type2 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_6043)
+      h_Kswitch h_Kcall x_8728)
 
 (** val cont_rect_Type1 :
@@ -896 +900 @@
 let rec cont_rect_Type1 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3 h_Kswitch h_Kcall = function
 | Kstop -> h_Kstop
-| Kseq (x_6057, x_6056) ->
-  h_Kseq x_6057 x_6056
+| Kseq (x_8742, x_8741) ->
+  h_Kseq x_8742 x_8741
     (cont_rect_Type1 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_6056)
-| Kwhile (x_6060, x_6059, x_6058) ->
-  h_Kwhile x_6060 x_6059 x_6058
+      h_Kswitch h_Kcall x_8741)
+| Kwhile (x_8745, x_8744, x_8743) ->
+  h_Kwhile x_8745 x_8744 x_8743
     (cont_rect_Type1 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_6058)
-| Kdowhile (x_6063, x_6062, x_6061) ->
-  h_Kdowhile x_6063 x_6062 x_6061
+      h_Kswitch h_Kcall x_8743)
+| Kdowhile (x_8748, x_8747, x_8746) ->
+  h_Kdowhile x_8748 x_8747 x_8746
     (cont_rect_Type1 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_6061)
-| Kfor2 (x_6067, x_6066, x_6065, x_6064) ->
-  h_Kfor2 x_6067 x_6066 x_6065 x_6064
+      h_Kswitch h_Kcall x_8746)
+| Kfor2 (x_8752, x_8751, x_8750, x_8749) ->
+  h_Kfor2 x_8752 x_8751 x_8750 x_8749
     (cont_rect_Type1 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_6064)
-| Kfor3 (x_6071, x_6070, x_6069, x_6068) ->
-  h_Kfor3 x_6071 x_6070 x_6069 x_6068
+      h_Kswitch h_Kcall x_8749)
+| Kfor3 (x_8756, x_8755, x_8754, x_8753) ->
+  h_Kfor3 x_8756 x_8755 x_8754 x_8753
     (cont_rect_Type1 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_6068)
-| Kswitch x_6072 ->
-  h_Kswitch x_6072
+      h_Kswitch h_Kcall x_8753)
+| Kswitch x_8757 ->
+  h_Kswitch x_8757
     (cont_rect_Type1 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_6072)
-| Kcall (x_6076, x_6075, x_6074, x_6073) ->
-  h_Kcall x_6076 x_6075 x_6074 x_6073
+      h_Kswitch h_Kcall x_8757)
+| Kcall (x_8761, x_8760, x_8759, x_8758) ->
+  h_Kcall x_8761 x_8760 x_8759 x_8758
     (cont_rect_Type1 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_6073)
+      h_Kswitch h_Kcall x_8758)
 
 (** val cont_rect_Type0 :
@@ -936 +940 @@
 let rec cont_rect_Type0 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3 h_Kswitch h_Kcall = function
 | Kstop -> h_Kstop
-| Kseq (x_6087, x_6086) ->
-  h_Kseq x_6087 x_6086
+| Kseq (x_8772, x_8771) ->
+  h_Kseq x_8772 x_8771
     (cont_rect_Type0 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_6086)
-| Kwhile (x_6090, x_6089, x_6088) ->
-  h_Kwhile x_6090 x_6089 x_6088
+      h_Kswitch h_Kcall x_8771)
+| Kwhile (x_8775, x_8774, x_8773) ->
+  h_Kwhile x_8775 x_8774 x_8773
     (cont_rect_Type0 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_6088)
-| Kdowhile (x_6093, x_6092, x_6091) ->
-  h_Kdowhile x_6093 x_6092 x_6091
+      h_Kswitch h_Kcall x_8773)
+| Kdowhile (x_8778, x_8777, x_8776) ->
+  h_Kdowhile x_8778 x_8777 x_8776
     (cont_rect_Type0 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_6091)
-| Kfor2 (x_6097, x_6096, x_6095, x_6094) ->
-  h_Kfor2 x_6097 x_6096 x_6095 x_6094
+      h_Kswitch h_Kcall x_8776)
+| Kfor2 (x_8782, x_8781, x_8780, x_8779) ->
+  h_Kfor2 x_8782 x_8781 x_8780 x_8779
     (cont_rect_Type0 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_6094)
-| Kfor3 (x_6101, x_6100, x_6099, x_6098) ->
-  h_Kfor3 x_6101 x_6100 x_6099 x_6098
+      h_Kswitch h_Kcall x_8779)
+| Kfor3 (x_8786, x_8785, x_8784, x_8783) ->
+  h_Kfor3 x_8786 x_8785 x_8784 x_8783
     (cont_rect_Type0 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_6098)
-| Kswitch x_6102 ->
-  h_Kswitch x_6102
+      h_Kswitch h_Kcall x_8783)
+| Kswitch x_8787 ->
+  h_Kswitch x_8787
     (cont_rect_Type0 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_6102)
-| Kcall (x_6106, x_6105, x_6104, x_6103) ->
-  h_Kcall x_6106 x_6105 x_6104 x_6103
+      h_Kswitch h_Kcall x_8787)
+| Kcall (x_8791, x_8790, x_8789, x_8788) ->
+  h_Kcall x_8791 x_8790 x_8789 x_8788
     (cont_rect_Type0 h_Kstop h_Kseq h_Kwhile h_Kdowhile h_Kfor2 h_Kfor3
-      h_Kswitch h_Kcall x_6103)
+      h_Kswitch h_Kcall x_8788)
 
 (** val cont_inv_rect_Type4 :
@@ -1069 +1073 @@
 type state0 =
 | State of Csyntax.function0 * Csyntax.statement * cont * env * GenMem.mem1
-| Callstate of Csyntax.clight_fundef * Values.val0 List.list * cont
-   * GenMem.mem1
+| Callstate of Values.val0 * Csyntax.clight_fundef * Values.val0 List.list
+   * cont * GenMem.mem1
 | Returnstate of Values.val0 * cont * GenMem.mem1
 | Finalstate of Integers.int
@@ -1076 +1080 @@
 (** val state_rect_Type4 :
     (Csyntax.function0 -> Csyntax.statement -> cont -> env -> GenMem.mem1 ->
-    'a1) -> (Csyntax.clight_fundef -> Values.val0 List.list -> cont ->
-    GenMem.mem1 -> 'a1) -> (Values.val0 -> cont -> GenMem.mem1 -> 'a1) ->
-    (Integers.int -> 'a1) -> state0 -> 'a1 **)
+    'a1) -> (Values.val0 -> Csyntax.clight_fundef -> Values.val0 List.list ->
+    cont -> GenMem.mem1 -> 'a1) -> (Values.val0 -> cont -> GenMem.mem1 ->
+    'a1) -> (Integers.int -> 'a1) -> state0 -> 'a1 **)
 let rec state_rect_Type4 h_State h_Callstate h_Returnstate h_Finalstate = function
 | State (f, s, k, e1, m) -> h_State f s k e1 m
-| Callstate (fd, args, k, m) -> h_Callstate fd args k m
+| Callstate (fb, fd, args, k, m) -> h_Callstate fb fd args k m
 | Returnstate (res1, k, m) -> h_Returnstate res1 k m
 | Finalstate r -> h_Finalstate r
@@ -1087 +1091 @@
 (** val state_rect_Type5 :
     (Csyntax.function0 -> Csyntax.statement -> cont -> env -> GenMem.mem1 ->
-    'a1) -> (Csyntax.clight_fundef -> Values.val0 List.list -> cont ->
-    GenMem.mem1 -> 'a1) -> (Values.val0 -> cont -> GenMem.mem1 -> 'a1) ->
-    (Integers.int -> 'a1) -> state0 -> 'a1 **)
+    'a1) -> (Values.val0 -> Csyntax.clight_fundef -> Values.val0 List.list ->
+    cont -> GenMem.mem1 -> 'a1) -> (Values.val0 -> cont -> GenMem.mem1 ->
+    'a1) -> (Integers.int -> 'a1) -> state0 -> 'a1 **)
 let rec state_rect_Type5 h_State h_Callstate h_Returnstate h_Finalstate = function
 | State (f, s, k, e1, m) -> h_State f s k e1 m
-| Callstate (fd, args, k, m) -> h_Callstate fd args k m
+| Callstate (fb, fd, args, k, m) -> h_Callstate fb fd args k m
 | Returnstate (res1, k, m) -> h_Returnstate res1 k m
 | Finalstate r -> h_Finalstate r
@@ -1098 +1102 @@
 (** val state_rect_Type3 :
     (Csyntax.function0 -> Csyntax.statement -> cont -> env -> GenMem.mem1 ->
-    'a1) -> (Csyntax.clight_fundef -> Values.val0 List.list -> cont ->
-    GenMem.mem1 -> 'a1) -> (Values.val0 -> cont -> GenMem.mem1 -> 'a1) ->
-    (Integers.int -> 'a1) -> state0 -> 'a1 **)
+    'a1) -> (Values.val0 -> Csyntax.clight_fundef -> Values.val0 List.list ->
+    cont -> GenMem.mem1 -> 'a1) -> (Values.val0 -> cont -> GenMem.mem1 ->
+    'a1) -> (Integers.int -> 'a1) -> state0 -> 'a1 **)
 let rec state_rect_Type3 h_State h_Callstate h_Returnstate h_Finalstate = function
 | State (f, s, k, e1, m) -> h_State f s k e1 m
-| Callstate (fd, args, k, m) -> h_Callstate fd args k m
+| Callstate (fb, fd, args, k, m) -> h_Callstate fb fd args k m
 | Returnstate (res1, k, m) -> h_Returnstate res1 k m
 | Finalstate r -> h_Finalstate r
@@ -1109 +1113 @@
 (** val state_rect_Type2 :
     (Csyntax.function0 -> Csyntax.statement -> cont -> env -> GenMem.mem1 ->
-    'a1) -> (Csyntax.clight_fundef -> Values.val0 List.list -> cont ->
-    GenMem.mem1 -> 'a1) -> (Values.val0 -> cont -> GenMem.mem1 -> 'a1) ->
-    (Integers.int -> 'a1) -> state0 -> 'a1 **)
+    'a1) -> (Values.val0 -> Csyntax.clight_fundef -> Values.val0 List.list ->
+    cont -> GenMem.mem1 -> 'a1) -> (Values.val0 -> cont -> GenMem.mem1 ->
+    'a1) -> (Integers.int -> 'a1) -> state0 -> 'a1 **)
 let rec state_rect_Type2 h_State h_Callstate h_Returnstate h_Finalstate = function
 | State (f, s, k, e1, m) -> h_State f s k e1 m
-| Callstate (fd, args, k, m) -> h_Callstate fd args k m
+| Callstate (fb, fd, args, k, m) -> h_Callstate fb fd args k m
 | Returnstate (res1, k, m) -> h_Returnstate res1 k m
 | Finalstate r -> h_Finalstate r
@@ -1120 +1124 @@
 (** val state_rect_Type1 :
     (Csyntax.function0 -> Csyntax.statement -> cont -> env -> GenMem.mem1 ->
-    'a1) -> (Csyntax.clight_fundef -> Values.val0 List.list -> cont ->
-    GenMem.mem1 -> 'a1) -> (Values.val0 -> cont -> GenMem.mem1 -> 'a1) ->
-    (Integers.int -> 'a1) -> state0 -> 'a1 **)
+    'a1) -> (Values.val0 -> Csyntax.clight_fundef -> Values.val0 List.list ->
+    cont -> GenMem.mem1 -> 'a1) -> (Values.val0 -> cont -> GenMem.mem1 ->
+    'a1) -> (Integers.int -> 'a1) -> state0 -> 'a1 **)
 let rec state_rect_Type1 h_State h_Callstate h_Returnstate h_Finalstate = function
 | State (f, s, k, e1, m) -> h_State f s k e1 m
-| Callstate (fd, args, k, m) -> h_Callstate fd args k m
+| Callstate (fb, fd, args, k, m) -> h_Callstate fb fd args k m
 | Returnstate (res1, k, m) -> h_Returnstate res1 k m
 | Finalstate r -> h_Finalstate r
@@ -1131 +1135 @@
 (** val state_rect_Type0 :
     (Csyntax.function0 -> Csyntax.statement -> cont -> env -> GenMem.mem1 ->
-    'a1) -> (Csyntax.clight_fundef -> Values.val0 List.list -> cont ->
-    GenMem.mem1 -> 'a1) -> (Values.val0 -> cont -> GenMem.mem1 -> 'a1) ->
-    (Integers.int -> 'a1) -> state0 -> 'a1 **)
+    'a1) -> (Values.val0 -> Csyntax.clight_fundef -> Values.val0 List.list ->
+    cont -> GenMem.mem1 -> 'a1) -> (Values.val0 -> cont -> GenMem.mem1 ->
+    'a1) -> (Integers.int -> 'a1) -> state0 -> 'a1 **)
 let rec state_rect_Type0 h_State h_Callstate h_Returnstate h_Finalstate = function
 | State (f, s, k, e1, m) -> h_State f s k e1 m
-| Callstate (fd, args, k, m) -> h_Callstate fd args k m
+| Callstate (fb, fd, args, k, m) -> h_Callstate fb fd args k m
 | Returnstate (res1, k, m) -> h_Returnstate res1 k m
 | Finalstate r -> h_Finalstate r
@@ -1142 +1146 @@
 (** val state_inv_rect_Type4 :
     state0 -> (Csyntax.function0 -> Csyntax.statement -> cont -> env ->
-    GenMem.mem1 -> __ -> 'a1) -> (Csyntax.clight_fundef -> Values.val0
-    List.list -> cont -> GenMem.mem1 -> __ -> 'a1) -> (Values.val0 -> cont ->
-    GenMem.mem1 -> __ -> 'a1) -> (Integers.int -> __ -> 'a1) -> 'a1 **)
+    GenMem.mem1 -> __ -> 'a1) -> (Values.val0 -> Csyntax.clight_fundef ->
+    Values.val0 List.list -> cont -> GenMem.mem1 -> __ -> 'a1) ->
+    (Values.val0 -> cont -> GenMem.mem1 -> __ -> 'a1) -> (Integers.int -> __
+    -> 'a1) -> 'a1 **)
 let state_inv_rect_Type4 hterm h1 h2 h3 h4 =
   let hcut = state_rect_Type4 h1 h2 h3 h4 hterm in hcut __
@@ -1150 +1155 @@
 (** val state_inv_rect_Type3 :
     state0 -> (Csyntax.function0 -> Csyntax.statement -> cont -> env ->
-    GenMem.mem1 -> __ -> 'a1) -> (Csyntax.clight_fundef -> Values.val0
-    List.list -> cont -> GenMem.mem1 -> __ -> 'a1) -> (Values.val0 -> cont ->
-    GenMem.mem1 -> __ -> 'a1) -> (Integers.int -> __ -> 'a1) -> 'a1 **)
+    GenMem.mem1 -> __ -> 'a1) -> (Values.val0 -> Csyntax.clight_fundef ->
+    Values.val0 List.list -> cont -> GenMem.mem1 -> __ -> 'a1) ->
+    (Values.val0 -> cont -> GenMem.mem1 -> __ -> 'a1) -> (Integers.int -> __
+    -> 'a1) -> 'a1 **)
 let state_inv_rect_Type3 hterm h1 h2 h3 h4 =
   let hcut = state_rect_Type3 h1 h2 h3 h4 hterm in hcut __
@@ -1158 +1164 @@
 (** val state_inv_rect_Type2 :
     state0 -> (Csyntax.function0 -> Csyntax.statement -> cont -> env ->
-    GenMem.mem1 -> __ -> 'a1) -> (Csyntax.clight_fundef -> Values.val0
-    List.list -> cont -> GenMem.mem1 -> __ -> 'a1) -> (Values.val0 -> cont ->
-    GenMem.mem1 -> __ -> 'a1) -> (Integers.int -> __ -> 'a1) -> 'a1 **)
+    GenMem.mem1 -> __ -> 'a1) -> (Values.val0 -> Csyntax.clight_fundef ->
+    Values.val0 List.list -> cont -> GenMem.mem1 -> __ -> 'a1) ->
+    (Values.val0 -> cont -> GenMem.mem1 -> __ -> 'a1) -> (Integers.int -> __
+    -> 'a1) -> 'a1 **)
 let state_inv_rect_Type2 hterm h1 h2 h3 h4 =
   let hcut = state_rect_Type2 h1 h2 h3 h4 hterm in hcut __
@@ -1166 +1173 @@
 (** val state_inv_rect_Type1 :
     state0 -> (Csyntax.function0 -> Csyntax.statement -> cont -> env ->
-    GenMem.mem1 -> __ -> 'a1) -> (Csyntax.clight_fundef -> Values.val0
-    List.list -> cont -> GenMem.mem1 -> __ -> 'a1) -> (Values.val0 -> cont ->
-    GenMem.mem1 -> __ -> 'a1) -> (Integers.int -> __ -> 'a1) -> 'a1 **)
+    GenMem.mem1 -> __ -> 'a1) -> (Values.val0 -> Csyntax.clight_fundef ->
+    Values.val0 List.list -> cont -> GenMem.mem1 -> __ -> 'a1) ->
+    (Values.val0 -> cont -> GenMem.mem1 -> __ -> 'a1) -> (Integers.int -> __
+    -> 'a1) -> 'a1 **)
 let state_inv_rect_Type1 hterm h1 h2 h3 h4 =
   let hcut = state_rect_Type1 h1 h2 h3 h4 hterm in hcut __
@@ -1174 +1182 @@
 (** val state_inv_rect_Type0 :
     state0 -> (Csyntax.function0 -> Csyntax.statement -> cont -> env ->
-    GenMem.mem1 -> __ -> 'a1) -> (Csyntax.clight_fundef -> Values.val0
-    List.list -> cont -> GenMem.mem1 -> __ -> 'a1) -> (Values.val0 -> cont ->
-    GenMem.mem1 -> __ -> 'a1) -> (Integers.int -> __ -> 'a1) -> 'a1 **)
+    GenMem.mem1 -> __ -> 'a1) -> (Values.val0 -> Csyntax.clight_fundef ->
+    Values.val0 List.list -> cont -> GenMem.mem1 -> __ -> 'a1) ->
+    (Values.val0 -> cont -> GenMem.mem1 -> __ -> 'a1) -> (Integers.int -> __
+    -> 'a1) -> 'a1 **)
 let state_inv_rect_Type0 hterm h1 h2 h3 h4 =
   let hcut = state_rect_Type0 h1 h2 h3 h4 hterm in hcut __
@@ -1186 +1195 @@
      | State (a0, a1, a2, a3, a4) ->
        Obj.m