@@ -149,18 +149,18 @@ let wordsOfNoArgInstr, isNoArgInstr =
149149let t =
150150lazy
151151( let t = HashMultiMap( 300 , HashIdentity.Structural)
152- noArgInstrs|> Lazy.force|> List.iter( fun ( x , mk ) -> t.Add( mk, x)) ;
152+ noArgInstrs|> Lazy.force|> List.iter( fun ( x , mk ) -> t.Add( mk, x)) ;
153153 t)
154- ( fun s -> ( Lazy.force t).[ s]),
154+ ( fun s -> ( Lazy.force t).[ s]),
155155( fun s -> ( Lazy.force t) .ContainsKey s)
156156#endif
157157
158158// --------------------------------------------------------------------
159159// Instructions are preceded by prefixes, e.g. ".tail" etc.
160160// --------------------------------------------------------------------
161161
162- let mk_stind ( nm , dt ) = ( nm, ( fun () -> I_ stind( Aligned, Nonvolatile, dt)))
163- let mk_ldind ( nm , dt ) = ( nm, ( fun () -> I_ ldind( Aligned, Nonvolatile, dt)))
162+ let mk_stind ( nm , dt ) = ( nm, ( fun () -> I_ stind( Aligned, Nonvolatile, dt)))
163+ let mk_ldind ( nm , dt ) = ( nm, ( fun () -> I_ ldind( Aligned, Nonvolatile, dt)))
164164
165165// --------------------------------------------------------------------
166166// Parsing only... Tables of different types of instructions.
@@ -192,7 +192,7 @@ type LazyInstrTable<'T> = Lazy<InstrTable<'T>>
192192// --------------------------------------------------------------------
193193
194194let NoArgInstrs =
195- lazy ((( noArgInstrs|> Lazy.force|> List.map( fun ( nm , i ) -> ( nm,( fun () -> i)))) @
195+ lazy ((( noArgInstrs|> Lazy.force|> List.map( fun ( nm , i ) -> ( nm, ( fun () -> i)))) @
196196[ ( mk_ stind([ " stind" ; " u" ], DT_ I));
197197( mk_ stind([ " stind" ; " i" ], DT_ I));
198198( mk_ stind([ " stind" ; " u1" ], DT_ I1)); (* ILX EQUIVALENT*)
@@ -218,8 +218,8 @@ let NoArgInstrs =
218218( mk_ ldind([ " ldind" ; " r4" ], DT_ R4));
219219( mk_ ldind([ " ldind" ; " r8" ], DT_ R8));
220220( mk_ ldind([ " ldind" ; " ref" ], DT_ REF));
221- ([ " cpblk" ], ( fun () -> I_ cpblk( Aligned, Nonvolatile)));
222- ([ " initblk" ], ( fun () -> I_ initblk( Aligned, Nonvolatile)));
221+ ([ " cpblk" ], ( fun () -> I_ cpblk( Aligned, Nonvolatile)));
222+ ([ " initblk" ], ( fun () -> I_ initblk( Aligned, Nonvolatile)));
223223]
224224) : NoArgInstr InstrTable);;
225225
@@ -231,14 +231,14 @@ let Int32Instrs =
231231([ " ldc" ; " i4" ; " s" ], ( fun x -> (( mkLdcInt32 x)))); ] : Int32Instr InstrTable)
232232
233233let Int32Int32Instrs =
234- lazy ([ ([ " ldlen" ; " multi" ], ( fun ( x , y ) -> EI_ ldlen_ multi( x, y))); ] : Int32Int32Instr InstrTable)
234+ lazy ([ ([ " ldlen" ; " multi" ], ( fun ( x , y ) -> EI_ ldlen_ multi( x, y))); ] : Int32Int32Instr InstrTable)
235235
236236let DoubleInstrs =
237237lazy ([ ([ " ldc" ; " r4" ], ( fun x -> ( AI_ ldc( DT_ R4, x))));
238238([ " ldc" ; " r8" ], ( fun x -> ( AI_ ldc( DT_ R8, x)))); ] : DoubleInstr InstrTable)
239239
240240let MethodSpecInstrs =
241- lazy ([ ( ([ " call" ], ( fun ( mspec , y ) -> I_ call( Normalcall, mspec, y)))) ] : InstrTable< MethodSpecInstr>)
241+ lazy ([ ( ([ " call" ], ( fun ( mspec , y ) -> I_ call( Normalcall, mspec, y)))) ] : InstrTable< MethodSpecInstr>)
242242
243243let StringInstrs =
244244lazy ([ ([ " ldstr" ], ( fun x -> I_ ldstr x)); ] : InstrTable< StringInstr>)
@@ -248,27 +248,27 @@ let TokenInstrs =
248248
249249
250250let TypeInstrs =
251- lazy ([ ([ " ldelema" ], ( fun x -> I_ ldelema( NormalAddress, false , ILArrayShape.SingleDimensional, x)));
252- ([ " ldelem" ; " any" ], ( fun x -> I_ ldelem_ any( ILArrayShape.SingleDimensional, x)));
251+ lazy ([ ([ " ldelema" ], ( fun x -> I_ ldelema( NormalAddress, false , ILArrayShape.SingleDimensional, x)));
252+ ([ " ldelem" ; " any" ], ( fun x -> I_ ldelem_ any( ILArrayShape.SingleDimensional, x)));
253253([ " stelem" ; " any" ], ( fun x -> I_ stelem_ any( ILArrayShape.SingleDimensional, x)));
254- ([ " newarr" ], ( fun x -> I_ newarr( ILArrayShape.SingleDimensional, x)));
254+ ([ " newarr" ], ( fun x -> I_ newarr( ILArrayShape.SingleDimensional, x)));
255255([ " castclass" ], ( fun x -> I_ castclass x));
256256([ " ilzero" ], ( fun x -> EI_ ilzero x));
257257([ " isinst" ], ( fun x -> I_ isinst x));
258258([ " initobj" ; " any" ], ( fun x -> I_ initobj x));
259259([ " unbox" ; " any" ], ( fun x -> I_ unbox_ any x)); ] : InstrTable< TypeInstr>)
260260
261261let IntTypeInstrs =
262- lazy ([ ([ " ldelem" ; " multi" ], ( fun ( x , y ) -> ( I_ ldelem_ any( ILArrayShape.FromRank x, y))));
263- ([ " stelem" ; " multi" ], ( fun ( x , y ) -> ( I_ stelem_ any( ILArrayShape.FromRank x, y))));
264- ([ " newarr" ; " multi" ], ( fun ( x , y ) -> ( I_ newarr( ILArrayShape.FromRank x, y))));
265- ([ " ldelema" ; " multi" ], ( fun ( x , y ) -> ( I_ ldelema( NormalAddress, false , ILArrayShape.FromRank x, y)))); ] : InstrTable< IntTypeInstr>)
262+ lazy ([ ([ " ldelem" ; " multi" ], ( fun ( x , y ) -> ( I_ ldelem_ any( ILArrayShape.FromRank x, y))));
263+ ([ " stelem" ; " multi" ], ( fun ( x , y ) -> ( I_ stelem_ any( ILArrayShape.FromRank x, y))));
264+ ([ " newarr" ; " multi" ], ( fun ( x , y ) -> ( I_ newarr( ILArrayShape.FromRank x, y))));
265+ ([ " ldelema" ; " multi" ], ( fun ( x , y ) -> ( I_ ldelema( NormalAddress, false , ILArrayShape.FromRank x, y)))); ] : InstrTable< IntTypeInstr>)
266266
267267let ValueTypeInstrs =
268268lazy ([ ([ " cpobj" ], ( fun x -> I_ cpobj x));
269269([ " initobj" ], ( fun x -> I_ initobj x));
270- ([ " ldobj" ], ( fun z -> I_ ldobj( Aligned, Nonvolatile, z)));
271- ([ " stobj" ], ( fun z -> I_ stobj( Aligned, Nonvolatile, z)));
270+ ([ " ldobj" ], ( fun z -> I_ ldobj( Aligned, Nonvolatile, z)));
271+ ([ " stobj" ], ( fun z -> I_ stobj( Aligned, Nonvolatile, z)));
272272([ " sizeof" ], ( fun x -> I_ sizeof x));
273273([ " box" ], ( fun x -> I_ box x));
274274([ " unbox" ], ( fun x -> I_ unbox x)); ] : InstrTable< ValueTypeInstr>)