Release 1.7.3

Makefile.in

@@ -56,7 +56,7 @@ CILLYDIR	  = lib
 OCAMLBEST = @OCAMLBEST@
 CILLIB_FILES = $(OBJDIR)/src/cil.cma
 ifeq ($(OCAMLBEST),opt)
- CILLIB_FILES  += $(OBJDIR)/src/cil.cmxa
+ CILLIB_FILES  += $(OBJDIR)/src/cil.cmxa $(OBJDIR)/src/cil.a
  EXEMODE        = .native
 else
  EXEMODE        = .byte

README.md

@@ -14,6 +14,10 @@ points-to analyses.
 Quick start
 -----------
 
+Install the latest release of CIL with [opam][]:
+
+    opam install cil
+
 Read the excellent [CIL tutorial][tuto] by Zachary Anderson, and
 check out the accompanying [project template][template].
 
@@ -23,22 +27,25 @@ check out the accompanying [project template][template].
 Installation
 -----------
 
+To build and install CIL, you need the OCaml compiler, perl, and
+[ocamlfind][findlib].  (Of course, you also need some C compiler,
+preferably gcc.)
+
 Run the following commands to build and install CIL:
 
     ./configure
     make
     make test       # regression test suite, optionnal
     make install    # as root or using sudo
 
-If you want to install to some other directory, you can change the
-configure step like this:
-
-    FORCE_PERL_PREFIX=1 ./configure --prefix=/opt/cil
+If you want to install to some other directory, you can tweak the prefix
+during the configure step.  For instance, to install in your local [opam][]
+directory:
 
-You only need the OCaml compiler, perl, and [ocamlfind][findlib] for the
-installation.  (Of course, you also need some C compiler.)
+    FORCE_PERL_PREFIX=1 ./configure --prefix=`opam config var prefix`
 
 [findlib]: http://projects.camlcity.org/projects/findlib.html
+[opam]: http://opam.ocamlpro.com/
 
 Usage
 -----
@@ -57,7 +64,7 @@ instance in the OCaml toplevel using [findlib][]:
     # #require "cil";;
     [...]
     # Cil.cilVersion;;           
-    - : string = "1.7.2"
+    - : string = "1.7.3"
 
 
 More documentation

configure

@@ -2207,7 +2207,7 @@ ac_config_files="$ac_config_files stamp-h"
 # Assign here the CIL version numbers
 CIL_VERSION_MAJOR=1
 CIL_VERSION_MINOR=7
-CIL_VERSION_REV=2
+CIL_VERSION_REV=3
 CIL_VERSION=$CIL_VERSION_MAJOR.$CIL_VERSION_MINOR.$CIL_VERSION_REV
 
 # make sure I haven't forgotten to run autoconf

configure.ac

@@ -33,7 +33,7 @@ AC_PREREQ([2.69])
 # Assign here the CIL version numbers
 CIL_VERSION_MAJOR=1
 CIL_VERSION_MINOR=7
-CIL_VERSION_REV=2
+CIL_VERSION_REV=3
 CIL_VERSION=$CIL_VERSION_MAJOR.$CIL_VERSION_MINOR.$CIL_VERSION_REV
 
 # make sure I haven't forgotten to run autoconf

doc/cil.version.aux

@@ -0,0 +1,22 @@
+\relax 
+\@setckpt{cil.version}{
+\setcounter{page}{1}
+\setcounter{equation}{0}
+\setcounter{enumi}{0}
+\setcounter{enumii}{0}
+\setcounter{enumiii}{0}
+\setcounter{enumiv}{0}
+\setcounter{footnote}{0}
+\setcounter{mpfootnote}{0}
+\setcounter{part}{0}
+\setcounter{section}{0}
+\setcounter{subsection}{0}
+\setcounter{subsubsection}{0}
+\setcounter{paragraph}{0}
+\setcounter{subparagraph}{0}
+\setcounter{figure}{0}
+\setcounter{table}{0}
+\setcounter{cuttingdepth}{0}
+\setcounter{LT@tables}{0}
+\setcounter{LT@chunks}{0}
+}

doc/cil.version.tex

@@ -0,0 +1 @@
+\def\cilversion{1.7.3}

doc/cilcode.tmp/ex1.c

@@ -0,0 +1,6 @@
+int long signed x;
+signed long extern x;
+long static int long y;
+
+// Some code that uses these declaration, so that CIL does not remove them
+int main() { return x + y; }

doc/cilcode.tmp/ex1.cil.c

@@ -0,0 +1,17 @@
+/* Generated by CIL v. 1.7.3 */
+/* print_CIL_Input is true */
+
+#line 1 "cilcode.tmp/ex1.c"
+long x  ;
+#line 3 "cilcode.tmp/ex1.c"
+static long long y  ;
+#line 6 "cilcode.tmp/ex1.c"
+int main(void) 
+{ 
+
+
+  {
+#line 6
+  return ((int )((long long )x + y));
+}
+}

doc/cilcode.tmp/ex1.cil.i

@@ -0,0 +1,17 @@
+# 1 "cilcode.tmp/ex1.cil.c"
+# 1 "<command-line>"
+# 1 "cilcode.tmp/ex1.cil.c"
+# 1 "cilcode.tmp/ex1.c"
+long x ;
+# 3 "cilcode.tmp/ex1.c"
+static long long y ;
+# 6 "cilcode.tmp/ex1.c"
+int main(void)
+{
+
+
+  {
+# 6 "cilcode.tmp/ex1.c"
+  return ((int )((long long )x + y));
+}
+}

doc/cilcode.tmp/ex1.i

@@ -0,0 +1,9 @@
+# 1 "cilcode.tmp/ex1.c"
+# 1 "<command-line>"
+# 1 "cilcode.tmp/ex1.c"
+int long signed x;
+signed long extern x;
+long static int long y;
+
+
+int main() { return x + y; }

doc/cilcode.tmp/ex10.c

@@ -0,0 +1 @@
+char foo[] = "foo plus bar";

doc/cilcode.tmp/ex10.cil.c

@@ -0,0 +1,10 @@
+/* Generated by CIL v. 1.7.3 */
+/* print_CIL_Input is true */
+
+#line 1 "cilcode.tmp/ex10.c"
+char foo[13]  = 
+#line 1 "cilcode.tmp/ex10.c"
+  {      (char )'f',      (char )'o',      (char )'o',      (char )' ', 
+        (char )'p',      (char )'l',      (char )'u',      (char )'s', 
+        (char )' ',      (char )'b',      (char )'a',      (char )'r', 
+        (char )'\000'};

doc/cilcode.tmp/ex10.cil.i

@@ -0,0 +1,10 @@
+# 1 "cilcode.tmp/ex10.cil.c"
+# 1 "<command-line>"
+# 1 "cilcode.tmp/ex10.cil.c"
+# 1 "cilcode.tmp/ex10.c"
+char foo[13] =
+# 1 "cilcode.tmp/ex10.c"
+  { (char )'f', (char )'o', (char )'o', (char )' ',
+        (char )'p', (char )'l', (char )'u', (char )'s',
+        (char )' ', (char )'b', (char )'a', (char )'r',
+        (char )'\000'};

doc/cilcode.tmp/ex10.i

@@ -0,0 +1,4 @@
+# 1 "cilcode.tmp/ex10.c"
+# 1 "<command-line>"
+# 1 "cilcode.tmp/ex10.c"
+char foo[] = "foo plus bar";

doc/cilcode.tmp/ex11.c

@@ -0,0 +1 @@
+char *foo = "foo " " plus " " bar ";

doc/cilcode.tmp/ex11.cil.c

@@ -0,0 +1,5 @@
+/* Generated by CIL v. 1.7.3 */
+/* print_CIL_Input is true */
+
+#line 1 "cilcode.tmp/ex11.c"
+char *foo  =    (char *)"foo  plus  bar ";

doc/cilcode.tmp/ex11.cil.i

@@ -0,0 +1,5 @@
+# 1 "cilcode.tmp/ex11.cil.c"
+# 1 "<command-line>"
+# 1 "cilcode.tmp/ex11.cil.c"
+# 1 "cilcode.tmp/ex11.c"
+char *foo = (char *)"foo  plus  bar ";

doc/cilcode.tmp/ex11.i

@@ -0,0 +1,4 @@
+# 1 "cilcode.tmp/ex11.c"
+# 1 "<command-line>"
+# 1 "cilcode.tmp/ex11.c"
+char *foo = "foo " " plus " " bar ";

doc/cilcode.tmp/ex12.c

@@ -0,0 +1,5 @@
+int main(void) {
+# 1
+  int x = 5; 
+  struct foo { int f1, f2; } a [] = {1, 2, 3, 4, 5 };
+}

doc/cilcode.tmp/ex12.cil.c

@@ -0,0 +1,33 @@
+/* Generated by CIL v. 1.7.3 */
+/* print_CIL_Input is true */
+
+#line 2 "cilcode.tmp/ex12.c"
+struct foo {
+   int f1 ;
+   int f2 ;
+};
+#line 1 "cilcode.tmp/ex12.c"
+int main(void) 
+{ 
+  int x ;
+  struct foo a[3] ;
+
+  {
+#line 1
+  x = 5;
+#line 2
+  a[0].f1 = 1;
+#line 2
+  a[0].f2 = 2;
+#line 2
+  a[1].f1 = 3;
+#line 2
+  a[1].f2 = 4;
+#line 2
+  a[2].f1 = 5;
+#line 2
+  a[2].f2 = 0;
+#line 3
+  return (0);
+}
+}

doc/cilcode.tmp/ex12.cil.i

@@ -0,0 +1,33 @@
+# 1 "cilcode.tmp/ex12.cil.c"
+# 1 "<command-line>"
+# 1 "cilcode.tmp/ex12.cil.c"
+# 2 "cilcode.tmp/ex12.c"
+struct foo {
+   int f1 ;
+   int f2 ;
+};
+# 1 "cilcode.tmp/ex12.c"
+int main(void)
+{
+  int x ;
+  struct foo a[3] ;
+
+  {
+# 1 "cilcode.tmp/ex12.c"
+  x = 5;
+# 2 "cilcode.tmp/ex12.c"
+  a[0].f1 = 1;
+# 2 "cilcode.tmp/ex12.c"
+  a[0].f2 = 2;
+# 2 "cilcode.tmp/ex12.c"
+  a[1].f1 = 3;
+# 2 "cilcode.tmp/ex12.c"
+  a[1].f2 = 4;
+# 2 "cilcode.tmp/ex12.c"
+  a[2].f1 = 5;
+# 2 "cilcode.tmp/ex12.c"
+  a[2].f2 = 0;
+# 3 "cilcode.tmp/ex12.c"
+  return (0);
+}
+}

doc/cilcode.tmp/ex12.i

@@ -0,0 +1,8 @@
+# 1 "cilcode.tmp/ex12.c"
+# 1 "<command-line>"
+# 1 "cilcode.tmp/ex12.c"
+int main(void) {
+# 1 "cilcode.tmp/ex12.c"
+  int x = 5;
+  struct foo { int f1, f2; } a [] = {1, 2, 3, 4, 5 };
+}

doc/cilcode.tmp/ex13.c

@@ -0,0 +1,9 @@
+  int x = 5; 
+  int main() {
+    int x = 6;
+    { 
+      int x = 7;
+      return x;
+    }
+    return x;
+  } 

doc/cilcode.tmp/ex13.cil.c

@@ -0,0 +1,22 @@
+/* Generated by CIL v. 1.7.3 */
+/* print_CIL_Input is true */
+
+#line 1 "cilcode.tmp/ex13.c"
+int x  =    5;
+#line 2 "cilcode.tmp/ex13.c"
+int main(void) 
+{ 
+  int x___0 ;
+  int x___1 ;
+
+  {
+#line 3
+  x___0 = 6;
+#line 5
+  x___1 = 7;
+#line 6
+  return (x___1);
+#line 8
+  return (x___0);
+}
+}

doc/cilcode.tmp/ex13.cil.i

@@ -0,0 +1,22 @@
+# 1 "cilcode.tmp/ex13.cil.c"
+# 1 "<command-line>"
+# 1 "cilcode.tmp/ex13.cil.c"
+# 1 "cilcode.tmp/ex13.c"
+int x = 5;
+# 2 "cilcode.tmp/ex13.c"
+int main(void)
+{
+  int x___0 ;
+  int x___1 ;
+
+  {
+# 3 "cilcode.tmp/ex13.c"
+  x___0 = 6;
+# 5 "cilcode.tmp/ex13.c"
+  x___1 = 7;
+# 6 "cilcode.tmp/ex13.c"
+  return (x___1);
+# 8 "cilcode.tmp/ex13.c"
+  return (x___0);
+}
+}

doc/cilcode.tmp/ex13.i

@@ -0,0 +1,12 @@
+# 1 "cilcode.tmp/ex13.c"
+# 1 "<command-line>"
+# 1 "cilcode.tmp/ex13.c"
+  int x = 5;
+  int main() {
+    int x = 6;
+    {
+      int x = 7;
+      return x;
+    }
+    return x;
+  }

doc/cilcode.tmp/ex14.c

@@ -0,0 +1,9 @@
+  int x = 5; 
+  int main() {
+    int x = 6;
+    { 
+      static int x = 7;
+      return x;
+    }
+    return x;
+  } 

doc/cilcode.tmp/ex14.cil.c

@@ -0,0 +1,23 @@
+/* Generated by CIL v. 1.7.3 */
+/* print_CIL_Input is true */
+
+#line 1 "cilcode.tmp/ex14.c"
+int x  =    5;
+#line 5
+int main(void) ;
+#line 5 "cilcode.tmp/ex14.c"
+static int x___1  =    7;
+#line 2 "cilcode.tmp/ex14.c"
+int main(void) 
+{ 
+  int x___0 ;
+
+  {
+#line 3
+  x___0 = 6;
+#line 6
+  return (x___1);
+#line 8
+  return (x___0);
+}
+}