Browse Source

* Range check fixes to BZHI tests

J. Gareth "Curious Kit" Moreton 2 years ago
parent
commit
735f297f5b

+ 9 - 8
tests/test/cg/tbzhi1.pp

@@ -1,5 +1,6 @@
 { %CPU=i386,x86_64 }
 { %CPU=i386,x86_64 }
 { %OPT=-O3 -CpCOREAVX2 -OpCOREAVX2 }
 { %OPT=-O3 -CpCOREAVX2 -OpCOREAVX2 }
+{$R-}
 
 
 program tbzhi1;
 program tbzhi1;
 
 
@@ -9,7 +10,7 @@ begin
 end;
 end;
 
 
 const
 const
-  Inputs:  array[0..3] of LongInt = (0, $FFFFFFFF, $12345678, $87654321);
+  Inputs:  array[0..3] of LongInt = (0, LongInt($FFFFFFFF), $12345678, LongInt($87654321));
   Expected: array[0..3] of array[0..31] of LongInt =
   Expected: array[0..3] of array[0..31] of LongInt =
     (
     (
       ($00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000),
       ($00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000),
@@ -26,13 +27,13 @@ begin
   for Y := Low(Inputs) to High(Inputs) do
   for Y := Low(Inputs) to High(Inputs) do
     for X := 0 to 31 do
     for X := 0 to 31 do
       begin
       begin
-	    Output := MaskOut(Inputs[Y], X);
-		if Output <> Expected[Y][X] then
-		  begin
-		    WriteLn('FAIL: $', HexStr(Inputs[Y], 8), ' and ((1 shl ', X, ') - 1) returned $', HexStr(Output, 8), '; expected $', HexStr(Expected[Y][X], 8));
-		    Halt(1);
-		  end;
-	  end;
+        Output := MaskOut(Inputs[Y], X);
+        if Output <> Expected[Y][X] then
+          begin
+            WriteLn('FAIL: $', HexStr(Inputs[Y], 8), ' and ((1 shl ', X, ') - 1) returned $', HexStr(Output, 8), '; expected $', HexStr(Expected[Y][X], 8));
+            Halt(1);
+          end;
+      end;
 
 
   WriteLn('ok');
   WriteLn('ok');
 end.
 end.

+ 9 - 8
tests/test/cg/tbzhi1a.pp

@@ -1,5 +1,6 @@
 { %CPU=i386,x86_64 }
 { %CPU=i386,x86_64 }
 { %OPT=-O3 -CpCOREAVX2 -OpCOREAVX2 }
 { %OPT=-O3 -CpCOREAVX2 -OpCOREAVX2 }
+{$R-}
 
 
 program tbzhi1a;
 program tbzhi1a;
 
 
@@ -9,7 +10,7 @@ begin
 end;
 end;
 
 
 const
 const
-  Inputs:  array[0..3] of LongInt = (0, $FFFFFFFF, $12345678, $87654321);
+  Inputs:  array[0..3] of LongInt = (0, LongInt($FFFFFFFF), $12345678, LongInt($87654321));
   Expected: array[0..3] of array[0..31] of LongInt =
   Expected: array[0..3] of array[0..31] of LongInt =
     (
     (
       ($00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000),
       ($00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000),
@@ -26,13 +27,13 @@ begin
   for Y := Low(Inputs) to High(Inputs) do
   for Y := Low(Inputs) to High(Inputs) do
     for X := 0 to 31 do
     for X := 0 to 31 do
       begin
       begin
-	    Output := MaskOut(Inputs[Y], X);
-		if Output <> Expected[Y][X] then
-		  begin
-		    WriteLn('FAIL: $', HexStr(Inputs[Y], 8), ' and ((1 shl ', X, ') - 1) returned $', HexStr(Output, 8), '; expected $', HexStr(Expected[Y][X], 8));
-		    Halt(1);
-		  end;
-	  end;
+        Output := MaskOut(Inputs[Y], X);
+        if Output <> Expected[Y][X] then
+          begin
+            WriteLn('FAIL: $', HexStr(Inputs[Y], 8), ' and ((1 shl ', X, ') - 1) returned $', HexStr(Output, 8), '; expected $', HexStr(Expected[Y][X], 8));
+            Halt(1);
+          end;
+      end;
 
 
   WriteLn('ok');
   WriteLn('ok');
 end.
 end.

+ 9 - 8
tests/test/cg/tbzhi1b.pp

@@ -1,5 +1,6 @@
 { %CPU=i386,x86_64 }
 { %CPU=i386,x86_64 }
 { %OPT=-O3 -CpCOREAVX2 -OpCOREAVX2 }
 { %OPT=-O3 -CpCOREAVX2 -OpCOREAVX2 }
+{$R-}
 
 
 program tbzhi1b;
 program tbzhi1b;
 
 
@@ -9,7 +10,7 @@ begin
 end;
 end;
 
 
 const
 const
-  Inputs:  array[0..3] of LongInt = (0, $FFFFFFFF, $12345678, $87654321);
+  Inputs:  array[0..3] of LongInt = (0, LongInt($FFFFFFFF), $12345678, LongInt($87654321));
   Expected: array[0..3] of array[0..31] of LongInt =
   Expected: array[0..3] of array[0..31] of LongInt =
     (
     (
       ($00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000),
       ($00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000),
@@ -26,13 +27,13 @@ begin
   for Y := Low(Inputs) to High(Inputs) do
   for Y := Low(Inputs) to High(Inputs) do
     for X := 0 to 31 do
     for X := 0 to 31 do
       begin
       begin
-	    Output := MaskOut(Inputs[Y], X);
-		if Output <> Expected[Y][X] then
-		  begin
-		    WriteLn('FAIL: $', HexStr(Inputs[Y], 8), ' and ((1 shl ', X, ') - 1) returned $', HexStr(Output, 8), '; expected $', HexStr(Expected[Y][X], 8));
-		    Halt(1);
-		  end;
-	  end;
+        Output := MaskOut(Inputs[Y], X);
+        if Output <> Expected[Y][X] then
+          begin
+            WriteLn('FAIL: $', HexStr(Inputs[Y], 8), ' and ((1 shl ', X, ') - 1) returned $', HexStr(Output, 8), '; expected $', HexStr(Expected[Y][X], 8));
+            Halt(1);
+          end;
+      end;
 
 
   WriteLn('ok');
   WriteLn('ok');
 end.
 end.

+ 10 - 9
tests/test/cg/tbzhi1c.pp

@@ -1,5 +1,6 @@
 { %CPU=i386,x86_64 }
 { %CPU=i386,x86_64 }
 { %OPT=-O3 -CpCOREAVX2 -OpCOREAVX2 }
 { %OPT=-O3 -CpCOREAVX2 -OpCOREAVX2 }
+{$R-}
 
 
 program tbzhi1c;
 program tbzhi1c;
 
 
@@ -9,7 +10,7 @@ begin
 end;
 end;
 
 
 const
 const
-  Inputs:  array[0..3] of LongInt = (0, $FFFFFFFF, $12345678, $87654321);
+  Inputs:  array[0..3] of LongInt = (0, LongInt($FFFFFFFF), $12345678, LongInt($87654321));
   Expected: array[0..3] of array[0..31] of LongInt =
   Expected: array[0..3] of array[0..31] of LongInt =
     (
     (
       ($00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000),
       ($00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000),
@@ -26,14 +27,14 @@ begin
   for Y := Low(Inputs) to High(Inputs) do
   for Y := Low(Inputs) to High(Inputs) do
     for X := 0 to 31 do
     for X := 0 to 31 do
       begin
       begin
-	    Output := Inputs[Y];
-		MaskOut(Output, X);
-		if Output <> Expected[Y][X] then
-		  begin
-		    WriteLn('FAIL: $', HexStr(Inputs[Y], 8), ' and ((1 shl ', X, ') - 1) returned $', HexStr(Output, 8), '; expected $', HexStr(Expected[Y][X], 8));
-		    Halt(1);
-		  end;
-	  end;
+        Output := Inputs[Y];
+        MaskOut(Output, X);
+        if Output <> Expected[Y][X] then
+          begin
+            WriteLn('FAIL: $', HexStr(Inputs[Y], 8), ' and ((1 shl ', X, ') - 1) returned $', HexStr(Output, 8), '; expected $', HexStr(Expected[Y][X], 8));
+            Halt(1);
+          end;
+      end;
 
 
   WriteLn('ok');
   WriteLn('ok');
 end.
 end.

+ 10 - 9
tests/test/cg/tbzhi1d.pp

@@ -1,5 +1,6 @@
 { %CPU=i386,x86_64 }
 { %CPU=i386,x86_64 }
 { %OPT=-O3 -CpCOREAVX2 -OpCOREAVX2 }
 { %OPT=-O3 -CpCOREAVX2 -OpCOREAVX2 }
+{$R-}
 
 
 program tbzhi1c;
 program tbzhi1c;
 
 
@@ -9,7 +10,7 @@ begin
 end;
 end;
 
 
 const
 const
-  Inputs:  array[0..3] of LongInt = (0, $FFFFFFFF, $12345678, $87654321);
+  Inputs:  array[0..3] of LongInt = (0, LongInt($FFFFFFFF), $12345678, LongInt($87654321));
   Expected: array[0..3] of array[0..31] of LongInt =
   Expected: array[0..3] of array[0..31] of LongInt =
     (
     (
       ($00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000),
       ($00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000),
@@ -26,14 +27,14 @@ begin
   for Y := Low(Inputs) to High(Inputs) do
   for Y := Low(Inputs) to High(Inputs) do
     for X := 0 to 31 do
     for X := 0 to 31 do
       begin
       begin
-	    Output := Inputs[Y];
-		MaskOut(Output, X);
-		if Output <> Expected[Y][X] then
-		  begin
-		    WriteLn('FAIL: $', HexStr(Inputs[Y], 8), ' and ((1 shl ', X, ') - 1) returned $', HexStr(Output, 8), '; expected $', HexStr(Expected[Y][X], 8));
-		    Halt(1);
-		  end;
-	  end;
+        Output := Inputs[Y];
+        MaskOut(Output, X);
+        if Output <> Expected[Y][X] then
+          begin
+            WriteLn('FAIL: $', HexStr(Inputs[Y], 8), ' and ((1 shl ', X, ') - 1) returned $', HexStr(Output, 8), '; expected $', HexStr(Expected[Y][X], 8));
+            Halt(1);
+          end;
+      end;
 
 
   WriteLn('ok');
   WriteLn('ok');
 end.
 end.

+ 9 - 8
tests/test/cg/tbzhi1e.pp

@@ -1,5 +1,6 @@
 { %CPU=i386,x86_64 }
 { %CPU=i386,x86_64 }
 { %OPT=-O3 -CpCOREAVX2 -OpCOREAVX2 }
 { %OPT=-O3 -CpCOREAVX2 -OpCOREAVX2 }
+{$R-}
 
 
 program tbzhi1e;
 program tbzhi1e;
 
 
@@ -9,7 +10,7 @@ begin
 end;
 end;
 
 
 const
 const
-  Inputs:  array[0..3] of LongInt = (0, $FFFFFFFF, $12345678, $87654321);
+  Inputs:  array[0..3] of LongInt = (0, LongInt($FFFFFFFF), $12345678, LongInt($87654321));
   Expected: array[0..3] of array[0..31] of LongInt =
   Expected: array[0..3] of array[0..31] of LongInt =
     (
     (
       ($00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000),
       ($00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000),
@@ -26,13 +27,13 @@ begin
   for Y := Low(Inputs) to High(Inputs) do
   for Y := Low(Inputs) to High(Inputs) do
     for X := 0 to 31 do
     for X := 0 to 31 do
       begin
       begin
-	    Output := MaskOut(Inputs[Y], X);
-		if Output <> Expected[Y][X] then
-		  begin
-		    WriteLn('FAIL: $', HexStr(Inputs[Y], 8), ' and ((1 shl ', X, ') - 1) returned $', HexStr(Output, 8), '; expected $', HexStr(Expected[Y][X], 8));
-		    Halt(1);
-		  end;
-	  end;
+        Output := MaskOut(Inputs[Y], X);
+        if Output <> Expected[Y][X] then
+          begin
+            WriteLn('FAIL: $', HexStr(Inputs[Y], 8), ' and ((1 shl ', X, ') - 1) returned $', HexStr(Output, 8), '; expected $', HexStr(Expected[Y][X], 8));
+            Halt(1);
+          end;
+      end;
 
 
   WriteLn('ok');
   WriteLn('ok');
 end.
 end.

+ 9 - 8
tests/test/cg/tbzhi1f.pp

@@ -1,5 +1,6 @@
 { %CPU=i386,x86_64 }
 { %CPU=i386,x86_64 }
 { %OPT=-O3 -CpCOREAVX2 -OpCOREAVX2 }
 { %OPT=-O3 -CpCOREAVX2 -OpCOREAVX2 }
+{$R-}
 
 
 program tbzhi1f;
 program tbzhi1f;
 
 
@@ -9,7 +10,7 @@ begin
 end;
 end;
 
 
 const
 const
-  Inputs:  array[0..3] of LongInt = (0, $FFFFFFFF, $12345678, $87654321);
+  Inputs:  array[0..3] of LongInt = (0, LongInt($FFFFFFFF), $12345678, LongInt($87654321));
   Expected: array[0..3] of array[0..31] of LongInt =
   Expected: array[0..3] of array[0..31] of LongInt =
     (
     (
       ($00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000),
       ($00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000),
@@ -26,13 +27,13 @@ begin
   for Y := Low(Inputs) to High(Inputs) do
   for Y := Low(Inputs) to High(Inputs) do
     for X := 0 to 31 do
     for X := 0 to 31 do
       begin
       begin
-	    Output := MaskOut(Inputs[Y], X);
-		if Output <> Expected[Y][X] then
-		  begin
-		    WriteLn('FAIL: $', HexStr(Inputs[Y], 8), ' and ((1 shl ', X, ') - 1) returned $', HexStr(Output, 8), '; expected $', HexStr(Expected[Y][X], 8));
-		    Halt(1);
-		  end;
-	  end;
+        Output := MaskOut(Inputs[Y], X);
+        if Output <> Expected[Y][X] then
+          begin
+            WriteLn('FAIL: $', HexStr(Inputs[Y], 8), ' and ((1 shl ', X, ') - 1) returned $', HexStr(Output, 8), '; expected $', HexStr(Expected[Y][X], 8));
+            Halt(1);
+          end;
+      end;
 
 
   WriteLn('ok');
   WriteLn('ok');
 end.
 end.

+ 10 - 9
tests/test/cg/tbzhi1g.pp

@@ -1,5 +1,6 @@
 { %CPU=i386,x86_64 }
 { %CPU=i386,x86_64 }
 { %OPT=-O3 -CpCOREAVX2 -OpCOREAVX2 }
 { %OPT=-O3 -CpCOREAVX2 -OpCOREAVX2 }
+{$R-}
 
 
 program tbzhi1g;
 program tbzhi1g;
 
 
@@ -9,7 +10,7 @@ begin
 end;
 end;
 
 
 const
 const
-  Inputs:  array[0..3] of LongInt = (0, $FFFFFFFF, $12345678, $87654321);
+  Inputs:  array[0..3] of LongInt = (0, LongInt($FFFFFFFF), $12345678, LongInt($87654321));
   Expected: array[0..3] of array[0..31] of LongInt =
   Expected: array[0..3] of array[0..31] of LongInt =
     (
     (
       ($00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000),
       ($00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000, $00000000),
@@ -26,14 +27,14 @@ begin
   for Y := Low(Inputs) to High(Inputs) do
   for Y := Low(Inputs) to High(Inputs) do
     for X := 0 to 31 do
     for X := 0 to 31 do
       begin
       begin
-	    Output := Inputs[Y];
-		MaskOut(Output, X);
-		if Output <> Expected[Y][X] then
-		  begin
-		    WriteLn('FAIL: $', HexStr(Inputs[Y], 8), ' and ((1 shl ', X, ') - 1) returned $', HexStr(Output, 8), '; expected $', HexStr(Expected[Y][X], 8));
-		    Halt(1);
-		  end;
-	  end;
+        Output := Inputs[Y];
+        MaskOut(Output, X);
+        if Output <> Expected[Y][X] then
+          begin
+            WriteLn('FAIL: $', HexStr(Inputs[Y], 8), ' and ((1 shl ', X, ') - 1) returned $', HexStr(Output, 8), '; expected $', HexStr(Expected[Y][X], 8));
+            Halt(1);
+          end;
+      end;
 
 
   WriteLn('ok');
   WriteLn('ok');
 end.
 end.

+ 2 - 1
tests/test/cg/tbzhi2.pp

@@ -1,5 +1,6 @@
 { %CPU=i386,x86_64 }
 { %CPU=i386,x86_64 }
 { %OPT=-O3 -CpCOREAVX2 -OpCOREAVX2 }
 { %OPT=-O3 -CpCOREAVX2 -OpCOREAVX2 }
+{$R-}
 
 
 program tbzhi2;
 program tbzhi2;
 
 
@@ -9,7 +10,7 @@ begin
 end;
 end;
 
 
 const
 const
-  Inputs:  array[0..3] of Int64 = (0, $FFFFFFFFFFFFFFFF, $0123456789ABCDEF, $FEDCBA9876543210);
+  Inputs:  array[0..3] of Int64 = (0, Int64($FFFFFFFFFFFFFFFF), $0123456789ABCDEF, Int64($FEDCBA9876543210));
   Expected: array[0..3] of array[0..63] of Int64 =
   Expected: array[0..3] of array[0..63] of Int64 =
     (
     (
       ($0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000),
       ($0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000),

+ 2 - 1
tests/test/cg/tbzhi2a.pp

@@ -1,5 +1,6 @@
 { %CPU=i386,x86_64 }
 { %CPU=i386,x86_64 }
 { %OPT=-O3 -CpCOREAVX2 -OpCOREAVX2 }
 { %OPT=-O3 -CpCOREAVX2 -OpCOREAVX2 }
+{$R-}
 
 
 program tbzhi2a;
 program tbzhi2a;
 
 
@@ -9,7 +10,7 @@ begin
 end;
 end;
 
 
 const
 const
-  Inputs:  array[0..3] of Int64 = (0, $FFFFFFFFFFFFFFFF, $0123456789ABCDEF, $FEDCBA9876543210);
+  Inputs:  array[0..3] of Int64 = (0, Int64($FFFFFFFFFFFFFFFF), $0123456789ABCDEF, Int64($FEDCBA9876543210));
   Expected: array[0..3] of array[0..63] of Int64 =
   Expected: array[0..3] of array[0..63] of Int64 =
     (
     (
       ($0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000),
       ($0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000),

+ 2 - 1
tests/test/cg/tbzhi2b.pp

@@ -1,5 +1,6 @@
 { %CPU=i386,x86_64 }
 { %CPU=i386,x86_64 }
 { %OPT=-O3 -CpCOREAVX2 -OpCOREAVX2 }
 { %OPT=-O3 -CpCOREAVX2 -OpCOREAVX2 }
+{$R-}
 
 
 program tbzhi2b;
 program tbzhi2b;
 
 
@@ -9,7 +10,7 @@ begin
 end;
 end;
 
 
 const
 const
-  Inputs:  array[0..3] of Int64 = (0, $FFFFFFFFFFFFFFFF, $0123456789ABCDEF, $FEDCBA9876543210);
+  Inputs:  array[0..3] of Int64 = (0, Int64($FFFFFFFFFFFFFFFF), $0123456789ABCDEF, Int64($FEDCBA9876543210));
   Expected: array[0..3] of array[0..63] of Int64 =
   Expected: array[0..3] of array[0..63] of Int64 =
     (
     (
       ($0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000),
       ($0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000),

+ 2 - 1
tests/test/cg/tbzhi2c.pp

@@ -1,5 +1,6 @@
 { %CPU=i386,x86_64 }
 { %CPU=i386,x86_64 }
 { %OPT=-O3 -CpCOREAVX2 -OpCOREAVX2 }
 { %OPT=-O3 -CpCOREAVX2 -OpCOREAVX2 }
+{$R-}
 
 
 program tbzhi2d;
 program tbzhi2d;
 
 
@@ -9,7 +10,7 @@ begin
 end;
 end;
 
 
 const
 const
-  Inputs:  array[0..3] of Int64 = (0, $FFFFFFFFFFFFFFFF, $0123456789ABCDEF, $FEDCBA9876543210);
+  Inputs:  array[0..3] of Int64 = (0, Int64($FFFFFFFFFFFFFFFF), $0123456789ABCDEF, Int64($FEDCBA9876543210));
   Expected: array[0..3] of array[0..63] of Int64 =
   Expected: array[0..3] of array[0..63] of Int64 =
     (
     (
       ($0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000),
       ($0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000),

+ 2 - 1
tests/test/cg/tbzhi2d.pp

@@ -1,5 +1,6 @@
 { %CPU=i386,x86_64 }
 { %CPU=i386,x86_64 }
 { %OPT=-O3 -CpCOREAVX2 -OpCOREAVX2 }
 { %OPT=-O3 -CpCOREAVX2 -OpCOREAVX2 }
+{$R-}
 
 
 program tbzhi2d;
 program tbzhi2d;
 
 
@@ -9,7 +10,7 @@ begin
 end;
 end;
 
 
 const
 const
-  Inputs:  array[0..3] of Int64 = (0, $FFFFFFFFFFFFFFFF, $0123456789ABCDEF, $FEDCBA9876543210);
+  Inputs:  array[0..3] of Int64 = (0, Int64($FFFFFFFFFFFFFFFF), $0123456789ABCDEF, Int64($FEDCBA9876543210));
   Expected: array[0..3] of array[0..63] of Int64 =
   Expected: array[0..3] of array[0..63] of Int64 =
     (
     (
       ($0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000),
       ($0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000, $0000000000000000),