diff --git a/META b/META index 1a5a9d0b9..dfcfe2df7 100644 --- a/META +++ b/META @@ -2,4 +2,4 @@ description = "C Intermediate Language" requires = "unix str num" version = "@CIL_VERSION@" archive(byte) = "cil.cma" -archive(opt) = "cil.cmxa" +archive(native) = "cil.cmxa" diff --git a/Makefile.in b/Makefile.in index 6a6c05220..5a1714283 100644 --- a/Makefile.in +++ b/Makefile.in @@ -98,10 +98,12 @@ ifeq ($(FORCE_PERL_PREFIX), 1) export PERL_MM_OPT endif -$(CILLYDIR)/Makefile: Makefile $(CILLYDIR)/Makefile.PL $(CILLYDIR)/App/Cilly.pm +CILLYMOD := Cilly + +$(CILLYDIR)/Makefile: Makefile $(CILLYDIR)/Makefile.PL $(CILLYDIR)/App/$(CILLYMOD).pm cd $(CILLYDIR); $(PERL) Makefile.PL -.PHONY: cilly +.PHONY: $(CILLY) $(CILLY): $(BINDIR)/$(CILLY)$(EXE) $(CILLYDIR)/Makefile $(MAKE) -C $(CILLYDIR) @@ -169,17 +171,17 @@ $(OBJDIR)/machdep.ml : src/machdep-ml.c configure.ac Makefile.in ;fi @echo "let theMachine : mach ref = ref gcc" >>$@ -$(CILLYDIR)/App/Cilly.pm: $(CILLYDIR)/App/Cilly.pm.in src/machdep-ml.c configure.ac Makefile.in - cp $(CILLYDIR)/App/Cilly.pm.in $(CILLYDIR)/App/Cilly.pm - sed -e "s|CIL_VERSION|@CIL_VERSION@|" $(CILLYDIR)/App/Cilly.pm > $(CILLYDIR)/App/Cilly.pm.tmp; \ - mv $(CILLYDIR)/App/Cilly.pm.tmp $(CILLYDIR)/App/Cilly.pm; \ +$(CILLYDIR)/App/$(CILLYMOD).pm: $(CILLYDIR)/App/$(CILLYMOD).pm.in src/machdep-ml.c configure.ac Makefile.in + cp $(CILLYDIR)/App/$(CILLYMOD).pm.in $(CILLYDIR)/App/$(CILLYMOD).pm + sed -e "s|CIL_VERSION|@CIL_VERSION@|" $(CILLYDIR)/App/$(CILLYMOD).pm > $(CILLYDIR)/App/$(CILLYMOD).pm.tmp; \ + mv $(CILLYDIR)/App/$(CILLYMOD).pm.tmp $(CILLYDIR)/App/$(CILLYMOD).pm; \ if $(MACHDEPCC) -m32 src/machdep-ml.c -o $(OBJDIR)/machdep-ml32.exe ;then \ - sed -e "s|nogcc32model|`$(EMUL) $(OBJDIR)/machdep-ml32.exe --env`|" $(CILLYDIR)/App/Cilly.pm > $(CILLYDIR)/App/Cilly.pm.tmp; \ - mv $(CILLYDIR)/App/Cilly.pm.tmp $(CILLYDIR)/App/Cilly.pm; \ + sed -e "s|nogcc32model|`$(EMUL) $(OBJDIR)/machdep-ml32.exe --env`|" $(CILLYDIR)/App/$(CILLYMOD).pm > $(CILLYDIR)/App/$(CILLYMOD).pm.tmp; \ + mv $(CILLYDIR)/App/$(CILLYMOD).pm.tmp $(CILLYDIR)/App/$(CILLYMOD).pm; \ fi if $(MACHDEPCC) -m64 src/machdep-ml.c -o $(OBJDIR)/machdep-ml64.exe ;then \ - sed -e "s|nogcc64model|`$(EMUL) $(OBJDIR)/machdep-ml64.exe --env`|" $(CILLYDIR)/App/Cilly.pm > $(CILLYDIR)/App/Cilly.pm.tmp; \ - mv $(CILLYDIR)/App/Cilly.pm.tmp $(CILLYDIR)/App/Cilly.pm; \ + sed -e "s|nogcc64model|`$(EMUL) $(OBJDIR)/machdep-ml64.exe --env`|" $(CILLYDIR)/App/$(CILLYMOD).pm > $(CILLYDIR)/App/$(CILLYMOD).pm.tmp; \ + mv $(CILLYDIR)/App/$(CILLYMOD).pm.tmp $(CILLYDIR)/App/$(CILLYMOD).pm; \ fi .PHONY: cilversion @@ -232,7 +234,7 @@ odoc: $(OBJDIR)/doc/cil.docdir/index.html -mkdir -p doc/html/cil/ -cp -r $(dir $<) doc/html/cil/api -doc/cilpp.tex: doc/cilcode.pl doc/cil.tex $(CILLYDIR)/App/Cilly.pm +doc/cilpp.tex: doc/cilcode.pl doc/cil.tex $(CILLYDIR)/App/$(CILLYMOD).pm -rm -rf doc/html/cil -mkdir -p doc/html/cil -mkdir -p doc/html/cil/examples @@ -254,12 +256,12 @@ pdfdoc: doc/cilpp.tex cd doc; pdflatex cilpp.tex; pdflatex cilpp.tex cd doc; mv cilpp.pdf html/cil/CIL.pdf -.PHONY: distclean cleandoc cleancilly clean +.PHONY: distclean clean distclean: clean $(MAKE) -C test distclean rm -rf autom4te.cache/ rm -f Makefile - rm -f $(CILLYDIR)/App/Cilly/CilConfig.pm + rm -f $(CILLYDIR)/App/$(CILLYMOD)/CilConfig.pm rm -f config.h rm -f config.log rm -f config.mk @@ -269,11 +271,6 @@ distclean: clean rm -f src/machdep-ml.c rm -f stamp-h - -cleandoc: - -cleancilly: - clean: $(CILLYDIR)/Makefile rm -rf $(OBJDIR) rm -f $(BINDIR)/$(CILLY).* @@ -282,7 +279,7 @@ clean: $(CILLYDIR)/Makefile rm -f doc/cil.version.* rm -f doc/cilpp.* $(MAKE) -C $(CILLYDIR) clean - rm -f $(CILLYDIR)/App/Cilly.pm + rm -f $(CILLYDIR)/App/$(CILLYMOD).pm rm -f $(CILLYDIR)/Makefile.old rm -f Makefile.features @@ -303,7 +300,6 @@ install: $(CILLY) install-findlib $(MAKE) -C $(CILLYDIR) pure_install $(INSTALL) -m 0755 $(BINDIR)/$(CILLY).* $(DESTDIR)$(bindir) -# FIXME uninstall: $(CILLYDIR)/Makefile uninstall-findlib -rm -f $(DESTDIR)$(bindir)/$(CILLY).* $(MAKE) -C $(CILLYDIR) force_uninstall diff --git a/README.md b/README.md index 15561e8d4..a3916f33b 100644 --- a/README.md +++ b/README.md @@ -57,7 +57,7 @@ instance in the OCaml toplevel using [findlib][]: # #require "cil";; [...] # Cil.cilVersion;; - - : string = "1.7.1" + - : string = "1.7.2" More documentation diff --git a/configure b/configure index 6baa190f4..72c5dddfc 100755 --- a/configure +++ b/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=1 +CIL_VERSION_REV=2 CIL_VERSION=$CIL_VERSION_MAJOR.$CIL_VERSION_MINOR.$CIL_VERSION_REV # make sure I haven't forgotten to run autoconf diff --git a/configure.ac b/configure.ac index 38e5afcab..0ff6ac3b9 100644 --- a/configure.ac +++ b/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=1 +CIL_VERSION_REV=2 CIL_VERSION=$CIL_VERSION_MAJOR.$CIL_VERSION_MINOR.$CIL_VERSION_REV # make sure I haven't forgotten to run autoconf diff --git a/doc/cil.tex b/doc/cil.tex index c1b5224ec..7664d7df0 100644 --- a/doc/cil.tex +++ b/doc/cil.tex @@ -3363,6 +3363,9 @@ \section{Bug reports} \section{Changes}\label{sec-changes}\cutname{changes.html} \begin{itemize} +\item{\bf June 27, 2013}: {\bf Released version 1.7.2}.\\ + Fix building and installation of CIL library (\#138). + \item{\bf June 18, 2013}: {\bf Released version 1.7.1}.\\ Improve build system, including: \begin{itemize} diff --git a/doc/html/cil/CIL.pdf b/doc/html/cil/CIL.pdf index 34c54d347..1b4ddfe31 100644 Binary files a/doc/html/cil/CIL.pdf and b/doc/html/cil/CIL.pdf differ diff --git a/doc/html/cil/api/Alpha.html b/doc/html/cil/api/Alpha.html index 6e1c280b6..22151d097 100644 --- a/doc/html/cil/api/Alpha.html +++ b/doc/html/cil/api/Alpha.html @@ -24,7 +24,7 @@ -CIL API Documentation (version 1.7.1) : Alpha +CIL API Documentation (version 1.7.2) : Alpha
 Up diff --git a/doc/html/cil/api/Cfg.html b/doc/html/cil/api/Cfg.html index 982af0fb5..f2f73a124 100644 --- a/doc/html/cil/api/Cfg.html +++ b/doc/html/cil/api/Cfg.html @@ -25,7 +25,7 @@ -CIL API Documentation (version 1.7.1) : Cfg +CIL API Documentation (version 1.7.2) : Cfg
Previous diff --git a/doc/html/cil/api/Cil.cilPrinter-c.html b/doc/html/cil/api/Cil.cilPrinter-c.html index cd707189f..4a872b5a8 100644 --- a/doc/html/cil/api/Cil.cilPrinter-c.html +++ b/doc/html/cil/api/Cil.cilPrinter-c.html @@ -25,7 +25,7 @@ -CIL API Documentation (version 1.7.1) : Cil.cilPrinter +CIL API Documentation (version 1.7.2) : Cil.cilPrinter
Previous diff --git a/doc/html/cil/api/Cil.cilVisitor-c.html b/doc/html/cil/api/Cil.cilVisitor-c.html index f0ae1a30b..d8165401b 100644 --- a/doc/html/cil/api/Cil.cilVisitor-c.html +++ b/doc/html/cil/api/Cil.cilVisitor-c.html @@ -24,7 +24,7 @@ -CIL API Documentation (version 1.7.1) : Cil.cilVisitor +CIL API Documentation (version 1.7.2) : Cil.cilVisitor
 Up diff --git a/doc/html/cil/api/Cil.defaultCilPrinterClass-c.html b/doc/html/cil/api/Cil.defaultCilPrinterClass-c.html index e0fa64383..23eda264a 100644 --- a/doc/html/cil/api/Cil.defaultCilPrinterClass-c.html +++ b/doc/html/cil/api/Cil.defaultCilPrinterClass-c.html @@ -25,7 +25,7 @@ -CIL API Documentation (version 1.7.1) : Cil.defaultCilPrinterClass +CIL API Documentation (version 1.7.2) : Cil.defaultCilPrinterClass
Previous diff --git a/doc/html/cil/api/Cil.descriptiveCilPrinter-c.html b/doc/html/cil/api/Cil.descriptiveCilPrinter-c.html index 59a630feb..5e15801dd 100644 --- a/doc/html/cil/api/Cil.descriptiveCilPrinter-c.html +++ b/doc/html/cil/api/Cil.descriptiveCilPrinter-c.html @@ -24,7 +24,7 @@ -CIL API Documentation (version 1.7.1) : Cil.descriptiveCilPrinter +CIL API Documentation (version 1.7.2) : Cil.descriptiveCilPrinter
Previous diff --git a/doc/html/cil/api/Cil.descriptiveCilPrinterClass-c.html b/doc/html/cil/api/Cil.descriptiveCilPrinterClass-c.html index ed8d1db07..e5b96449b 100644 --- a/doc/html/cil/api/Cil.descriptiveCilPrinterClass-c.html +++ b/doc/html/cil/api/Cil.descriptiveCilPrinterClass-c.html @@ -24,7 +24,7 @@ -CIL API Documentation (version 1.7.1) : Cil.descriptiveCilPrinterClass +CIL API Documentation (version 1.7.2) : Cil.descriptiveCilPrinterClass
Previous diff --git a/doc/html/cil/api/Cil.html b/doc/html/cil/api/Cil.html index ffcfc521c..73dd3b4df 100644 --- a/doc/html/cil/api/Cil.html +++ b/doc/html/cil/api/Cil.html @@ -25,7 +25,7 @@ -CIL API Documentation (version 1.7.1) : Cil +CIL API Documentation (version 1.7.2) : Cil
Previous diff --git a/doc/html/cil/api/Cil.nopCilVisitor-c.html b/doc/html/cil/api/Cil.nopCilVisitor-c.html index 3d5dc1169..89e7af9cc 100644 --- a/doc/html/cil/api/Cil.nopCilVisitor-c.html +++ b/doc/html/cil/api/Cil.nopCilVisitor-c.html @@ -24,7 +24,7 @@ -CIL API Documentation (version 1.7.1) : Cil.nopCilVisitor +CIL API Documentation (version 1.7.2) : Cil.nopCilVisitor
 Up diff --git a/doc/html/cil/api/Cil.plainCilPrinterClass-c.html b/doc/html/cil/api/Cil.plainCilPrinterClass-c.html index 0636044bc..2206b332e 100644 --- a/doc/html/cil/api/Cil.plainCilPrinterClass-c.html +++ b/doc/html/cil/api/Cil.plainCilPrinterClass-c.html @@ -25,7 +25,7 @@ -CIL API Documentation (version 1.7.1) : Cil.plainCilPrinterClass +CIL API Documentation (version 1.7.2) : Cil.plainCilPrinterClass
Previous diff --git a/doc/html/cil/api/Cillower.html b/doc/html/cil/api/Cillower.html index 76957b0cf..470d99cf8 100644 --- a/doc/html/cil/api/Cillower.html +++ b/doc/html/cil/api/Cillower.html @@ -25,7 +25,7 @@ -CIL API Documentation (version 1.7.1) : Cillower +CIL API Documentation (version 1.7.2) : Cillower
Previous diff --git a/doc/html/cil/api/Clist.html b/doc/html/cil/api/Clist.html index 9e630a854..422aa4f95 100644 --- a/doc/html/cil/api/Clist.html +++ b/doc/html/cil/api/Clist.html @@ -25,7 +25,7 @@ -CIL API Documentation (version 1.7.1) : Clist +CIL API Documentation (version 1.7.2) : Clist
Previous diff --git a/doc/html/cil/api/Dataflow.BackwardsDataFlow.html b/doc/html/cil/api/Dataflow.BackwardsDataFlow.html index 2a2b2a6f7..81bf83d52 100644 --- a/doc/html/cil/api/Dataflow.BackwardsDataFlow.html +++ b/doc/html/cil/api/Dataflow.BackwardsDataFlow.html @@ -24,7 +24,7 @@ -CIL API Documentation (version 1.7.1) : Dataflow.BackwardsDataFlow +CIL API Documentation (version 1.7.2) : Dataflow.BackwardsDataFlow
Previous diff --git a/doc/html/cil/api/Dataflow.BackwardsTransfer.html b/doc/html/cil/api/Dataflow.BackwardsTransfer.html index fb62ce7c9..6437ef7ec 100644 --- a/doc/html/cil/api/Dataflow.BackwardsTransfer.html +++ b/doc/html/cil/api/Dataflow.BackwardsTransfer.html @@ -24,7 +24,7 @@ -CIL API Documentation (version 1.7.1) : Dataflow.BackwardsTransfer +CIL API Documentation (version 1.7.2) : Dataflow.BackwardsTransfer
Previous diff --git a/doc/html/cil/api/Dataflow.ForwardsDataFlow.html b/doc/html/cil/api/Dataflow.ForwardsDataFlow.html index 917595d65..048b32027 100644 --- a/doc/html/cil/api/Dataflow.ForwardsDataFlow.html +++ b/doc/html/cil/api/Dataflow.ForwardsDataFlow.html @@ -24,7 +24,7 @@ -CIL API Documentation (version 1.7.1) : Dataflow.ForwardsDataFlow +CIL API Documentation (version 1.7.2) : Dataflow.ForwardsDataFlow
 Up diff --git a/doc/html/cil/api/Dataflow.ForwardsTransfer.html b/doc/html/cil/api/Dataflow.ForwardsTransfer.html index 3fe3fa34e..e5013d4fe 100644 --- a/doc/html/cil/api/Dataflow.ForwardsTransfer.html +++ b/doc/html/cil/api/Dataflow.ForwardsTransfer.html @@ -24,7 +24,7 @@ -CIL API Documentation (version 1.7.1) : Dataflow.ForwardsTransfer +CIL API Documentation (version 1.7.2) : Dataflow.ForwardsTransfer
 Up diff --git a/doc/html/cil/api/Dataflow.html b/doc/html/cil/api/Dataflow.html index a1799d531..d7a13a546 100644 --- a/doc/html/cil/api/Dataflow.html +++ b/doc/html/cil/api/Dataflow.html @@ -25,7 +25,7 @@ -CIL API Documentation (version 1.7.1) : Dataflow +CIL API Documentation (version 1.7.2) : Dataflow
Previous diff --git a/doc/html/cil/api/Dominators.html b/doc/html/cil/api/Dominators.html index 97cf904b5..5cad73889 100644 --- a/doc/html/cil/api/Dominators.html +++ b/doc/html/cil/api/Dominators.html @@ -25,7 +25,7 @@ -CIL API Documentation (version 1.7.1) : Dominators +CIL API Documentation (version 1.7.2) : Dominators
Previous diff --git a/doc/html/cil/api/Errormsg.html b/doc/html/cil/api/Errormsg.html index 3ccb074e1..28e128a7c 100644 --- a/doc/html/cil/api/Errormsg.html +++ b/doc/html/cil/api/Errormsg.html @@ -25,7 +25,7 @@ -CIL API Documentation (version 1.7.1) : Errormsg +CIL API Documentation (version 1.7.2) : Errormsg
Previous diff --git a/doc/html/cil/api/Formatcil.html b/doc/html/cil/api/Formatcil.html index 5d2780699..d01c31d9a 100644 --- a/doc/html/cil/api/Formatcil.html +++ b/doc/html/cil/api/Formatcil.html @@ -25,7 +25,7 @@ -CIL API Documentation (version 1.7.1) : Formatcil +CIL API Documentation (version 1.7.2) : Formatcil
Previous diff --git a/doc/html/cil/api/Pretty.MakeMapPrinter.html b/doc/html/cil/api/Pretty.MakeMapPrinter.html index a832e393e..53caf857d 100644 --- a/doc/html/cil/api/Pretty.MakeMapPrinter.html +++ b/doc/html/cil/api/Pretty.MakeMapPrinter.html @@ -24,7 +24,7 @@ -CIL API Documentation (version 1.7.1) : Pretty.MakeMapPrinter +CIL API Documentation (version 1.7.2) : Pretty.MakeMapPrinter
 Up diff --git a/doc/html/cil/api/Pretty.MakeSetPrinter.html b/doc/html/cil/api/Pretty.MakeSetPrinter.html index beb078b99..240273601 100644 --- a/doc/html/cil/api/Pretty.MakeSetPrinter.html +++ b/doc/html/cil/api/Pretty.MakeSetPrinter.html @@ -24,7 +24,7 @@ -CIL API Documentation (version 1.7.1) : Pretty.MakeSetPrinter +CIL API Documentation (version 1.7.2) : Pretty.MakeSetPrinter
Previous diff --git a/doc/html/cil/api/Pretty.html b/doc/html/cil/api/Pretty.html index 0e86d81c0..6a697a09f 100644 --- a/doc/html/cil/api/Pretty.html +++ b/doc/html/cil/api/Pretty.html @@ -25,7 +25,7 @@ -CIL API Documentation (version 1.7.1) : Pretty +CIL API Documentation (version 1.7.2) : Pretty
Previous diff --git a/doc/html/cil/api/Stats.html b/doc/html/cil/api/Stats.html index f08117d60..26853816c 100644 --- a/doc/html/cil/api/Stats.html +++ b/doc/html/cil/api/Stats.html @@ -24,7 +24,7 @@ -CIL API Documentation (version 1.7.1) : Stats +CIL API Documentation (version 1.7.2) : Stats
Previous diff --git a/doc/html/cil/api/index.html b/doc/html/cil/api/index.html index f751dedb3..cc5e1516d 100644 --- a/doc/html/cil/api/index.html +++ b/doc/html/cil/api/index.html @@ -22,10 +22,10 @@ -CIL API Documentation (version 1.7.1) +CIL API Documentation (version 1.7.2) -

CIL API Documentation (version 1.7.1)

+

CIL API Documentation (version 1.7.2)

  • Index of types
  • Index of exceptions
    • diff --git a/doc/html/cil/api/index_attributes.html b/doc/html/cil/api/index_attributes.html index 69e8e6b4c..bce745905 100644 --- a/doc/html/cil/api/index_attributes.html +++ b/doc/html/cil/api/index_attributes.html @@ -21,7 +21,7 @@ -CIL API Documentation (version 1.7.1) : Index of class attributes +CIL API Documentation (version 1.7.2) : Index of class attributes
     Up diff --git a/doc/html/cil/api/index_class_types.html b/doc/html/cil/api/index_class_types.html index 0d0847a3d..a76b514a6 100644 --- a/doc/html/cil/api/index_class_types.html +++ b/doc/html/cil/api/index_class_types.html @@ -21,7 +21,7 @@ -CIL API Documentation (version 1.7.1) : Index of class types +CIL API Documentation (version 1.7.2) : Index of class types
     Up diff --git a/doc/html/cil/api/index_classes.html b/doc/html/cil/api/index_classes.html index e63ef1e6e..87fb0dde4 100644 --- a/doc/html/cil/api/index_classes.html +++ b/doc/html/cil/api/index_classes.html @@ -21,7 +21,7 @@ -CIL API Documentation (version 1.7.1) : Index of classes +CIL API Documentation (version 1.7.2) : Index of classes
     Up diff --git a/doc/html/cil/api/index_exceptions.html b/doc/html/cil/api/index_exceptions.html index 741570945..85c234167 100644 --- a/doc/html/cil/api/index_exceptions.html +++ b/doc/html/cil/api/index_exceptions.html @@ -21,7 +21,7 @@ -CIL API Documentation (version 1.7.1) : Index of exceptions +CIL API Documentation (version 1.7.2) : Index of exceptions
     Up diff --git a/doc/html/cil/api/index_methods.html b/doc/html/cil/api/index_methods.html index b2f934880..e85a5e65a 100644 --- a/doc/html/cil/api/index_methods.html +++ b/doc/html/cil/api/index_methods.html @@ -21,7 +21,7 @@ -CIL API Documentation (version 1.7.1) : Index of class methods +CIL API Documentation (version 1.7.2) : Index of class methods
     Up diff --git a/doc/html/cil/api/index_module_types.html b/doc/html/cil/api/index_module_types.html index 1c143f7aa..a7a4ad0ee 100644 --- a/doc/html/cil/api/index_module_types.html +++ b/doc/html/cil/api/index_module_types.html @@ -21,7 +21,7 @@ -CIL API Documentation (version 1.7.1) : Index of module types +CIL API Documentation (version 1.7.2) : Index of module types
     Up diff --git a/doc/html/cil/api/index_modules.html b/doc/html/cil/api/index_modules.html index 3f382c7d3..c7b784734 100644 --- a/doc/html/cil/api/index_modules.html +++ b/doc/html/cil/api/index_modules.html @@ -21,7 +21,7 @@ -CIL API Documentation (version 1.7.1) : Index of modules +CIL API Documentation (version 1.7.2) : Index of modules
     Up diff --git a/doc/html/cil/api/index_types.html b/doc/html/cil/api/index_types.html index 035495479..885a07b76 100644 --- a/doc/html/cil/api/index_types.html +++ b/doc/html/cil/api/index_types.html @@ -21,7 +21,7 @@ -CIL API Documentation (version 1.7.1) : Index of types +CIL API Documentation (version 1.7.2) : Index of types
     Up diff --git a/doc/html/cil/api/index_values.html b/doc/html/cil/api/index_values.html index 641d98e59..518b89ac7 100644 --- a/doc/html/cil/api/index_values.html +++ b/doc/html/cil/api/index_values.html @@ -21,7 +21,7 @@ -CIL API Documentation (version 1.7.1) : Index of values +CIL API Documentation (version 1.7.2) : Index of values
     Up diff --git a/doc/html/cil/api/type_Alpha.html b/doc/html/cil/api/type_Alpha.html index b32b65d3e..1ac71721f 100644 --- a/doc/html/cil/api/type_Alpha.html +++ b/doc/html/cil/api/type_Alpha.html @@ -20,7 +20,7 @@ -CIL API Documentation (version 1.7.1) : Alpha +CIL API Documentation (version 1.7.2) : Alpha sig
    diff --git a/doc/html/cil/api/type_Cfg.html b/doc/html/cil/api/type_Cfg.html index 8c2973b00..231bf295c 100644 --- a/doc/html/cil/api/type_Cfg.html +++ b/doc/html/cil/api/type_Cfg.html @@ -20,7 +20,7 @@ -CIL API Documentation (version 1.7.1) : Cfg +CIL API Documentation (version 1.7.2) : Cfg sig
    diff --git a/doc/html/cil/api/type_Cil.cilPrinter.html b/doc/html/cil/api/type_Cil.cilPrinter.html index d65fcaa25..0f9546ae8 100644 --- a/doc/html/cil/api/type_Cil.cilPrinter.html +++ b/doc/html/cil/api/type_Cil.cilPrinter.html @@ -20,7 +20,7 @@ -CIL API Documentation (version 1.7.1) : Cil.cilPrinter +CIL API Documentation (version 1.7.2) : Cil.cilPrinter object
    diff --git a/doc/html/cil/api/type_Cil.cilVisitor.html b/doc/html/cil/api/type_Cil.cilVisitor.html index 320098de4..8201cc3bd 100644 --- a/doc/html/cil/api/type_Cil.cilVisitor.html +++ b/doc/html/cil/api/type_Cil.cilVisitor.html @@ -20,7 +20,7 @@ -CIL API Documentation (version 1.7.1) : Cil.cilVisitor +CIL API Documentation (version 1.7.2) : Cil.cilVisitor object
    diff --git a/doc/html/cil/api/type_Cil.defaultCilPrinterClass.html b/doc/html/cil/api/type_Cil.defaultCilPrinterClass.html index 2a47307ca..18f284b6e 100644 --- a/doc/html/cil/api/type_Cil.defaultCilPrinterClass.html +++ b/doc/html/cil/api/type_Cil.defaultCilPrinterClass.html @@ -20,7 +20,7 @@ -CIL API Documentation (version 1.7.1) : Cil.defaultCilPrinterClass +CIL API Documentation (version 1.7.2) : Cil.defaultCilPrinterClass Cil.cilPrinter \ No newline at end of file diff --git a/doc/html/cil/api/type_Cil.descriptiveCilPrinter.html b/doc/html/cil/api/type_Cil.descriptiveCilPrinter.html index e5c7f2fdf..38d4549fa 100644 --- a/doc/html/cil/api/type_Cil.descriptiveCilPrinter.html +++ b/doc/html/cil/api/type_Cil.descriptiveCilPrinter.html @@ -20,7 +20,7 @@ -CIL API Documentation (version 1.7.1) : Cil.descriptiveCilPrinter +CIL API Documentation (version 1.7.2) : Cil.descriptiveCilPrinter object
    diff --git a/doc/html/cil/api/type_Cil.descriptiveCilPrinterClass.html b/doc/html/cil/api/type_Cil.descriptiveCilPrinterClass.html index 47d3fbdfc..ef140a390 100644 --- a/doc/html/cil/api/type_Cil.descriptiveCilPrinterClass.html +++ b/doc/html/cil/api/type_Cil.descriptiveCilPrinterClass.html @@ -20,7 +20,7 @@ -CIL API Documentation (version 1.7.1) : Cil.descriptiveCilPrinterClass +CIL API Documentation (version 1.7.2) : Cil.descriptiveCilPrinterClass bool -> Cil.descriptiveCilPrinter \ No newline at end of file diff --git a/doc/html/cil/api/type_Cil.html b/doc/html/cil/api/type_Cil.html index fcb040c46..8fb2641b4 100644 --- a/doc/html/cil/api/type_Cil.html +++ b/doc/html/cil/api/type_Cil.html @@ -20,7 +20,7 @@ -CIL API Documentation (version 1.7.1) : Cil +CIL API Documentation (version 1.7.2) : Cil sig
    diff --git a/doc/html/cil/api/type_Cil.nopCilVisitor.html b/doc/html/cil/api/type_Cil.nopCilVisitor.html index ad08bd8b0..881e4689f 100644 --- a/doc/html/cil/api/type_Cil.nopCilVisitor.html +++ b/doc/html/cil/api/type_Cil.nopCilVisitor.html @@ -20,7 +20,7 @@ -CIL API Documentation (version 1.7.1) : Cil.nopCilVisitor +CIL API Documentation (version 1.7.2) : Cil.nopCilVisitor Cil.cilVisitor \ No newline at end of file diff --git a/doc/html/cil/api/type_Cil.plainCilPrinterClass.html b/doc/html/cil/api/type_Cil.plainCilPrinterClass.html index 2c3e29912..e0a320377 100644 --- a/doc/html/cil/api/type_Cil.plainCilPrinterClass.html +++ b/doc/html/cil/api/type_Cil.plainCilPrinterClass.html @@ -20,7 +20,7 @@ -CIL API Documentation (version 1.7.1) : Cil.plainCilPrinterClass +CIL API Documentation (version 1.7.2) : Cil.plainCilPrinterClass Cil.cilPrinter \ No newline at end of file diff --git a/doc/html/cil/api/type_Cillower.html b/doc/html/cil/api/type_Cillower.html index 7bdc96f99..daaa367cb 100644 --- a/doc/html/cil/api/type_Cillower.html +++ b/doc/html/cil/api/type_Cillower.html @@ -20,7 +20,7 @@ -CIL API Documentation (version 1.7.1) : Cillower +CIL API Documentation (version 1.7.2) : Cillower sig val lowerEnumVisitor : Cil.cilVisitor end \ No newline at end of file diff --git a/doc/html/cil/api/type_Clist.html b/doc/html/cil/api/type_Clist.html index 513c6e0fd..6fd3dfa22 100644 --- a/doc/html/cil/api/type_Clist.html +++ b/doc/html/cil/api/type_Clist.html @@ -20,7 +20,7 @@ -CIL API Documentation (version 1.7.1) : Clist +CIL API Documentation (version 1.7.2) : Clist sig
    diff --git a/doc/html/cil/api/type_Dataflow.BackwardsDataFlow.html b/doc/html/cil/api/type_Dataflow.BackwardsDataFlow.html index d1690699b..ee809946a 100644 --- a/doc/html/cil/api/type_Dataflow.BackwardsDataFlow.html +++ b/doc/html/cil/api/type_Dataflow.BackwardsDataFlow.html @@ -20,7 +20,7 @@ -CIL API Documentation (version 1.7.1) : Dataflow.BackwardsDataFlow +CIL API Documentation (version 1.7.2) : Dataflow.BackwardsDataFlow functor (T : BackwardsTransfer) ->
    diff --git a/doc/html/cil/api/type_Dataflow.BackwardsTransfer.html b/doc/html/cil/api/type_Dataflow.BackwardsTransfer.html index 40ddd007b..6bf1ef79a 100644 --- a/doc/html/cil/api/type_Dataflow.BackwardsTransfer.html +++ b/doc/html/cil/api/type_Dataflow.BackwardsTransfer.html @@ -20,7 +20,7 @@ -CIL API Documentation (version 1.7.1) : Dataflow.BackwardsTransfer +CIL API Documentation (version 1.7.2) : Dataflow.BackwardsTransfer sig
    diff --git a/doc/html/cil/api/type_Dataflow.ForwardsDataFlow.html b/doc/html/cil/api/type_Dataflow.ForwardsDataFlow.html index a70494c43..fcb32ff5f 100644 --- a/doc/html/cil/api/type_Dataflow.ForwardsDataFlow.html +++ b/doc/html/cil/api/type_Dataflow.ForwardsDataFlow.html @@ -20,7 +20,7 @@ -CIL API Documentation (version 1.7.1) : Dataflow.ForwardsDataFlow +CIL API Documentation (version 1.7.2) : Dataflow.ForwardsDataFlow functor (T : ForwardsTransfer) -> sig val compute : Cil.stmt list -> unit end \ No newline at end of file diff --git a/doc/html/cil/api/type_Dataflow.ForwardsTransfer.html b/doc/html/cil/api/type_Dataflow.ForwardsTransfer.html index 6a4ee8a6d..7347cf613 100644 --- a/doc/html/cil/api/type_Dataflow.ForwardsTransfer.html +++ b/doc/html/cil/api/type_Dataflow.ForwardsTransfer.html @@ -20,7 +20,7 @@ -CIL API Documentation (version 1.7.1) : Dataflow.ForwardsTransfer +CIL API Documentation (version 1.7.2) : Dataflow.ForwardsTransfer sig
    diff --git a/doc/html/cil/api/type_Dataflow.html b/doc/html/cil/api/type_Dataflow.html index 07cfd43cc..7d52dd2bf 100644 --- a/doc/html/cil/api/type_Dataflow.html +++ b/doc/html/cil/api/type_Dataflow.html @@ -20,7 +20,7 @@ -CIL API Documentation (version 1.7.1) : Dataflow +CIL API Documentation (version 1.7.2) : Dataflow sig
    diff --git a/doc/html/cil/api/type_Dominators.html b/doc/html/cil/api/type_Dominators.html index f3c580d1a..fd640ca5f 100644 --- a/doc/html/cil/api/type_Dominators.html +++ b/doc/html/cil/api/type_Dominators.html @@ -20,7 +20,7 @@ -CIL API Documentation (version 1.7.1) : Dominators +CIL API Documentation (version 1.7.2) : Dominators sig
    diff --git a/doc/html/cil/api/type_Errormsg.html b/doc/html/cil/api/type_Errormsg.html index dcc02dd70..854a32526 100644 --- a/doc/html/cil/api/type_Errormsg.html +++ b/doc/html/cil/api/type_Errormsg.html @@ -20,7 +20,7 @@ -CIL API Documentation (version 1.7.1) : Errormsg +CIL API Documentation (version 1.7.2) : Errormsg sig
    diff --git a/doc/html/cil/api/type_Formatcil.html b/doc/html/cil/api/type_Formatcil.html index 7f7d135c4..a1e37ef63 100644 --- a/doc/html/cil/api/type_Formatcil.html +++ b/doc/html/cil/api/type_Formatcil.html @@ -20,7 +20,7 @@ -CIL API Documentation (version 1.7.1) : Formatcil +CIL API Documentation (version 1.7.2) : Formatcil sig
    diff --git a/doc/html/cil/api/type_Pretty.MakeMapPrinter.html b/doc/html/cil/api/type_Pretty.MakeMapPrinter.html index 04002f006..cd27340c6 100644 --- a/doc/html/cil/api/type_Pretty.MakeMapPrinter.html +++ b/doc/html/cil/api/type_Pretty.MakeMapPrinter.html @@ -20,7 +20,7 @@ -CIL API Documentation (version 1.7.1) : Pretty.MakeMapPrinter +CIL API Documentation (version 1.7.2) : Pretty.MakeMapPrinter functor
    diff --git a/doc/html/cil/api/type_Pretty.MakeSetPrinter.html b/doc/html/cil/api/type_Pretty.MakeSetPrinter.html index 48790a149..b7a0ce1c7 100644 --- a/doc/html/cil/api/type_Pretty.MakeSetPrinter.html +++ b/doc/html/cil/api/type_Pretty.MakeSetPrinter.html @@ -20,7 +20,7 @@ -CIL API Documentation (version 1.7.1) : Pretty.MakeSetPrinter +CIL API Documentation (version 1.7.2) : Pretty.MakeSetPrinter functor
    diff --git a/doc/html/cil/api/type_Pretty.html b/doc/html/cil/api/type_Pretty.html index 01c699675..1f842b5dd 100644 --- a/doc/html/cil/api/type_Pretty.html +++ b/doc/html/cil/api/type_Pretty.html @@ -20,7 +20,7 @@ -CIL API Documentation (version 1.7.1) : Pretty +CIL API Documentation (version 1.7.2) : Pretty sig
    diff --git a/doc/html/cil/api/type_Stats.html b/doc/html/cil/api/type_Stats.html index 82ac58b0e..bbbd9b0bd 100644 --- a/doc/html/cil/api/type_Stats.html +++ b/doc/html/cil/api/type_Stats.html @@ -20,7 +20,7 @@ -CIL API Documentation (version 1.7.1) : Stats +CIL API Documentation (version 1.7.2) : Stats sig
    diff --git a/doc/html/cil/changes.html b/doc/html/cil/changes.html index de512e019..9f47ad2a9 100644 --- a/doc/html/cil/changes.html +++ b/doc/html/cil/changes.html @@ -22,7 +22,8 @@ Up

    20  Changes

    • -June 18, 2013: Released version 1.7.1.
      +June 27, 2013: Released version 1.7.2.
      + Fix building and installation of CIL library (#138).
    • June 18, 2013: Released version 1.7.1.
      Improve build system, including:
      • Fix make uninstall. diff --git a/doc/html/cil/cil.html b/doc/html/cil/cil.html index 1e24dd9ce..e71737ac6 100644 --- a/doc/html/cil/cil.html +++ b/doc/html/cil/cil.html @@ -152,11 +152,11 @@

        2  Installat Download the CIL distribution (latest version is -http://sourceforge.net/projects/cil/files/cil/cil-1.7.1.tar.gz). +http://sourceforge.net/projects/cil/files/cil/cil-1.7.2.tar.gz). See the Section 20 for recent changes to the CIL distribution.

      • Unzip and untar the source distribution. This will create a directory called cil whose structure is explained below.
        -     tar xvfz cil-1.7.1.tar.gz +     tar xvfz cil-1.7.2.tar.gz
      • Git Repository:
        Alternately, you can download an up to the minute version of CIL @@ -233,7 +233,7 @@

        2.1  Buil everything that you need to run CIL on another machine. You will have to edit manually some of the files in the bin directory to replace CILHOME. The resulting CIL can be run with ActiveState Perl also.

        -

        3  Distribution Contents

        The file distrib/cil-1.7.1.tar.gz +

        3  Distribution Contents

        The file distrib/cil-1.7.2.tar.gz contains the complete source CIL distribution, consisting of the following files:

        @@ -2444,7 +2444,8 @@

        19  Bug rep as it will ensure your message is viewed by a broad audience.

        20  Changes

        • -June 18, 2013: Released version 1.7.1.
          +June 27, 2013: Released version 1.7.2.
          + Fix building and installation of CIL library (#138).
        • June 18, 2013: Released version 1.7.1.
          Improve build system, including:
          • Fix make uninstall. diff --git a/doc/html/cil/cil.version.tex b/doc/html/cil/cil.version.tex index 9523da7b1..8e3d14f96 100644 --- a/doc/html/cil/cil.version.tex +++ b/doc/html/cil/cil.version.tex @@ -1 +1 @@ -\def\cilversion{1.7.1} +\def\cilversion{1.7.2} diff --git a/doc/html/cil/cil002.html b/doc/html/cil/cil002.html index d71fc2aee..0c1e7e8ca 100644 --- a/doc/html/cil/cil002.html +++ b/doc/html/cil/cil002.html @@ -39,11 +39,11 @@

            2  Installation

            You nee Download the CIL distribution (latest version is -http://sourceforge.net/projects/cil/files/cil/cil-1.7.1.tar.gz). +http://sourceforge.net/projects/cil/files/cil/cil-1.7.2.tar.gz). See the Section 20 for recent changes to the CIL distribution.

          • Unzip and untar the source distribution. This will create a directory called cil whose structure is explained below.
            -     tar xvfz cil-1.7.1.tar.gz +     tar xvfz cil-1.7.2.tar.gz
          • Git Repository:
            Alternately, you can download an up to the minute version of CIL diff --git a/doc/html/cil/cil003.html b/doc/html/cil/cil003.html index be531d0f6..ec2eecab9 100644 --- a/doc/html/cil/cil003.html +++ b/doc/html/cil/cil003.html @@ -22,7 +22,7 @@ Up Next
            -

            3  Distribution Contents

            The file distrib/cil-1.7.1.tar.gz +

            3  Distribution Contents

            The file distrib/cil-1.7.2.tar.gz contains the complete source CIL distribution, consisting of the following files:

            diff --git a/doc/html/cil/header.html b/doc/html/cil/header.html index 3f0f0a60d..4414861a5 100644 --- a/doc/html/cil/header.html +++ b/doc/html/cil/header.html @@ -5,13 +5,13 @@ -CIL Documentation (v. 1.7.1) +CIL Documentation (v. 1.7.2) -

            CIL - Infrastructure for C Program Analysis and Transformation (v. 1.7.1)

            +

            CIL - Infrastructure for C Program Analysis and Transformation (v. 1.7.2)

            diff --git a/doc/html/cil/index.html b/doc/html/cil/index.html index 8d93af2b4..3a24581b0 100644 --- a/doc/html/cil/index.html +++ b/doc/html/cil/index.html @@ -4,7 +4,7 @@ -CIL Documentation (v. 1.7.1) +CIL Documentation (v. 1.7.2) diff --git a/lib/Makefile.PL b/lib/Makefile.PL index dc518fb91..d3c8f10eb 100644 --- a/lib/Makefile.PL +++ b/lib/Makefile.PL @@ -3,17 +3,20 @@ use strict; use warnings; use ExtUtils::MakeMaker; +my $cilly = 'cilly'; +my $Cilly = ucfirst($cilly); + WriteMakefile( - NAME => 'cilly', - VERSION_FROM => 'App/Cilly.pm', + NAME => $cilly, + VERSION_FROM => 'App/'.$Cilly.'.pm', PM => { - 'App/Cilly.pm' => '$(INST_LIBDIR)/App/Cilly.pm', - 'App/Cilly/CilConfig.pm' => '$(INST_LIBDIR)/App/Cilly/CilConfig.pm', - 'App/Cilly/KeptFile.pm' => '$(INST_LIBDIR)/App/Cilly/KeptFile.pm', - 'App/Cilly/OutputFile.pm' => '$(INST_LIBDIR)/App/Cilly/OutputFile.pm', - 'App/Cilly/TempFile.pm' => '$(INST_LIBDIR)/App/Cilly/TempFile.pm', + 'App/'.$Cilly.'.pm' => '$(INST_LIBDIR)/App/'.$Cilly.'.pm', + 'App/'.$Cilly.'/CilConfig.pm' => '$(INST_LIBDIR)/App/'.$Cilly.'/CilConfig.pm', + 'App/'.$Cilly.'/KeptFile.pm' => '$(INST_LIBDIR)/App/'.$Cilly.'/KeptFile.pm', + 'App/'.$Cilly.'/OutputFile.pm' => '$(INST_LIBDIR)/App/'.$Cilly.'/OutputFile.pm', + 'App/'.$Cilly.'/TempFile.pm' => '$(INST_LIBDIR)/App/'.$Cilly.'/TempFile.pm', }, - EXE_FILES => [ '../bin/cilly' ], + EXE_FILES => [ '../bin/'.$cilly ], PREREQ_PM => { 'Carp' => 0, 'Data::Dumper' => 0, @@ -40,8 +43,8 @@ sub MY::postamble { force_uninstall: ifeq ($(INSTALLDIRS), site) - $(RM_F) $(DESTINSTALLSITEBIN)/cilly - $(RM_RF) $(DESTINSTALLSITELIB)/App/Cilly* + $(RM_F) $(DESTINSTALLSITEBIN)/$(NAME) + cd $(DESTINSTALLSITELIB) && $(RM_F) $(TO_INST_PM) $(RM_RF) $(DESTINSTALLSITEARCH)/auto/$(FULLEXT) else echo "force_uninstall works only if INSTALLDIRS=site" diff --git a/src/check.ml b/src/check.ml index d988cbe2a..48ddc9764 100644 --- a/src/check.ml +++ b/src/check.ml @@ -623,14 +623,16 @@ and checkInit (i: init) : typ = | CompoundInit (ct, initl) -> begin checkType ct CTSizeof; (match unrollType ct with - TArray(bt, Some elen, _) -> - ignore (checkExp true elen); + TArray(bt, elen, _) -> let len = - match isInteger (constFold true elen) with + match elen with + | None -> 0L + | Some e -> (ignore (checkExp true e); + match isInteger (constFold true e) with Some len -> len | None -> ignore (warn "Array length is not a constant"); - 0L + 0L) in let rec loopIndex i = function [] -> @@ -647,8 +649,6 @@ and checkInit (i: init) : typ = ignore (warn "Malformed initializer for array element") in loopIndex Int64.zero initl - | TArray(_, None, _) -> - ignore (warn "Malformed initializer for array") | TComp (comp, _) -> if comp.cstruct then let rec loopFields diff --git a/src/cil.mllib b/src/cil.mllib index 8fc2c2d6b..5971b45ce 100644 --- a/src/cil.mllib +++ b/src/cil.mllib @@ -65,7 +65,6 @@ Simplemem Simplify Ssa Stats -Testcil Trace Uref Usedef diff --git a/test/small1/init8.c b/test/small1/init8.c index 312682223..7f0aa79e1 100644 --- a/test/small1/init8.c +++ b/test/small1/init8.c @@ -4,6 +4,6 @@ struct pci_device_info { const char *name; }; -static struct pci_device_info __devices_0000 [] +struct pci_device_info __devices_0000 [] __attribute__ ((__section__ (".data.init"))) = { };