* unified settings for CPU "size"

git-svn-id: trunk@46757 -

tests/test/cg/tcalcla1.pp

@@ -24,7 +24,7 @@ program tcalcla1;
 {$mode objfpc}
 {$R+}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
  const
  { should be defined depending on CPU target }

tests/test/cg/tcalcst1.pp

@@ -28,7 +28,7 @@ program tcalcst1;
   {$define tp}
 {$endif}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
  { REAL should map to single or double }
  { so it is not checked, since single  }

tests/test/cg/tcalcst2.pp

@@ -28,7 +28,7 @@ program tcalcst2;
   {$define tp}
 {$endif}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
  { REAL should map to single or double }
  { so it is not checked, since single  }

tests/test/cg/tcalcst3.pp

@@ -28,7 +28,7 @@ program tcalcst3;
   {$define tp}
 {$endif}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
  { REAL should map to single or double }
  { so it is not checked, since single  }

tests/test/cg/tcalcst4.pp

@@ -28,7 +28,7 @@ program tcalcst4;
   {$define tp}
 {$endif}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
  { REAL should map to single or double }
  { so it is not checked, since single  }

tests/test/cg/tcalcst5.pp

@@ -29,7 +29,7 @@ program tcalcst5;
   {$define tp}
 {$endif}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
  { REAL should map to single or double }
  { so it is not checked, since single  }

tests/test/cg/tcalcst6.pp

@@ -34,7 +34,7 @@ program tcalcst6;
   {$define safecall_is_cdecl}
 {$endif}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
  { REAL should map to single or double }
  { so it is not checked, since single  }

tests/test/cg/tcalcst7.pp

@@ -28,7 +28,7 @@ program tcalcst7;
   {$define tp}
 {$endif}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
  { REAL should map to single or double }
  { so it is not checked, since single  }

tests/test/cg/tcalcst8.pp

@@ -28,7 +28,7 @@ program tcalcst8;
   {$define tp}
 {$endif}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
  { REAL should map to single or double }
  { so it is not checked, since single  }

tests/test/cg/tcalfun1.pp

@@ -31,7 +31,7 @@
   {$define tp}
 {$endif}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
   { REAL should map to single or double }
   { so it is not checked, since single  }

tests/test/cg/tcalfun2.pp

@@ -31,7 +31,7 @@
   {$define tp}
 {$endif}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
   { REAL should map to single or double }
   { so it is not checked, since single  }

tests/test/cg/tcalfun3.pp

@@ -31,7 +31,7 @@
   {$define tp}
 {$endif}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
   { REAL should map to single or double }
   { so it is not checked, since single  }

tests/test/cg/tcalfun4.pp

@@ -33,7 +33,7 @@
   {$define tp}
 {$endif}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
   { REAL should map to single or double }
   { so it is not checked, since single  }

tests/test/cg/tcalfun6.pp

@@ -31,7 +31,7 @@
   {$define tp}
 {$endif}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
   { REAL should map to single or double }
   { so it is not checked, since single  }

tests/test/cg/tcalfun7.pp

@@ -31,7 +31,7 @@
   {$define tp}
 {$endif}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
   { REAL should map to single or double }
   { so it is not checked, since single  }

tests/test/cg/tcalfun8.pp

@@ -31,7 +31,7 @@
   {$define tp}
 {$endif}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
 
   { REAL should map to single or double }

tests/test/cg/tcalobj1.pp

@@ -20,7 +20,7 @@
 program tcalobj1;
 {$R+}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
  const
  { should be defined depending on CPU target }

tests/test/cg/tcalobj2.pp

@@ -20,7 +20,7 @@
 program tcalobj2;
 {$R+}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
  const
  { should be defined depending on CPU target }

tests/test/cg/tcalobj3.pp

@@ -20,7 +20,7 @@
 program tcalobj3;
 {$R+}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
  const
  { should be defined depending on CPU target }

tests/test/cg/tcalobj4.pp

@@ -22,7 +22,7 @@
 program tcalobj4;
 {$R+}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
  const
  { should be defined depending on CPU target }

tests/test/cg/tcalobj6.pp

@@ -20,7 +20,7 @@
 program tcalobj6;
 {$R+}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
  const
  { should be defined depending on CPU target }

tests/test/cg/tcalobj7.pp

@@ -20,7 +20,7 @@
 program tcalobj7;
 {$R+}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
  const
  { should be defined depending on CPU target }

tests/test/cg/tcalval1.pp

@@ -30,7 +30,7 @@ program tcalval1;
   {$define tp}
 {$endif}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
  { REAL should map to single or double }
  { so it is not checked, since single  }

tests/test/cg/tcalval2.pp

@@ -28,7 +28,7 @@ program tcalval2;
   {$define tp}
 {$endif}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
  { REAL should map to single or double }
  { so it is not checked, since single  }

tests/test/cg/tcalval3.pp

@@ -30,7 +30,7 @@ program tcalval3;
   {$define tp}
 {$endif}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
  { REAL should map to single or double }
  { so it is not checked, since single  }

tests/test/cg/tcalval4.pp

@@ -30,7 +30,7 @@ program tcalval4;
   {$define tp}
 {$endif}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
  { REAL should map to single or double }
  { so it is not checked, since single  }

tests/test/cg/tcalval5.pp

@@ -32,7 +32,7 @@ program tcalval5;
   {$define tp}
 {$endif}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
  { REAL should map to single or double }
  { so it is not checked, since single  }

tests/test/cg/tcalval7.pp

@@ -30,7 +30,7 @@ program tcalval7;
   {$define tp}
 {$endif}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
  { REAL should map to single or double }
  { so it is not checked, since single  }

tests/test/cg/tcalval8.pp

@@ -30,7 +30,7 @@ program tcalval8;
   {$define tp}
 {$endif}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
  { REAL should map to single or double }
  { so it is not checked, since single  }

tests/test/cg/tcalvar1.pp

@@ -28,7 +28,7 @@ program tcalvar1;
   {$define tp}
 {$endif}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
  { REAL should map to single or double }
  { so it is not checked, since single  }

tests/test/cg/tcalvar2.pp

@@ -28,7 +28,7 @@ program tcalvar2;
   {$define tp}
 {$endif}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
  { REAL should map to single or double }
  { so it is not checked, since single  }

tests/test/cg/tcalvar3.pp

@@ -28,7 +28,7 @@ program tcalvar3;
   {$define tp}
 {$endif}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
  { REAL should map to single or double }
  { so it is not checked, since single  }

tests/test/cg/tcalvar4.pp

@@ -30,7 +30,7 @@ program tcalvar4;
   {$define tp}
 {$endif}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
  { REAL should map to single or double }
  { so it is not checked, since single  }

tests/test/cg/tcalvar5.pp

@@ -32,7 +32,7 @@ program tcalvar5;
   {$define tp}
 {$endif}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
  { REAL should map to single or double }
  { so it is not checked, since single  }

tests/test/cg/tcalvar6.pp

@@ -36,7 +36,7 @@ program tcalvar6;
   {$define safecall_is_cdecl}
 {$endif}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
  { REAL should map to single or double }
  { so it is not checked, since single  }

tests/test/cg/tcalvar7.pp

@@ -30,7 +30,7 @@ program tcalvar7;
   {$define tp}
 {$endif}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
  { REAL should map to single or double }
  { so it is not checked, since single  }

tests/test/cg/tcalvar8.pp

@@ -30,7 +30,7 @@ program tcalvar8;
   {$define tp}
 {$endif}
 
-{$i tcaldefs.inc}
+{$i cpudefs.inc}
 
  { REAL should map to single or double }
  { so it is not checked, since single  }

tests/test/cg/tsubst.pp

@@ -25,17 +25,13 @@ const
  { Should be equal to the maximum offset possible in indirect addressing
    mode with displacement. (CPU SPECIFIC) }
 
-{$ifdef cpu68k}
-  {$define use_small}
-{$endif}
-{$ifdef cpui8086}
-  {$define use_small}
-{$endif}
-{$ifdef use_small}
+{$i cpudefs.inc }
+
+{$ifdef cpusmall}
  MAX_DISP = 32767;
-{$else}
+{$else cpusmall}
  MAX_DISP = 65535;
-{$endif}
+{$endif cpusmall}
 
 { These different alignments are described in the PowerPC ABI
   supplement, they should represent most possible cases.

tests/test/cg/tvec.pp

@@ -39,19 +39,21 @@ const
  min_small_array = 0;
  max_small_array = 255;
 
-{$IFDEF CPU16}
+{$i cpudefs.inc}
+
+{$ifdef cpusmall}
  min_big_neg_array = -770;
  max_big_neg_array = 770;
 
  min_big_array = 0;
  max_big_array = 770;
-{$ELSE CPU16}
+{$else cpusmall}
  min_big_neg_array = -77000;
  max_big_neg_array = 77000;
 
  min_big_array = 0;
  max_big_array = 77000;
-{$ENDIF CPU16}
+{$endif cpusmall}
 
  min_big_odd_array = 0;
  max_big_odd_array = 255;