Merge pull request #852 from smowton/smowton/merge/master_2017_04_20

Merge master 2017/04/20

Author: peterschrammel

.gitignore

@@ -31,8 +31,6 @@ src/ansi-c/gcc_builtin_headers_ia32-2.inc
 src/ansi-c/gcc_builtin_headers_ia32.inc
 src/ansi-c/gcc_builtin_headers_mips.inc
 src/ansi-c/gcc_builtin_headers_power.inc
-src/util/irep_ids.h
-src/util/irep_ids.inc
 
 # regression/test files
 *.out

CODING_STANDARD

@@ -92,6 +92,35 @@ Header files:
   of the header file rather than in line
 - Guard headers with #ifndef CPROVER_DIRECTORIES_FILE_H, etc
 
+Make files
+- Each source file should appear on a separate line
+- The final source file should still be followed by a trailing slash
+- The last line should be a comment to not be deleted, i.e. should look like:
+```
+SRC = source_file.cpp \
+      source_file2.cpp \
+      # Empty last line
+```
+- This ensures the Makefiles can be easily merged.
+
+Program Command Line Options
+- Each program contains a program_name_parse_optionst class which should
+  contain a define PROGRAM_NAME_PARSE_OPTIONS which is a string of all the
+  parse options in brackets (with a colon after the bracket if it takes a
+  parameter)
+- Each parameter should be one per line to yield easy merging
+- If parameters are shared between programs, they should be pulled out into
+  a common file and then included using a define
+- The defines should be OPT_FLAG_NAMES which should go into the OPTIONS define
+- The defines should include HELP_FLAG_NAMES which should contain the help
+  output of the format:
+  ```
+  " --flag                explanations\n" \
+  " --another flag        more explanation\n" \
+   <-------30 chars------>
+- The defines may include PARSE_OPTIONS_FLAG_NAMES which move the options
+  from the command line into the options
+
 C++ features:
 - Do not use namespaces.
 - Prefer use of 'typedef' insted of 'using'.
@@ -143,3 +172,13 @@ Output:
 - Use '\n' instead of std::endl
 
 You are allowed to break rules if you have a good reason to do so.
+
+Pre-commit hook to run cpplint locally
+--------------------------------------
+To install the hook
+cp .githooks/pre-commit .git/hooks/pre-commit
+or use a symbolic link.
+Then, when running git commit, you should get the linter output
+(if any) before being prompted to enter a commit message.
+To bypass the check (e.g. if there was a false positive),
+add the option --no-verify.

README.md

@@ -1,4 +1,4 @@
-[![Build Status][build_img]][travis]
+[![Build Status][travis_img]][travis] [![Build Status][appveyor_img]][appveyor]
 
 [CProver Wiki](http://www.cprover.org/wiki)
 
@@ -19,5 +19,7 @@ License
 =======
 4-clause BSD license, see `LICENSE` file.
 
-[build_img]: https://travis-ci.org/diffblue/cbmc.svg?branch=master
 [travis]: https://travis-ci.org/diffblue/cbmc
+[travis_img]: https://travis-ci.org/diffblue/cbmc.svg?branch=master
+[appveyor]: https://ci.appveyor.com/project/diffblue/cbmc/
+[appveyor_img]: https://ci.appveyor.com/api/projects/status/github/diffblue/cbmc?svg=true&branch=master

appveyor.yml

@@ -0,0 +1,110 @@
+version: 1.0.{build}
+image: Visual Studio 2013
+clone_depth: 50
+environment:
+  BUILD_ENV: MSVC
+  PATH: C:\projects\cbmc\deps\bin;%PATH%
+  INCLUDE: C:\projects\cbmc\deps\include
+install:
+- ps: |
+    #check if dependencies were copied from cache, if not, download them.
+    if (!(Test-Path deps)) {
+    md deps
+    }
+    cd deps
+    if (!(Test-Path bin\bison.exe)) {
+    & appveyor DownloadFile "https://storage.googleapis.com/diffblue-mirror/appveyor-deps/bison-2.4.1-bin.zip?GoogleAccessId=diffbluemaster@diffblue-cr.iam.gserviceaccount.com&Expires=1519839050&Signature=JAPFzNPMJDI4IViAVlJAEc6l8aHB3k17NpZRdoWDMLbALaJNX88vfwocuezU1tfhyrSJxfo2fTK4rgP5OULkikJs7MBZI9ovp2V%2BMT6yg87KDdH9EIOlMgltGfbP%2BoZkwBY7kXb3W5puSlt4OTE%2Bw7CRlHF9MNqFXVBqVBfa%2BGw0gXDe5Jd9qV%2BvUXZzRuBl9ERSQkSD%2B%2B%2BxFo24FZoOeYkgBHJz03%2BHuIMnlmcLgneTB2aiZZU3%2B6UTPceUxLus9%2Bksb5UbqEVaVE06TIXl76VKwqAgXM2LWaNyeJDog%2BT%2BhjW4v4ypxh6mIBo5KRNXVLPc1MxSPFQB3ITlIXv9Zg%3D%3D"
+    & 7z x bison-2.4.1-bin.zip
+    }
+    if (!(Test-Path bin\flex.exe)) {
+    & appveyor DownloadFile "https://storage.googleapis.com/diffblue-mirror/appveyor-deps/flex-2.5.4a-1-bin.zip?GoogleAccessId=diffbluemaster@diffblue-cr.iam.gserviceaccount.com&Expires=1519839050&Signature=WriP8S047Mmq271ZHWL0MCPGx1gEFsuc%2BKMmChoXhXFRkn0GlIgCxZEiOu52ke9fT1kAvycWXePNBFAyCHjpF%2BJkXCwisQ6FLIf3NL%2F92849YgQKdJkDUOcZ%2Bh82XVTwNBrljKIkExkak7QEyhOf3buTC1oeuatCUV5Ez42RZjgtRiJaqcFW6xLbhfuVONr39KxH5hGx%2FDUi2RRXPbgoKDwavc9s56NP1rNbWMTE6NdNHzJeaf43E%2BSMemlVO%2BhhIY6W0f%2FtaQ7fYF%2F6YaqxdQ0sB8W5DnG4Hb%2F0CyQlrTZpGDXGr301rV0M4WBkYLmfauq4IyJsBaR095tXGW%2BzmA%3D%3D"
+    & 7z x flex-2.5.4a-1-bin.zip
+    }
+    if (!(Test-Path include\FlexLexer.h)) {
+    & appveyor DownloadFile "https://storage.googleapis.com/diffblue-mirror/appveyor-deps/flex-2.5.4a-1-lib.zip?GoogleAccessId=diffbluemaster@diffblue-cr.iam.gserviceaccount.com&Expires=1519839050&Signature=H%2FLeKGv2QqKAGDTP%2F6TYPhDzuL6K%2F5dFOt61HfYBm1vUWVUNmAYVGvUAcvnUqBnhEHwZgtc8vZt1H7k3W8azxCUc7l6ZhlCDbqQ6Mg2VhfpBaQMbL1V%2BjSq5ePpWcuLMBntKk2br38PF1NtiAwCCpRTRPptaYPeGs%2BOjAH%2BN8aIIxjvj45QAgt9mcg6dfBsyfj5fdJmpHRQFuJ7%2FnsG50fmN5JDvdvmBWloB6rjxVWaN4XO6VTWZFZ34JWFyOqgWNEw9aDN3HdsSuJ0Uz19AbdwZBIWe5Elrl71rRJjn1lijCknDB7D4sAmP33k71e%2BB0qvsNl1Shuh9FkY8Z6y05Q%3D%3D"
+    & 7z x flex-2.5.4a-1-lib.zip
+    }
+    if (!(Test-Path bin\iconv.exe)) {
+    & appveyor DownloadFile "https://storage.googleapis.com/diffblue-mirror/appveyor-deps/libiconv-1.9.2-1-bin.zip?GoogleAccessId=diffbluemaster@diffblue-cr.iam.gserviceaccount.com&Expires=1519839050&Signature=sS3Y2lC1oWOhBDsL8C9ASuO4LOM%2BpB%2F8PwG5w5CdB9JnPfLqhb3FnA1zkkZJoSNuIYS3DM6CN2qxoWjpJbLEtVQe0PpxziQZjLpJw2MpxXdJiJHRDu8x9THgzwuZ3ze5BWHzPoCBQPdRkKzVPezf1HwptUsm3Y9c2jlWljQjhc8NVsI4iPmjEOwT8E%2BYpR5fsLs2GsRjuoyqKa%2Bi4JJ6MbpXVX1IgR4fzp1Li9SnE39ujHDb%2FyI3c96eCdVm1Oa6jNxzSJNfq%2FgOZM8BIxlR55a%2BtM3oBQhU0voEtDOABwuO7ZBay8dLt%2FG5vz1%2Bi%2FIlRLFxQfICaprPLzw6pXRm8Q%3D%3D"
+    & 7z x libiconv-1.9.2-1-bin.zip
+    }
+    if (!(Test-Path bin\libintl3.dll)) {
+    & appveyor DownloadFile "https://storage.googleapis.com/diffblue-mirror/appveyor-deps/libintl-0.14.4-bin.zip?GoogleAccessId=diffbluemaster@diffblue-cr.iam.gserviceaccount.com&Expires=1519839050&Signature=lJViGr6bl%2F4i%2B6nIfeYChreq%2FKfgid9QqGSq7Ie%2FMG%2Fmr9nPyPUA%2BLtT7jn1ogunTzQLZP%2FNxVFcYqyd8gyuT%2Bn2MF80Ds4Whw4cRYnXPb2LZg4%2FiEqZV6wgBMIQfq5v2l3lAsglISVErOik%2BQAHec5gZe2%2BKaVjRnJnhPRziZkQyzF9Xdf2xsPi28hBaX4RQx8XqSLcY1kQpY13PDBZDi9lmdKHf0pBKu%2F0WXspmRAU02HtleMk6Zeg5vEDFcwoe8C3fb4vwtpwGwN9TX5ddaq56yUVn70zh%2BH2KgKIsRl26avnrCpeWF9M5lLck0ngaqFX84w%2BgxmZu40IVU%2Ff0A%3D%3D"
+    & 7z x libintl-0.14.4-bin.zip
+    }
+    if (!(Test-Path bin\make.exe)) {
+    & appveyor DownloadFile "https://storage.googleapis.com/diffblue-mirror/appveyor-deps/make-3.81-bin.zip?GoogleAccessId=diffbluemaster@diffblue-cr.iam.gserviceaccount.com&Expires=1519839050&Signature=PRC97AWzJ2ZAyjEK4p7eCbA3RAEr8sTf8TUK5zoMBcrXPUHWYjnCwXRMnIxUUufBYjsAx8t1XnOQdlTuAPJYpcha%2FFJRlcxMmfQjNbpNEQFJuqEpA5c%2FGhFYxSD3a26vjpgReUW5MuQXeLeNh7PziLB0GP0sdRHN%2B1eDiHeCJWYNMYhrEY9BAkf5rXeRQWr1ZG0Hzq%2FxZEHceypx8xyaT%2BFzREYQOyKjGdre1QXtI%2FXo4ImA1xWt%2F8TnlGcAnCEaTltxuSRVB%2F7s1ShMr9KoagCb%2BjBWq6BgbcNGxyzyOZfi2Sjjo39mhudF9DNbKbkczes9Kp3ySgXmrXSWjIG4Iw%3D%3D"
+    & 7z x make-3.81-bin.zip
+    }
+    if (!(Test-Path bin\regex2.dll)) {
+    & appveyor DownloadFile "https://storage.googleapis.com/diffblue-mirror/appveyor-deps/regex-2.7-bin.zip?GoogleAccessId=diffbluemaster@diffblue-cr.iam.gserviceaccount.com&Expires=1519839050&Signature=bXRvFV%2Be4Dpm8vzp%2F1bJWwgkERE6WakcPTBN57n9vNh0dr42jDTXv8JF%2BWCmTIb%2Fy4XzxYl0faggt3g6TqTLYn5UDVUBYx%2FMLmNVVNEv%2BaBlDd87UAZGLi6fkEV5oAP4W4FYsqEnKRDfGPOBoL7D7CuW9Kcxy3Moubxdl%2Bmes%2BMI%2FzWJ6BgLD3Oj04GyD42zLCYVtAzkeDAX0UADoh06ExhpTjI4BNnQ%2FhzSlPtPG7mon4q81%2F2tDNskKVJS466eR%2F8XV6H4QT3LoCkh6dxQ9%2B9ZnkWJplundRbiIlpj43vmdvjIChczl4jbAgL6zFj5Gz6u58uvCV%2FbOuyx3Sw1fg%3D%3D"
+    & 7z x regex-2.7-bin.zip
+    }
+    if (!(Test-Path minisat2-2.2.1)) {
+     & appveyor DownloadFile http://ftp.debian.org/debian/pool/main/m/minisat2/minisat2_2.2.1.orig.tar.gz
+     & 7z x minisat2_2.2.1.orig.tar.gz
+     &7z x minisat2_2.2.1.orig.tar
+    }
+    cd ..
+
+cache: deps
+
+build_script:
+- cmd: |
+    cp -r deps/minisat2-2.2.1 minisat-2.2.1
+    patch -d minisat-2.2.1 -p1 < scripts/minisat-2.2.1-patch
+    call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" x64
+    sed -i "s/BUILD_ENV.*/BUILD_ENV = MSVC/" src/config.inc
+    make -C src -j2
+
+test_script:
+- cmd: |
+    cd regression
+    sed -i "s/goto-cc\/goto-cc/goto-cc\/goto-cl/" ansi-c/Makefile
+    sed -i "s/goto-cc\/goto-cc/goto-cc\/goto-cl/" cpp/Makefile
+    sed -i "s/goto-cc\/goto-cc/goto-cc\/goto-cl/" goto-instrument/chain.sh
+    sed -i "15s/.*/$goto_cc $name.c/" goto-instrument/chain.sh
+    sed -i "16i mv $name.exe $name.gb" goto-instrument/chain.sh
+    sed -i "23s/.*/  $goto_cc ${name}-mod.c/" goto-instrument/chain.sh
+    sed -i "24i   mv ${name}-mod.exe $name-mod.gb" goto-instrument/chain.sh
+    cat goto-instrument/chain.sh
+
+    sed -i "s/goto-cc\/goto-cc/goto-cc\/goto-cl/" goto-instrument-typedef/chain.sh || true
+    sed -i "12s/.*/$GC $NAME.c --function fun/" goto-instrument-typedef/chain.sh || true
+    sed -i "13i mv $NAME.exe $NAME.gb" goto-instrument-typedef/chain.sh || true
+    cat goto-instrument-typedef/chain.sh || true
+
+    rem HACK disable failing tests
+    rmdir /s /q ansi-c\Forward_Declaration2
+    rmdir /s /q ansi-c\Incomplete_Type1
+    rmdir /s /q ansi-c\Union_Padding1
+    rmdir /s /q ansi-c\Universal_characters1
+    rmdir /s /q ansi-c\function_return1
+    rmdir /s /q ansi-c\gcc_attributes7
+    rmdir /s /q ansi-c\struct6
+    rmdir /s /q ansi-c\struct7
+    rmdir /s /q cbmc\Malloc23
+    rmdir /s /q cbmc\byte_update2
+    rmdir /s /q cbmc\byte_update3
+    rmdir /s /q cbmc\byte_update4
+    rmdir /s /q cbmc\byte_update5
+    rmdir /s /q cbmc\byte_update6
+    rmdir /s /q cbmc\byte_update7
+    rmdir /s /q cbmc\pipe1
+    rmdir /s /q cbmc\unsigned___int128
+    rmdir /s /q cpp\Decltype1
+    rmdir /s /q cpp\Decltype2
+    rmdir /s /q cpp\Function_Overloading1
+    rmdir /s /q cpp\enum2
+    rmdir /s /q cpp\enum7
+    rmdir /s /q cpp\enum8
+    rmdir /s /q cpp\nullptr1
+    rmdir /s /q cpp\sizeof1
+    rmdir /s /q cpp\static_assert1
+    rmdir /s /q cbmc-java\VarLengthArrayTrace1
+    rmdir /s /q cbmc-java\classpath1
+    rmdir /s /q cbmc-java\jar-file3
+    rmdir /s /q cbmc-java\tableswitch2
+    rmdir /s /q goto-instrument\slice08
+
+    make test

regression/ansi-c/static1/main.c

@@ -0,0 +1,4 @@
+static int fun(int a)
+{
+    return a+1;
+}

regression/ansi-c/static_inline2/test.desc renamed to regression/ansi-c/static1/test.desc

@@ -1,8 +1,7 @@
-KNOWNBUG
+CORE
 main.c
 --function fun
 ^EXIT=0$
 ^SIGNAL=0$
-^VERIFICATION SUCCESSFUL$
 --
 ^warning: ignoring

regression/ansi-c/static2/main.c

@@ -0,0 +1,4 @@
+int foo(int a)
+{
+  return a+1;
+}

regression/ansi-c/static2/main2.c

@@ -0,0 +1,4 @@
+static int foo(int a)
+{
+  return a+1;
+}

regression/ansi-c/static2/test.desc

@@ -0,0 +1,6 @@
+CORE
+main.c
+main2.c --function foo
+^main symbol `foo' is ambiguous$
+--
+^warning: ignoring

regression/ansi-c/static3/main.c

@@ -0,0 +1,4 @@
+static int foo(int a)
+{
+  return a+1;
+}

regression/ansi-c/static3/main2.c

@@ -0,0 +1,4 @@
+static int foo(int a)
+{
+  return a+1;
+}

regression/ansi-c/static3/test.desc

@@ -0,0 +1,6 @@
+CORE
+main.c
+main2.c --function foo
+^main symbol `foo' is ambiguous$
+--
+^warning: ignoring

regression/ansi-c/static_inline1/test.desc

@@ -1,8 +1,7 @@
-KNOWNBUG
+CORE
 main.c
 
 ^EXIT=0$
 ^SIGNAL=0$
-^VERIFICATION SUCCESSFUL$
 --
 ^warning: ignoring

regression/ansi-c/static_inline2/main.c

@@ -0,0 +1,4 @@
+static int foo(int a)
+{
+  return a+1;
+}

regression/cbmc/Static4/main.c

@@ -0,0 +1,7 @@
+CORE
+main.c
+--show-symbol-table
+^EXIT=0$
+^SIGNAL=0$
+--
+^Symbol......: foo

regression/cbmc/Static4/test.desc

@@ -0,0 +1,16 @@
+int fun(int **a)
+{
+  if(!a)
+  {
+    return 0;
+  }
+  if(!*a)
+  {
+    return 1;
+  }
+  if(**a==4)
+  {
+    return 2;
+  }
+  return 3;
+}

regression/cbmc/pointer-function-parameters-2/main.c

@@ -0,0 +1,12 @@
+CORE
+main.c
+--function fun --cover branch
+^\*\* 7 of 7 covered \(100.0%\)$
+^\*\* Used 4 iterations$
+^Test suite:$
+^a=\(\(signed int \*\*\)NULL\), tmp\$1=[^,]*, tmp\$2=[^,]*$
+^a=&tmp\$1!0, tmp\$1=\(\(signed int \*\)NULL\), tmp\$2=[^,]*$
+^a=&tmp\$1!0, tmp\$1=&tmp\$2!0, tmp\$2=([012356789][0-9]*|4[0-9]+)$
+^a=&tmp\$1!0, tmp\$1=&tmp\$2!0, tmp\$2=4$
+--
+^warning: ignoring

regression/cbmc/pointer-function-parameters-2/test.desc

@@ -0,0 +1,12 @@
+int fun(int *a)
+{
+  if(!a)
+  {
+    return 0;
+  }
+  if(*a==4)
+  {
+    return 1;
+  }
+  return 2;
+}

regression/cbmc/pointer-function-parameters/main.c

@@ -0,0 +1,11 @@
+CORE
+main.c
+--function fun --cover branch
+^\*\* 5 of 5 covered \(100\.0%\)$
+^\*\* Used 3 iterations$
+^Test suite:$
+^a=\(\(signed int \*\)NULL\), tmp\$1=[^,]*$
+^a=&tmp\$1!0, tmp\$1=4$
+^a=&tmp\$1!0, tmp\$1=([012356789][0-9]*|4[0-9]+)$
+--
+^warning: ignoring

regression/cbmc/pointer-function-parameters/test.desc

@@ -0,0 +1,6 @@
+int main()
+{
+  unsigned x;
+  x=0u;
+  return 0;
+}

regression/cbmc/unsigned1/main.c

@@ -0,0 +1,8 @@
+CORE
+main.c
+--show-goto-functions
+^EXIT=0$
+^SIGNAL=0$
+--
+00u
+^warning: ignoring

regression/cbmc/unsigned1/test.desc

@@ -1,30 +1,37 @@
 # include <stdint.h>
 
-typedef unsigned __int128 uint128_t; 
+typedef unsigned __int128 uint128_t;
 
 typedef uint64_t limb;
 typedef uint128_t widelimb;
 
 typedef limb felem[4];
 typedef widelimb widefelem[7];
 
-felem p = {0x1FFFFFFFFFFFFFF, 
-           0xFFFFFFFFFFFFFF, 
-           0xFFFFE000000000, 
+felem p = {0x1FFFFFFFFFFFFFF,
+           0xFFFFFFFFFFFFFF,
+           0xFFFFE000000000,
            0x00000000000002};
 
 
 /*-
  * Reduce seven 128-bit coefficients to four 64-bit coefficients.
  * Requires in[i] < 2^126,
  * ensures out[0] < 2^56, out[1] < 2^56, out[2] < 2^56, out[3] <= 2^56 + 2^16 */
-void reduce(felem out, const widefelem in)
+void reduce(
+    limb out0, limb out1, limb out2, limb out3, widelimb in0, widelimb in1,
+    widelimb in2, widelimb in3, widelimb in4, widelimb in5, widelimb in6)
 {
+    felem out = {out0, out1, out2, out3};
+    const widefelem in = {in0, in1, in2, in3, in4, in5, in6};
 
     __CPROVER_assume(in[0]<(widelimb)((widelimb)1<<126));
     __CPROVER_assume(in[1]<((widelimb)1<<126));
     __CPROVER_assume(in[2]<((widelimb)1<<126));
     __CPROVER_assume(in[3]<((widelimb)1<<126));
+    __CPROVER_assume(in[4]<((widelimb)1<<126));
+    __CPROVER_assume(in[5]<((widelimb)1<<126));
+    __CPROVER_assume(in[6]<((widelimb)1<<126));
 
     static const widelimb two127p15 = (((widelimb) 1) << 127) +
         (((widelimb) 1) << 15);
@@ -75,9 +82,9 @@ void reduce(felem out, const widefelem in)
 
     output[2] += output[1] >> 56;
     /* output[2] < 2^57 + 2^72 */
-    
+
     assert(output[2] < (((widelimb)1)<<57)+(((widelimb)1)<<72));
-    
+
     out[1] = output[1] & 0x00ffffffffffffff;
     output[3] += output[2] >> 56;
     /* output[3] <= 2^56 + 2^16 */