Do not (unnecessarily) require preprocessing for fixed 32/64 bit regression tests

tautschnig · tautschnig · commit 9b809beeeb22 · 2018-07-07T06:38:11.000+01:00
This is not portable as some architectures might not provide header
files for non-native bit widths. Preprocessing/the use of header files
is not essential for any of these regression tests.
diff --git a/.travis.yml b/.travis.yml
@@ -101,7 +101,6 @@ jobs:
             - g++-5
             - libubsan0
             - parallel
-            - libc6-dev-i386
       before_install:
         - mkdir bin
         - ln -s /usr/bin/gcc-5 bin/gcc
@@ -136,7 +135,6 @@ jobs:
             - libwww-perl
             - g++-5
             - libubsan0
-            - libc6-dev-i386
       before_install:
         - mkdir bin
         - ln -s /usr/bin/gcc-5 bin/gcc
@@ -165,7 +163,6 @@ jobs:
             - libstdc++-5-dev
             - libubsan0
             - parallel
-            - libc6-dev-i386
       before_install:
         - mkdir bin
         - ln -s /usr/bin/gcc-5 bin/gcc
@@ -194,7 +191,6 @@ jobs:
             - g++-5
             - libstdc++-5-dev
             - libubsan0
-            - libc6-dev-i386
       before_install:
         - mkdir bin
         - ln -s /usr/bin/gcc-5 bin/gcc
@@ -220,7 +216,6 @@ jobs:
             - ubuntu-toolchain-r-test
           packages:
             - g++-5
-            - libc6-dev-i386
       before_install:
         - mkdir bin
         - ln -s /usr/bin/gcc-5 bin/gcc
@@ -245,7 +240,6 @@ jobs:
             - ubuntu-toolchain-r-test
           packages:
             - g++-7
-            - libc6-dev-i386
       before_install:
         - mkdir bin
         - ln -s /usr/bin/gcc-7 bin/gcc
@@ -276,7 +270,6 @@ jobs:
             - libstdc++-5-dev
             - libubsan0
             - parallel
-            - libc6-dev-i386
       before_install:
         - mkdir bin
         # Use gcc/g++ 5 for tests, as Clang doesn't work yet
diff --git a/regression/cbmc/Float24/main.i b/regression/cbmc/Float24/main.i
diff --git a/regression/cbmc/Float24/test.desc b/regression/cbmc/Float24/test.desc
@@ -1,5 +1,5 @@
 CORE
-main.c
+main.i
 --win32 --xml-ui
 ^EXIT=10$
 ^SIGNAL=0$
diff --git a/regression/cbmc/Malloc15/main.i b/regression/cbmc/Malloc15/main.i
diff --git a/regression/cbmc/Malloc15/test.desc b/regression/cbmc/Malloc15/test.desc
@@ -1,5 +1,5 @@
 CORE
-main.c
+main.i
 --32
 ^EXIT=0$
 ^SIGNAL=0$
diff --git a/regression/cbmc/Malloc16/main.i b/regression/cbmc/Malloc16/main.i
diff --git a/regression/cbmc/Malloc16/test.desc b/regression/cbmc/Malloc16/test.desc
@@ -1,5 +1,5 @@
 CORE
-main.c
+main.i
 --32
 ^EXIT=0$
 ^SIGNAL=0$
diff --git a/regression/cbmc/Pointer_Arithmetic12/main.i b/regression/cbmc/Pointer_Arithmetic12/main.i
@@ -1,6 +1,4 @@
-#include <stdint.h>
-
-#include <assert.h>
+typedef unsigned int uint32_t;
 
 uint32_t __stack[32];
 
@@ -98,35 +96,25 @@ int main()
   L_0x401_0: esp-=0x14;
   L_0x404_0: var15=ebp;
   L_0x404_1: var15-=0x4;
-#ifdef NONDET
-  L_0x404_2: *(uint32_t*)(var15)=nondet_uint();
-#else
   L_0x404_2: *(uint32_t*)(var15)=0xffffffff;
-#endif
   L_0x40b_0: var16=ebp;
   L_0x40b_1: var16-=0x4;
   L_0x40b_2: eax=*(uint32_t*)(var16);
   L_0x40e_0: *(uint32_t*)(esp)=eax;
   L_0x411_0: esp-=4; f__L_0x3c6_0(); esp+=4;
-#if 1
              uint32_t eax1=eax;
   C_0x3ff_0: ebp=esp;
   C_0x401_0: esp-=0x14;
   C_0x404_0: var15=ebp;
   C_0x404_1: var15-=0x4;
-#ifdef NONDET
-  C_0x404_2: *(uint32_t*)(var15)=nondet_uint();
-#else
   C_0x404_2: *(uint32_t*)(var15)=0xffffffff;
-#endif
   C_0x40b_0: var16=ebp;
   C_0x40b_1: var16-=0x4;
   C_0x40b_2: eax=*(uint32_t*)(var16);
   C_0x40e_0: *(uint32_t*)(esp)=eax;
   C_0x411_0: esp-=4; f__L_0x3c6_0(); esp+=4;
              uint32_t eax2=eax;
-             assert(eax2==eax1);
-#endif
+             __CPROVER_assert(eax2 == eax1, "");
   L_0x416_0: esp=ebp;
   L_0x416_1: ebp=*(uint32_t*)(esp);
   L_0x416_2: esp+=0x4;
diff --git a/regression/cbmc/Pointer_Arithmetic12/test.desc b/regression/cbmc/Pointer_Arithmetic12/test.desc
@@ -1,5 +1,5 @@
 CORE
-main.c
+main.i
 --32 --little-endian
 ^EXIT=0$
 ^SIGNAL=0$
diff --git a/regression/cbmc/Pointer_array4/main.i b/regression/cbmc/Pointer_array4/main.i
@@ -1,5 +1,3 @@
-#include <assert.h>
-
 int main()
 {
   int arrayOfIntegers[] = {1, 2, 3};
@@ -8,6 +6,6 @@ int main()
   int iFirst=(int)pointer2FirstElem;
   int iThird=(int)pointer2ThirdElem;
   int addrDiff = iThird-iFirst;
-  assert(addrDiff == 2* sizeof(int));
+  __CPROVER_assert(addrDiff == 2* sizeof(int), "");
   return 0;
 }
diff --git a/regression/cbmc/Pointer_array4/test.desc b/regression/cbmc/Pointer_array4/test.desc
@@ -1,5 +1,5 @@
 CORE
-main.c
+main.i
 --32
 ^EXIT=0$
 ^SIGNAL=0$
diff --git a/regression/cbmc/Pointer_byte_extract5/main.i b/regression/cbmc/Pointer_byte_extract5/main.i
@@ -6,19 +6,14 @@ typedef union
   int b;
 } Union;
 
-#ifdef __GNUC__
-typedef struct
-{
-  int Count;
-  Union List[1];
-} __attribute__((packed)) Struct3;
-#else
+#pragma pack(push)
+#pragma pack(1)
 typedef struct
 {
   int Count;
   Union List[1];
 } Struct3;
-#endif
+#pragma pack(pop)
 
 int main()
 {
diff --git a/regression/cbmc/Pointer_byte_extract5/no-simplify.desc b/regression/cbmc/Pointer_byte_extract5/no-simplify.desc
@@ -1,5 +1,5 @@
 CORE
-main.c
+main.i
 --bounds-check --32 --no-simplify
 ^EXIT=10$
 ^SIGNAL=0$
diff --git a/regression/cbmc/Pointer_byte_extract5/test.desc b/regression/cbmc/Pointer_byte_extract5/test.desc
@@ -1,5 +1,5 @@
 CORE
-main.c
+main.i
 --bounds-check --32
 ^EXIT=10$
 ^SIGNAL=0$
diff --git a/regression/cbmc/Pointer_byte_extract8/main.i b/regression/cbmc/Pointer_byte_extract8/main.i
diff --git a/regression/cbmc/Pointer_byte_extract8/test.desc b/regression/cbmc/Pointer_byte_extract8/test.desc
@@ -1,5 +1,5 @@
 KNOWNBUG
-main.c
+main.i
 --bounds-check --32 --no-simplify
 ^EXIT=0$
 ^SIGNAL=0$
diff --git a/regression/cbmc/Struct_Padding1/main.i b/regression/cbmc/Struct_Padding1/main.i
@@ -1,8 +1,3 @@
-#include <assert.h>
-
-#define STATIC_ASSERT(condition) \
-  int some_array##__LINE__[(condition) ? 1 : -1]
-
 struct my_struct1
 {
   int i;
@@ -40,22 +35,22 @@ struct my_struct3 {
    int i;
 } xx3= { 1, 2 };
 
-STATIC_ASSERT(sizeof(xx1)==4+1+3+4+4);
-STATIC_ASSERT(sizeof(xx2)==4+4+4+4);
+int some_array1[(sizeof(xx1)==4+1+3+4+4) ? 1 : -1];
+int some_array2[(sizeof(xx2)==4+4+4+4) ? 1 : -1];
 
 int main()
 {
-  assert(xx1.i==1);
-  assert(xx1.ch==2);
-  assert(xx1.j==3);
+  __CPROVER_assert(xx1.i==1, "");
+  __CPROVER_assert(xx1.ch==2, "");
+  __CPROVER_assert(xx1.j==3, "");
 
   // let's probe the padding
   char *p=&xx1.ch;
-  assert(p[0]==2);
-  assert(p[1]==0);
-  assert(p[2]==0);
-  assert(p[3]==0);
+  __CPROVER_assert(p[0]==2, "");
+  __CPROVER_assert(p[1]==0, "");
+  __CPROVER_assert(p[2]==0, "");
+  __CPROVER_assert(p[3]==0, "");
 
-  assert(xx3.bit_field==1);
-  assert(xx3.i==2);
+  __CPROVER_assert(xx3.bit_field==1, "");
+  __CPROVER_assert(xx3.i==2, "");
 }
diff --git a/regression/cbmc/Struct_Padding1/test.desc b/regression/cbmc/Struct_Padding1/test.desc
@@ -1,5 +1,5 @@
 CORE
-main.c
+main.i
 --32
 ^EXIT=0$
 ^SIGNAL=0$
diff --git a/regression/cbmc/Visual_Studio_Types1/main.i b/regression/cbmc/Visual_Studio_Types1/main.i
@@ -1,7 +1,7 @@
 int main()
 {
   // these types are Visual Studio-specific
-  #ifdef _MSC_VER
+  /* #ifdef _MSC_VER */
   __int8 i1;
   __int16 i2;
   __int32 i3;
@@ -11,7 +11,7 @@ int main()
   assert(sizeof(i2)==2);
   assert(sizeof(i3)==4);
   assert(sizeof(i4)==8);
-  #endif
+  /* #endif */
 
   // general types
 
@@ -28,7 +28,7 @@ int main()
   assert(sizeof(ll)==8);
 
   // these constants are Visual Studio-specific
-  #ifdef _MSC_VER
+  /* #ifdef _MSC_VER */
   assert(sizeof(1i8)==1);
   assert(sizeof(1i16)==2);
   assert(sizeof(1i32)==4);
@@ -42,7 +42,7 @@ int main()
   // requires --i386-win32 to work
   assert(sizeof(p32)==4);
   //assert(sizeof(p64)==8);
-  #endif
+  /* #endif */
 
   assert(sizeof(void *)==4);
 }
diff --git a/regression/cbmc/Visual_Studio_Types1/test.desc b/regression/cbmc/Visual_Studio_Types1/test.desc
@@ -1,5 +1,5 @@
 CORE
-main.c
+main.i
 --i386-win32
 ^EXIT=0$
 ^SIGNAL=0$
diff --git a/regression/cbmc/Visual_Studio_Types2/main.i b/regression/cbmc/Visual_Studio_Types2/main.i
@@ -12,14 +12,14 @@ int main()
   assert(sizeof(ll)==8);
 
   // oh, and these pointer qualifiers are MS-specific
-  #ifdef _MSC_VER
+  /* #ifdef _MSC_VER */
   int * __ptr32 p32;
   int * __ptr64 p64;
 
   // requires --winx64 to work
   assert(sizeof(p32)==4);
   assert(sizeof(p64)==8);
-  #endif
+  /* #endif */
 
   assert(sizeof(void *)==8);
 }
diff --git a/regression/cbmc/Visual_Studio_Types2/test.desc b/regression/cbmc/Visual_Studio_Types2/test.desc
@@ -1,5 +1,5 @@
 CORE
-main.c
+main.i
 --winx64
 ^EXIT=0$
 ^SIGNAL=0$
diff --git a/regression/cbmc/address_space_size_limit2/test.desc b/regression/cbmc/address_space_size_limit2/test.desc
@@ -1,5 +1,5 @@
 KNOWNBUG
-test.c
+test.i
 --32 --object-bits 31 --unwind 11 --no-simplify
 dynamic object too large
 --
diff --git a/regression/cbmc/address_space_size_limit2/test.i b/regression/cbmc/address_space_size_limit2/test.i
@@ -1,11 +1,9 @@
-#include <assert.h>
-
 void *malloc(__CPROVER_size_t);
 
 int main(int argc, char** argv)
 {
   char* c=(char*)malloc(10);
   char* d=c;
   for(char i=0; i<10; i++, d++);
-  assert((size_t)d==(size_t)c+10);
+  __CPROVER_assert((__CPROVER_size_t)d == (__CPROVER_size_t)c + 10, "");
 }
diff --git a/regression/cbmc/address_space_size_limit3/main.i b/regression/cbmc/address_space_size_limit3/main.i
@@ -1,8 +1,6 @@
 // copy of Pointer_Arithmetic12
 
-#include <stdint.h>
-
-#include <assert.h>
+typedef unsigned int uint32_t;
 
 uint32_t __stack[32];
 
@@ -100,35 +98,25 @@ int main()
   L_0x401_0: esp-=0x14;
   L_0x404_0: var15=ebp;
   L_0x404_1: var15-=0x4;
-#ifdef NONDET
-  L_0x404_2: *(uint32_t*)(var15)=nondet_uint();
-#else
   L_0x404_2: *(uint32_t*)(var15)=0xffffffff;
-#endif
   L_0x40b_0: var16=ebp;
   L_0x40b_1: var16-=0x4;
   L_0x40b_2: eax=*(uint32_t*)(var16);
   L_0x40e_0: *(uint32_t*)(esp)=eax;
   L_0x411_0: esp-=4; f__L_0x3c6_0(); esp+=4;
-#if 1
              uint32_t eax1=eax;
   C_0x3ff_0: ebp=esp;
   C_0x401_0: esp-=0x14;
   C_0x404_0: var15=ebp;
   C_0x404_1: var15-=0x4;
-#ifdef NONDET
-  C_0x404_2: *(uint32_t*)(var15)=nondet_uint();
-#else
   C_0x404_2: *(uint32_t*)(var15)=0xffffffff;
-#endif
   C_0x40b_0: var16=ebp;
   C_0x40b_1: var16-=0x4;
   C_0x40b_2: eax=*(uint32_t*)(var16);
   C_0x40e_0: *(uint32_t*)(esp)=eax;
   C_0x411_0: esp-=4; f__L_0x3c6_0(); esp+=4;
              uint32_t eax2=eax;
-             assert(eax2==eax1);
-#endif
+             __CPROVER_assert(eax2 == eax1, "");
   L_0x416_0: esp=ebp;
   L_0x416_1: ebp=*(uint32_t*)(esp);
   L_0x416_2: esp+=0x4;
diff --git a/regression/cbmc/address_space_size_limit3/test.desc b/regression/cbmc/address_space_size_limit3/test.desc
@@ -1,5 +1,5 @@
 CORE
-main.c
+main.i
 --32 --little-endian --object-bits 25 --pointer-check
 ^EXIT=10$
 ^SIGNAL=0$

-Original file line number
+Diff line change
@@ @@ -1,5 +1,5 @@ @@
 CORE
 -main.c
 +main.i
 --32
 ^EXIT=0$
 ^SIGNAL=0$
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-#include <assert.h>`
`2`		`-`
`3`	`1`	`int main()`
`4`	`2`	`{`
`5`	`3`	`int arrayOfIntegers[] = {1, 2, 3};`
`@@ -8,6 +6,6 @@ int main()`
`8`	`6`	`int iFirst=(int)pointer2FirstElem;`
`9`	`7`	`int iThird=(int)pointer2ThirdElem;`
`10`	`8`	`int addrDiff = iThird-iFirst;`
`11`		`- assert(addrDiff == 2* sizeof(int));`
	`9`	`+ __CPROVER_assert(addrDiff == 2* sizeof(int), "");`
`12`	`10`	`return 0;`
`13`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,9 @@`
`1`		`-#include <assert.h>`
`2`		`-`
`3`	`1`	`void *malloc(__CPROVER_size_t);`
`4`	`2`
`5`	`3`	`int main(int argc, char** argv)`
`6`	`4`	`{`
`7`	`5`	`char* c=(char*)malloc(10);`
`8`	`6`	`char* d=c;`
`9`	`7`	`for(char i=0; i<10; i++, d++);`
`10`		`- assert((size_t)d==(size_t)c+10);`
	`8`	`+ __CPROVER_assert((__CPROVER_size_t)d == (__CPROVER_size_t)c + 10, "");`
`11`	`9`	`}`