working on new testmethods (memref-operands)

git-svn-id: branches/tg74/avx512-0037785@47600 -

tests/utils/avx/asmtestgenerator.pas

@@ -94,7 +94,7 @@ type
     destructor Destroy; override;
 
     class procedure CalcTestData(aX64, aAVX512, aSAE: boolean; const aInst, aOp1, aOp2, aOp3, aOp4: String; aSL: TStringList);
-    class procedure CalcTestDataMREF(aX64, aAVX512, aSAE: boolean; const aInst, aOp1, aOp2, aOp3, aOp4: String; aSL: TStringList);
+    class procedure CalcTestDataMREF(aX64, aAVX512, aSAE: boolean; const aInst, aOp1, aOp2, aOp3, aOp4: String; aSL: TStringList; var aLocalVarDataTyp: string);
 
     class procedure CalcTestInstFile;
 
@@ -2943,9 +2943,8 @@ begin
 end;
 
 class procedure TAsmTestGenerator.CalcTestDataMREF(aX64, aAVX512, aSAE: boolean; const aInst, aOp1, aOp2, aOp3,
-  aOp4: String;  aSL: TStringList);
+  aOp4: String;  aSL: TStringList; var aLocalVarDataTyp: string);
 var
-  sDataTyp: string;	
   sl: TStringList;
 begin
   with TAsmTestGenerator.Create do
@@ -2954,7 +2953,7 @@ begin
     FAVX512 := aAVX512;
     FSAE    := aSAE;
 
-    sl := InternalCalcTestDataMREF(aInst, aOp1, aOp2, aOp3, aOp4, sDataTyp);
+    sl := InternalCalcTestDataMREF(aInst, aOp1, aOp2, aOp3, aOp4, aLocalVarDataTyp);
     try
       aSL.AddStrings(sl);
     finally

tests/utils/avx/avxopcodes.pas

@@ -3260,6 +3260,7 @@ var
   i: integer;
   sData: string;
   sDestFile: string;
+  sLocalVarDataTyp: string;
   sl: TStringList;
   slAsm: TStringList;
   LastOpCode: String;
@@ -3316,8 +3317,13 @@ begin
 	    begin
               if aMREF then
 	      begin	      
- 	        TAsmTestGenerator.CalcTestDataMREF(aX64, aAVX512 and (sl[3] = '1'), aSAE, sl[0], sl[4], sl[5], sl[6], sl[7], slAsm);
+ 	        TAsmTestGenerator.CalcTestDataMREF(aX64, aAVX512 and (sl[3] = '1'), aSAE, sl[0], sl[4], sl[5], sl[6], sl[7], slAsm, sLocalVarDataTyp);
 		sDestFile := 'MREF_' + sDestFile;
+                
+		if trim(sLocalVarDataTyp) = '' then
+		 sLocalVarDataTyp := 'byte';
+ 
+                aHeaderList.Text :=  StringReplace(aHeaderList.Text, '$$$LOCALVARDATATYP$$$', sLocalVarDataTyp, [rfReplaceAll]);
 	      end
    	      else TAsmTestGenerator.CalcTestData(aX64, aAVX512 and (sl[3] = '1'), aSAE, sl[0], sl[4], sl[5], sl[6], sl[7], slAsm);
 	    end;	    
@@ -3383,7 +3389,9 @@ begin
 
                   slHeader.Add('Program $$$OPCODE$$$;');
                   slHeader.Add('{$asmmode intel}');
-                  slHeader.Add(' procedure 1;');
+                  slHeader.Add(' procedure dummyproc;');
+		  slHeader.Add(' var');
+		  slHeader.Add('    v1: $$$LOCALVARDATATYP$$$;');
                   slHeader.Add(' begin');
                   slHeader.Add('   asm');
                   for i := 1 to 10 do