diff --git a/.gitignore b/.gitignore
index 17bec48bb6f15516de1b02f6faee518bdbe2f51f..e1d5ff388e3df4c1b0b7594ad0e8e1f1e0247533 100644
--- a/.gitignore
+++ b/.gitignore
@@ -90,6 +90,7 @@ autom4te.cache
/doc/*/*.fls
/doc/*/*.fdb_latexmk
/doc/*/*.synctex.gz
+/doc/*/frama-c-affiliation.tex
/doc/acsl/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5c3a674ee5aca48c0a5f864812cad2aafe461e0b..5f32c25ff70a79ad3d17b9d9df41260a9067a9df 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -142,7 +142,7 @@ with respect to several Frama-C versions and OCaml dependencies.
Coding conventions
==================
-- Use [ocp-indent](https://github.com/OCamlPro/ocp-indent), v1.7.0
+- Use [ocp-indent](https://github.com/OCamlPro/ocp-indent), v1.8.1
to indent OCaml source files;
- Avoid trailing whitespaces;
diff --git a/bin/frama-c.debug b/bin/frama-c.debug
index a7727dd707ac8df61c9cd420f9b028b8db4ef14a..e97d4fe9d0571ae28182aedae1c3b0cf84128d6c 100755
--- a/bin/frama-c.debug
+++ b/bin/frama-c.debug
@@ -65,8 +65,6 @@ install_printer Cil_types_debug.pp_global
install_printer Cil_types_debug.pp_typ
install_printer Cil_types_debug.pp_ikind
install_printer Cil_types_debug.pp_fkind
-install_printer Cil_types_debug.pp_bitsSizeofTyp
-install_printer Cil_types_debug.pp_bitsSizeofTypCache
install_printer Cil_types_debug.pp_attribute
install_printer Cil_types_debug.pp_attributes
install_printer Cil_types_debug.pp_attrparam
@@ -79,7 +77,6 @@ install_printer Cil_types_debug.pp_varinfo
install_printer Cil_types_debug.pp_storage
install_printer Cil_types_debug.pp_exp
install_printer Cil_types_debug.pp_exp_node
-install_printer Cil_types_debug.pp_exp_info
install_printer Cil_types_debug.pp_constant
install_printer Cil_types_debug.pp_unop
install_printer Cil_types_debug.pp_binop
@@ -136,7 +133,6 @@ install_printer Cil_types_debug.pp_funspec
install_printer Cil_types_debug.pp_code_annotation
install_printer Cil_types_debug.pp_funbehavior
install_printer Cil_types_debug.pp_global_annotation
-install_printer Cil_types_debug.pp_custom_tree
install_printer Cil_types_debug.pp_kinstr
install_printer Cil_types_debug.pp_cil_function
install_printer Cil_types_debug.pp_kernel_function
diff --git a/doc/Makefile b/doc/Makefile
index 658b77e2d65cf640d0f42c6ad03112ebc3b0b6b7..1c6f1d1a70e6664b9ec64199036362a86b98d649 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -20,10 +20,8 @@
# #
##########################################################################
-# This file just download the manuals in the released version
-
-all:download
-
+# default when make is invoked without target
+default:
FRAMAC_SRC=..
MAKECONFIG_DIR=$(FRAMAC_SRC)/share
@@ -33,23 +31,26 @@ include $(FRAMAC_SRC)/share/Makefile.common
DOCDIR ?= "$(DESTDIR)${prefix}/share/doc"
FRAMAC_DOCDIR ?= $(DOCDIR)/frama-c
+.PHONY: .force
+
+
###################
# Frama-C Version #
###################
VERSION=$(shell $(SED) -e 's/\\(.*\\)/\\1/' $(FRAMAC_SRC)/VERSION)
+VERSION_CODENAME=$(shell cat $(FRAMAC_SRC)/VERSION_CODENAME)
VERSION_SAFE=$(subst ~,-,$(VERSION))
ifeq ($(findstring +dev,$(VERSION)),+dev)
-DEVELOPMENT=yes
-else
-DEVELOPMENT=no
-endif
-###
+# Developpement version, generate the manuals
+default: all
-.PHONY: force
+else
+# Distributed version, download the manuals by default
+default: download
MANUALS=acsl
@@ -63,22 +64,131 @@ FILES= $(addprefix manuals/, \
$(addsuffix .pdf, $(MANUALS)) \
)
-
-ifeq ($(DEVELOPMENT),yes)
-
-download: force
- @echo "You can't download the manuals in this way for the development version"
-
-else
-
-download: force
+download: .force
$(MKDIR) manuals
wget -nv -N -P manuals \
$(addprefix http://frama-c.com/download/,$(addsuffix -$(VERSION).pdf, $(VERSIONED_MANUALS))) \
$(addprefix http://frama-c.com/download/,$(addsuffix .pdf, $(MANUALS)))
-endif
-
install:
$(MKDIR) $(FRAMAC_DOCDIR)
$(CP) $(FILES) $(FRAMAC_DOCDIR)
+
+endif
+
+
+###################
+# Generation #
+###################
+
+FC_SUFFIX=$(VERSION_SAFE)-$(VERSION_CODENAME)
+
+clean::
+ $(RM) manuals/*.pdf
+ $(RM) manuals/*.tgz
+ $(MAKE) -C userman clean
+ $(MAKE) -C developer clean
+ $(MAKE) -C rte clean
+ $(MAKE) -C aorai clean
+ $(MAKE) -C value clean
+ $(MAKE) -C metrics clean
+ $(MAKE) -C ../src/plugins/wp/doc/manual clean
+
+all: \
+ manuals/user-manual-$(FC_SUFFIX).pdf \
+ manuals/plugin-development-guide-$(FC_SUFFIX).pdf \
+ manuals/rte-manual-$(FC_SUFFIX).pdf \
+ manuals/aorai-manual-$(FC_SUFFIX).pdf \
+ manuals/aorai-example-$(FC_SUFFIX).tgz \
+ manuals/eva-manual-$(FC_SUFFIX).pdf \
+ manuals/metrics-manual-$(FC_SUFFIX).pdf \
+ manuals/wp-manual-$(FC_SUFFIX).pdf \
+
+manuals/%:
+ mkdir --parent manuals
+ $(CP) $< $@
+
+%.pdf:
+ $(PRINT) Generating $@
+ $(MAKE) -C $(@D) $(@F)
+
+%.tgz:
+ $(PRINT) Generating $@
+ $(MAKE) -C $(@D) $(@F)
+
+manuals/user-manual-$(FC_SUFFIX).pdf: userman/userman.pdf
+manuals/plugin-development-guide-$(FC_SUFFIX).pdf: developer/developer.pdf
+manuals/rte-manual-$(FC_SUFFIX).pdf: rte/main.pdf
+manuals/aorai-manual-$(FC_SUFFIX).pdf: aorai/main.pdf
+manuals/aorai-example-$(FC_SUFFIX).tgz: aorai/aorai-example.tgz
+manuals/eva-manual-$(FC_SUFFIX).pdf: value/main.pdf
+manuals/metrics-manual-$(FC_SUFFIX).pdf: metrics/metrics.pdf
+manuals/wp-manual-$(FC_SUFFIX).pdf: ../src/plugins/wp/doc/manual/wp.pdf
+
+
+###################
+# ACSL #
+###################
+
+ifeq ($(wildcard acsl),)
+
+# ACSL and E-ACSL manuals requires a clone of the acsl repository
+$(info 'acsl' not in doc; try: git clone https://github.com/acsl-language/acsl.git)
+
+else
+
+ACSL_SUFFIX=$(shell grep acslversion acsl/version.tex | sed 's/.*{\([^{}\\]*\).*/\1/')
+
+clean::
+ $(MAKE) -C acsl clean
+
+all: \
+ manuals/acsl-implementation-$(FC_SUFFIX).pdf \
+ manuals/acsl-$(ACSL_SUFFIX).pdf \
+
+manuals/acsl-implementation-$(FC_SUFFIX).pdf: acsl/acsl-implementation.pdf
+manuals/acsl-$(ACSL_SUFFIX).pdf: acsl/acsl.pdf
+
+
+###################
+# E-ACSL #
+###################
+
+EACSL_DOC=../src/plugins/e-acsl/doc
+EACSL_SUFFIX=$(shell grep 'newcommand{\\eacsllangversion' $(EACSL_DOC)/refman/main.tex | sed 's/.*{\([^{}\\]*\).*/\1/')
+
+ifeq ($(EACSL_SUFFIX),)
+
+$(info could not retrieve E-ACSL version from ../src/plugins/e-acsl/doc/refman/main.tex")
+
+else
+
+# Sanity check: version differences between Frama-C, and E-ACSL
+ifneq ($(ACSL_SUFFIX),$(EACSL_SUFFIX))
+ $(info WARNING: different versions for ACSL and E-ACSL manuals: $(ACSL_SUFFIX) versus $(EACSL_SUFFIX))
+endif
+
+clean::
+ $(MAKE) -C $(EACSL_DOC)/refman/ clean
+ $(MAKE) -C $(EACSL_DOC)/userman/ clean
+
+all: \
+ manuals/e-acsl-implementation-$(FC_SUFFIX).pdf \
+ manuals/e-acsl-manual-$(FC_SUFFIX).pdf \
+ manuals/e-acsl-$(EACSL_SUFFIX).pdf \
+
+manuals/e-acsl-implementation-$(FC_SUFFIX).pdf: $(EACSL_DOC)/refman/e-acsl-implementation.pdf
+manuals/e-acsl-manual-$(FC_SUFFIX).pdf: $(EACSL_DOC)/userman/main.pdf
+manuals/e-acsl-$(EACSL_SUFFIX).pdf: $(EACSL_DOC)/refman/e-acsl.pdf
+
+endif
+
+# Note: The makefiles of ACSL/E-ACSL are not parallelizable when producing both
+# acsl.pdf and acsl-implementation.pdf (race conditions in intermediary files,
+# leading to non-deterministic errors): we have to wait for one to complete
+# before making the other
+
+acsl/acsl-implementation.pdf: | acsl/acsl.pdf
+$(EACSL_DOC)/refman/e-acsl-implementation.pdf: | $(EACSL_DOC)/refman/e-acsl.pdf
+
+endif
diff --git a/doc/build-manuals.sh b/doc/build-manuals.sh
deleted file mode 100755
index 3f330a4ea60ce67b3216d7da404d3af2b932f8f6..0000000000000000000000000000000000000000
--- a/doc/build-manuals.sh
+++ /dev/null
@@ -1,132 +0,0 @@
-#! /usr/bin/env bash
-
-# Look for GNU parallel
-PARALLEL=1
-if ! command -v parallel >/dev/null 2>/dev/null; then
- echo "parallel not found, building in sequential"
- PARALLEL=0
-fi
-
-# latexmk needs to be installed
-if ! command -v latexmk >/dev/null 2>/dev/null; then
- echo "latexmk is required"
- exit 127
-fi
-
-cd $(dirname $0)
-
-usage () {
- echo "usage: $(basename $0) [help|clean|build] (default: build)"
-}
-
-if test $# -gt 1; then usage; exit 2; fi;
-
-if test $# -eq 1; then
- case $1 in
- "help") usage; exit 0;;
- "clean") rm -f manuals/*.pdf; exit 0;;
- "build") ;;
- *) usage; exit 2;;
- esac
-fi
-
-set -e
-
-if [ ! -e acsl ]; then
- echo "error: 'acsl' not in doc; try: git clone git@github.com:acsl-language/acsl.git"
- exit 1
-fi
-
-mkdir -p manuals
-
-
-FC_SUFFIX=$(cat ../VERSION)-$(cat ../VERSION_CODENAME)
-FC_SUFFIX="$(echo ${FC_SUFFIX} | sed -e "s/~/-/")"
-ACSL_SUFFIX=$(grep acslversion acsl/version.tex | sed 's/.*{\([^{}\\]*\).*/\1/')
-FC_VERSION=$(cat ../VERSION)
-EACSL_SUFFIX=$(grep 'newcommand{\\eacsllangversion' ../src/plugins/e-acsl/doc/refman/main.tex | sed 's/.*{\([^{}\\]*\).*/\1/')
-# sanity check
-if [ "$EACSL_SUFFIX" = "" ]; then
- echo "error: could not retrieve E-ACSL version from ../src/plugins/e-acsl/doc/refman/main.tex"
- exit 1
-fi
-
-build () {
-
- echo "##### Building $1"
- set +e
- make -C $(dirname $1) $(basename $1)
- ret=$?
- if [ $ret -eq 0 ]; then
- echo "##### $1 done"
- else
- echo "######### $1 failed"
- exit 1
- fi
- if [ "$NO_SUFFIX" == "yes" ] ; then
- MANUAL=$2
- else
- # extract extension, add suffix, re-append extension
- MANUAL=${2%.*}-$3.${2##*.}
- fi
- cp -f $1 manuals/$MANUAL
- echo "##### $MANUAL copied"
-
-}
-
-EACSL_DOC=../src/plugins/e-acsl/doc
-
-export -f build
-
-if [[ $PARALLEL -eq 1 ]]; then
- # Note: The makefiles of ACSL/E-ACSL are not parallelizable when producing both
- # acsl.pdf and acsl-implementation.pdf (race conditions in intermediary files,
- # leading to non-deterministic errors).
- # Therefore, we perform a second call to parellel for these files.
- SHELL=(type -p bash) parallel --halt soon,fail=1 --csv build {1} {2} {3} ::: \
- userman/userman.pdf,user-manual.pdf,$FC_SUFFIX \
- developer/developer.pdf,plugin-development-guide.pdf,$FC_SUFFIX \
- rte/main.pdf,rte-manual.pdf,$FC_SUFFIX \
- aorai/main.pdf,aorai-manual.pdf,$FC_SUFFIX \
- aorai/aorai-example.tgz,aorai-example.tgz,$FC_SUFFIX \
- value/main.pdf,eva-manual.pdf,$FC_SUFFIX \
- metrics/metrics.pdf,metrics-manual.pdf,$FC_SUFFIX \
- ../src/plugins/wp/doc/manual/wp.pdf,wp-manual.pdf,$FC_SUFFIX \
- acsl/acsl-implementation.pdf,acsl-implementation.pdf,$FC_SUFFIX \
- $EACSL_DOC/refman/e-acsl-implementation.pdf,e-acsl-implementation.pdf,$FC_SUFFIX \
- $EACSL_DOC/userman/main.pdf,e-acsl-manual.pdf,$FC_SUFFIX \
-
- SHELL=(type -p bash) parallel --halt soon,fail=1 --csv build {1} {2} {3} ::: \
- acsl/acsl.pdf,acsl.pdf,$ACSL_SUFFIX \
- $EACSL_DOC/refman/e-acsl.pdf,e-acsl.pdf,$EACSL_SUFFIX
-else
- build userman/userman.pdf user-manual.pdf $FC_SUFFIX
- build developer/developer.pdf plugin-development-guide.pdf $FC_SUFFIX
- build rte/main.pdf rte-manual.pdf $FC_SUFFIX
- build aorai/main.pdf aorai-manual.pdf $FC_SUFFIX
- build aorai/aorai-example.tgz aorai-example.tgz $FC_SUFFIX
- build value/main.pdf eva-manual.pdf $FC_SUFFIX
- build metrics/metrics.pdf metrics-manual.pdf $FC_SUFFIX
- build ../src/plugins/wp/doc/manual/wp.pdf wp-manual.pdf $FC_SUFFIX
- build acsl/acsl.pdf acsl.pdf $ACSL_SUFFIX
- build acsl/acsl-implementation.pdf acsl-implementation.pdf $FC_SUFFIX
- build $EACSL_DOC/refman/e-acsl-implementation.pdf e-acsl-implementation.pdf $FC_SUFFIX
- build $EACSL_DOC/userman/main.pdf e-acsl-manual.pdf $FC_SUFFIX
- build $EACSL_DOC/refman/e-acsl.pdf e-acsl.pdf $EACSL_SUFFIX
-fi
-
-# Sanity check: version differences between Frama-C, ACSL and E-ACSL
-FAIL=0
-if [ "$ACSL_SUFFIX" != "$EACSL_SUFFIX" ]; then
- echo "WARNING: different versions for ACSL and E-ACSL manuals: $ACSL_SUFFIX versus $EACSL_SUFFIX"
- FAIL=1
-fi
-
-# The file fc_version.tex is created by the compilation of the implementation manual
-ACSL_IMPLEM_VERSION=$(grep fcversion acsl/fc_version.tex | sed 's/.*{\([^{}\\]*\).*/\1/')
-
-if [ "$ACSL_IMPLEM_VERSION" != "$FC_VERSION" ]; then
- echo "WARNING: ACSL implementation refers to a different Frama-C version: $ACSL_IMPLEM_VERSION versus $FC_VERSION"
- FAIL=1
-fi
-exit $FAIL
diff --git a/doc/release/build.tex b/doc/release/build.tex
index 72bf61a1a9785e8328492cd974620bbdd239065e..0bdeb73171ac5c9f7747ca4e10a4d90ac54687bc 100644
--- a/doc/release/build.tex
+++ b/doc/release/build.tex
@@ -163,25 +163,10 @@ manuals.
%\texttt{doc/manuals} in order to update the manuals (required by the
%\texttt{install} target below).
-Run the script \texttt{doc/build-manuals.sh} to compile and install all manuals,
-even for E-ACSL. Note that this script requires \texttt{GNU parallel}.
-
-Otherwise, if you want to do it \textbf{manually}, in each directory:
-\begin{shell}
-make
-make install
-\end{shell}
-
-The result is installed in \texttt{doc/manuals/}.
-
-For E-ACSL, the \textbf{manual} steps (ignore if you used the script)
-are slightly different: \texttt{make} and
-\texttt{make install} must be run in the following directories:
-
-\begin{itemize}
-\item \texttt{src/plugins/e-acsl/doc/refman}
-\item \texttt{src/plugins/e-acsl/doc/userman}
-\end{itemize}
+In the \texttt{doc} directory, just run \texttt{make} to compile
+and install all manuals, together with some final coherence checks with
+respect to the current Frama-C implementation (notably
+for the developer manual and ACSL implementation manual).
% No longer use git annex (as recommended by VP)
%\paragraph{Getting the manuals on the web (ultimately)}
diff --git a/headers/headache_config.txt b/headers/headache_config.txt
index b8fa4937cfdfd7218714afce59a2672aee229f25..69124192483bd84ab38cf7126e7693fa00fc8779 100644
--- a/headers/headache_config.txt
+++ b/headers/headache_config.txt
@@ -151,7 +151,7 @@
##########
| ".*\.py" -> frame open: "#" line: "#" close:"#"
-| ".*\.py" -> skip multiline_match: "#!.*" multiline_match: "#-\*-.*"
+| ".*\.py" -> skip multiline_match: "#!.*" multiline_match: "# -\*-.*"
##############
# Misc files #
diff --git a/headers/header_spec.txt b/headers/header_spec.txt
index fc3f7cd5925d9bdd595efa5286da61869aff2c7b..46728f67158b574cdc4d57a131dabe62f6f58a01 100644
--- a/headers/header_spec.txt
+++ b/headers/header_spec.txt
@@ -139,6 +139,7 @@ share/analysis-scripts/normalize_jcdb.py: CEA_LGPL
share/analysis-scripts/parse-coverage.sh: .ignore
share/analysis-scripts/print_callgraph.py: CEA_LGPL
share/analysis-scripts/prologue.mk: CEA_LGPL
+share/analysis-scripts/pyproject.toml: .ignore
share/analysis-scripts/README.md: .ignore
share/analysis-scripts/results_display.py: CEA_LGPL
share/analysis-scripts/script_for_creduce_fatal.sh: .ignore
@@ -479,8 +480,6 @@ src/kernel_services/abstract_interp/abstract_offset.ml: CEA_LGPL
src/kernel_services/abstract_interp/abstract_offset.mli: CEA_LGPL
src/kernel_services/abstract_interp/base.ml: CEA_LGPL
src/kernel_services/abstract_interp/base.mli: CEA_LGPL
-src/kernel_services/abstract_interp/bottom.ml: CEA_LGPL
-src/kernel_services/abstract_interp/bottom.mli: CEA_LGPL
src/kernel_services/abstract_interp/eva_lattice_type.mli: CEA_LGPL
src/kernel_services/abstract_interp/fc_float.ml: CEA_LGPL
src/kernel_services/abstract_interp/fc_float.mli: CEA_LGPL
@@ -503,6 +502,8 @@ src/kernel_services/abstract_interp/int_val.ml: CEA_LGPL
src/kernel_services/abstract_interp/int_val.mli: CEA_LGPL
src/kernel_services/abstract_interp/ival.ml: CEA_LGPL
src/kernel_services/abstract_interp/ival.mli: CEA_LGPL
+src/kernel_services/abstract_interp/lattice_bounds.ml: CEA_LGPL
+src/kernel_services/abstract_interp/lattice_bounds.mli: CEA_LGPL
src/kernel_services/abstract_interp/lattice_messages.ml: CEA_LGPL
src/kernel_services/abstract_interp/lattice_messages.mli: CEA_LGPL
src/kernel_services/abstract_interp/lattice_type.mli: CEA_LGPL
diff --git a/ivette/Makefile b/ivette/Makefile
index 186681c5cd4c2d66479a02505dd4c74fb5eb457b..61da1162e785923967f0dd1d6d8aa08d1454fb2f 100644
--- a/ivette/Makefile
+++ b/ivette/Makefile
@@ -31,7 +31,7 @@ DOME_CUSTOM_ENTRIES= yes
COPYRIGHT=CEA LIST / LSL
# --------------------------------------------------------------------------
-.PHONY: all app dev pkg doc serve dist lint fixlint
+.PHONY: all app dev pkg doc serve dist lint fixlint checkcase
all: pkg lint app
@@ -39,11 +39,22 @@ app: dome-app
dev: dome-dev
dist: dome-dist
-lint: dome-pkg dome-templ
+lint: dome-pkg dome-templ checkcase
@echo "[Ivette] running typechecker & linter"
yarn run typecheck
yarn run lint
+# In case-insensitive filesystems (macOS/Windows), import statements and
+# filenames can have issues due to case differences
+checkcase:
+ @echo "[Ivette] check case issues in imported filenames"
+ @err=0 ; for f in `find src | sed -E 's/(.ts|.tsx|.js|.jsx|.css|.json)$$//' | sort -f | uniq -di` ;\
+ do \
+ err=1; \
+ echo " - ambiguous $$f.*"; \
+ done ;\
+ exit $$err
+
tsc: dome-pkg dome-templ
@echo "[Ivette] running typechecker & linter (with cache & fix mode)"
yarn run typecheck
@@ -153,7 +164,9 @@ doc: $(NODEBIN)/typedoc icons
@rm -fr doc/html
@yarn run typedoc $(DOCFILES)
@echo "\n[Ivette] main page"
- @echo " file://$(PWD)/doc/html/index.html"
+ @echo ""
+ @echo " file://$(PWD)/ivette/doc/html/index.html"
+ @echo ""
$(NODEBIN)/%:
@echo "[Node] install package $*"
diff --git a/ivette/Makefile.distrib b/ivette/Makefile.distrib
index d4eeff9d4e3f8d69a886b74a1997bcfe70d8feb5..59ac03f8c157a13de8fd437f9010b796dbf14691 100644
--- a/ivette/Makefile.distrib
+++ b/ivette/Makefile.distrib
@@ -93,6 +93,7 @@ DISTRIB_FILES += ivette/src/dome/renderer/controls/gallery.json
DISTRIB_FILES += ivette/src/dome/renderer/controls/icons.tsx
DISTRIB_FILES += ivette/src/dome/renderer/controls/labels.tsx
DISTRIB_FILES += ivette/src/dome/renderer/controls/style.css
+DISTRIB_FILES += ivette/src/dome/renderer/dark.css
DISTRIB_FILES += ivette/src/dome/renderer/data/compare.ts
DISTRIB_FILES += ivette/src/dome/renderer/data/json.ts
DISTRIB_FILES += ivette/src/dome/renderer/data/library.js
@@ -112,15 +113,18 @@ DISTRIB_FILES += ivette/src/dome/renderer/layout/forms.tsx
DISTRIB_FILES += ivette/src/dome/renderer/layout/grids.js
DISTRIB_FILES += ivette/src/dome/renderer/layout/splitters.tsx
DISTRIB_FILES += ivette/src/dome/renderer/layout/style.css
+DISTRIB_FILES += ivette/src/dome/renderer/light.css
DISTRIB_FILES += ivette/src/dome/renderer/style.css
DISTRIB_FILES += ivette/src/dome/renderer/table/arrays.ts
DISTRIB_FILES += ivette/src/dome/renderer/table/models.ts
DISTRIB_FILES += ivette/src/dome/renderer/table/style.css
DISTRIB_FILES += ivette/src/dome/renderer/table/views.tsx
DISTRIB_FILES += ivette/src/dome/renderer/text/buffers.ts
+DISTRIB_FILES += ivette/src/dome/renderer/text/dark-code.css
DISTRIB_FILES += ivette/src/dome/renderer/text/editors.tsx
DISTRIB_FILES += ivette/src/dome/renderer/text/pages.tsx
DISTRIB_FILES += ivette/src/dome/renderer/text/style.css
+DISTRIB_FILES += ivette/src/dome/renderer/themes.tsx
DISTRIB_FILES += ivette/src/dome/template/Application.js
DISTRIB_FILES += ivette/src/dome/template/Preferences.js
DISTRIB_FILES += ivette/src/dome/template/babelrc.json
@@ -150,6 +154,7 @@ DISTRIB_FILES += ivette/src/frama-c/kernel/Globals.tsx
DISTRIB_FILES += ivette/src/frama-c/kernel/History.tsx
DISTRIB_FILES += ivette/src/frama-c/kernel/Locations.tsx
DISTRIB_FILES += ivette/src/frama-c/kernel/Messages.tsx
+DISTRIB_FILES += ivette/src/frama-c/kernel/PivotTable-style.css
DISTRIB_FILES += ivette/src/frama-c/kernel/PivotTable.tsx
DISTRIB_FILES += ivette/src/frama-c/kernel/Properties.tsx
DISTRIB_FILES += ivette/src/frama-c/kernel/SourceCode.tsx
@@ -175,26 +180,17 @@ DISTRIB_FILES += ivette/src/frama-c/plugins/eva/CoverageMeter.tsx
DISTRIB_FILES += ivette/src/frama-c/plugins/eva/Summary.tsx
DISTRIB_FILES += ivette/src/frama-c/plugins/eva/api/general/index.ts
DISTRIB_FILES += ivette/src/frama-c/plugins/eva/api/values/index.ts
-DISTRIB_FILES += ivette/src/frama-c/plugins/eva/cells.ts
-DISTRIB_FILES += ivette/src/frama-c/plugins/eva/diffed.tsx
DISTRIB_FILES += ivette/src/frama-c/plugins/eva/index.tsx
-DISTRIB_FILES += ivette/src/frama-c/plugins/eva/layout.ts
-DISTRIB_FILES += ivette/src/frama-c/plugins/eva/model.ts
DISTRIB_FILES += ivette/src/frama-c/plugins/eva/pkg.json
-DISTRIB_FILES += ivette/src/frama-c/plugins/eva/probeinfos.tsx
-DISTRIB_FILES += ivette/src/frama-c/plugins/eva/probes.ts
-DISTRIB_FILES += ivette/src/frama-c/plugins/eva/sized.tsx
-DISTRIB_FILES += ivette/src/frama-c/plugins/eva/stacks.ts
DISTRIB_FILES += ivette/src/frama-c/plugins/eva/style.css
-DISTRIB_FILES += ivette/src/frama-c/plugins/eva/summary.css
-DISTRIB_FILES += ivette/src/frama-c/plugins/eva/valueinfos.tsx
+DISTRIB_FILES += ivette/src/frama-c/plugins/eva/style_summary.css
DISTRIB_FILES += ivette/src/frama-c/plugins/eva/valuetable.tsx
DISTRIB_FILES += ivette/src/frama-c/plugins/pivot/api/general/index.ts
DISTRIB_FILES += ivette/src/frama-c/plugins/studia/api/studia/index.ts
DISTRIB_FILES += ivette/src/frama-c/react-pivottable.d.ts
+DISTRIB_FILES += ivette/src/frama-c/richtext.tsx
DISTRIB_FILES += ivette/src/frama-c/server.ts
DISTRIB_FILES += ivette/src/frama-c/states.ts
-DISTRIB_FILES += ivette/src/frama-c/utils.ts
DISTRIB_FILES += ivette/src/ivette/index.tsx
DISTRIB_FILES += ivette/src/ivette/prefs.tsx
DISTRIB_FILES += ivette/src/ivette/sandbox.tsx
diff --git a/ivette/headers/header_spec.txt b/ivette/headers/header_spec.txt
index e4d41f1530f1c839dd642385123045132d425cc2..f0cfef73b512a8b4c2bcb94126afce27b1dce109 100644
--- a/ivette/headers/header_spec.txt
+++ b/ivette/headers/header_spec.txt
@@ -93,6 +93,7 @@ src/dome/renderer/controls/gallery.json: .ignore
src/dome/renderer/controls/icons.tsx: CEA_LGPL
src/dome/renderer/controls/labels.tsx: CEA_LGPL
src/dome/renderer/controls/style.css: .ignore
+src/dome/renderer/dark.css: .ignore
src/dome/renderer/data/compare.ts: CEA_LGPL
src/dome/renderer/data/json.ts: CEA_LGPL
src/dome/renderer/data/library.js: CEA_LGPL
@@ -112,15 +113,18 @@ src/dome/renderer/layout/forms.tsx: CEA_LGPL
src/dome/renderer/layout/grids.js: CEA_LGPL
src/dome/renderer/layout/splitters.tsx: CEA_LGPL
src/dome/renderer/layout/style.css: .ignore
+src/dome/renderer/light.css: .ignore
src/dome/renderer/style.css: .ignore
src/dome/renderer/table/arrays.ts: CEA_LGPL
src/dome/renderer/table/models.ts: CEA_LGPL
src/dome/renderer/table/style.css: .ignore
src/dome/renderer/table/views.tsx: CEA_LGPL
src/dome/renderer/text/buffers.ts: CEA_LGPL
+src/dome/renderer/text/dark-code.css: .ignore
src/dome/renderer/text/editors.tsx: CEA_LGPL
src/dome/renderer/text/pages.tsx: CEA_LGPL
src/dome/renderer/text/style.css: .ignore
+src/dome/renderer/themes.tsx: CEA_LGPL
src/dome/template/Application.js: CEA_LGPL
src/dome/template/Preferences.js: CEA_LGPL
src/dome/template/babelrc.json: .ignore
@@ -150,6 +154,7 @@ src/frama-c/kernel/Globals.tsx: CEA_LGPL
src/frama-c/kernel/History.tsx: CEA_LGPL
src/frama-c/kernel/Locations.tsx: CEA_LGPL
src/frama-c/kernel/Messages.tsx: CEA_LGPL
+src/frama-c/kernel/PivotTable-style.css: .ignore
src/frama-c/kernel/PivotTable.tsx: CEA_LGPL
src/frama-c/kernel/Properties.tsx: CEA_LGPL
src/frama-c/kernel/SourceCode.tsx: CEA_LGPL
@@ -175,26 +180,17 @@ src/frama-c/plugins/eva/CoverageMeter.tsx: CEA_LGPL
src/frama-c/plugins/eva/Summary.tsx: CEA_LGPL
src/frama-c/plugins/eva/api/general/index.ts: CEA_LGPL
src/frama-c/plugins/eva/api/values/index.ts: CEA_LGPL
-src/frama-c/plugins/eva/cells.ts: CEA_LGPL
-src/frama-c/plugins/eva/diffed.tsx: CEA_LGPL
src/frama-c/plugins/eva/index.tsx: CEA_LGPL
-src/frama-c/plugins/eva/layout.ts: CEA_LGPL
-src/frama-c/plugins/eva/model.ts: CEA_LGPL
src/frama-c/plugins/eva/pkg.json: .ignore
-src/frama-c/plugins/eva/probeinfos.tsx: CEA_LGPL
-src/frama-c/plugins/eva/probes.ts: CEA_LGPL
-src/frama-c/plugins/eva/sized.tsx: CEA_LGPL
-src/frama-c/plugins/eva/stacks.ts: CEA_LGPL
src/frama-c/plugins/eva/style.css: .ignore
-src/frama-c/plugins/eva/summary.css: .ignore
-src/frama-c/plugins/eva/valueinfos.tsx: CEA_LGPL
+src/frama-c/plugins/eva/style_summary.css: .ignore
src/frama-c/plugins/eva/valuetable.tsx: CEA_LGPL
src/frama-c/plugins/pivot/api/general/index.ts: CEA_LGPL
src/frama-c/plugins/studia/api/studia/index.ts: CEA_LGPL
src/frama-c/react-pivottable.d.ts: CEA_LGPL
+src/frama-c/richtext.tsx: CEA_LGPL
src/frama-c/server.ts: CEA_LGPL
src/frama-c/states.ts: CEA_LGPL
-src/frama-c/utils.ts: CEA_LGPL
src/ivette/index.tsx: CEA_LGPL
src/ivette/prefs.tsx: CEA_LGPL
src/ivette/sandbox.tsx: CEA_LGPL
diff --git a/ivette/src/dome/renderer/data/settings.ts b/ivette/src/dome/renderer/data/settings.ts
index 4421943d26bd8d03cbb1626e8743950bd3b95566..585fe1405557d4015898dcea5ca6bd0428bd2cfa 100644
--- a/ivette/src/dome/renderer/data/settings.ts
+++ b/ivette/src/dome/renderer/data/settings.ts
@@ -248,26 +248,29 @@ function useSettings<A>(
D: Driver,
K?: string,
): State<A> {
- // Load value
- const loader = () => (
+ // Local State
+ const [value, setValue] = React.useState<A>(() => (
JSON.jCatch(S.decoder, S.defaultValue)(D.load(K))
- );
- // Local state
- const [value, setValue] = React.useState<A>(loader);
- // Emit update event
+ ));
+ // Foreign Settings Update
React.useEffect(() => {
const event = D.evt;
- const callback = () => setValue(loader());
- SysEmitter.on(event, callback);
- return () => { SysEmitter.off(event, callback); };
+ const onUpdate = () => {
+ const fromSettings = JSON.jCatch(S.decoder, undefined)(D.load(K));
+ if (fromSettings !== undefined)
+ setValue(fromSettings);
+ };
+ SysEmitter.on(event, onUpdate);
+ return () => { SysEmitter.off(event, onUpdate); };
});
- // Updates
+ // Hooked Settings Update
const updateValue = React.useCallback((newValue: A) => {
if (!isEqual(value, newValue)) {
setValue(newValue);
if (K) D.save(K, S.encoder(newValue));
}
}, [S, D, K, value]);
+ // Hook
return [value, updateValue];
}
diff --git a/ivette/src/dome/renderer/dome.tsx b/ivette/src/dome/renderer/dome.tsx
index 1770a29b7f2d5412424b59ab9fcdcd04940ed798..51eb64b19f4f5f77a58e6cb45c3ecacd0fcfc471 100644
--- a/ivette/src/dome/renderer/dome.tsx
+++ b/ivette/src/dome/renderer/dome.tsx
@@ -173,7 +173,7 @@ export function useEvent<A>(
return () => evt.off(callback);
}
return undefined;
- });
+ }, [evt, callback]);
}
// --------------------------------------------------------------------------
@@ -582,6 +582,29 @@ export function usePromise<T>(job: Promise<T>) {
return { result, error, loading };
}
+/* Internal type alias */
+type Serialize<A> = (a: A) => string;
+
+/**
+ Hook to add a cache system to a function, allowing to reuse previous results.
+ As the equality used in JS maps does not allow to effectively implement a
+ cache for complex type, a serialization function can be procured.
+ The hook returns the cached version of the function.
+*/
+export function useCache<K, V>(r: (k: K) => V, s?: Serialize<K>): (k: K) => V {
+ const { current: cache } = React.useRef(new Map<string, V>());
+ const serialize = React.useMemo(() => s ? s : (k: K) => `${k}`, [s]);
+ const get = React.useCallback((k: K): V => {
+ const id = serialize(k);
+ if (cache.has(id))
+ return cache.get(id) as V;
+ const v = r(k);
+ cache.set(id, v);
+ return v;
+ }, [ cache, r, serialize ]);
+ return get;
+}
+
// --------------------------------------------------------------------------
// --- Timer Hooks
// --------------------------------------------------------------------------
@@ -704,11 +727,7 @@ export function useFlipSettings(
const [state, setState] = Settings.useWindowSettings(
key, Json.jBoolean, defaultValue,
);
- const flipState = React.useCallback(
- () => setState(!state),
- [state, setState],
- );
- return [state, flipState];
+ return [state, () => setState(!state)];
}
/** Number window settings helper. Default is `0` unless specified. */
diff --git a/ivette/src/dome/renderer/frame/toolbars.tsx b/ivette/src/dome/renderer/frame/toolbars.tsx
index 44f69e6012a22edccb1e207f77f3b0ebfd15977f..51ab7f1a51a34b6623b7188a55f2d270c6132eef 100644
--- a/ivette/src/dome/renderer/frame/toolbars.tsx
+++ b/ivette/src/dome/renderer/frame/toolbars.tsx
@@ -124,6 +124,8 @@ export interface ButtonProps<A> {
selection?: A;
/** Selection callback. Receives the button's value. */
onClick?: (value: A | undefined) => void;
+ /** Button contents */
+ children?: React.ReactNode;
}
/** Toolbar Button. */
@@ -145,6 +147,7 @@ export function Button<A = undefined>(props: ButtonProps<A>) {
>
{props.icon && <SVG id={props.icon} />}
{props.label && <label>{props.label}</label>}
+ {props.children}
</button>
);
}
diff --git a/ivette/src/dome/renderer/text/editors.tsx b/ivette/src/dome/renderer/text/editors.tsx
index 43df5396e92fe069852ce49cdfa8aab940e908ef..deea5d38e582dcf11ae9b182f3f57d4938e59b0d 100644
--- a/ivette/src/dome/renderer/text/editors.tsx
+++ b/ivette/src/dome/renderer/text/editors.tsx
@@ -72,6 +72,9 @@ export interface TextProps extends CodeMirror.EditorConfiguration {
/** The currently selected marker identifier. */
selection?: string;
+ /** Callback on hovered marker, if some. */
+ onHover?: (id?: string) => void;
+
/** Callback on identified marker selection. */
onSelection?: MarkerCallback;
@@ -311,6 +314,8 @@ class CodeMirrorWrapper extends React.Component<TextProps> {
if (newMarker && newMarker.hover)
this._markElementsWith(newMarker.classNameId, CSS_HOVERED);
this.marker = newMarker;
+ const callback = this.props.onHover;
+ if (callback) callback(newMarker?.id);
}
}
@@ -479,6 +484,7 @@ class CodeMirrorWrapper extends React.Component<TextProps> {
onFocus={this.onFocus}
onScroll={this.onScroll}
onMouseMove={this.onMouseMove}
+ onMouseLeave={this.onMouseMove}
/>
);
}
diff --git a/ivette/src/dome/renderer/themes.tsx b/ivette/src/dome/renderer/themes.tsx
index fc24cb2bd4ec9f1fea98e3c17a7bde85eb131c3d..2f2099545e0aecb2f05be27880fa9ba15c78f1e9 100644
--- a/ivette/src/dome/renderer/themes.tsx
+++ b/ivette/src/dome/renderer/themes.tsx
@@ -2,7 +2,7 @@
/* */
/* This file is part of Frama-C. */
/* */
-/* Copyright (C) 2007-2021 */
+/* Copyright (C) 2007-2022 */
/* CEA (Commissariat à l'énergie atomique et aux énergies */
/* alternatives) */
/* */
diff --git a/ivette/src/frama-c/api_generator.ml b/ivette/src/frama-c/api_generator.ml
index 371495e164343380571b7490cc496fffbb2b4302..b72055204a8002d9e3778a336fd422f14d2f6e69 100644
--- a/ivette/src/frama-c/api_generator.ml
+++ b/ivette/src/frama-c/api_generator.ml
@@ -349,8 +349,9 @@ let makeDeclaration fmt names d =
Format.fprintf fmt " name: '%s',@\n" (Pkg.name_of_ident d.d_ident) ;
Format.fprintf fmt " input: %a,@\n" makeParam input ;
Format.fprintf fmt " output: %a,@\n" makeParam output ;
- Format.fprintf fmt " signals: [%a],@\n"
- (Pretty_utils.pp_list ~pre:"@[<hov 2>[ " ~sep:",@ " ~suf:"@ ]@]"
+ Format.fprintf fmt " signals: %a,@\n"
+ (Pretty_utils.pp_list
+ ~empty:"[]" ~pre:"@[<hov 2>[ " ~sep:",@ " ~suf:"@ ]@]"
(fun fmt s -> Format.fprintf fmt "{ name: '%s' }" s))
rq.rq_signals;
Format.fprintf fmt "};@\n" ;
diff --git a/ivette/src/frama-c/client.ts b/ivette/src/frama-c/client.ts
index 0398a92fcb28ac2ca8b61d8ff00a00d0141e059c..ae1acb242e98e7f18c14e371fdb9aeebf8bf1794 100644
--- a/ivette/src/frama-c/client.ts
+++ b/ivette/src/frama-c/client.ts
@@ -44,7 +44,7 @@ export abstract class Client {
/** Signal ON */
abstract sigOn(id: string): void;
- /** Signal ON */
+ /** Signal OFF */
abstract sigOff(id: string): void;
/** Kill Request */
@@ -143,6 +143,20 @@ export abstract class Client {
this.events.emit('CONNECT', err);
}
+ // --------------------------------------------------------------------------
+ // --- CMDLINE Event
+ // --------------------------------------------------------------------------
+
+ /** Signal callback */
+ onCmdLine(callback: (cmd: boolean) => void): void {
+ this.events.on('CMDLINE', callback);
+ }
+
+ /** @internal */
+ emitCmdLine(cmd: boolean): void {
+ this.events.emit('CMDLINE', cmd);
+ }
+
}
// --------------------------------------------------------------------------
diff --git a/ivette/src/frama-c/client_socket.ts b/ivette/src/frama-c/client_socket.ts
index d31c8554672a2987ed23dd83fd299dde2a1f403d..4f6d62223cc1c431cc6019c41bde1bdf6719ebae 100644
--- a/ivette/src/frama-c/client_socket.ts
+++ b/ivette/src/frama-c/client_socket.ts
@@ -27,7 +27,7 @@ import { Client } from './client';
const D = new Debug('SocketServer');
-const RETRIES = 10;
+const RETRIES = 30;
const TIMEOUT = 200;
// --------------------------------------------------------------------------
@@ -61,6 +61,7 @@ class SocketClient extends Client {
const s = Net.createConnection(sockaddr, () => {
this.running = true;
this.retries = 0;
+ this.buffer = Buffer.from('');
this.emitConnect();
this._flush();
});
@@ -73,7 +74,7 @@ class SocketClient extends Client {
this.socket = undefined;
this.timer = setTimeout(() => this.connect(sockaddr), TIMEOUT);
} else {
- this.running = false;
+ this.disconnect();
this.emitConnect(err);
}
});
@@ -84,6 +85,7 @@ class SocketClient extends Client {
this.queue = [];
this.retries = 0;
this.running = false;
+ this.buffer = Buffer.from('');
if (this.timer) {
clearTimeout(this.timer);
this.timer = undefined;
@@ -176,10 +178,8 @@ class SocketClient extends Client {
_receive(chunk: Buffer): void {
this.buffer = Buffer.concat([this.buffer, chunk]);
while (true) {
- const n0 = this.buffer.length;
const data = this._fetch();
- const n1 = this.buffer.length;
- if (data === undefined || n0 <= n1) break;
+ if (!data) break;
try {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const cmd: any = JSON.parse(data);
@@ -193,8 +193,14 @@ class SocketClient extends Client {
default:
D.warn('Unknown command', cmd);
}
- } else
- D.warn('Misformed data', data);
+ } else {
+ switch (cmd) {
+ case 'CMDLINEON': this.emitCmdLine(true); break;
+ case 'CMDLINEOFF': this.emitCmdLine(false); break;
+ default:
+ D.warn('Misformed data', data);
+ }
+ }
} catch (err) {
D.warn('Misformed JSON', data, err);
}
diff --git a/ivette/src/frama-c/client_zmq.ts b/ivette/src/frama-c/client_zmq.ts
index 45be4a2c04832c2079a0973c19bee13c8e0d8793..e66610de46cc555c1c555555398bd747303a7ad6 100644
--- a/ivette/src/frama-c/client_zmq.ts
+++ b/ivette/src/frama-c/client_zmq.ts
@@ -190,6 +190,12 @@ class ZmqClient extends Client {
D.error(`ZMQ Protocol Error: ${err}`);
}
break;
+ case 'CMDLINEON':
+ this.emitCmdLine(true);
+ break;
+ case 'CMDLINEOFF':
+ this.emitCmdLine(false);
+ break;
default:
D.error(`Unknown Response: ${cmd}`);
return;
diff --git a/ivette/src/frama-c/index.tsx b/ivette/src/frama-c/index.tsx
index 9c3e42d30e134a2a68a0eeb39d2357abfc9aa23c..171fbe23f912103aca11d18cb28e0add4fb7d2e0 100644
--- a/ivette/src/frama-c/index.tsx
+++ b/ivette/src/frama-c/index.tsx
@@ -55,18 +55,18 @@ Ivette.registerGroup({
Ivette.registerSidebar({ id: 'frama-c.globals', children: <Globals /> });
Ivette.registerToolbar({ id: 'frama-c.history', children: <History /> });
Ivette.registerStatusbar({ id: 'frama-c.message', children: <Status /> });
+ Ivette.registerComponent({
+ id: 'frama-c.astinfo',
+ label: 'Inspector',
+ title: 'Contextual information on selected AST elements',
+ children: <ASTinfo />
+ });
Ivette.registerComponent({
id: 'frama-c.astview',
label: 'AST',
title: 'Normalized C/ACSL Source Code',
children: <ASTview />,
});
- Ivette.registerComponent({
- id: 'frama-c.astinfo',
- label: 'Informations',
- title: 'Informations on currently selected item',
- children: <ASTinfo />,
- });
Ivette.registerComponent({
id: 'frama-c.sourcecode',
label: 'Source Code',
diff --git a/ivette/src/frama-c/kernel/ASTinfo.tsx b/ivette/src/frama-c/kernel/ASTinfo.tsx
index 928411368bdae0c159d30feae7ece4330b2bd0c0..8eeff601e8c0a51ecd5b6460654bccddf4ce9e49 100644
--- a/ivette/src/frama-c/kernel/ASTinfo.tsx
+++ b/ivette/src/frama-c/kernel/ASTinfo.tsx
@@ -25,49 +25,345 @@
// --------------------------------------------------------------------------
import React from 'react';
+import * as Dome from 'dome';
+import { classes } from 'dome/misc/utils';
import * as States from 'frama-c/states';
-import * as Utils from 'frama-c/utils';
+import * as DATA from 'frama-c/kernel/api/data';
+import * as AST from 'frama-c/kernel/api/ast';
+import { Text } from 'frama-c/richtext';
+import { Icon } from 'dome/controls/icons';
+import { Code } from 'dome/controls/labels';
+import { IconButton } from 'dome/controls/buttons';
+import * as Boxes from 'dome/layout/boxes';
+import { TitleBar } from 'ivette';
-import { Vfill } from 'dome/layout/boxes';
-import { RichTextBuffer } from 'dome/text/buffers';
-import { Text } from 'dome/text/editors';
-import { getInfo } from 'frama-c/kernel/api/ast';
+// --------------------------------------------------------------------------
+// --- Marker Kinds
+// --------------------------------------------------------------------------
+
+import Kind = AST.markerKind;
+import Var = AST.markerVar
+
+function getMarkerKind (props: AST.markerInfoData): [string, string] {
+ switch (props.kind) {
+ case Kind.declaration:
+ switch (props.var) {
+ case Var.function: return ["Declaration", "Function declaration"];
+ case Var.variable: return ["Declaration", "Variable declaration"];
+ case Var.none: return ["Declaration", "Declaration"];
+ }
+ break;
+ case Kind.global: return ["Global", "Global declaration or definition"];
+ case Kind.lvalue:
+ switch (props.var) {
+ case Var.function: return ["Function", "Function"];
+ case Var.variable: return ["Variable", "C variable"];
+ case Var.none: return ["Lvalue", "C lvalue"];
+ }
+ break;
+ case Kind.expression: return ["Expression", "C expression"];
+ case Kind.statement: return ["Statement", "C statement"];
+ case Kind.property: return ["Property", "ACSL property"];
+ case Kind.term: return ["Term", "ACSL term"];
+ }
+}
+
+function markerKind (props: AST.markerInfoData): JSX.Element {
+ const [label, title] = getMarkerKind(props);
+ return <span className="astinfo-markerkind" title={title}>{label}</span>;
+}
// --------------------------------------------------------------------------
-// --- Information Panel
+// --- Information Details
// --------------------------------------------------------------------------
-export default function ASTinfo(): JSX.Element {
+interface InfoItemProps {
+ label: string;
+ title: string;
+ descr: DATA.text;
+}
- const buffer = React.useMemo(() => new RichTextBuffer(), []);
- const [selection, updateSelection] = States.useSelection();
- const marker = selection?.current?.marker;
- const data = States.useRequest(getInfo, marker);
+function InfoItem(props: InfoItemProps): JSX.Element {
+ return (
+ <div className="astinfo-infos">
+ <div
+ className="dome-text-label astinfo-kind"
+ title={props.title}
+ >
+ {props.label}
+ </div>
+ <div className="dome-text-cell astinfo-data">
+ <Text text={props.descr} />
+ </div>
+ </div>
+ );
+}
- React.useEffect(() => {
- buffer.clear();
- const style = { css: 'color: var(--text-highlighted)' };
- if (data) Utils.printTextWithTags(buffer, data, style);
- }, [buffer, data]);
-
- // Callbacks
- function onTextSelection(id: string): void {
- // For now, the only markers are functions.
- const location = { fct: id };
- updateSelection({ location });
+interface ASTinfos {
+ id: string;
+ label: string;
+ title: string;
+ descr: DATA.text;
+}
+
+interface InfoSectionProps {
+ marker: AST.marker;
+ markerInfo: AST.markerInfoData;
+ filter: string;
+ selected: boolean;
+ hovered: boolean;
+ pinned: boolean;
+ onPin: () => void;
+ onHover: (hover: boolean) => void;
+ onSelect: () => void;
+ onRemove: () => void;
+}
+
+function MarkInfos(props: InfoSectionProps): JSX.Element {
+ const [unfold, setUnfold] = React.useState(true);
+ const [more, setMore] = React.useState(false);
+ const { marker, markerInfo } = props;
+ const allInfos: ASTinfos[] =
+ States.useRequest(AST.getInformation, marker) ?? [];
+ const highlight = classes(
+ props.selected && 'selected',
+ props.hovered && 'hovered',
+ );
+ const descr = markerInfo.descr ?? markerInfo.name;
+ const kind = markerKind(markerInfo);
+ const fs = props.filter.split(':');
+ const filtered = allInfos.filter((info) => !fs.some((m) => m === info.id));
+ const infos = more ? allInfos : filtered;
+ const hasMore = filtered.length < allInfos.length;
+ const pinButton =
+ (!props.pinned || props.selected) ?
+ {
+ icon: "PIN", selected: props.pinned, onClick: props.onPin,
+ title: "Pin/unpin marker information"
+ } : {
+ icon: "CIRC.CLOSE", onClick: props.onRemove,
+ title:"Remove marker information"
+ };
+ return (
+ <div
+ className={`astinfo-section ${highlight}`}
+ onMouseEnter={() => props.onHover(true)}
+ onMouseLeave={() => props.onHover(false)}
+ onDoubleClick={props.onSelect}
+ >
+ <div
+ key="MARKER"
+ className={`astinfo-markerbar ${highlight}`}
+ title={descr}
+ >
+ <Icon
+ className="astinfo-folderbutton"
+ style={{ visibility: infos.length ? 'visible' : 'hidden' }}
+ size={9}
+ offset={-2}
+ id={unfold ? 'TRIANGLE.DOWN' : 'TRIANGLE.RIGHT'}
+ onClick={() => setUnfold(!unfold)}
+ />
+ <Code className="astinfo-markercode">
+ {kind}{descr}
+ </Code>
+ <IconButton
+ style={{ display: hasMore ? undefined : 'none' }}
+ className="astinfo-markerbutton"
+ title="Show all available information"
+ size={9}
+ offset={0}
+ icon="CIRC.PLUS"
+ selected={more}
+ onClick={() => setMore(!more)}
+ />
+ <IconButton
+ className="astinfo-markerbutton"
+ size={9}
+ offset={0}
+ {...pinButton}
+ />
+ </div>
+ {unfold && infos.map((info) => <InfoItem key={info.id} {...info} />)}
+ </div>
+ );
+}
+
+// --------------------------------------------------------------------------
+// --- Information Selection State
+// --------------------------------------------------------------------------
+
+type Mark = { fct: string; marker: AST.marker };
+
+const reload = new Dome.Event('frama-c.astinfo');
+
+class InfoMarkers {
+
+ private selection: Mark[] = [];
+ private mSelected: AST.marker | undefined;
+ private mHovered: AST.marker | undefined;
+ private pinned = new Set<string>();
+
+ isPinned(marker: AST.marker): boolean {
+ return this.pinned.has(marker);
+ }
+
+ setPinned(marker: AST.marker, pinned: boolean): void {
+ const oldpin = this.isPinned(marker);
+ if (oldpin !== pinned) {
+ if (pinned)
+ this.pinned.add(marker);
+ else
+ this.pinned.delete(marker);
+ reload.emit();
+ }
}
- // Component
+ addMarker(s: Mark[], marker: AST.marker, fct: string): Mark[] {
+ if (s.some((m) => m.marker === marker))
+ return s;
+ else
+ return s.concat({ marker, fct });
+ }
+
+ setLocations(
+ selected: States.Location | undefined,
+ hovered: States.Location | undefined
+ ): void {
+ const sm = selected?.marker;
+ const sf = selected?.fct;
+ const hm = hovered?.marker;
+ const hf = hovered?.fct;
+ const s0 = this.mSelected;
+ const h0 = this.mHovered;
+ let s = this.selection.filter((mark): boolean => {
+ const m = mark.marker;
+ return this.isPinned(m) || (m !== s0 && m !== h0);
+ });
+ if (sm && sf) s = this.addMarker(s, sm, sf);
+ if (hm && hf) s = this.addMarker(s, hm, hf);
+ this.selection = s;
+ this.mSelected = sm;
+ this.mHovered = hm;
+ reload.emit();
+ }
+
+ removeMarker(marker: AST.marker): void {
+ if (marker === this.mSelected) this.mSelected = undefined;
+ if (marker === this.mHovered) this.mHovered = undefined;
+ this.selection = this.selection.filter((m) => m.marker !== marker);
+ this.pinned.delete(marker);
+ reload.emit();
+ }
+
+ getSelected(): Mark[] { return this.selection; }
+
+}
+
+// --------------------------------------------------------------------------
+// --- Context Menu Filter
+// --------------------------------------------------------------------------
+
+function openFilter(
+ infos: ASTinfos[],
+ filter: string,
+ onChange: (f: string) => void,
+): void {
+ const fs = filter.split(':');
+ const menuItems = infos.map((info) => {
+ const checked = !fs.some((m) => m === info.id);
+ const onClick = (): void => {
+ const newFs =
+ checked
+ ? fs.concat(info.id)
+ : fs.filter((m) => m !== info.id);
+ onChange(newFs.join(':'));
+ };
+ return {
+ id: info.id,
+ label: `${info.title} (${info.label})`,
+ checked,
+ onClick,
+ };
+ });
+ Dome.popupMenu(menuItems);
+ return;
+}
+
+// --------------------------------------------------------------------------
+// --- Information Panel
+// --------------------------------------------------------------------------
+
+export default function ASTinfo(): JSX.Element {
+ // Hooks
+ Dome.useUpdate(reload);
+ const markers = React.useMemo(() => new InfoMarkers(), []);
+ const markerInfos = States.useSyncArray(AST.markerInfo, false);
+ const [selection] = States.useSelection();
+ const [hoveredLoc] = States.useHovered();
+ const information = States.useRequest(AST.getInformation, null) ?? [];
+ const [filter, setFilter] =
+ Dome.useStringSettings('frama-c.sidebar.astinfo.filter', '');
+ const selectedLoc = selection?.current;
+ const selected = selectedLoc?.marker;
+ const hovered = hoveredLoc?.marker;
+ React.useEffect(() => {
+ markers.setLocations(selectedLoc, hoveredLoc);
+ }, [markers, selectedLoc, hoveredLoc]);
+ const pinMarker = React.useCallback((location: States.Location) => {
+ if (location?.marker)
+ markers.setPinned(location?.marker, true);
+ }, [markers]);
+ React.useEffect(() => {
+ States.MetaSelection.on(pinMarker);
+ return () => States.MetaSelection.off(pinMarker);
+ }, [pinMarker]);
+ const scrollTarget = React.useRef<HTMLInputElement>(null);
+ React.useEffect(() => {
+ scrollTarget.current?.scrollIntoView({ block: 'nearest' });
+ });
+ // Rendering
+ const renderMark = (mark: Mark): JSX.Element | null => {
+ const { marker } = mark;
+ const markerInfo = markerInfos.getData(marker);
+ if (!markerInfo) return null;
+ const pinned = markers.isPinned(marker);
+ const isSelected = selected === marker;
+ const isHovered = hovered === marker;
+ const onPin = () => void markers.setPinned(marker, !pinned);
+ const onRemove = () => void markers.removeMarker(marker);
+ const onSelect = () => void States.setSelection(mark);
+ const onHover =
+ (h: boolean): void => States.setHovered(h ? mark : undefined);
+ const ref = isHovered ? scrollTarget : undefined;
+ const markInfo =
+ <MarkInfos
+ key={marker}
+ marker={marker}
+ markerInfo={markerInfo}
+ pinned={pinned}
+ selected={isSelected}
+ filter={filter}
+ hovered={isHovered}
+ onPin={onPin}
+ onRemove={onRemove}
+ onHover={onHover}
+ onSelect={onSelect}
+ />;
+ return <div ref={ref}>{markInfo}</div>;
+ };
return (
<>
- <Vfill>
- <Text
- buffer={buffer}
- mode="text"
- onSelection={onTextSelection}
- readOnly
+ <TitleBar>
+ <IconButton
+ icon="CLIPBOARD"
+ onClick={() => openFilter(information, filter, setFilter)}
+ title="Information Filters"
/>
- </Vfill>
+ </TitleBar>
+ <Boxes.Scroll>
+ {markers.getSelected().map(renderMark)}
+ </Boxes.Scroll>
</>
);
}
diff --git a/ivette/src/frama-c/kernel/ASTview.tsx b/ivette/src/frama-c/kernel/ASTview.tsx
index e98cb526378526a9edc93cfa001493d4c42ee5ce..339961b65b0344a4dddf128fdbbeb1b71abb56b5 100644
--- a/ivette/src/frama-c/kernel/ASTview.tsx
+++ b/ivette/src/frama-c/kernel/ASTview.tsx
@@ -30,7 +30,7 @@ import React from 'react';
import _ from 'lodash';
import * as Server from 'frama-c/server';
import * as States from 'frama-c/states';
-import * as Utils from 'frama-c/utils';
+import * as RichText from 'frama-c/richtext';
import * as Dome from 'dome';
import { RichTextBuffer } from 'dome/text/buffers';
@@ -66,7 +66,7 @@ async function loadAST(
if (!data) {
buffer.log('// No code for function', theFunction);
}
- Utils.printTextWithTags(buffer, data);
+ RichText.printTextWithTags(buffer, data);
if (theMarker)
buffer.scroll(theMarker);
} catch (err) {
@@ -161,9 +161,11 @@ export default function ASTview() {
const buffer = React.useMemo(() => new RichTextBuffer(), []);
const printed = React.useRef<string | undefined>();
const [selection, updateSelection] = States.useSelection();
+ const [hoveredLoc] = States.useHovered();
const multipleSelections = selection?.multiple.allSelections;
const theFunction = selection?.current?.fct;
const theMarker = selection?.current?.marker;
+ const hovered = hoveredLoc?.marker;
const [fontSize] = Settings.useGlobalSettings(Preferences.EditorFontSize);
const markersInfo = States.useSyncArray(Ast.markerInfo);
@@ -220,16 +222,24 @@ export default function ASTview() {
return 'dead-code';
if (deadCode?.nonTerminating?.some((m) => m === marker))
return 'non-terminating';
+ if (marker === hovered)
+ return 'hovered-marker';
return undefined;
};
buffer.setDecorator(decorator);
- }, [buffer, multipleSelections, deadCode]);
+ }, [buffer, multipleSelections, hovered, deadCode]);
// Hook: marker scrolling
React.useEffect(() => {
if (theMarker) buffer.scroll(theMarker);
}, [buffer, theMarker]);
+ function onHover(markerId?: string) {
+ const marker = Ast.jMarker(markerId);
+ const fct = selection?.current?.fct;
+ States.setHovered(marker ? { fct, marker } : undefined);
+ }
+
function onSelection(markerId: string, meta = false) {
const fct = selection?.current?.fct;
const location = { fct, marker: Ast.jMarker(markerId) };
@@ -303,6 +313,7 @@ export default function ASTview() {
mode="text/x-csrc"
fontSize={fontSize}
selection={theMarker}
+ onHover={onHover}
onSelection={onSelection}
onContextMenu={onContextMenu}
gutters={['bullet']}
diff --git a/ivette/src/frama-c/kernel/api/ast/index.ts b/ivette/src/frama-c/kernel/api/ast/index.ts
index 73dad1c72165f7f5bf3ababda8b50304ce305663..40bf034596919523dba48b67e06bb05d0d6a69d2 100644
--- a/ivette/src/frama-c/kernel/api/ast/index.ts
+++ b/ivette/src/frama-c/kernel/api/ast/index.ts
@@ -256,7 +256,7 @@ const markerInfo_internal: State.Array<string,markerInfoData> = {
reload: reloadMarkerInfo,
order: byMarkerInfoData,
};
-/** Marker informations */
+/** Marker information */
export const markerInfo: State.Array<string,markerInfoData> = markerInfo_internal;
/** Localizable AST markers */
@@ -458,15 +458,34 @@ const functions_internal: State.Array<Json.key<'#functions'>,functionsData> = {
/** AST Functions */
export const functions: State.Array<Json.key<'#functions'>,functionsData> = functions_internal;
-const getInfo_internal: Server.GetRequest<marker,text> = {
+/** Updated AST information */
+export const getInformationUpdate: Server.Signal = {
+ name: 'kernel.ast.getInformationUpdate',
+};
+
+const getInformation_internal: Server.GetRequest<
+ marker |
+ undefined,
+ { id: string, label: string, title: string, descr: text }[]
+ > = {
kind: Server.RqKind.GET,
- name: 'kernel.ast.getInfo',
+ name: 'kernel.ast.getInformation',
input: jMarker,
- output: jText,
- signals: [],
+ output: Json.jList(
+ Json.jObject({
+ id: Json.jFail(Json.jString,'String expected'),
+ label: Json.jFail(Json.jString,'String expected'),
+ title: Json.jFail(Json.jString,'String expected'),
+ descr: jTextSafe,
+ })),
+ signals: [ { name: 'kernel.ast.getInformationUpdate' } ],
};
-/** Get textual information about a marker */
-export const getInfo: Server.GetRequest<marker,text>= getInfo_internal;
+/** Get available information about markers. When no marker is given, returns all kinds of information (with empty `descr` field). */
+export const getInformation: Server.GetRequest<
+ marker |
+ undefined,
+ { id: string, label: string, title: string, descr: text }[]
+ >= getInformation_internal;
const getMarkerAt_internal: Server.GetRequest<
[ string, number, number ],
diff --git a/ivette/src/frama-c/kernel/style.css b/ivette/src/frama-c/kernel/style.css
index be30b0d1581daf1edff87853cd07e314138b2694..9b5d8f34ae951f23a7dd5595cb6267ef8d63b870 100644
--- a/ivette/src/frama-c/kernel/style.css
+++ b/ivette/src/frama-c/kernel/style.css
@@ -9,6 +9,18 @@
text-overflow: ellipsis;
}
+/* -------------------------------------------------------------------------- */
+/* --- Lightweight Text Markers --- */
+/* -------------------------------------------------------------------------- */
+
+.kernel-text {
+ white-space: pre;
+}
+
+.kernel-text-marker:hover {
+ background: var(--code-hover);
+}
+
/* -------------------------------------------------------------------------- */
/* --- AST View --- */
/* -------------------------------------------------------------------------- */
@@ -17,6 +29,10 @@
background-color: var(--highlighted-marker);
}
+.hovered-marker {
+ background-color: var(--code-hover);
+}
+
.dead-code {
background-color: var(--dead-code);
border-bottom: solid 0.1em var(--dead-code);
@@ -46,7 +62,7 @@
.globals-attr {
font-size: smaller;
font-weight: lighter;
- color: #aaa;
+ color: var(--info-text);
}
.globals-function-section {
@@ -54,7 +70,79 @@
}
/* -------------------------------------------------------------------------- */
-/* --- Globals --- */
+/* --- Informations --- */
+/* -------------------------------------------------------------------------- */
+
+.astinfo-section {
+ position: relative;
+ overflow: auto;
+ padding-top: 1px;
+ padding-bottom: 2px;
+}
+
+.astinfo-section.selected {
+ background: var(--code-select);
+}
+
+.astinfo-section.hovered {
+ background: var(--code-hover);
+}
+
+.astinfo-section.selected.hovered {
+ background: var(--code-select-hover);
+}
+
+.astinfo-folderbutton {
+ flex: 0 0 auto;
+}
+
+.astinfo-markerbar {
+ display: flex;
+ overflow: hidden;
+ padding-left: 4px;
+}
+
+.astinfo-markerkind {
+ background: var(--selected-element);
+ position: relative;
+ top: -1px;
+ border-radius: 2px;
+ font-size: 7pt;
+ padding: 2px;
+ color: var(--text);
+ user-select: none;
+ margin-right: 3pt;
+}
+
+.astinfo-markercode {
+ flex: 1 1 auto;
+ text-overflow: ellipsis;
+ cursor: default;
+}
+
+.astinfo-markerbutton {
+ flex: 0 1 auto;
+ margin: 0px;
+ position: relative;
+}
+
+.astinfo-infos {
+ display: flex ;
+ margin-top: 1px ;
+ margin-bottom: 1px ;
+}
+
+.astinfo-kind {
+ flex: 0 1 50px;
+ text-align: center;
+ margin-top: 1px;
+ margin-left: 8px;
+ color: var(--info-text);
+ font-size: smaller;
+}
+
+/* -------------------------------------------------------------------------- */
+/* --- Messages --- */
/* -------------------------------------------------------------------------- */
.message-search {
diff --git a/ivette/src/frama-c/plugins/eva/Summary.tsx b/ivette/src/frama-c/plugins/eva/Summary.tsx
index 8a97b7d7f16e19f8ade58a51db3745c23f9ebec7..cccace6c00f3be04ba7bef73c24f7ea435d57721 100644
--- a/ivette/src/frama-c/plugins/eva/Summary.tsx
+++ b/ivette/src/frama-c/plugins/eva/Summary.tsx
@@ -29,7 +29,7 @@ import * as Eva from 'frama-c/plugins/eva/api/general';
import CoverageMeter, { percent } from './CoverageMeter';
-import './summary.css';
+import './style_summary.css';
function CoverageTable(data: Eva.programStatsType): JSX.Element {
const { progFunCoverage: functions, progStmtCoverage: statements } = data;
diff --git a/ivette/src/frama-c/plugins/eva/api/values/index.ts b/ivette/src/frama-c/plugins/eva/api/values/index.ts
index 4f550b91b0a00dd4cabbff1f89bf799c2741af30..c286426c70a761b23db0616b0870188f7456068e 100644
--- a/ivette/src/frama-c/plugins/eva/api/values/index.ts
+++ b/ivette/src/frama-c/plugins/eva/api/values/index.ts
@@ -121,7 +121,7 @@ export const getStmtInfo: Server.GetRequest<
const getProbeInfo_internal: Server.GetRequest<
marker,
{ condition: boolean, effects: boolean, rank: number,
- stmt?: Json.key<'#stmt'>, code?: string }
+ stmt?: Json.key<'#stmt'>, code?: string, evaluable: boolean }
> = {
kind: Server.RqKind.GET,
name: 'plugins.eva.values.getProbeInfo',
@@ -132,6 +132,7 @@ const getProbeInfo_internal: Server.GetRequest<
rank: Json.jFail(Json.jNumber,'Number expected'),
stmt: Json.jKey<'#stmt'>('#stmt'),
code: Json.jString,
+ evaluable: Json.jFail(Json.jBoolean,'Boolean expected'),
}),
signals: [],
};
@@ -139,7 +140,7 @@ const getProbeInfo_internal: Server.GetRequest<
export const getProbeInfo: Server.GetRequest<
marker,
{ condition: boolean, effects: boolean, rank: number,
- stmt?: Json.key<'#stmt'>, code?: string }
+ stmt?: Json.key<'#stmt'>, code?: string, evaluable: boolean }
>= getProbeInfo_internal;
/** Evaluation of an expression or lvalue */
diff --git a/ivette/src/frama-c/plugins/eva/cells.ts b/ivette/src/frama-c/plugins/eva/cells.ts
deleted file mode 100644
index 02e3ef3ffdcd13688398468a33c0eb1947b5dd40..0000000000000000000000000000000000000000
--- a/ivette/src/frama-c/plugins/eva/cells.ts
+++ /dev/null
@@ -1,236 +0,0 @@
-/* ************************************************************************ */
-/* */
-/* This file is part of Frama-C. */
-/* */
-/* Copyright (C) 2007-2022 */
-/* CEA (Commissariat à l'énergie atomique et aux énergies */
-/* alternatives) */
-/* */
-/* you can redistribute it and/or modify it under the terms of the GNU */
-/* Lesser General Public License as published by the Free Software */
-/* Foundation, version 2.1. */
-/* */
-/* It is distributed in the hope that it will be useful, */
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
-/* GNU Lesser General Public License for more details. */
-/* */
-/* See the GNU Lesser General Public License version 2.1 */
-/* for more details (enclosed in the file licenses/LGPLv2.1). */
-/* */
-/* ************************************************************************ */
-
-// --------------------------------------------------------------------------
-// --- Cells
-// --------------------------------------------------------------------------
-
-// Frama-C
-import * as Server from 'frama-c/server';
-import * as Ast from 'frama-c/kernel/api/ast';
-import * as Values from 'frama-c/plugins/eva/api/values';
-
-// --------------------------------------------------------------------------
-// --- Cell Utilities
-// --------------------------------------------------------------------------
-
-export type callback = () => void;
-
-export interface ModelCallbacks {
- forceUpdate: callback;
- forceLayout: callback;
-}
-
-export interface Size { cols: number; rows: number }
-
-export const EMPTY: Size = { cols: 0, rows: 0 };
-
-export function sizeof(text?: string): Size {
- if (text === undefined) return EMPTY;
- const lines = text.split('\n');
- return {
- rows: lines.length,
- cols: lines.reduce((w, l) => Math.max(w, l.length), 0),
- };
-}
-
-export function merge(a: Size, b: Size): Size {
- return {
- cols: Math.max(a.cols, b.cols),
- rows: Math.max(a.rows, b.rows),
- };
-}
-
-export function addH(a: Size, b: Size, padding = 0): Size {
- return {
- cols: a.cols + b.cols + padding,
- rows: Math.max(a.rows, b.rows),
- };
-}
-
-export function addV(a: Size, b: Size, padding = 0): Size {
- return {
- cols: Math.max(a.cols, b.cols),
- rows: a.rows + b.rows + padding,
- };
-}
-
-export function addS(s: Size, t: string | undefined): Size {
- return t ? merge(s, sizeof(t)) : s;
-}
-
-export function lt(a: Size, b: Size): boolean {
- return a.rows < b.rows && a.cols < b.cols;
-}
-
-export function leq(a: Size, b: Size): boolean {
- return a.rows <= b.rows && a.cols <= b.cols;
-}
-
-// --------------------------------------------------------------------------
-// --- Data
-// --------------------------------------------------------------------------
-
-export type EvaStatus = 'True' | 'False' | 'Unknown';
-export type EvaAlarm = [EvaStatus, string];
-export type EvaPointedVar = [string, Ast.marker];
-export type Evaluation = Values.evaluation;
-
-const emptyEvaluation: Values.evaluation = {
- value: '',
- alarms: [],
- pointedVars: [],
-};
-
-export interface EvaValues {
- errors?: string;
- vBefore: Evaluation;
- vAfter?: Evaluation;
- vThen?: Evaluation;
- vElse?: Evaluation;
- size: Size;
-}
-
-// --------------------------------------------------------------------------
-// --- Value Cache
-// --------------------------------------------------------------------------
-
-export interface Probe {
- fct: string | undefined;
- marker: Ast.marker;
-}
-
-export class ValueCache {
-
- private readonly state: ModelCallbacks;
- private readonly probes = new Map<Ast.marker, Size>(); // Marker -> max in column
- private readonly stacks = new Map<string, Size>(); // Callstack -> max in row
- private readonly vcache = new Map<string, EvaValues>(); // '<Marker><@Callstack>?' -> value
- private smax = EMPTY; // max cell size
-
- constructor(state: ModelCallbacks) {
- this.state = state;
- }
-
- clear(): void {
- this.smax = EMPTY;
- this.probes.clear();
- this.stacks.clear();
- this.vcache.clear();
- this.state.forceLayout();
- }
-
- // --- Cached Measures
-
- getMaxSize(): Size { return this.smax; }
-
- getProbeSize(target: Ast.marker): Size {
- return this.probes.get(target) ?? EMPTY;
- }
-
- private static stackKey(fct: string, callstack: Values.callstack): string {
- return `${fct}::${callstack}`;
- }
-
- getStackSize(fct: string, callstack: Values.callstack): Size {
- const key = ValueCache.stackKey(fct, callstack);
- return this.stacks.get(key) ?? EMPTY;
- }
-
- // --- Cached Values & Request Update
-
- getValues(
- { fct, marker }: Probe,
- callstack: Values.callstack | undefined,
- ): EvaValues {
- const key = callstack !== undefined ? `${marker}@${callstack}` : marker;
- const cache = this.vcache;
- const cached = cache.get(key);
- if (cached) return cached;
- const newValue: EvaValues = { vBefore: emptyEvaluation, size: EMPTY };
- if (callstack !== undefined && fct === undefined)
- return newValue;
- // callstack !== undefined ==> fct !== undefined)
- cache.set(key, newValue);
- Server
- .send(Values.getValues, { target: marker, callstack })
- .then((r) => {
- newValue.errors = undefined;
- if (r.vBefore) newValue.vBefore = r.vBefore;
- newValue.vAfter = r.vAfter;
- newValue.vThen = r.vThen;
- newValue.vElse = r.vElse;
- if (this.updateLayout(marker, fct, callstack, newValue))
- this.state.forceLayout();
- else
- this.state.forceUpdate();
- })
- .catch((err) => {
- newValue.errors = `$Error: ${err}`;
- this.state.forceUpdate();
- });
- return newValue;
- }
-
- // --- Updating Measures
-
- private updateLayout(
- target: Ast.marker,
- fct: string | undefined,
- callstack: Values.callstack | undefined,
- v: EvaValues,
- ): boolean {
- // measuring cell
- let s = sizeof(v.vBefore.value);
- s = addS(s, v.vAfter?.value);
- s = addS(s, v.vThen?.value);
- s = addS(s, v.vElse?.value);
- v.size = s;
- // max cell size
- const { smax } = this;
- let small = leq(s, smax);
- if (!small) this.smax = merge(s, smax);
- // max size for probe column
- const ps = this.getProbeSize(target);
- if (!leq(s, ps)) {
- this.probes.set(target, merge(ps, s));
- small = false;
- }
- // max size for stack row
- if (callstack !== undefined) {
- if (fct === undefined) small = false;
- else {
- const key = ValueCache.stackKey(fct, callstack);
- const cs = this.stacks.get(key) ?? EMPTY;
- if (!leq(s, cs)) {
- this.stacks.set(key, merge(cs, s));
- small = false;
- }
- }
- }
- // request new layout if not small enough
- return !small;
- }
-
-}
-
-// --------------------------------------------------------------------------
diff --git a/ivette/src/frama-c/plugins/eva/diffed.tsx b/ivette/src/frama-c/plugins/eva/diffed.tsx
deleted file mode 100644
index 5859784ad91d73f565d7fa09b46ac37dfd224170..0000000000000000000000000000000000000000
--- a/ivette/src/frama-c/plugins/eva/diffed.tsx
+++ /dev/null
@@ -1,182 +0,0 @@
-/* ************************************************************************ */
-/* */
-/* This file is part of Frama-C. */
-/* */
-/* Copyright (C) 2007-2022 */
-/* CEA (Commissariat à l'énergie atomique et aux énergies */
-/* alternatives) */
-/* */
-/* you can redistribute it and/or modify it under the terms of the GNU */
-/* Lesser General Public License as published by the Free Software */
-/* Foundation, version 2.1. */
-/* */
-/* It is distributed in the hope that it will be useful, */
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
-/* GNU Lesser General Public License for more details. */
-/* */
-/* See the GNU Lesser General Public License version 2.1 */
-/* for more details (enclosed in the file licenses/LGPLv2.1). */
-/* */
-/* ************************************************************************ */
-
-// --------------------------------------------------------------------------
-// --- Diff Text Rendering
-// --------------------------------------------------------------------------
-
-import React from 'react';
-import { Change, diffChars } from 'diff';
-
-const MODIFIED = 'eva-diff eva-diff-modified';
-const REMOVED = 'eva-diff eva-diff-removed';
-const ADDED = 'eva-diff eva-diff-added';
-const SHADOW = 'eva-diff eva-diff-shadow';
-
-export class DiffBuffer {
-
- private added = false;
- private removed = false;
- private value = '';
- private scratch = '';
- private contents: React.ReactNode[] = [];
-
- constructor() {
- this.push = this.push.bind(this);
- }
-
- clear(): void {
- this.added = false;
- this.removed = false;
- this.value = '';
- this.scratch = '';
- this.contents = [];
- }
-
- push(c: Change): void {
- if (!c.added && !c.removed) {
- this.flush();
- this.value += c.value;
- this.flush();
- } else {
- if (c.added) this.added = true;
- if (c.removed) {
- this.removed = true;
- this.value += c.value;
- }
- }
- }
-
- private flush(): void {
- const { value, added, removed } = this;
- if (added && removed) {
- if (value) {
- this.scratch += '\0'.repeat(value.length);
- this.contents.push(
- <span className={MODIFIED} title="Modified">{value}</span>,
- );
- }
- } else if (removed) {
- if (value) {
- this.contents.push(
- <span className={REMOVED} title="Removed">{value}</span>,
- );
- }
- } else if (added) {
- this.contents.push(
- <span className={ADDED}><span className={SHADOW} /></span>,
- );
- } else if (value) {
- this.scratch += value;
- this.contents.push(value);
- }
- this.value = '';
- this.added = false;
- this.removed = false;
- }
-
- getContents(): React.ReactNode {
- this.flush();
- return React.Children.toArray(this.contents);
- }
-
- getScratch(): string {
- this.flush();
- return this.scratch;
- }
-
-}
-
-/* --------------------------------------------------------------------------*/
-/* --- Diff2 Component ---*/
-/* --------------------------------------------------------------------------*/
-
-export interface Diff2Props {
- text: string;
- diff: string;
-}
-
-export function Diff2(props: Diff2Props): JSX.Element {
- const { text, diff } = props;
- const contents = React.useMemo<React.ReactNode>(() => {
- if (text === diff) return text;
- const buffer = new DiffBuffer();
- const chunks = diffChars(text, diff);
- chunks.forEach(buffer.push);
- return buffer.getContents();
- }, [text, diff]);
- return <>{contents}</>;
-}
-
-/* --------------------------------------------------------------------------*/
-/* --- Diff3 Component ---*/
-/* --------------------------------------------------------------------------*/
-
-export interface Diff3Props {
- text: string;
- diffA: string;
- diffB: string;
-}
-
-export function Diff3(props: Diff3Props): JSX.Element {
- const { text, diffA, diffB } = props;
- const contents = React.useMemo<React.ReactNode>(() => {
- if (text === diffA && text === diffB) return text;
- const buffer = new DiffBuffer();
- diffChars(diffA, diffB).forEach(buffer.push);
- const scratch = buffer.getScratch();
- buffer.clear();
- diffChars(text, scratch).forEach(buffer.push);
- return buffer.getContents();
- }, [text, diffA, diffB]);
- return <>{contents}</>;
-}
-
-/* --------------------------------------------------------------------------*/
-/* --- Diff Component ---*/
-/* --------------------------------------------------------------------------*/
-
-export interface DiffProps {
- text?: string;
- diff?: string;
- diff2?: string;
-}
-
-
-export function Diff(props: DiffProps): JSX.Element | null {
- const { text, diff, diff2 } = props;
- if (text === undefined)
- return null;
- if (diff !== undefined && diff2 !== undefined)
- return <Diff3 text={text} diffA={diff} diffB={diff2} />;
- if (diff !== undefined) {
- if (diff === text) return <>{text}</>;
- return <Diff2 text={text} diff={diff} />;
- }
- if (diff2 !== undefined) {
- if (diff2 === text) return <>{text}</>;
- return <Diff2 text={text} diff={diff2} />;
- }
- return <>{text}</>;
-}
-
-// --------------------------------------------------------------------------
diff --git a/ivette/src/frama-c/plugins/eva/index.tsx b/ivette/src/frama-c/plugins/eva/index.tsx
index 26595d2539b505e4c4d894dd61c780abbcabd0f5..2df245b2abe7bf7506b891b4be2c375a894f0e8a 100644
--- a/ivette/src/frama-c/plugins/eva/index.tsx
+++ b/ivette/src/frama-c/plugins/eva/index.tsx
@@ -24,84 +24,16 @@
// --- Eva Values
// --------------------------------------------------------------------------
-// React & Dome
-import React from 'react';
-import * as Dome from 'dome';
import * as Ivette from 'ivette';
-import * as Server from 'frama-c/server';
-import { GlobalState, useGlobalState } from 'dome/data/states';
-import { Vfill } from 'dome/layout/boxes';
-import { IconButton } from 'dome/controls/buttons';
-import { AutoSizer } from 'react-virtualized';
-import { Model } from './model';
-
-// Locals
-import { ProbeInfos } from './probeinfos';
-import { Dimension, ValuesPanel } from './valuetable';
-import { AlarmsInfos, StackInfos } from './valueinfos';
+import { } from 'frama-c/plugins/eva/valuetable';
import { } from './Summary';
import { } from './Coverage';
import './style.css';
-// --------------------------------------------------------------------------
-// --- Values Component
-// --------------------------------------------------------------------------
-
-const globalModelState = new GlobalState(new Model());
-
-function ValuesComponent(): JSX.Element {
- const [model] = useGlobalState(globalModelState);
- model.mount();
- Dome.useUpdate(model.changed, model.laidout);
- Server.onShutdown(() => model.unmount());
- const [zoom, setZoom] = Dome.useNumberSettings('eva-zoom-factor', 0);
- return (
- <>
- <Ivette.TitleBar>
- <IconButton
- enabled={zoom > 0}
- icon="ZOOM.OUT"
- onClick={() => setZoom(zoom - 1)}
- />
- <IconButton
- enabled={zoom < 20}
- icon="ZOOM.IN"
- onClick={() => setZoom(zoom + 1)}
- />
- </Ivette.TitleBar>
- <Vfill>
- <ProbeInfos model={model} />
- <Vfill>
- <AutoSizer>
- {(dim: Dimension) => (
- <ValuesPanel
- zoom={zoom}
- model={model}
- {...dim}
- />
- )}
- </AutoSizer>
- </Vfill>
- <AlarmsInfos model={model} />
- <StackInfos model={model} />
- </Vfill>
- </>
- );
-}
-
// --------------------------------------------------------------------------
// --- Export Component
// --------------------------------------------------------------------------
-Ivette.registerComponent({
- id: 'frama-c.plugins.values',
- group: 'frama-c.plugins',
- rank: 1,
- label: 'Eva Values',
- title: 'Values inferred by the Eva analysis',
- children: <ValuesComponent />,
-});
-
Ivette.registerView({
id: 'summary',
rank: 1,
diff --git a/ivette/src/frama-c/plugins/eva/layout.ts b/ivette/src/frama-c/plugins/eva/layout.ts
deleted file mode 100644
index b8e4c1e27ebe807313b4f41b88f06e4e9e15f094..0000000000000000000000000000000000000000
--- a/ivette/src/frama-c/plugins/eva/layout.ts
+++ /dev/null
@@ -1,237 +0,0 @@
-/* ************************************************************************ */
-/* */
-/* This file is part of Frama-C. */
-/* */
-/* Copyright (C) 2007-2022 */
-/* CEA (Commissariat à l'énergie atomique et aux énergies */
-/* alternatives) */
-/* */
-/* you can redistribute it and/or modify it under the terms of the GNU */
-/* Lesser General Public License as published by the Free Software */
-/* Foundation, version 2.1. */
-/* */
-/* It is distributed in the hope that it will be useful, */
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
-/* GNU Lesser General Public License for more details. */
-/* */
-/* See the GNU Lesser General Public License version 2.1 */
-/* for more details (enclosed in the file licenses/LGPLv2.1). */
-/* */
-/* ************************************************************************ */
-
-/* --------------------------------------------------------------------------*/
-/* --- Layout ---*/
-/* --------------------------------------------------------------------------*/
-
-import { callstack } from 'frama-c/plugins/eva/api/values';
-import { Probe } from './probes';
-import { StacksCache } from './stacks';
-import { Size, EMPTY, leq, addH, ValueCache } from './cells';
-
-export interface LayoutProps {
- zoom?: number;
- margin: number;
-}
-
-export type RowKind = 'section' | 'probes' | 'values' | 'callstack';
-
-export interface Row {
- key: string;
- fct: string;
- kind: RowKind;
- probes: Probe[];
- headstack?: string;
- stackIndex?: number;
- stackCount?: number;
- callstack?: callstack;
- hlines: number;
-}
-
-/* --------------------------------------------------------------------------*/
-/* --- Layout Enfine ---*/
-/* --------------------------------------------------------------------------*/
-
-const HEAD_PADDING = 4; // Left margin
-const CELL_PADDING = 4; // Inter cell padding
-const TEXT_PADDING = 2; // Intra cell padding
-const HCROP = 18;
-const VCROP = 1;
-
-export class LayoutEngine {
-
- // --- Setup
-
- private readonly folded: (fct: string) => boolean;
- private readonly values: ValueCache;
- private readonly stacks: StacksCache;
- private readonly hcrop: number;
- private readonly vcrop: number;
- private readonly margin: number;
-
- constructor(
- props: undefined | LayoutProps,
- values: ValueCache,
- stacks: StacksCache,
- folded: (fct: string) => boolean,
- ) {
- this.values = values;
- this.stacks = stacks;
- this.folded = folded;
- const zoom = Math.max(0, props?.zoom ?? 0);
- this.vcrop = VCROP + 3 * zoom;
- this.hcrop = HCROP + zoom;
- this.margin = (props?.margin ?? 80) - HEAD_PADDING;
- this.push = this.push.bind(this);
- }
-
- // --- Probe Buffer
- private byFct?: string; // current function
- private byStk = new Map<string, boolean>(); // callstack probes
- private skip?: boolean; // skip current function
- private rowSize: Size = EMPTY;
- private buffer: Probe[] = [];
- private rows: Row[] = [];
- private chained?: Probe;
-
- crop(zoomed: boolean, s: Size): Size {
- const s$cols = s.cols + TEXT_PADDING;
- const cols = zoomed ? s$cols : Math.min(s$cols, this.hcrop);
- const rows = zoomed ? s.rows : Math.min(s.rows, this.vcrop);
- return {
- cols: Math.max(HCROP, cols),
- rows: Math.max(VCROP, rows),
- };
- }
-
- layout(ps: Probe[], byCallstacks: Map<string, boolean>): Row[] {
- this.chained = undefined;
- this.byStk = byCallstacks;
- ps.sort(LayoutEngine.order).forEach(this.push);
- return this.flush();
- }
-
- private static order(p: Probe, q: Probe): number {
- const fp = p.fct;
- const fq = q.fct;
- if (fp === fq) {
- const rp = p.rank ?? 0;
- const rq = q.rank ?? 0;
- if (rp < rq) return (-1);
- if (rp > rq) return (+1);
- if (p.marker < q.marker) return (-1);
- if (p.marker > q.marker) return (+1);
- }
- return 0;
- }
-
- private push(p: Probe): void {
- // --- sectionning
- const { fct } = p;
- if (fct !== this.byFct) {
- this.flush();
- this.rows.push({
- key: `S:${fct}`,
- kind: 'section',
- fct,
- probes: [],
- hlines: 1,
- });
- this.byFct = fct;
- this.csRowsCounter = 1;
- this.skip = this.folded(fct);
- }
- if (this.skip) return;
- // --- chaining
- const q = this.chained;
- if (q) q.next = p;
- p.prev = q;
- this.chained = p;
- // --- sizing
- const probeSize = this.values.getProbeSize(p.marker);
- const s = this.crop(p.zoomed, probeSize);
- p.zoomable = p.zoomed || !leq(probeSize, s);
- p.minCols = s.cols;
- p.maxCols = Math.max(p.minCols, probeSize.cols);
- // --- queueing
- if (s.cols + this.rowSize.cols > this.margin)
- this.flush();
- this.rowSize = addH(this.rowSize, s);
- this.rowSize.cols += CELL_PADDING;
- this.buffer.push(p);
- }
-
- // --- Flush Rows
-
- private csRowsCounter = 1;
-
- private flush(): Row[] {
- const ps = this.buffer;
- const rs = this.rows;
- const fct = this.byFct;
- if (fct && ps.length > 0) {
- const stk = this.byStk.get(fct);
- const hlines = this.rowSize.rows;
- if (stk) {
- // --- by callstacks
- const markers = ps.map((p) => p.marker);
- const stacks = this.stacks.getStacks(...markers);
- const summary = fct ? this.stacks.getSummary(fct) : false;
- const callstacks = stacks.length;
- const { csRowsCounter } = this;
- rs.push({
- key: `P:${fct}:${csRowsCounter}`,
- kind: 'probes',
- probes: ps,
- stackCount: callstacks,
- fct,
- hlines: 1,
- });
- if (summary && callstacks > 1) rs.push({
- key: `V:${fct}:${csRowsCounter}`,
- kind: 'values',
- probes: ps,
- stackIndex: -1,
- stackCount: stacks.length,
- fct,
- hlines,
- });
- stacks.forEach((cs, k) => {
- rs.push({
- key: `C:${fct}:${csRowsCounter}:${cs}`,
- kind: 'callstack',
- probes: ps,
- stackIndex: k,
- stackCount: callstacks,
- callstack: cs,
- fct,
- hlines,
- });
- });
- } else {
- // --- not by callstacks
- const n = rs.length;
- rs.push({
- key: `P#${n}`,
- kind: 'probes',
- probes: ps,
- fct,
- hlines: 1,
- }, {
- key: `V#${n}`,
- kind: 'values',
- probes: ps,
- fct,
- hlines,
- });
- }
- }
- this.buffer = [];
- this.rowSize = EMPTY;
- this.csRowsCounter++;
- return rs;
- }
-
-}
-
-/* --------------------------------------------------------------------------*/
diff --git a/ivette/src/frama-c/plugins/eva/model.ts b/ivette/src/frama-c/plugins/eva/model.ts
deleted file mode 100644
index 01e3d14334b3f900c850d943f1c2815a7ae76fca..0000000000000000000000000000000000000000
--- a/ivette/src/frama-c/plugins/eva/model.ts
+++ /dev/null
@@ -1,316 +0,0 @@
-/* ************************************************************************ */
-/* */
-/* This file is part of Frama-C. */
-/* */
-/* Copyright (C) 2007-2022 */
-/* CEA (Commissariat à l'énergie atomique et aux énergies */
-/* alternatives) */
-/* */
-/* you can redistribute it and/or modify it under the terms of the GNU */
-/* Lesser General Public License as published by the Free Software */
-/* Foundation, version 2.1. */
-/* */
-/* It is distributed in the hope that it will be useful, */
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
-/* GNU Lesser General Public License for more details. */
-/* */
-/* See the GNU Lesser General Public License version 2.1 */
-/* for more details (enclosed in the file licenses/LGPLv2.1). */
-/* */
-/* ************************************************************************ */
-
-/* eslint-disable @typescript-eslint/explicit-function-return-type */
-
-// --------------------------------------------------------------------------
-// --- Eva Values
-// --------------------------------------------------------------------------
-
-// External Libs
-import { throttle } from 'lodash';
-import equal from 'react-fast-compare';
-import * as Dome from 'dome';
-
-import * as Server from 'frama-c/server';
-import * as States from 'frama-c/states';
-import * as Values from 'frama-c/plugins/eva/api/values';
-
-// Model
-import { Probe } from './probes';
-import { StacksCache, Callsite } from './stacks';
-import { ModelCallbacks, ValueCache } from './cells';
-import { LayoutProps, LayoutEngine, Row } from './layout';
-
-export interface ModelLayout extends LayoutProps {
- location?: States.Location;
-}
-
-export type EvalStmt = 'Before' | 'After';
-export type EvalCond = 'Cond' | 'Then' | 'Else';
-
-/* --------------------------------------------------------------------------*/
-/* --- EVA Values Model ---*/
-/* --------------------------------------------------------------------------*/
-
-export class Model implements ModelCallbacks {
-
- constructor() {
- this.forceUpdate = this.forceUpdate.bind(this);
- this.forceLayout = this.forceLayout.bind(this);
- this.forceReload = this.forceReload.bind(this);
- this.computeLayout = this.computeLayout.bind(this);
- this.setLayout = throttle(this.setLayout.bind(this), 300);
- this.metaSelection = this.metaSelection.bind(this);
- this.getRowKey = this.getRowKey.bind(this);
- this.getRowCount = this.getRowCount.bind(this);
- this.getRowLines = this.getRowLines.bind(this);
- this.isFolded = this.isFolded.bind(this);
- }
-
- // --- Probes
-
- private vstmt: EvalStmt = 'Before';
- private vcond: EvalCond = 'Cond';
- private selected?: Probe;
- private focused?: Probe;
- private callstack?: Values.callstack;
- private remanent?: Probe; // last transient
- private probes = new Map<string, Probe>();
- private folded = new Map<string, boolean>(); // folded functions
- private byCallstacks = new Map<string, boolean>();
-
- getFocused() { return this.focused; }
- isFocused(p: Probe | undefined) { return this.focused === p; }
-
- getProbe(location: States.Location | undefined): Probe | undefined {
- if (!location) return undefined;
- const { fct, marker } = location;
- if (fct && marker) {
- let p = this.probes.get(marker);
- if (!p) {
- p = new Probe(this, fct, marker);
- this.probes.set(marker, p);
- p.requestProbeInfo();
- }
- return p;
- }
- return undefined;
- }
-
- addProbe(location: States.Location) {
- const { fct, marker } = location;
- if (fct && marker) {
- const probe = new Probe(this, fct, marker);
- probe.setPersistent();
- probe.requestProbeInfo();
- this.probes.set(marker, probe);
- this.forceLayout();
- }
- }
-
- removeProbe(probe: Probe) {
- probe.setTransient();
- if (this.selected === probe)
- this.clearSelection();
- }
-
- getStacks(p: Probe | undefined): Values.callstack[] {
- return p ? this.stacks.getStacks(p.marker) : [];
- }
-
- getVstmt(): EvalStmt { return this.vstmt; }
- getVcond(): EvalCond { return this.vcond; }
- setVstmt(s: EvalStmt) { this.vstmt = s; this.forceUpdate(); }
- setVcond(s: EvalCond) { this.vcond = s; this.forceUpdate(); }
-
- isFolded(fct: string): boolean {
- return (this.focused?.fct !== fct) && (this.folded.get(fct) ?? false);
- }
-
- isFoldable(fct: string): boolean {
- return this.focused?.fct !== fct;
- }
-
- setFolded(fct: string, folded: boolean) {
- this.folded.set(fct, folded);
- this.forceLayout();
- }
-
- isByCallstacks(fct: string): boolean {
- return this.byCallstacks.get(fct) ?? false;
- }
-
- setByCallstacks(fct: string, b: boolean) {
- this.byCallstacks.set(fct, b);
- this.forceLayout();
- }
-
- clearFunction(fct: string) {
- let selected = false;
- this.probes.forEach((p) => {
- if (p.fct === fct) {
- p.setTransient();
- if (this.selected === p)
- selected = true;
- }
- });
- if (selected)
- this.clearSelection();
- }
-
- // --- Caches
-
- readonly stacks = new StacksCache(this);
- readonly values = new ValueCache(this);
-
- // --- Rows
-
- private lock = false;
- private layout: ModelLayout = { margin: 80 };
- private rows: Row[] = [];
-
- getRow(index: number): Row | undefined {
- return this.rows[index];
- }
-
- getRowCount() {
- return this.rows.length;
- }
-
- getRowKey(index: number): string {
- const row = this.rows[index];
- return row ? row.key : `#${index}`;
- }
-
- getRowLines(index: number): number {
- const row = this.rows[index];
- return row ? row.hlines : 0;
- }
-
- setSelectedRow(row: Row) {
- const cs = row.callstack;
- if (cs !== this.callstack) {
- this.callstack = cs;
- this.forceUpdate();
- }
- }
-
- isSelectedRow(row: Row): boolean {
- if (!this.byCallstacks) return false;
- const cs = this.callstack;
- return cs !== undefined && cs === row.callstack;
- }
-
- isAlignedRow(row: Row): boolean {
- const cs = this.callstack;
- const cr = row.callstack;
- return cs !== undefined && cr !== undefined && this.stacks.aligned(cs, cr);
- }
-
- getCallstack(): Values.callstack | undefined {
- return this.callstack;
- }
-
- getCalls(): Callsite[] {
- const c = this.callstack;
- return c === undefined ? [] : this.stacks.getCalls(c);
- }
-
- // --- Throttled
- setLayout(ly: ModelLayout) {
- if (!equal(this.layout, ly)) {
- this.layout = ly;
- this.selected = this.getProbe(ly.location);
- this.forceLayout();
- }
- }
-
- metaSelection(location: States.Location) {
- const p = this.getProbe(location);
- if (p && p.transient)
- p.setPersistent();
- }
-
- clearSelection() {
- this.focused = undefined;
- this.selected = undefined;
- this.remanent = undefined;
- this.forceLayout();
- }
-
- // --- Recompute Layout
-
- private computeLayout() {
- if (this.lock) return;
- this.lock = true;
- const s = this.selected;
- if (!s) {
- this.focused = undefined;
- this.remanent = undefined;
- } else if (!s.loading) {
- this.focused = s;
- if (s.code && s.transient) {
- this.remanent = s;
- } else {
- this.remanent = undefined;
- }
- }
- const toLayout: Probe[] = [];
- this.probes.forEach((p) => {
- if (p.code && (!p.transient || p === this.remanent)) {
- toLayout.push(p);
- }
- });
- const engine = new LayoutEngine(
- this.layout,
- this.values,
- this.stacks,
- this.isFolded,
- );
- this.rows = engine.layout(toLayout, this.byCallstacks);
- this.laidout.emit();
- this.lock = false;
- }
-
- // --- Force Reload (empty caches)
- forceReload() {
- this.focused = undefined;
- this.remanent = undefined;
- this.selected = undefined;
- this.callstack = undefined;
- this.probes.clear();
- this.stacks.clear();
- this.values.clear();
- this.forceLayout();
- this.forceUpdate();
- }
-
- // --- Events
- readonly changed = new Dome.Event('eva-changed');
- readonly laidout = new Dome.Event('eva-laidout');
-
- // --- Force Layout
- forceLayout() {
- setImmediate(this.computeLayout);
- }
-
- // --- Foce Update
- forceUpdate() { this.changed.emit(); }
-
- // --- Global Signals
-
- mount() {
- States.MetaSelection.on(this.metaSelection);
- Server.onSignal(Values.changed, this.forceReload);
- }
-
- unmount() {
- States.MetaSelection.off(this.metaSelection);
- Server.offSignal(Values.changed, this.forceReload);
- }
-
-}
-
-export interface ModelProp {
- model: Model;
-}
diff --git a/ivette/src/frama-c/plugins/eva/probeinfos.tsx b/ivette/src/frama-c/plugins/eva/probeinfos.tsx
deleted file mode 100644
index 9baa4c9acdb5fc6ee9a3291fbee5eacd8d73f385..0000000000000000000000000000000000000000
--- a/ivette/src/frama-c/plugins/eva/probeinfos.tsx
+++ /dev/null
@@ -1,172 +0,0 @@
-/* ************************************************************************ */
-/* */
-/* This file is part of Frama-C. */
-/* */
-/* Copyright (C) 2007-2022 */
-/* CEA (Commissariat à l'énergie atomique et aux énergies */
-/* alternatives) */
-/* */
-/* you can redistribute it and/or modify it under the terms of the GNU */
-/* Lesser General Public License as published by the Free Software */
-/* Foundation, version 2.1. */
-/* */
-/* It is distributed in the hope that it will be useful, */
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
-/* GNU Lesser General Public License for more details. */
-/* */
-/* See the GNU Lesser General Public License version 2.1 */
-/* for more details (enclosed in the file licenses/LGPLv2.1). */
-/* */
-/* ************************************************************************ */
-
-// --------------------------------------------------------------------------
-// --- Eva Values
-// --------------------------------------------------------------------------
-
-// React & Dome
-import React from 'react';
-import { Hpack, Filler } from 'dome/layout/boxes';
-import { Code } from 'dome/controls/labels';
-import { IconButton } from 'dome/controls/buttons';
-import { ButtonGroup, Button } from 'dome/frame/toolbars';
-
-// Frama-C
-import * as States from 'frama-c/states';
-
-// Locals
-import { SizedArea } from './sized';
-import { sizeof } from './cells';
-import { ModelProp } from './model';
-import { Stmt } from './valueinfos';
-
-// --------------------------------------------------------------------------
-// --- Probe Editor
-// --------------------------------------------------------------------------
-
-function ProbeEditor(props: ModelProp): JSX.Element | null {
- const { model } = props;
- const probe = model.getFocused();
- if (!probe || !probe.code) return null;
- const { code } = probe;
- const { stmt, marker } = probe;
- const { cols, rows } = sizeof(code);
- const { transient } = probe;
- const { zoomed } = probe;
- const { zoomable } = probe;
- return (
- <>
- <div className="eva-probeinfo-code">
- <SizedArea cols={cols} rows={rows}>{code}</SizedArea>
- </div>
- <Code><Stmt stmt={stmt} marker={marker} /></Code>
- <IconButton
- icon="SEARCH"
- className="eva-probeinfo-button"
- display={zoomable}
- selected={zoomed}
- title="Resize cells to fit values"
- onClick={() => { if (probe) probe.setZoomed(!zoomed); }}
- />
- <IconButton
- icon="PIN"
- className="eva-probeinfo-button"
- selected={!transient}
- title={transient ? 'Make the probe persistent' : 'Release the probe'}
- onClick={() => {
- if (probe) {
- if (transient) probe.setPersistent();
- else probe.setTransient();
- }
- }}
- />
- <IconButton
- icon="CIRC.CLOSE"
- className="eva-probeinfo-button"
- display={!transient}
- title="Discard the probe"
- onClick={() => {
- if (probe) {
- probe.setTransient();
- const p = probe.next ?? probe.prev;
- if (p) setImmediate(() => {
- States.setSelection({ fct: p.fct, marker: p.marker });
- });
- else model.clearSelection();
- }
- }}
- />
- </>
- );
-}
-
-// --------------------------------------------------------------------------
-// --- Probe Panel
-// --------------------------------------------------------------------------
-
-export function ProbeInfos(props: ModelProp): JSX.Element {
- const { model } = props;
- const probe = model.getFocused();
- const fct = probe?.fct;
- const byCS = fct ? model.isByCallstacks(fct) : false;
- const effects = probe ? probe.effects : false;
- const condition = probe ? probe.condition : false;
- const summary = fct ? model.stacks.getSummary(fct) : false;
- const vcond = model.getVcond();
- const vstmt = model.getVstmt();
- return (
- <Hpack className="eva-probeinfo">
- <ProbeEditor model={model} />
- <Filler />
- <ButtonGroup
- enabled={!!probe}
- className="eva-probeinfo-state"
- >
- <Button
- label={'\u2211'}
- title="Show Callstacks Summary"
- selected={summary}
- visible={byCS}
- onClick={() => { if (fct) model.stacks.setSummary(fct, !summary); }}
- />
- <Button
- visible={condition}
- label="C"
- selected={vcond === 'Cond'}
- title="Show values in all conditions"
- onClick={() => model.setVcond('Cond')}
- />
- <Button
- visible={condition || vcond === 'Then'}
- selected={vcond === 'Then'}
- enabled={condition}
- label="T"
- value="Then"
- title="Show reduced values when condition holds (Then)"
- onClick={() => model.setVcond('Then')}
- />
- <Button
- visible={condition || vcond === 'Else'}
- selected={vcond === 'Else'}
- enabled={condition}
- label="E"
- value="Else"
- title="Show reduced values when condition does not hold (Else)"
- onClick={() => model.setVcond('Else')}
- />
- <Button
- visible={condition || effects}
- selected={vstmt === 'After'}
- label="A"
- value="After"
- title="Show values after/before statement effects"
- onClick={() => {
- model.setVstmt(vstmt === 'After' ? 'Before' : 'After');
- }}
- />
- </ButtonGroup>
- </Hpack>
- );
-}
-
-// --------------------------------------------------------------------------
diff --git a/ivette/src/frama-c/plugins/eva/probes.ts b/ivette/src/frama-c/plugins/eva/probes.ts
deleted file mode 100644
index e9bdb0da9ca7d49f0887b03e57d475913505cfe2..0000000000000000000000000000000000000000
--- a/ivette/src/frama-c/plugins/eva/probes.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-/* ************************************************************************ */
-/* */
-/* This file is part of Frama-C. */
-/* */
-/* Copyright (C) 2007-2022 */
-/* CEA (Commissariat à l'énergie atomique et aux énergies */
-/* alternatives) */
-/* */
-/* you can redistribute it and/or modify it under the terms of the GNU */
-/* Lesser General Public License as published by the Free Software */
-/* Foundation, version 2.1. */
-/* */
-/* It is distributed in the hope that it will be useful, */
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
-/* GNU Lesser General Public License for more details. */
-/* */
-/* See the GNU Lesser General Public License version 2.1 */
-/* for more details (enclosed in the file licenses/LGPLv2.1). */
-/* */
-/* ************************************************************************ */
-
-/* --------------------------------------------------------------------------*/
-/* --- Probes ---*/
-/* --------------------------------------------------------------------------*/
-
-// Frama-C
-import * as Server from 'frama-c/server';
-import * as Values from 'frama-c/plugins/eva/api/values';
-import * as Ast from 'frama-c/kernel/api/ast';
-
-// Model
-import { ModelCallbacks } from './cells';
-
-/* --------------------------------------------------------------------------*/
-/* --- Probe State ---*/
-/* --------------------------------------------------------------------------*/
-
-const LabelSize = 12;
-
-export class Probe {
-
- // properties
- readonly fct: string;
- readonly marker: Ast.marker;
- readonly model: ModelCallbacks;
- next?: Probe;
- prev?: Probe;
- transient = true;
- loading = true;
- code?: string;
- stmt?: Ast.marker;
- rank?: number;
- minCols: number = LabelSize;
- maxCols: number = LabelSize;
- zoomed = true;
- zoomable = false;
- effects = false;
- condition = false;
-
- constructor(state: ModelCallbacks, fct: string, marker: Ast.marker) {
- this.fct = fct;
- this.marker = marker;
- this.model = state;
- this.requestProbeInfo = this.requestProbeInfo.bind(this);
- }
-
- requestProbeInfo(): void {
- this.loading = true;
- Server
- .send(Values.getProbeInfo, this.marker)
- .then(({ code, stmt, rank, effects, condition }) => {
- this.code = code;
- this.stmt = stmt;
- this.rank = rank;
- this.effects = effects;
- this.condition = condition;
- this.loading = false;
- })
- .catch(() => {
- this.code = '(error)';
- this.stmt = undefined;
- this.rank = undefined;
- this.effects = false;
- this.condition = false;
- this.loading = false;
- })
- .finally(this.model.forceLayout);
- }
-
- // --------------------------------------------------------------------------
- // --- Internal State
- // --------------------------------------------------------------------------
-
- setPersistent(): void { this.updateTransient(false); }
- setTransient(): void { this.updateTransient(true); }
-
- private updateTransient(tr: boolean): void {
- if (this.transient !== tr) {
- this.transient = tr;
- this.model.forceLayout();
- }
- }
-
- setZoomed(zoomed: boolean): void {
- if (zoomed !== this.zoomed) {
- this.zoomed = zoomed;
- this.model.forceLayout();
- }
- }
-
-}
-
-/* --------------------------------------------------------------------------*/
diff --git a/ivette/src/frama-c/plugins/eva/sized.tsx b/ivette/src/frama-c/plugins/eva/sized.tsx
deleted file mode 100644
index 95496201039ff396d631d14007332faca894ac48..0000000000000000000000000000000000000000
--- a/ivette/src/frama-c/plugins/eva/sized.tsx
+++ /dev/null
@@ -1,141 +0,0 @@
-/* ************************************************************************ */
-/* */
-/* This file is part of Frama-C. */
-/* */
-/* Copyright (C) 2007-2022 */
-/* CEA (Commissariat à l'énergie atomique et aux énergies */
-/* alternatives) */
-/* */
-/* you can redistribute it and/or modify it under the terms of the GNU */
-/* Lesser General Public License as published by the Free Software */
-/* Foundation, version 2.1. */
-/* */
-/* It is distributed in the hope that it will be useful, */
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
-/* GNU Lesser General Public License for more details. */
-/* */
-/* See the GNU Lesser General Public License version 2.1 */
-/* for more details (enclosed in the file licenses/LGPLv2.1). */
-/* */
-/* ************************************************************************ */
-
-// --------------------------------------------------------------------------
-// --- Sized Cell
-// --------------------------------------------------------------------------
-
-import React from 'react';
-
-// --------------------------------------------------------------------------
-// --- Measurer
-// --------------------------------------------------------------------------
-
-export class Streamer {
- private readonly v0: number;
- private readonly vs: number[] = [];
- private v?: number;
- constructor(v0: number) {
- this.v0 = v0;
- }
-
- push(v: number): void {
- const { vs } = this;
- vs.push(Math.round(v));
- if (vs.length > 200) vs.shift();
- }
-
- mean(): number {
- if (this.v === undefined) {
- const { vs } = this;
- const n = vs.length;
- if (n > 0) {
- const m = vs.reduce((s, v) => s + v, 0) / n;
- this.v = Math.round(m + 0.5);
- } else {
- this.v = this.v0;
- }
- }
- return this.v;
- }
-
-}
-
-export class FontSizer {
- a = 0;
- b = 0;
- k: Streamer;
- p: Streamer;
-
- constructor(k: number, p: number) {
- this.k = new Streamer(k);
- this.p = new Streamer(p);
- }
-
- push(x: number, y: number): void {
- const a0 = this.a;
- const b0 = this.b;
- if (x !== a0 && a0 !== 0) {
- const k = (y - b0) / (x - a0);
- const p = y - k * x;
- this.k.push(k);
- this.p.push(p);
- }
- this.a = x;
- this.b = y;
- }
-
- capacity(y: number): number {
- const k = this.k.mean();
- const p = this.p.mean();
- return Math.round(0.5 + (y - p) / k);
- }
-
- dimension(n: number): number {
- const k = this.k.mean();
- const p = this.p.mean();
- return p + n * k;
- }
-
- dump(x: string): string {
- const k = this.k.mean();
- const p = this.p.mean();
- return `${k}.${x}+${p}`;
- }
-
-}
-
-/* --------------------------------------------------------------------------*/
-/* --- Sizing Component ---*/
-/* --------------------------------------------------------------------------*/
-
-export const WSIZER = new FontSizer(7, 6);
-export const HSIZER = new FontSizer(15, 6);
-
-export interface SizedAreaProps {
- cols: number;
- rows: number;
- children?: React.ReactNode;
-}
-
-export function SizedArea(props: SizedAreaProps): JSX.Element {
- const { rows, cols, children } = props;
- const refSizer = React.useCallback(
- (ref: null | HTMLDivElement) => {
- if (ref) {
- const r = ref.getBoundingClientRect();
- WSIZER.push(cols, r.width);
- HSIZER.push(rows, r.height);
- }
- }, [rows, cols],
- );
- return (
- <div
- ref={refSizer}
- className="eva-sized-area dome-text-cell"
- >
- {children}
- </div>
- );
-}
-
-/* --------------------------------------------------------------------------*/
diff --git a/ivette/src/frama-c/plugins/eva/stacks.ts b/ivette/src/frama-c/plugins/eva/stacks.ts
deleted file mode 100644
index 447890eef2d65a65d95e4b89afc1dc25441241d4..0000000000000000000000000000000000000000
--- a/ivette/src/frama-c/plugins/eva/stacks.ts
+++ /dev/null
@@ -1,141 +0,0 @@
-/* ************************************************************************ */
-/* */
-/* This file is part of Frama-C. */
-/* */
-/* Copyright (C) 2007-2022 */
-/* CEA (Commissariat à l'énergie atomique et aux énergies */
-/* alternatives) */
-/* */
-/* you can redistribute it and/or modify it under the terms of the GNU */
-/* Lesser General Public License as published by the Free Software */
-/* Foundation, version 2.1. */
-/* */
-/* It is distributed in the hope that it will be useful, */
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
-/* GNU Lesser General Public License for more details. */
-/* */
-/* See the GNU Lesser General Public License version 2.1 */
-/* for more details (enclosed in the file licenses/LGPLv2.1). */
-/* */
-/* ************************************************************************ */
-
-// --------------------------------------------------------------------------
-// --- CallStacks
-// --------------------------------------------------------------------------
-
-import * as Server from 'frama-c/server';
-import * as Ast from 'frama-c/kernel/api/ast';
-import * as Values from 'frama-c/plugins/eva/api/values';
-
-import { ModelCallbacks } from './cells';
-
-// --------------------------------------------------------------------------
-// --- Callstack infos
-// --------------------------------------------------------------------------
-
-export type callstacks = Values.callstack[];
-export interface Callsite {
- callee: string;
- caller?: string;
- stmt?: Ast.marker;
-}
-
-function equalSite(a: Callsite, b: Callsite): boolean {
- return a.stmt === b.stmt && a.callee === b.callee;
-}
-
-// --------------------------------------------------------------------------
-// --- CallStacks Cache
-// --------------------------------------------------------------------------
-
-export class StacksCache {
-
- private readonly model: ModelCallbacks;
- private readonly stacks = new Map<string, callstacks>();
- private readonly summary = new Map<string, boolean>();
- private readonly calls = new Map<Values.callstack, Callsite[]>();
-
- // --------------------------------------------------------------------------
- // --- LifeCycle
- // --------------------------------------------------------------------------
-
- constructor(state: ModelCallbacks) {
- this.model = state;
- }
-
- clear(): void {
- this.stacks.clear();
- this.calls.clear();
- }
-
- // --------------------------------------------------------------------------
- // --- Getters
- // --------------------------------------------------------------------------
-
- getSummary(fct: string): boolean {
- return this.summary.get(fct) ?? true;
- }
-
- setSummary(fct: string, s: boolean): void {
- this.summary.set(fct, s);
- this.model.forceLayout();
- }
-
- getStacks(...markers: Ast.marker[]): callstacks {
- if (markers.length === 0) return [];
- const key = markers.join('$');
- const cs = this.stacks.get(key);
- if (cs !== undefined) return cs;
- this.stacks.set(key, []);
- this.requestStacks(key, markers);
- return [];
- }
-
- getCalls(cs: Values.callstack): Callsite[] {
- const fs = this.calls.get(cs);
- if (fs !== undefined) return fs;
- this.calls.set(cs, []);
- this.requestCalls(cs);
- return [];
- }
-
- aligned(a: Values.callstack, b: Values.callstack): boolean {
- if (a === b) return true;
- const ca = this.getCalls(a);
- const cb = this.getCalls(b);
- let ka = ca.length - 1;
- let kb = cb.length - 1;
- while (ka >= 0 && kb >= 0 && equalSite(ca[ka], cb[kb])) {
- --ka;
- --kb;
- }
- return ka < 0 || kb < 0;
- }
-
- // --------------------------------------------------------------------------
- // --- Fetchers
- // --------------------------------------------------------------------------
-
- private requestStacks(key: string, markers: Ast.marker[]): void {
- Server
- .send(Values.getCallstacks, markers)
- .then((stacks: callstacks) => {
- this.stacks.set(key, stacks);
- this.model.forceLayout();
- this.model.forceUpdate();
- });
- }
-
- private requestCalls(cs: Values.callstack): void {
- Server
- .send(Values.getCallstackInfo, cs)
- .then((calls) => {
- this.calls.set(cs, calls);
- this.model.forceUpdate();
- });
- }
-
-}
-
-// --------------------------------------------------------------------------
diff --git a/ivette/src/frama-c/plugins/eva/style.css b/ivette/src/frama-c/plugins/eva/style.css
index 3dd5be0b82191f7e234969da8d661bffaa387a1b..34a3fce5060b1aea5442781b961a7bd06b85d05e 100644
--- a/ivette/src/frama-c/plugins/eva/style.css
+++ b/ivette/src/frama-c/plugins/eva/style.css
@@ -1,82 +1,62 @@
/* -------------------------------------------------------------------------- */
-/* --- Probe Panel --- */
+/* --- Call Stack Info --- */
/* -------------------------------------------------------------------------- */
-.eva-probeinfo {
- min-height: 32px;
- padding-left: 6px;
- padding-top: 2px;
- padding-bottom: 4px;
- width: 100%;
- background: var(--background-profound);
- display: flex;
+:root {
+ --eva-min-width: 90px;
}
-.eva-probeinfo-label {
- flex: 0 1 auto;
- min-width: 22px;
- text-align: left;
+.eva-info {
+ width: 100%;
+ display: flex;
+ flex-wrap: nowrap;
+ align-items: center;
+ background: var(--background-profound);
+ padding: 2px;
}
-.eva-probeinfo-code {
- flex: 0 1 auto;
- height: fit-content;
- background: var(--background-intense);
- min-width: 120px;
- width: auto;
- border: thin solid var(--border);
- padding-left: 6px;
- padding-right: 6px;
- border-radius: 4px;
- overflow: hidden;
+.eva-info-wrap {
+ flex: auto;
+ flex-wrap: wrap;
}
-.eva-probeinfo-stmt {
- flex: 0 0 auto;
- margin-left: 2px;
- margin-right: 0px;
- margin-top: 2px;
+.eva-callsite {
+ flex: 0 0 auto;
+ fill: var(--selected-element);
+ background: var(--background-softer);
+ border-radius: 4px;
+ border: thin solid var(--border);
+ padding-right: 7px;
}
-.eva-probeinfo-button {
- flex: 0 0 auto;
- margin: 1px;
- min-width: 16px;
+.eva-cell-container {
+ display: flex;
+ justify-content: center;
}
-.eva-probeinfo-state {
- margin-top: 2px;
- margin-bottom: 2px;
+.eva-cell-left {
+ flex: 1;
}
-/* -------------------------------------------------------------------------- */
-/* --- Call Satck Info --- */
-/* -------------------------------------------------------------------------- */
-
-.eva-info {
- width: 100%;
- flex-wrap: wrap;
- background: var(--background-profound);
- padding-top: 3px;
- padding-left: 12px;
- padding-bottom: 2px;
+.eva-cell-content {
+ margin-left: 4px;
+ margin-right: 4px;
+ flex: 0 auto;
+ overflow: hidden;
+ display: flex;
+ align-items: baseline;
}
-.eva-callsite {
- flex: 0 0 auto;
- fill: var(--selected-element);
- background: var(--background-softer);
- border-radius: 4px;
- border: thin solid var(--border);
- padding-right: 7px;
-}
-
-.eva-callsite.eva-focused {
- background: var(--warning-button-color);
+.eva-header-text-overflow {
+ overflow: hidden;
+ text-overflow: ellipsis;
}
-.eva-callsite.eva-focused.eva-transient {
- background: var(--code-select);
+.eva-cell-right {
+ display: flex;
+ flex: 1;
+ min-width: max-content;
+ justify-content: flex-end;
}
/* -------------------------------------------------------------------------- */
@@ -84,17 +64,15 @@
/* -------------------------------------------------------------------------- */
.eva-cell-alarms {
- fill: orange;
- position: absolute;
- top: -1px;
- right: 3px;
- z-index: 1;
+ margin: 0px;
+ padding: 0px;
+ margin-right: 4px;
}
.eva-alarm-info {
- font-size: x-small;
- padding: 0px;
- margin: 1px;
+ font-size: x-small;
+ padding: 0px;
+ margin: 1px;
}
.eva-alarm-none { display: none; }
@@ -103,173 +81,225 @@
.eva-alarm-Unknown { fill: var(--eva-alarms-unknown); }
/* -------------------------------------------------------------------------- */
-/* --- Styling Values --- */
+/* --- Styling Statement display --- */
/* -------------------------------------------------------------------------- */
.eva-stmt {
- color: var(--info-text);
- text-select: none;
-}
-
-.eva-sized-area {
- padding: 3px;
- white-space: pre;
- overflow: hidden;
- text-overflow: ellipsis;
+ color: var(--info-text);
+ font-weight: normal;
}
/* -------------------------------------------------------------------------- */
-/* --- Table Rows --- */
+/* --- Function Section Header --- */
/* -------------------------------------------------------------------------- */
-.eva-row {
- display: flex;
- position: relative;
- flex: 0 1 auto;
- height: 100%;
+.eva-function {
+ padding: 2px;
+ background: var(--background-profound);
+ height: 25px;
+ align-items: center;
+}
+
+.eva-fct-fold {
+ margin-left: 4px;
+ margin-right: 8px;
+ padding: 0px;
+}
+
+.eva-fct-name {
+ font-weight: bold;
}
/* -------------------------------------------------------------------------- */
-/* --- Table Heads --- */
+/* --- Table General CSS --- */
/* -------------------------------------------------------------------------- */
-.eva-function {
- padding-top: 0px;
- background: var(--background-profound);
+.eva-table {
+ border: 0px;
+ border-spacing: 0px;
+}
+
+.eva-table-header-sticky {
+ position: sticky;
+ top: 0;
+ z-index: +1;
}
-.eva-head {
- padding-top: 2px;
- color: var(--info-text);
- text-align: center;
- border-left: thin solid var(--border);
- border-bottom: thin solid var(--border);
+.eva-table tr:nth-child(n + 4) {
+ cursor: pointer;
}
-.eva-probes .eva-head {
- border-top: thin solid var(--border);
+.eva-table tr th {
+ border-right: thin solid var(--border);
+ border-top: thin solid var(--border);
+ border-bottom: thin solid var(--border);
+ height: 22px;
+ min-height: 22px;
+ max-height: 22px;
+ min-width: calc(var(--eva-min-width) + 30px);
+ max-width: calc(var(--eva-min-width) + 30px);
}
-.eva-phantom {
- visibility: hidden;
- height: 0;
+.eva-table tr:nth-child(2n) {
+ background-color: var(--background-alterning-even);
+}
+
+.eva-table tr:nth-child(2n + 1) {
+ background-color: var(--background-alterning-odd);
+}
+
+.eva-table-container {
+ position: relative;
+ overflow: auto;
+ height: 100%;
+ min-height: 66px;
+}
+
+.eva-functions-section {
+ display: grid;
+ overflow: auto;
+ align-content: start;
+}
+
+.eva-nb-callstacks {
+ color: var(--info-text);
+ padding-right: 11px;
}
/* -------------------------------------------------------------------------- */
-/* --- Table Cells --- */
+/* --- Table Headers CSS --- */
/* -------------------------------------------------------------------------- */
-.eva-fct-fold {
- margin-left: 4px;
- margin-right: 8px;
- padding: 0px;
+.eva-header-tracked {
}
-.eva-fct-name {
- padding: 2px;
- font-weight: bold;
+.eva-header-tracked-focused {
}
-.eva-cell {
- flex: 1 1 auto;
- border-right: thin solid var(--border);
- border-bottom: thin solid var(--border);
- overflow: hidden;
- display: flex;
- justify-content: center;
- position: relative;
+.eva-header-just-focused {
+ background: var(--code-select);
}
-.eva-cell .eva-stmt {
- margin-left: 0.2em;
- padding: 2px 0px;
+.eva-header-pinned {
+ background: var(--eva-probes-pinned);
}
-.eva-cell-expression {
- text-align: center;
- text-overflow: ellipsis;
- flex: 0 1 auto;
- display: inline-block;
- overflow: hidden;
+.eva-header-pinned-focused {
+ background: var(--eva-probes-pinned-focused);
}
-.eva-cell:nth-child(2) {
- border-left: thin solid var(--border);
+.eva-header-after-condition {
+ display: flex;
+ justify-content: center;
+ gap: 0.3em;
}
-.eva-probes .eva-cell {
- padding: 2px 4px;
- text-align: center;
- border-top: thin solid var(--border);
+.eva-header-buttons-container {
+ position: absolute;
+ right: 1px;
+ top: 0px;
+ padding-left: 2px;
+ display: flex;
+ z-index: +1;
+ background: inherit;
}
-.eva-cell * {
- user-select: text;
+.eva-header-button {
+ padding: 2px 2px 3px 2px;
+}
+
+.eva-header-text {
+ display: flex;
}
/* -------------------------------------------------------------------------- */
-/* --- Cell Diffs --- */
+/* --- Table Callsite Boxes --- */
/* -------------------------------------------------------------------------- */
-.eva-diff-shadow {
- border: solid transparent 2px;
- position: relative;
- z-index: -1;
+.eva-table-callsite-box {
+ width: 18px;
+ min-width: 18px;
+ background: var(--background);
+ border: 0px;
+ text-align: center;
+ color: var(--info-text);
+ border-left: thin solid var(--border);
+ border-right: thin solid var(--border);
+ border-bottom: thin solid var(--border);
+ padding: 2px;
}
-.eva-diff-added { }
-.eva-diff-removed { text-decoration: strike }
-
-.eva-state-Before .eva-diff { background: var(--eva-state-before); }
-.eva-state-After .eva-diff { background: var(--eva-state-after); }
-.eva-state-Cond .eva-diff { background: var(--eva-state-before); }
-.eva-state-Then .eva-diff { background: var(--eva-state-then); }
-.eva-state-Else .eva-diff { background: var(--eva-state-else); }
+tr:first-of-type > .eva-table-callsite-box {
+ border-top: thin solid var(--border);
+}
/* -------------------------------------------------------------------------- */
-/* --- Table Rows Background --- */
+/* --- Table Values --- */
/* -------------------------------------------------------------------------- */
-/* --- Probes --- */
-
-.eva-probes .eva-cell {
- background: var(--eva-probes-pinned);
+.eva-table-values {
+ position: relative;
+ border: 0px;
+ padding: 2px 3px 2px 3px;
+ border-bottom: thin solid var(--border);
+ border-right: thin solid var(--border);
+ min-width: var(--eva-min-width);
+ font-family: Andale Mono, monospace;
+ font-size: 9pt;
+ height: 22px;
+ min-height: 22px;
+ max-height: 22px;
+ white-space: pre;
}
-.eva-probes .eva-focused {
- background: var(--eva-probes-pinned-focused);
+.eva-table-descrs {
+ background-color: var(--background-sidebar);
+ border-right: thin solid var(--border);
}
-.eva-probes .eva-transient {
- background: var(--eva-probes-transient);
- align-items: center;
+.eva-table-descr-sticky {
+ position: sticky;
+ top: 22px;
+ z-index: +1;
}
-.eva-probes .eva-transient.eva-focused {
- background: var(--eva-probes-transient-focused);
+.eva-table-callsite-box.eva-table-header-sticky {
+ left: 0px;
+ z-index: +2;
}
+.eva-table-value-sticky {
+ position: sticky;
+ left: 0px;
+ z-index: +1;
+}
-/* --- Values / Callstacks --- */
-
-.eva-values .eva-cell {
- background: var(--background-alterning-odd);
+.eva-values-position {
+ display: inline-block;
+ width: 0px;
}
-.eva-callstack.eva-row-odd .eva-cell {
- background: var(--background-alterning-odd);
+.eva-table-text {
+ cursor: text;
+ user-select: text;
+ margin-left: 1px;
+ margin-right: 1px;
}
-.eva-callstack.eva-row-even .eva-cell {
- background: var(--background-alterning-even);
+/* -------------------------------------------------------------------------- */
+/* --- Miscellaneous --- */
+/* -------------------------------------------------------------------------- */
+
+.eva-button {
+ margin: 0px;
}
-.eva-callstack.eva-row-aligned {
- background: var(--grid-layout-holder);
+.eva-italic {
+ font-style: italic;
}
-.eva-callstack.eva-row-selected {
- background: var(--code-select);
+.eva-focused {
+ background: var(--code-select);
}
/* -------------------------------------------------------------------------- */
diff --git a/ivette/src/frama-c/plugins/eva/summary.css b/ivette/src/frama-c/plugins/eva/style_summary.css
similarity index 100%
rename from ivette/src/frama-c/plugins/eva/summary.css
rename to ivette/src/frama-c/plugins/eva/style_summary.css
diff --git a/ivette/src/frama-c/plugins/eva/valueinfos.tsx b/ivette/src/frama-c/plugins/eva/valueinfos.tsx
deleted file mode 100644
index 28fb0a302494c2d5879a3b7ed5b9cf703650db45..0000000000000000000000000000000000000000
--- a/ivette/src/frama-c/plugins/eva/valueinfos.tsx
+++ /dev/null
@@ -1,148 +0,0 @@
-/* ************************************************************************ */
-/* */
-/* This file is part of Frama-C. */
-/* */
-/* Copyright (C) 2007-2022 */
-/* CEA (Commissariat à l'énergie atomique et aux énergies */
-/* alternatives) */
-/* */
-/* you can redistribute it and/or modify it under the terms of the GNU */
-/* Lesser General Public License as published by the Free Software */
-/* Foundation, version 2.1. */
-/* */
-/* It is distributed in the hope that it will be useful, */
-/* but WITHOUT ANY WARRANTY; without even the implied warranty of */
-/* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the */
-/* GNU Lesser General Public License for more details. */
-/* */
-/* See the GNU Lesser General Public License version 2.1 */
-/* for more details (enclosed in the file licenses/LGPLv2.1). */
-/* */
-/* ************************************************************************ */
-
-/* eslint-disable @typescript-eslint/explicit-function-return-type */
-
-// --------------------------------------------------------------------------
-// --- Info Components
-// --------------------------------------------------------------------------
-
-// React & Dome
-import React from 'react';
-import { classes } from 'dome/misc/utils';
-import { Hpack, Vpack } from 'dome/layout/boxes';
-import { Code, Cell } from 'dome/controls/labels';
-import * as States from 'frama-c/states';
-import * as Ast from 'frama-c/kernel/api/ast';
-import { ModelProp } from 'frama-c/plugins/eva/model';
-
-// Locals
-import { EvaAlarm } from './cells';
-import { Callsite } from './stacks';
-
-// --------------------------------------------------------------------------
-// --- Stmt Printer
-// --------------------------------------------------------------------------
-
-interface StmtProps {
- stmt?: Ast.marker;
- marker: Ast.marker;
- short?: boolean;
-}
-
-export function Stmt(props: StmtProps) {
- const markersInfo = States.useSyncArray(Ast.markerInfo);
-
- const { stmt, marker, short } = props;
- if (!stmt) return null;
- const line = markersInfo.getData(marker)?.sloc?.line;
- const filename = markersInfo.getData(marker)?.sloc?.base;
- const title = markersInfo.getData(stmt)?.descr;
- const text = short ? `@L${line}` : `@${filename}:${line}`;
- return (
- <span className="dome-text-cell eva-stmt" title={title}>
- {text}
- </span>
- );
-}
-
-// --------------------------------------------------------------------------
-// --- Alarms Panel
-// --------------------------------------------------------------------------
-
-export function AlarmsInfos(props: ModelProp) {
- const { model } = props;
- const probe = model.getFocused();
- if (probe) {
- const callstack = model.getCallstack();
- const domain = model.values.getValues(probe, callstack);
- const alarms = domain?.vBefore.alarms ?? [];
- if (alarms.length > 0) {
- const renderAlarm = ([status, alarm]: EvaAlarm) => {
- const className = `eva-alarm-info eva-alarm-${status}`;
- return (
- <Code className={className} icon="WARNING">{alarm}</Code>
- );
- };
- return (
- <Vpack className="eva-info">
- {React.Children.toArray(alarms.map(renderAlarm))}
- </Vpack>
- );
- }
- }
- return null;
-}
-
-// --------------------------------------------------------------------------
-// --- Stack Panel
-// --------------------------------------------------------------------------
-
-export function StackInfos(props: ModelProp) {
- const { model } = props;
- const [, setSelection] = States.useSelection();
- const focused = model.getFocused();
- const callstack = model.getCalls();
- if (callstack.length <= 1) return null;
- const makeCallsite = ({ caller, stmt }: Callsite) => {
- if (!caller || !stmt) return null;
- const key = `${caller}@${stmt}`;
- const isFocused = focused?.marker === stmt;
- const isTransient = focused?.transient;
- const className = classes(
- 'eva-callsite',
- isFocused && 'eva-focused',
- isTransient && 'eva-transient',
- );
- const select = (meta: boolean) => {
- const location = { fct: caller, marker: stmt };
- setSelection({ location });
- if (meta) States.MetaSelection.emit(location);
- };
- const onClick = (evt: React.MouseEvent) => {
- select(evt.altKey);
- };
- const onDoubleClick = (evt: React.MouseEvent) => {
- evt.preventDefault();
- select(true);
- };
- return (
- <Cell
- key={key}
- icon="TRIANGLE.LEFT"
- className={className}
- onClick={onClick}
- onDoubleClick={onDoubleClick}
- >
- {caller}
- <Stmt stmt={stmt} marker={stmt} />
- </Cell>
- );
- };
- return (
- <Hpack className="eva-info">
- {callstack.map(makeCallsite)}
- </Hpack>
- );
-}
-
-// --------------------------------------------------------------------------
diff --git a/ivette/src/frama-c/plugins/eva/valuetable.tsx b/ivette/src/frama-c/plugins/eva/valuetable.tsx
index 3e09f9d2c5467581d8e64c430c858b864870b2d6..63b225fd27088c3374be59051e7d0653566ff4ce 100644
--- a/ivette/src/frama-c/plugins/eva/valuetable.tsx
+++ b/ivette/src/frama-c/plugins/eva/valuetable.tsx
@@ -20,396 +20,1070 @@
/* */
/* ************************************************************************ */
-/* eslint-disable @typescript-eslint/explicit-function-return-type */
-
-// --------------------------------------------------------------------------
-// --- Eva Values
-// --------------------------------------------------------------------------
-
-// React & Dome
import React from 'react';
-import * as Dome from 'dome';
+import _ from 'lodash';
+import * as Ivette from 'ivette';
+import * as Dome from 'dome/dome';
+import * as States from 'frama-c/states';
+import * as Server from 'frama-c/server';
+import * as Ast from 'frama-c/kernel/api/ast';
+import * as Values from 'frama-c/plugins/eva/api/values';
+import { GlobalState, useGlobalState } from 'dome/data/states';
+
import { classes } from 'dome/misc/utils';
-import { VariableSizeList } from 'react-window';
-import { Hpack, Filler } from 'dome/layout/boxes';
-import { Inset } from 'dome/frame/toolbars';
import { Icon } from 'dome/controls/icons';
-import { Cell } from 'dome/controls/labels';
+import { Inset } from 'dome/frame/toolbars';
+import { Cell, Code } from 'dome/controls/labels';
import { IconButton } from 'dome/controls/buttons';
-import { ModelProp, EvalStmt, EvalCond } from 'frama-c/plugins/eva/model';
+import { Filler, Hpack, Hfill, Vpack, Vfill } from 'dome/layout/boxes';
-// Frama-C
-import * as States from 'frama-c/states';
-// Locals
-import { SizedArea, HSIZER, WSIZER } from './sized';
-import { Diff } from './diffed';
-import { sizeof, EvaValues, EvaPointedVar, Evaluation } from './cells';
-import { Probe } from './probes';
-import { Row } from './layout';
-import { Callsite } from './stacks';
-import { Stmt } from './valueinfos';
-import './style.css';
-
-// --------------------------------------------------------------------------
-// --- Cell Diffs
-// --------------------------------------------------------------------------
-
-function computeValueDiffs(v: EvaValues, vstate: EvalStmt | EvalCond) {
- let here = v.vBefore;
- let diff: undefined | Evaluation;
- let diff2: undefined | Evaluation;
- function setValue(e?: Evaluation) { if (e) { here = e; diff = v.vBefore; } }
- switch (vstate) {
- case 'Before': diff = v.vAfter; break;
- case 'After': setValue(v.vAfter); break;
- case 'Then': setValue(v.vThen); break;
- case 'Else': setValue(v.vElse); break;
- case 'Cond': diff = v.vThen; diff2 = v.vElse; break;
- }
- const vdiffs = { text: here.value, diff: diff?.value, diff2: diff2?.value };
- return { value: here, vdiffs };
-}
-// --------------------------------------------------------------------------
-// --- Table Cell
-// --------------------------------------------------------------------------
+/* -------------------------------------------------------------------------- */
+/* --- Miscellaneous definitions --- */
+/* -------------------------------------------------------------------------- */
-interface TableCellProps extends ModelProp {
- probe: Probe;
- row: Row;
-}
-
-const CELLPADDING = 12;
-
-function TableCell(props: TableCellProps) {
- const { probe, row, model } = props;
- const [, setSelection] = States.useSelection();
- const { kind, callstack } = row;
- const minWidth = CELLPADDING + WSIZER.dimension(probe.minCols);
- const maxWidth = CELLPADDING + WSIZER.dimension(probe.maxCols);
- const style = { width: minWidth, maxWidth };
- let contents: React.ReactNode = props.probe.marker;
- let valueText = '';
- let pointedVars: EvaPointedVar[] = [];
- const { transient, marker } = probe;
- const focused = model.getFocused();
- const isFocused = focused === probe;
-
- switch (kind) {
-
- // ---- Probe Contents
- case 'probes':
- {
- const { stmt, code } = probe;
- contents = (
- <>
- <span className='dome-text-cell'>{code}</span>
- <Stmt stmt={stmt} marker={marker} short />
- </>
- );
- }
- break;
-
- // ---- Values Contents
- case 'values':
- case 'callstack':
- {
- const domain = model.values.getValues(probe, callstack);
- const { condition } = probe;
- const vstate = condition ? model.getVcond() : model.getVstmt();
- const { value, vdiffs } = computeValueDiffs(domain, vstate);
- valueText = value.value;
- const text = vdiffs.text ?? vdiffs.diff;
- const { cols, rows } = sizeof(text);
- let status = 'none';
- if (value.alarms.length > 0) {
- if (value.alarms.find(([st, _]) => st === 'False')) status = 'False';
- else status = 'Unknown';
- }
- if (value.pointedVars.length > 0)
- pointedVars = value.pointedVars;
- const alarmClass = `eva-cell-alarms eva-alarm-${status}`;
- const title = 'At least one alarm is raised in one callstack';
- contents = (
- <>
- <Icon className={alarmClass} size={10} title={title} id="WARNING" />
- <SizedArea cols={cols} rows={rows}>
- <span className={`eva-state-${vstate}`}>
- <Diff {...vdiffs} />
- </span>
- </SizedArea>
- </>
- );
- }
- break;
+type Request<A, B> = (a: A) => Promise<B>;
- }
+type Alarm = [ 'True' | 'False' | 'Unknown', string ]
+function getAlarmStatus(alarms: Alarm[] | undefined): string {
+ if (!alarms) return 'none';
+ if (alarms.length === 0) return 'none';
+ if (alarms.find(([st, _]) => st === 'False')) return 'False';
+ else return 'Unknown';
+}
- // --- Cell Packing
- const className = classes(
- 'eva-cell',
- transient && 'eva-transient',
- isFocused && 'eva-focused',
- );
- const onClick = () => {
- const location = { fct: probe.fct, marker: probe.marker };
- setSelection({ location });
- model.setSelectedRow(row);
- };
- const onDoubleClick = () => {
- probe.setPersistent();
- if (probe.zoomable) probe.setZoomed(!probe.zoomed);
- };
+type MarkerTracked = [ 'Tracked', boolean ]
+type MarkerPinned = [ 'Pinned' , boolean ]
+type MarkerStatus = MarkerTracked | MarkerPinned | 'JustFocused'
- async function onContextMenu() {
- const items: Dome.PopupMenuItem[] = [];
- const copyValue = () => navigator.clipboard.writeText(valueText);
- if (valueText !== '')
- items.push({ label: 'Copy to clipboard', onClick: copyValue });
- if (items.length > 0 && pointedVars.length > 0)
- items.push('separator');
- pointedVars.forEach((lval) => {
- const [text, lvalMarker] = lval;
- const label = `Display values for ${text}`;
- const location = { fct: probe.fct, marker: lvalMarker };
- const onItemClick = () => model.addProbe(location);
- items.push({ label, onClick: onItemClick });
- });
- if (items.length > 0)
- items.push('separator');
- const remove = () => model.removeProbe(probe);
- const removeLabel = `Remove column for ${probe.code}`;
- items.push({ label: removeLabel, onClick: remove });
- if (items.length > 0) Dome.popupMenu(items);
- }
+function MarkerStatusClass(status: MarkerStatus): string {
+ if (status === 'JustFocused') return 'eva-header-just-focused';
+ const [ kind, focused ] = status;
+ return 'eva-header-' + kind.toLowerCase() + (focused ? '-focused' : '');
+}
+
+function isPinnedMarker(status: MarkerStatus): boolean {
+ if (status === 'JustFocused') return false;
+ const [ kind ] = status;
+ return kind === 'Pinned';
+}
+
+interface TableCellProps {
+ children?: JSX.Element | JSX.Element[];
+ right?: JSX.Element;
+ align?: 'left' | 'center';
+}
+function TableCell(props: TableCellProps): JSX.Element {
+ const { children, right, align = 'center' } = props;
+ const leftVisible = align === 'center' ? 'block' : 'none';
return (
- <div
- className={className}
- style={style}
- onClick={onClick}
- onDoubleClick={onDoubleClick}
- onContextMenu={onContextMenu}
- >
- {contents}
+ <div className='eva-cell-container'>
+ <div className='eva-cell-left' style={{ display: leftVisible }}/>
+ <div className='eva-cell-content'>
+ {children}
+ </div>
+ <div className='eva-cell-right'>
+ {right}
+ </div>
</div>
);
}
-// --------------------------------------------------------------------------
-// --- Table Section
-// --------------------------------------------------------------------------
+/* -------------------------------------------------------------------------- */
+
+
+
+/* -------------------------------------------------------------------------- */
+/* --- Callstack related definitions --- */
+/* -------------------------------------------------------------------------- */
+
+/* Callstacks are declared by the server. We add the `Summary` construction to
+ * cleanly represent the summary of all the callstacks. */
+type callstack = 'Summary' | Values.callstack
+
+/* Builds a cached version of the `getCallstacks` request */
+function useCallstacksCache(): Request<Ast.marker[], callstack[]> {
+ const g = React.useCallback((m) => Server.send(Values.getCallstacks, m), []);
+ const toString = React.useCallback((ms) => ms.join('|'), []);
+ return Dome.useCache(g, toString);
+}
+
+/* -------------------------------------------------------------------------- */
+
+
+
+/* -------------------------------------------------------------------------- */
+/* --- Callsite related definitions --- */
+/* -------------------------------------------------------------------------- */
+
+/* Representation of a callsite as described in the server */
+interface Callsite {
+ callee: string;
+ caller?: string;
+ stmt?: Ast.marker;
+}
+
+/* Builds a cached version of the `getCallstackInfo` request */
+function useCallsitesCache(): Request<callstack, Callsite[]> {
+ const get = React.useCallback((c) => {
+ if (c !== 'Summary') return Server.send(Values.getCallstackInfo, c);
+ else return Promise.resolve([]);
+ }, []);
+ return Dome.useCache(get);
+}
+
+/* -------------------------------------------------------------------------- */
+
-interface TableSectionProps {
+
+/* -------------------------------------------------------------------------- */
+/* --- Probe related definitions --- */
+/* -------------------------------------------------------------------------- */
+
+/* A Location is a marker in a function */
+interface Location {
+ target: Ast.marker;
fct: string;
- folded: boolean;
- foldable: boolean;
- onClick: () => void;
- byCallstacks: boolean;
- onCallstackClick: () => void;
+}
+
+/* An Evaluation keeps track of the values at relevant control point around a
+ * statement, along with the potential errors */
+interface Evaluation {
+ errors?: string;
+ vBefore?: Values.evaluation;
+ vAfter?: Values.evaluation;
+ vThen?: Values.evaluation;
+ vElse?: Values.evaluation;
+}
+
+/* A Probe is a location along with data representing textually what it is, the
+ * considered statement, if it is an effectfull one or one with conditions.
+ * Moreover, it gives a function that computes an Evaluation for a given
+ * callstack. This computation is asynchronous. */
+interface Probe extends Location {
+ code?: string;
+ stmt?: Ast.marker;
+ rank?: number;
+ evaluable: boolean;
+ effects?: boolean;
+ condition?: boolean;
+ evaluate: Request<callstack, Evaluation>
+}
+
+/* Builds a cached version of the `getValues` request */
+function useEvaluationCache(): Request<[ Location, callstack ], Evaluation> {
+ type LocStack = [ Location, callstack ];
+ const toString = React.useCallback(([ l, c ] : LocStack): string => {
+ return `${l.fct}:${l.target}:${c}`;
+ }, []);
+ const get: Request<LocStack, Evaluation> = React.useCallback(([ l, c ]) => {
+ const callstack = c === 'Summary' ? undefined : c;
+ return Server.send(Values.getValues, { ...l, callstack });
+ }, []);
+ return Dome.useCache(get, toString);
+}
+
+/* Builds a cached function that builds a Probe given a Location */
+function useProbeCache(): Request<Location, Probe> {
+ const toString = React.useCallback((l) => `${l.fct}:${l.target}`, []);
+ const cache = useEvaluationCache();
+ const get = React.useCallback(async (loc: Location): Promise<Probe> => {
+ const infos = await Server.send(Values.getProbeInfo, loc.target);
+ const evaluate: Request<callstack, Evaluation> = (c) => cache([ loc, c ]);
+ return { ...loc, ...infos, evaluate };
+ }, [ cache ]);
+ return Dome.useCache(get, toString);
+}
+
+/* -------------------------------------------------------------------------- */
+
+
+
+/* -------------------------------------------------------------------------- */
+/* --- Statement Component --- */
+/* -------------------------------------------------------------------------- */
+
+interface StmtProps {
+ stmt?: Ast.marker;
+ marker?: Ast.marker;
+ short?: boolean;
+}
+
+function Stmt(props: StmtProps): JSX.Element {
+ const markersInfo = States.useSyncArray(Ast.markerInfo);
+ const { stmt, marker, short } = props;
+ if (!stmt || !marker) return <></>;
+ const line = markersInfo.getData(marker)?.sloc?.line;
+ const filename = markersInfo.getData(marker)?.sloc?.base;
+ const title = markersInfo.getData(stmt)?.descr;
+ const text = short ? `@L${line}` : `@${filename}:${line}`;
+ const className = 'dome-text-cell eva-stmt';
+ return <span className={className} title={title}>{text}</span>;
+}
+
+/* -------------------------------------------------------------------------- */
+
+
+
+/* -------------------------------------------------------------------------- */
+/* --- Informations on the alarms in a given callstack --- */
+/* -------------------------------------------------------------------------- */
+
+function AlarmsInfos(probe?: Probe): Request<callstack, JSX.Element> {
+ return async (c: callstack): Promise<JSX.Element> => {
+ const evaluation = await probe?.evaluate(c);
+ const alarms = evaluation?.vBefore?.alarms ?? [];
+ if (alarms.length <= 0) return <></>;
+ const renderAlarm = ([status, alarm]: Alarm): JSX.Element => {
+ const className = classes('eva-alarm-info', `eva-alarm-${status}`);
+ return <Code className={className} icon="WARNING">{alarm}</Code>;
+ };
+ const children = React.Children.toArray(alarms.map(renderAlarm));
+ return <Vpack className="eva-info">{children}</Vpack>;
+ };
+}
+
+/* -------------------------------------------------------------------------- */
+
+
+
+/* -------------------------------------------------------------------------- */
+/* --- Informations on the selected callstack --- */
+/* -------------------------------------------------------------------------- */
+
+interface StackInfosProps {
+ callsites: Callsite[];
+ isSelected: boolean;
+ setSelection: (a: States.SelectionActions) => void;
close: () => void;
}
-function TableSection(props: TableSectionProps) {
- const { fct, foldable, folded, onClick } = props;
- const icon = folded ? 'ANGLE.RIGHT' :
- foldable ? 'ANGLE.DOWN' : 'TRIANGLE.RIGHT';
+async function StackInfos(props: StackInfosProps): Promise<JSX.Element> {
+ const { callsites, setSelection, isSelected, close } = props;
+ const selectedClass = isSelected ? 'eva-focused' : '';
+ const className = classes('eva-callsite', selectedClass);
+ if (callsites.length <= 1) return <></>;
+ const makeCallsite = ({ caller, stmt }: Callsite): JSX.Element => {
+ if (!caller || !stmt) return <></>;
+ const key = `${caller}@${stmt}`;
+ const location = { fct: caller, marker: stmt };
+ const select = (meta: boolean): void => {
+ setSelection({ location });
+ if (meta) States.MetaSelection.emit(location);
+ };
+ const onClick = (evt: React.MouseEvent): void => { select(evt.altKey); };
+ const onDoubleClick = (evt: React.MouseEvent): void => {
+ evt.preventDefault();
+ select(true);
+ };
+ return (
+ <Cell
+ key={key}
+ icon='TRIANGLE.LEFT'
+ className={className}
+ onClick={onClick}
+ onDoubleClick={onDoubleClick}
+ >
+ {caller}
+ <Stmt stmt={stmt} marker={stmt} />
+ </Cell>
+ );
+ };
+ const children = React.Children.toArray(callsites.map(makeCallsite));
return (
- <>
+ <div className='eva-info'>
+ <Hpack className='eva-info-wrap'>{children}</Hpack>
+ <Hfill />
<IconButton
- className="eva-fct-fold"
- size={10}
- offset={-1}
- icon={icon}
- enabled={foldable}
- onClick={onClick}
+ icon='CROSS'
+ className='eva-button'
+ onClick={close}
/>
- <Cell className="eva-fct-name">{fct}</Cell>
- <Filler />
+ </div>
+ );
+}
+
+/* -------------------------------------------------------------------------- */
+
+
+
+/* -------------------------------------------------------------------------- */
+/* --- Probe Header Component --- */
+/* -------------------------------------------------------------------------- */
+/* --- Header of a column, describing the evaluated expression and its --- */
+/* --- status inside the component (pinned, tracked, etc). --- */
+/* -------------------------------------------------------------------------- */
+
+interface ProbeHeaderProps {
+ probe: Probe;
+ status: MarkerStatus;
+ pinProbe: (pin: boolean) => void;
+ selectProbe: () => void;
+ removeProbe: () => void;
+ setSelection: (a: States.SelectionActions) => void;
+ locEvt: Dome.Event<Location>;
+}
+
+function ProbeHeader(props: ProbeHeaderProps): JSX.Element {
+ const { probe, status, setSelection, locEvt } = props;
+ const { code = '(error)', stmt, target, fct } = probe;
+ const color = classes(MarkerStatusClass(status), 'eva-table-header-sticky');
+ const { selectProbe, removeProbe, pinProbe } = props;
+ const span = 1 + (probe.effects ? 1 : 0) + (probe.condition ? 2 : 0);
+ const buttonClass = classes('eva-button', 'eva-header-button');
+
+ // When the location is selected, we scroll the header into view, making it
+ // appears wherever it was.
+ const ref = React.createRef<HTMLTableCellElement>();
+ locEvt.on((l) => { if (l === probe) ref.current?.scrollIntoView(); });
+
+ const isPinned = isPinnedMarker(status);
+ const pinText = isPinned ? 'Unpin' : 'Pin';
+ const loc: States.SelectionActions = { location: { fct, marker: target} };
+ const onClick = (): void => { setSelection(loc); selectProbe(); };
+ const onDoubleClick = (): void => pinProbe(!isPinned);
+ const onContextMenu = (): void => {
+ const items: Dome.PopupMenuItem[] = [];
+ const pinLabel = `${pinText} column for ${code}`;
+ items.push({ label: pinLabel, onClick: onDoubleClick });
+ const removeLabel = `Remove column for ${code}`;
+ items.push({ label: removeLabel, onClick: removeProbe });
+ Dome.popupMenu(items);
+ };
+
+ const buttons =
+ <div>
<IconButton
- icon="ITEMS.LIST"
- className="eva-probeinfo-button"
- selected={props.byCallstacks}
- title="Details by callstack"
- onClick={props.onCallstackClick}
+ icon='PIN'
+ className={buttonClass}
+ title={`${pinText} the column`}
+ selected={isPinned}
+ onClick={onDoubleClick}
/>
- <Inset />
<IconButton
- icon="CROSS"
- className="eva-probeinfo-button"
- title="Close"
- onClick={props.close}
+ icon="CIRC.CLOSE"
+ className={buttonClass}
+ title="Remove the column"
+ onClick={() => removeProbe()}
/>
- </>
+ </div>;
+
+ return (
+ <th
+ ref={ref}
+ className={color}
+ colSpan={span}
+ onClick={onClick}
+ onDoubleClick={onDoubleClick}
+ onContextMenu={onContextMenu}
+ >
+ <TableCell right={buttons}>
+ <div className='eva-header-text-overflow'>
+ <span className='dome-text-cell' title={code}>{code}</span>
+ </div>
+ <Stmt stmt={stmt} marker={target} short={true}/>
+ </TableCell>
+ </th>
);
}
-// --------------------------------------------------------------------------
-// --- Table Row Header
-// --------------------------------------------------------------------------
+/* -------------------------------------------------------------------------- */
+
+
+
+/* -------------------------------------------------------------------------- */
+/* --- Probe Description Component --- */
+/* -------------------------------------------------------------------------- */
+/* --- Description of a table column, i.e. if it contains values --- */
+/* --- evaluated before or after the considered statement. --- */
+/* -------------------------------------------------------------------------- */
+
+interface ProbeDescrProps {
+ probe: Probe;
+}
+
+function ProbeDescr(props: ProbeDescrProps): JSX.Element[] {
+ const { probe } = props;
+ const valuesClass = classes('eva-table-values', 'eva-table-values-center');
+ const tableClass = classes('eva-table-descrs', 'eva-table-descr-sticky');
+ const cls = classes(valuesClass, tableClass);
+ const title = (s: string): string => `Values ${s} the statement evaluation`;
+ const elements: JSX.Element[] = [];
+ function push(title: string, children: JSX.Element | string): void {
+ elements.push(<td className={cls} title={title}>{children}</td>);
+ }
+ if (!probe.effects && !probe.condition)
+ push('Values at the statement', '-');
+ if (probe.effects || probe.condition)
+ push(title('before'), 'Before');
+ if (probe.effects)
+ push(title('after'), 'After');
+ if (probe.condition) {
+ const pushCondition = (s: string): void => {
+ const t = `Values after the condition, in the ${s.toLowerCase()} branch`;
+ const child =
+ <div className='eva-header-after-condition'>
+ After
+ <div className='eva-stmt'>{`(${s})`}</div>
+ </div>;
+ push(t, child);
+ };
+ pushCondition('Then');
+ pushCondition('Else');
+ }
+ return elements;
+}
+
+/* -------------------------------------------------------------------------- */
+
-interface TableHeadProps {
- stackCalls: Callsite[];
- stackIndex: number | undefined;
- stackCount: number | undefined;
- onClick: () => void;
+
+/* -------------------------------------------------------------------------- */
+/* --- Probe Values Component --- */
+/* -------------------------------------------------------------------------- */
+/* --- This component represents the contents of one of the table that --- */
+/* --- displays values information. As the content depends on the --- */
+/* --- considered callstack, we decided to return a function that build --- */
+/* --- the actual component when given a callstack. It avoids useless --- */
+/* --- computational boilerplate. --- */
+/* -------------------------------------------------------------------------- */
+
+interface ProbeValuesProps {
+ probe: Probe;
+ addLoc: (loc: Location) => void;
+ isSelectedCallstack: (c: callstack) => boolean;
}
-function makeStackTitle(calls: Callsite[]) {
+function ProbeValues(props: ProbeValuesProps): Request<callstack, JSX.Element> {
+ const { probe, addLoc, isSelectedCallstack } = props;
+
+ // Building common parts
+ const onContextMenu = (evaluation?: Values.evaluation) => (): void => {
+ const { value = '', pointedVars = [] } = evaluation ?? {};
+ const items: Dome.PopupMenuItem[] = [];
+ const copy = (): void => { navigator.clipboard.writeText(value); };
+ if (value !== '') items.push({ label: 'Copy to clipboard', onClick: copy });
+ if (items.length > 0 && pointedVars.length > 0) items.push('separator');
+ pointedVars.forEach((lval) => {
+ const [text, lvalMarker] = lval;
+ const label = `Display values for ${text}`;
+ const location = { fct: probe.fct, target: lvalMarker };
+ const onItemClick = (): void => addLoc(location);
+ items.push({ label, onClick: onItemClick });
+ });
+ if (items.length > 0) Dome.popupMenu(items);
+ };
+
+ return async (callstack: callstack): Promise<JSX.Element> => {
+ const evaluation = await probe.evaluate(callstack);
+ const { vBefore, vAfter, vThen, vElse } = evaluation;
+ const isSelected = isSelectedCallstack(callstack);
+ const selected = isSelected && callstack !== 'Summary' ? 'eva-focused' : '';
+ const font = callstack === 'Summary' ? 'eva-italic' : '';
+ const c = classes('eva-table-values', selected, font);
+ const kind = callstack === 'Summary' ? 'one' : 'this';
+ const title = `At least one alarm is raised in ${kind} callstack`;
+ function td(e?: Values.evaluation, colSpan = 1): JSX.Element {
+ const { alarms, value = '-' } = e ?? {};
+ const status = getAlarmStatus(alarms);
+ const alarmClass = classes('eva-cell-alarms', `eva-alarm-${status}`);
+ const align = value?.includes('\n') ? 'left' : 'center';
+ const warning =
+ <Icon className={alarmClass} size={10} title={title} id="WARNING" />;
+ return (
+ <td className={c} colSpan={colSpan} onContextMenu={onContextMenu(e)}>
+ <TableCell right={warning} align={align}>
+ <span className='eva-table-text'>{value}</span>
+ </TableCell>
+ </td>
+ );
+ }
+ const elements: JSX.Element[] = [];
+ if (probe.effects && _.isEqual(vBefore, vAfter))
+ elements.push(td(vBefore, 2));
+ else {
+ if (!probe.effects && !probe.condition)
+ elements.push(td(vBefore));
+ if (probe.effects || probe.condition)
+ elements.push(td(vBefore));
+ if (probe.effects)
+ elements.push(td(vAfter));
+ if (probe.condition)
+ elements.push(td(vThen), td(vElse));
+ }
+ return <>{React.Children.toArray(elements)}</>;
+ };
+}
+
+/* -------------------------------------------------------------------------- */
+
+
+
+/* -------------------------------------------------------------------------- */
+/* --- Row header describing the corresponding callstack --- */
+/* -------------------------------------------------------------------------- */
+
+interface CallsiteCellProps {
+ callstack: callstack | 'Header';
+ index?: number;
+ getCallsites: Request<callstack, Callsite[]>;
+ selectedClass?: string;
+}
+
+function makeStackTitle(calls: Callsite[]): string {
const cs = calls.slice(1);
if (cs.length > 0)
return `Callstack: ${cs.map((c) => c.callee).join(' \u2190 ')}`;
return 'Callstack Details';
}
-function TableHead(props: TableHeadProps) {
- const sk = props.stackIndex;
- const sc = props.stackCount;
- const hdClass = classes('eva-head', sc ? undefined : 'dome-hidden');
- const hdHeader = sk === undefined;
- const hdSummary = sk !== undefined && sk < 0;
- const hdNumber = sk === undefined ? 0 : 1 + sk;
- const hdTitle =
- hdHeader ? 'Callstack / Summary' :
- hdSummary ? 'Summary' : makeStackTitle(props.stackCalls);
- return (
- <div
- className={hdClass}
- title={hdTitle}
- onClick={props.onClick}
- >
- <div className="eva-phantom">{'\u2211'}{sc ?? '#'}</div>
- {hdHeader ? '#' : hdSummary ? '\u2211' : `${hdNumber}`}
- </div>
- );
+async function CallsiteCell(props: CallsiteCellProps): Promise<JSX.Element> {
+ const { callstack, index, getCallsites, selectedClass = '' } = props;
+ const baseClasses = classes('eva-table-callsite-box', selectedClass);
+ switch (callstack) {
+ case 'Header': {
+ const cls = classes(baseClasses, 'eva-table-header-sticky');
+ const title = 'Callstack at which expressions are evaluated';
+ return <td className={cls} rowSpan={2} title={title}>{'#'}</td>;
+ }
+ default: {
+ const cls = classes(baseClasses, 'eva-table-value-sticky');
+ const callsites = await getCallsites(callstack);
+ const isSummary = callstack === 'Summary';
+ const summary = 'Summary: value consolidated accross all callstacks';
+ const infos = isSummary ? summary : makeStackTitle(callsites);
+ const text = isSummary ? '∑' : (index ? index.toString() : '0');
+ return <td className={cls} title={infos}>{text}</td>;
+ }
+ }
}
-// --------------------------------------------------------------------------
-// --- Table Row
-// --------------------------------------------------------------------------
+/* -------------------------------------------------------------------------- */
+
+
-interface TableRowProps {
- style: React.CSSProperties;
- index: number;
- data: ModelProp;
+/* -------------------------------------------------------------------------- */
+/* --- Function Section Component --- */
+/* -------------------------------------------------------------------------- */
+
+interface FunctionProps {
+ fct: string;
+ markers: Map<Ast.marker, MarkerStatus>;
+ close: () => void;
+ getProbe: Request<Location, Probe>;
+ pinProbe: (probe: Probe, pin: boolean) => void;
+ selectProbe: (probe: Probe) => void;
+ removeProbe: (probe: Probe) => void;
+ addLoc: (loc: Location) => void;
+ folded: boolean;
+ setFolded: (folded: boolean) => void;
+ getCallsites: Request<callstack, Callsite[]>;
+ byCallstacks: boolean;
+ getCallstacks: Request<Ast.marker[], callstack[]>;
+ setByCallstacks: (byCallstack: boolean) => void;
+ selectCallstack: (callstack: callstack) => void;
+ isSelectedCallstack: (c: callstack) => boolean;
+ setSelection: (a: States.SelectionActions) => void;
+ locEvt: Dome.Event<Location>;
+ startingCallstack: number;
+ changeStartingCallstack: (n: number) => void;
}
-function TableRow(props: TableRowProps) {
- const { model } = props.data;
- const row = model.getRow(props.index);
- if (!row) return null;
- const { kind, probes } = row;
- if (kind === 'section') {
- const { fct } = row;
- if (!fct) return null;
- const folded = model.isFolded(fct);
- const foldable = model.isFoldable(fct);
- const byCallstacks = model.isByCallstacks(fct);
+const PageSize = 99;
+
+async function FunctionSection(props: FunctionProps): Promise<JSX.Element> {
+ const { fct, folded, isSelectedCallstack, locEvt } = props;
+ const { byCallstacks, setSelection, getCallsites } = props;
+ const { addLoc, getCallstacks: getCS } = props;
+ const { setFolded, setByCallstacks, close } = props;
+ const { startingCallstack, changeStartingCallstack } = props;
+ const displayTable = folded ? 'none' : 'block';
+ type RowHandler = React.MouseEventHandler<HTMLTableRowElement>;
+ const onClick: (c: callstack) => RowHandler = (c) => (event) => {
+ const elt = document.elementFromPoint(event.clientX, event.clientY);
+ if (elt?.localName !== 'span')
+ props.selectCallstack(isSelectedCallstack(c) ? 'Summary' : c);
+ };
+
+ /* Computes the relevant callstacks */
+ const markers = Array.from(props.markers.keys());
+ const allCallstacks = await getCS(markers);
+ const summaryOnly = allCallstacks.length === 1;
+ const callstacks = byCallstacks || summaryOnly ? allCallstacks : [];
+ const nbCS = allCallstacks.length;
+
+ /* Computes the relevant data for each marker */
+ interface Data { probe: Probe; summary: Evaluation; status: MarkerStatus }
+ const entries = Array.from(props.markers.entries());
+ const data = await Promise.all(entries.map(async ([ target, status ]) => {
+ const probe = await props.getProbe({ target, fct });
+ const summary = await probe.evaluate('Summary');
+ return { probe, summary, status } as Data;
+ }));
+ const doCall = data.length > 0;
+
+ /* Computes the headers for each marker */
+ const headerCall = await CallsiteCell({ getCallsites, callstack: 'Header' });
+ const headers = await Promise.all(data.map((d: Data) => {
+ const pinProbe = (pin: boolean): void => props.pinProbe(d.probe, pin);
+ const selectProbe = (): void => props.selectProbe(d.probe);
+ const removeProbe = (): void => props.removeProbe(d.probe);
+ const fcts = { selectProbe, pinProbe, removeProbe, setSelection };
+ return ProbeHeader({ ...d, ...fcts, locEvt });
+ }));
+
+ /* Computes the columns descriptions */
+ const descrs = data.map((d) => ProbeDescr(d)).flat();
+
+ /* Computes the summary values */
+ const miscs = { addLoc, isSelectedCallstack };
+ const builders = data.map((d: Data) => ProbeValues({ ...d, ...miscs }));
+ const summary = await Promise.all(builders.map((b) => b('Summary')));
+ const summCall = await CallsiteCell({ callstack: 'Summary', getCallsites });
+ let summaryRow = <></>;
+ if (!summaryOnly) {
+ summaryRow =
+ <tr key={'Summary'} onClick={onClick('Summary')}>
+ {doCall ? summCall : undefined}
+ {React.Children.toArray(summary)}
+ </tr>;
+ }
+
+ /* Computes the values for each callstack */
+ const start = Math.max(1, startingCallstack);
+ const stop = Math.min(start + PageSize, callstacks.length);
+ const values = await Promise.all(callstacks.map(async (callstack, n) => {
+ const index = n + 1;
+ if (start > index || stop < index) return <></>;
+ const selectedClass = isSelectedCallstack(callstack) ? 'eva-focused' : '';
+ const callProps = { selectedClass, getCallsites };
+ const call = await CallsiteCell({ index, callstack, ...callProps });
+ const values = await Promise.all(builders.map((b) => b(callstack)));
return (
- <Hpack className="eva-function" style={props.style}>
- <TableSection
- fct={fct}
- folded={folded}
- foldable={foldable}
- onClick={() => model.setFolded(fct, !folded)}
- byCallstacks={byCallstacks}
- onCallstackClick={() => model.setByCallstacks(fct, !byCallstacks)}
- close={() => model.clearFunction(fct)}
- />
- </Hpack>
+ <tr key={callstack} onClick={onClick(callstack)}>
+ {call}
+ {React.Children.toArray(values)}
+ </tr>
);
- }
- const sk = row.stackIndex;
- const sc = row.stackCount;
- const cs = row.callstack;
- const calls = cs ? model.stacks.getCalls(cs) : [];
- const rowKind = `eva-${kind}`;
- const rowParity = sk !== undefined && sk % 2 === 1;
- const rowIndexKind =
- model.isSelectedRow(row) ? 'eva-row-selected' :
- model.isAlignedRow(row) ? 'eva-row-aligned' :
- rowParity ? 'eva-row-odd' : 'eva-row-even';
- const rowClass = classes('eva-row', rowKind, rowIndexKind);
- const onHeaderClick = () => model.setSelectedRow(row);
- const makeCell = (probe: Probe) => (
- <TableCell
- key={probe.marker}
- probe={probe}
- row={row}
- model={model}
- />
- );
+ }));
+
+ /* We change the starting callstack dynamically when we reach the ends of the
+ * scroll to avoid to build the complete table */
+ const onScroll: React.UIEventHandler<HTMLDivElement> = (event) => {
+ const { scrollTop, scrollHeight, clientHeight } = event.currentTarget;
+ if (scrollTop / (scrollHeight - clientHeight) <= 0.1)
+ changeStartingCallstack(Math.max(startingCallstack - 10, 0));
+ const botGap = (scrollHeight - scrollTop - clientHeight) / scrollHeight;
+ const lastCallstack = startingCallstack + PageSize;
+ if (botGap <= 0.1 && lastCallstack !== callstacks.length) {
+ const maxStart = callstacks.length - PageSize;
+ const start = Math.min(startingCallstack + 10, maxStart);
+ changeStartingCallstack(start);
+ }
+ };
+
+ /* Builds the component */
return (
- <Hpack style={props.style}>
- <div className={rowClass}>
- <TableHead
- stackIndex={sk}
- stackCount={sc}
- stackCalls={calls}
- onClick={onHeaderClick}
+ <>
+ <Hpack className="eva-function">
+ <IconButton
+ className="eva-fct-fold"
+ icon={folded ? 'ANGLE.RIGHT' : 'ANGLE.DOWN'}
+ onClick={() => setFolded(!folded)}
+ />
+ <Cell className="eva-fct-name">{fct}</Cell>
+ <Filler />
+ <div className='eva-nb-callstacks'>
+ {`${nbCS} callstack${nbCS > 1 ? 's' : ''}`}
+ </div>
+ <IconButton
+ icon="ITEMS.LIST"
+ className="eva-button"
+ selected={byCallstacks}
+ disabled={summaryOnly}
+ title="Show values by callstack"
+ onClick={() => setByCallstacks(!byCallstacks)}
+ />
+ <Inset />
+ <IconButton
+ icon="CROSS"
+ className="eva-button"
+ title="Close"
+ onClick={close}
/>
- {probes.map(makeCell)}
+ </Hpack>
+ <div
+ onScroll={onScroll}
+ className='eva-table-container'
+ style={{ display: displayTable }}
+ >
+ <table className='eva-table'>
+ <tbody>
+ <tr>
+ {doCall ? headerCall : undefined}
+ {React.Children.toArray(headers)}
+ </tr>
+ <tr>
+ {React.Children.toArray(descrs)}
+ </tr>
+ {summaryRow}
+ {React.Children.toArray(values)}
+ </tbody>
+ </table>
</div>
- <Filler />
- </Hpack>
+ </>
);
}
-// --------------------------------------------------------------------------
-// --- Values Panel
-// --------------------------------------------------------------------------
+/* -------------------------------------------------------------------------- */
-export interface Dimension {
- width: number;
- height: number;
-}
-export interface ValuesPanelProps extends Dimension, ModelProp {
- zoom: number;
+
+/* -------------------------------------------------------------------------- */
+/* --- Function Manager --- */
+/* -------------------------------------------------------------------------- */
+/* --- The Function Manager is responsible of all the data related to --- */
+/* --- programs functions. --- */
+/* -------------------------------------------------------------------------- */
+
+/* Informations on one function */
+class FunctionInfos {
+
+ readonly fct: string; // Function's name
+ readonly pinned = new Set<Ast.marker>(); // Pinned markers
+ readonly tracked = new Set<Ast.marker>(); // Tracked markers
+ startingCallstack = 1; // First displayed callstack
+ byCallstacks = false; // True if displayed by callstacks
+ folded = false; // True if folded
+
+ constructor(fct: string) {
+ this.fct = fct;
+ }
+
+ has(marker: Ast.marker): boolean {
+ const pinned = this.pinned.has(marker);
+ const tracked = this.tracked.has(marker);
+ return pinned || tracked;
+ }
+
+ pin(marker: Ast.marker): void {
+ this.pinned.add(marker);
+ this.tracked.delete(marker);
+ }
+
+ track(marker: Ast.marker): void {
+ this.tracked.add(marker);
+ this.pinned.delete(marker);
+ }
+
+ delete(marker: Ast.marker): void {
+ this.pinned.delete(marker);
+ this.tracked.delete(marker);
+ }
+
+ isEmpty(): boolean {
+ return this.pinned.size === 0 && this.tracked.size === 0;
+ }
+
+ markers(focusedLoc?: Location): Map<Ast.marker, MarkerStatus> {
+ const { target: tgt, fct } = focusedLoc ?? {};
+ const inFct = fct !== undefined && fct === this.fct;
+ const ms = new Map<Ast.marker, MarkerStatus>();
+ this.pinned.forEach((p) => ms.set(p, [ 'Pinned', inFct && tgt === p ]));
+ this.tracked.forEach((p) => ms.set(p, [ 'Tracked', inFct && tgt === p ]));
+ if (inFct && tgt && !this.has(tgt)) ms.set(tgt, 'JustFocused');
+ return new Map(Array.from(ms.entries()).reverse());
+ }
+
}
-export function ValuesPanel(props: ValuesPanelProps) {
- const { zoom, width, height, model } = props;
- // --- reset line cache
- const listRef = React.useRef<VariableSizeList>(null);
- const [rowCount, setRowCount] = React.useState(model.getRowCount());
- Dome.useEvent(model.laidout, () => {
- // The layout has changed, so the number of rows may also have changed.
- setRowCount(model.getRowCount());
- setImmediate(() => {
- const vlist = listRef.current;
- if (vlist) vlist.resetAfterIndex(0, true);
+/* State keeping tracks of informations for every relevant functions */
+class FunctionsManager {
+
+ private readonly cache = new Map<string, FunctionInfos>();
+
+ constructor() {
+ this.newFunction = this.newFunction.bind(this);
+ this.getInfos = this.getInfos.bind(this);
+ this.setByCallstacks = this.setByCallstacks.bind(this);
+ this.setFolded = this.setFolded.bind(this);
+ this.pin = this.pin.bind(this);
+ this.track = this.track.bind(this);
+ this.removeLocation = this.removeLocation.bind(this);
+ this.delete = this.delete.bind(this);
+ this.clear = this.clear.bind(this);
+ this.map = this.map.bind(this);
+ }
+
+ newFunction(fct: string): void {
+ if (!this.cache.has(fct)) this.cache.set(fct, new FunctionInfos(fct));
+ }
+
+ private getInfos(fct: string): FunctionInfos {
+ const { cache } = this;
+ if (cache.has(fct)) return cache.get(fct) as FunctionInfos;
+ const infos = new FunctionInfos(fct);
+ this.cache.set(fct, infos);
+ return infos;
+ }
+
+ isEmpty(fct: string): boolean {
+ const infos = this.cache.get(fct);
+ return infos ? infos.isEmpty() : true;
+ }
+
+ setByCallstacks(fct: string, byCallstacks: boolean): void {
+ const infos = this.cache.get(fct);
+ if (infos) infos.byCallstacks = byCallstacks;
+ }
+
+ setFolded(fct: string, folded: boolean): void {
+ const infos = this.cache.get(fct);
+ if (infos) infos.folded = folded;
+ }
+
+ changeStartingCallstack(fct: string, n: number): void {
+ const infos = this.cache.get(fct);
+ if (infos) infos.startingCallstack = n;
+ }
+
+ pin(loc: Location): void {
+ const { target, fct } = loc;
+ this.getInfos(fct).pin(target);
+ }
+
+ unpin(loc: Location): void {
+ const { target, fct } = loc;
+ this.cache.get(fct)?.pinned.delete(target);
+ }
+
+ track(loc: Location): void {
+ const { target, fct } = loc;
+ this.getInfos(fct).track(target);
+ }
+
+ removeLocation(loc: Location): void {
+ const { target, fct } = loc;
+ const infos = this.cache.get(fct);
+ if (infos) infos.delete(target);
+ }
+
+ delete(fct: string): void {
+ this.cache.delete(fct);
+ }
+
+ clear(): void {
+ this.cache.clear();
+ }
+
+ clean(focused?: Location): void {
+ const focusedFct = focused?.fct;
+ this.cache.forEach((infos) => {
+ if (focusedFct !== infos.fct && infos.isEmpty())
+ this.cache.delete(infos.fct);
});
- });
- // --- compute line height
- const getRowHeight = React.useCallback(
- (k: number) => HSIZER.dimension(model.getRowLines(k)),
- [model],
- );
- // --- compute layout
- const margin = WSIZER.capacity(width);
- const estimatedHeight = HSIZER.dimension(1);
- const [selection] = States.useSelection();
+ }
+
+ map<A>(func: (infos: FunctionInfos, fct: string) => A): A[] {
+ const entries = Array.from(this.cache.entries());
+ return entries.map(([ fct, infos ]) => func(infos, fct));
+ }
+
+}
+
+/* -------------------------------------------------------------------------- */
+
+
+
+/* -------------------------------------------------------------------------- */
+/* --- Eva Table Complet Component --- */
+/* -------------------------------------------------------------------------- */
+
+/* Table's state. It is global for when the user changes the view. */
+const CallstackState = new GlobalState<callstack>('Summary');
+const FunctionsManagerState = new GlobalState(new FunctionsManager());
+const FocusState = new GlobalState<Probe | undefined>(undefined);
+
+/* Component */
+function EvaTable(): JSX.Element {
+
+ /* Component state */
+ const [ selection, select ] = States.useSelection();
+ const [ cs, setCS ] = useGlobalState(CallstackState);
+ const [ fcts ] = useGlobalState(FunctionsManagerState);
+ const [ focus, setFocus ] = useGlobalState(FocusState);
+
+ /* Used to force the component update. We cannot use the `forceUpdate` hook
+ * proposed by Dome as we need to be able to add dependencies on a changing
+ * value (here tac) explicitly. We need to force the update as modifications
+ * of the Function Manager internal data does NOT trigger the component
+ * update. */
+ const [ tac, setTic ] = React.useState(0);
+
+ /* Event use to communicate when a location is selected. Used to scroll
+ * related column into view if needed */
+ const [ locEvt ] = React.useState(new Dome.Event<Location>('eva-location'));
+
+ /* Build cached version of needed server's requests */
+ const getProbe = useProbeCache();
+ const getCallsites = useCallsitesCache();
+ const getCallstacks = useCallstacksCache();
+
+ /* Computing the function corresponding to the selected callstack */
+ const csFctPromise = React.useMemo(async () => {
+ const selectedCSInfos = await getCallsites(cs);
+ if (selectedCSInfos.length === 0) return undefined;
+ else return selectedCSInfos[0].callee;
+ }, [ cs, getCallsites ]);
+ const { result: csFct } = Dome.usePromise(csFctPromise);
+
+ /* Reset the selected callstack when the corresponding function is removed */
+ React.useEffect(() => {
+ if (csFct && fcts.isEmpty(csFct) && focus?.fct !== csFct)
+ setCS('Summary');
+ }, [ csFct, setCS, fcts, focus?.fct ] );
+
+ /* Updated the focused Probe when the selection changes. Also emit on the
+ * `locEvent` event. */
+ React.useEffect(() => {
+ const target = selection?.current?.marker;
+ const fct = selection?.current?.fct;
+ const loc = (target && fct) ? { target, fct } : undefined;
+ fcts.clean(loc);
+ const doUpdate = (p: Probe): void => {
+ if (!p.evaluable) { setFocus(undefined); return; }
+ if (fct && p.code) fcts.newFunction(fct);
+ setFocus(p); locEvt.emit(p);
+ };
+ if (loc) getProbe(loc).then(doUpdate);
+ else setFocus(undefined);
+ }, [ fcts, selection, getProbe, setFocus, locEvt ]);
+
+ /* Callback used to pin or unpin a location */
+ const setLocPin = React.useCallback((loc: Location, pin: boolean): void => {
+ if (pin) fcts.pin(loc);
+ else fcts.unpin(loc);
+ setTic(tac + 1);
+ }, [fcts, setTic, tac]);
+
+ /* On meta-selection, pin the selected location. */
React.useEffect(() => {
- const location = selection?.current;
- model.setLayout({ zoom, margin, location });
+ const pin = (loc: States.Location): void => {
+ const {marker, fct} = loc;
+ if (marker && fct) setLocPin({ target: marker, fct }, true);
+ };
+ States.MetaSelection.on(pin);
+ return () => States.MetaSelection.off(pin);
});
- // --- render list
+
+ /* Callback used to remove a probe */
+ const remove = React.useCallback((probe: Probe): void => {
+ fcts.removeLocation(probe);
+ if (probe.target === focus?.target) {
+ setFocus(undefined);
+ fcts.clean(undefined);
+ }
+ else {
+ fcts.clean(focus);
+ }
+ setTic(tac + 1);
+ }, [ fcts, focus, setFocus, tac ]);
+
+ /* Builds the sections for each function. As the component is built
+ * asynchronously, we have to use the `usePromise` hook, which forces us to
+ * memoize the promises building. */
+ const functionsPromise = React.useMemo(() => {
+ const ps = fcts.map((infos, fct) => {
+ const { byCallstacks, folded } = infos;
+ const isSelectedCallstack = (c: callstack): boolean => c === cs;
+ const setFolded = (folded: boolean): void => {
+ fcts.setFolded(fct, folded);
+ setTic(tac + 1);
+ };
+ const setByCS = (byCS: boolean): void => {
+ fcts.setByCallstacks(fct, byCS);
+ setTic(tac + 1);
+ };
+ const changeStartingCallstack = (n: number): void => {
+ fcts.changeStartingCallstack(fct, n);
+ setTic(tac + 1);
+ };
+ const close = (): void => {
+ fcts.delete(fct);
+ if (csFct === fct) setCS('Summary');
+ setTic(tac + 1);
+ };
+ return {
+ fct,
+ markers: infos.markers(focus),
+ close,
+ pinProbe: setLocPin,
+ getProbe,
+ selectProbe: setFocus,
+ removeProbe: remove,
+ addLoc: (loc: Location) => { fcts.pin(loc); setTic(tac + 1); },
+ folded,
+ setFolded,
+ getCallsites,
+ byCallstacks,
+ getCallstacks,
+ setByCallstacks: setByCS,
+ selectCallstack: (c: callstack) => { setCS(c); setTic(tac + 1); },
+ isSelectedCallstack,
+ setSelection: select,
+ locEvt,
+ startingCallstack: infos.startingCallstack,
+ changeStartingCallstack,
+ };
+ });
+ return Promise.all(ps.map(FunctionSection));
+ },
+ [ cs, setCS, fcts, focus, setFocus, tac, getCallsites, setLocPin, csFct,
+ getCallstacks, getProbe, remove, select, locEvt ]);
+ const { result: functions } = Dome.usePromise(functionsPromise);
+
+ /* Builds the alarms component. As for the function sections, it is an
+ * asynchronous process. */
+ const alarmsProm = React.useMemo(() => AlarmsInfos(focus)(cs), [ focus, cs ]);
+ const { result: alarmsInfos } = Dome.usePromise(alarmsProm);
+
+ /* Builds the stacks component. As for the function sections, it is an
+ * asynchronous process. */
+ const stackInfosPromise = React.useMemo(async () => {
+ const callsites = await getCallsites(cs);
+ const tgt = selection.current?.marker;
+ const p = (c: Callsite): boolean => c.stmt !== undefined && c.stmt === tgt;
+ const isSelected = callsites.find(p) !== undefined;
+ const close = (): void => setCS('Summary');
+ return StackInfos({ callsites, isSelected, setSelection: select, close });
+ }, [ cs, setCS, select, getCallsites, selection ]);
+ const { result: stackInfos } = Dome.usePromise(stackInfosPromise);
+
+ /* Builds the component */
return (
- <VariableSizeList
- ref={listRef}
- itemCount={rowCount}
- itemKey={model.getRowKey}
- itemSize={getRowHeight}
- estimatedItemSize={estimatedHeight}
- width={width}
- height={height}
- itemData={{ model }}
- >
- {TableRow}
- </VariableSizeList>
+ <>
+ <Ivette.TitleBar />
+ <div className='eva-functions-section'>
+ {React.Children.toArray(functions)}
+ </div>
+ <Vfill/>
+ {alarmsInfos}
+ {stackInfos}
+ </>
);
+
}
-// --------------------------------------------------------------------------
+/* Registers the component in Ivette */
+Ivette.registerComponent({
+ id: 'frama-c.plugins.values',
+ group: 'frama-c.plugins',
+ rank: 1,
+ label: 'Eva Values',
+ title: 'Values inferred by the Eva analysis',
+ children: <EvaTable />,
+});
+
+/* -------------------------------------------------------------------------- */
diff --git a/ivette/src/frama-c/utils.ts b/ivette/src/frama-c/richtext.tsx
similarity index 55%
rename from ivette/src/frama-c/utils.ts
rename to ivette/src/frama-c/richtext.tsx
index 86df5df5f3d98aa58f68fddd141d156b532e5461..3a9c72c6c7c428f0a7906744e1a886a99aec61d8 100644
--- a/ivette/src/frama-c/utils.ts
+++ b/ivette/src/frama-c/richtext.tsx
@@ -26,12 +26,14 @@
/**
* @packageDocumentation
- * @module frama-c/utils
-*/
+ * @module frama-c/richtext
+ */
+import React from 'react';
import * as Dome from 'dome';
import * as DomeBuffers from 'dome/text/buffers';
import * as KernelData from 'frama-c/kernel/api/data';
+import { classes } from 'dome/misc/utils';
const D = new Dome.Debug('Utils');
@@ -42,33 +44,82 @@ const D = new Dome.Debug('Utils');
/**
* Print text containing tags into buffer.
* @param buffer Rich text buffer to print into.
- * @param contents Actual text containing tags.
+ * @param text Actual text containing tags.
* @param options Specify particular marker options.
*/
export function printTextWithTags(
buffer: DomeBuffers.RichTextBuffer,
- contents: KernelData.text,
+ text: KernelData.text,
options?: DomeBuffers.MarkerProps,
): void {
- if (Array.isArray(contents)) {
- let marker = false;
- const tag = contents.shift();
- if (tag) {
- if (Array.isArray(tag)) {
- contents.unshift(tag);
- } else {
- buffer.openTextMarker({ id: tag, ...options ?? {} });
- marker = true;
- }
+ if (Array.isArray(text)) {
+ const tag = text[0];
+ const marker = typeof (tag) === 'string';
+ if (marker) {
+ buffer.openTextMarker({ id: tag, ...options ?? {} });
+ }
+ for (let k = marker ? 1 : 0; k < text.length; k++) {
+ printTextWithTags(buffer, text[k], options);
}
- contents.forEach((txt) => printTextWithTags(buffer, txt, options));
if (marker) {
- marker = false;
buffer.closeTextMarker();
}
- } else if (typeof contents === 'string') {
- buffer.append(contents);
+ } else if (typeof text === 'string') {
+ buffer.append(text);
} else {
- D.error('Unexpected text', contents);
+ D.error('Unexpected text', text);
}
}
+
+// --------------------------------------------------------------------------
+// --- Lightweight Text Renderer
+// --------------------------------------------------------------------------
+
+interface MarkerProps {
+ marker: string;
+ onMarker?: (marker: string) => void;
+ children?: React.ReactNode;
+}
+
+function Marker(props: MarkerProps): JSX.Element {
+ const { marker, onMarker, children } = props;
+ const onClick = (): void => { if (onMarker) onMarker(marker); };
+ return (
+ <span
+ className="kernel-text-marker"
+ onClick={onClick}
+ >
+ {children}
+ </span>
+ );
+}
+
+function makeContents(text: KernelData.text): React.ReactNode {
+ if (Array.isArray(text)) {
+ const tag = text[0];
+ const marker = tag && typeof (tag) === 'string';
+ const array = marker ? text.slice(1) : text;
+ const contents = React.Children.toArray(array.map(makeContents));
+ if (marker) {
+ return <Marker marker={tag}>{contents}</Marker>;
+ }
+ return <>{contents}</>;
+ } if (typeof text === 'string') {
+ return text;
+ }
+ D.error('Unexpected text', text);
+ return null;
+}
+
+export interface TextProps {
+ text: KernelData.text;
+ onMarker?: (marker: string) => void;
+ className?: string;
+}
+
+export function Text(props: TextProps): JSX.Element {
+ const className = classes('kernel-text', 'dome-text-code', props.className);
+ return <div className={className}>{makeContents(props.text)}</div>;
+}
+
+// --------------------------------------------------------------------------
diff --git a/ivette/src/frama-c/server.ts b/ivette/src/frama-c/server.ts
index c43690340005c66589b631d1e2db19b383207a5a..a621798462c09a889bdb455af074f4205445c2bb 100644
--- a/ivette/src/frama-c/server.ts
+++ b/ivette/src/frama-c/server.ts
@@ -20,8 +20,6 @@
/* */
/* ************************************************************************ */
-/* eslint-disable @typescript-eslint/explicit-function-return-type */
-
// --------------------------------------------------------------------------
// --- Connection to Frama-C Server
// --------------------------------------------------------------------------
@@ -42,6 +40,30 @@ import { ChildProcess } from 'child_process';
import { client } from './client_socket';
//import { client } from './client_zmq';
+// --------------------------------------------------------------------------
+// --- Server Status
+// --------------------------------------------------------------------------
+
+/** Server stages. */
+export enum Status {
+ /** Server is off. */
+ OFF = 'OFF',
+ /** Server is starting, but not on yet. */
+ STARTING = 'STARTING',
+ /** Server is running. */
+ ON = 'ON',
+ /** Server is running command line. */
+ CMD = 'CMD',
+ /** Server is halting, but not off yet. */
+ HALTING = 'HALTING',
+ /** Server is restarting. */
+ RESTARTING = 'RESTARTING',
+ /** Server is off upon failure. */
+ FAILURE = 'FAILURE',
+}
+
+const unreachable = (_c: never): never => { throw ('unreachable'); };
+
// --------------------------------------------------------------------------
// --- Events
// --------------------------------------------------------------------------
@@ -56,7 +78,7 @@ const STATUS = new Dome.Event<Status>('frama-c.server.status');
/**
* Server is actually started and running.
- * This event is emitted when ther server _enters_ the `ON` state.
+ * This event is emitted when ther server _enters_ the `ON` or `CMD` state.
* The server is now ready to handle requests.
*/
const READY = new Dome.Event('frama-c.server.ready');
@@ -64,7 +86,7 @@ const READY = new Dome.Event('frama-c.server.ready');
/**
* Server Status Notification Event
- * This event is emitted when ther server _leaves_ the `ON` state.
+ * This event is emitted when ther server _leaves_ the `ON` or `CMD` state.
* The server is no more able to handle requests until restart.
*/
const SHUTDOWN = new Dome.Event('frama-c.server.shutdown');
@@ -80,26 +102,6 @@ export class SIGNAL extends Dome.Event {
}
}
-// --------------------------------------------------------------------------
-// --- Server Status
-// --------------------------------------------------------------------------
-
-/** Server stages. */
-export enum Status {
- /** Server is off. */
- OFF = 'OFF',
- /** Server is starting, but not on yet. */
- STARTING = 'STARTING',
- /** Server is on. */
- ON = 'ON',
- /** Server is halting, but not off yet. */
- HALTING = 'HALTING',
- /** Server is restarting. */
- RESTARTING = 'RESTARTING',
- /** Server is off upon failure. */
- FAILURE = 'FAILURE',
-}
-
// --------------------------------------------------------------------------
// --- Server Global State
// --------------------------------------------------------------------------
@@ -121,7 +123,7 @@ const pending = new Map<string, PendingRequest>();
let process: ChildProcess | undefined;
/** Polling timeout when server is busy. */
-const pollingTimeout = 200;
+const pollingTimeout = 50;
let pollingTimer: NodeJS.Timeout | undefined;
/** Killing timeout and timer for server process hard kill. */
@@ -154,11 +156,17 @@ export function useStatus(): Status {
return status;
}
+const running = (st: Status): boolean =>
+ (st === Status.ON || st === Status.CMD);
+
/**
* Whether the server is running and ready to handle requests.
- * @return {boolean} Whether server stage is [[ON]].
+ * @return {boolean} Whether server is in running stage,
+ * defined by status `ON` or `CMD`.
*/
-export function isRunning(): boolean { return status === Status.ON; }
+export function isRunning(): boolean {
+ return running(status);
+}
/**
* Number of requests still pending.
@@ -170,30 +178,38 @@ export function getPending(): number {
/**
* Register callback on `READY` event.
- * @param {function} callback Invoked when the server enters [[ON]] stage.
+ * @param {function} callback Invoked when the server enters running stage.
*/
-export function onReady(callback: () => void) { READY.on(callback); }
+export function onReady(callback: () => void): void {
+ READY.on(callback);
+}
/**
* Register callback on `SHUTDOWN` event.
- * @param {function} callback Invoked when the server leaves [[ON]] stage.
+ * @param {function} callback Invoked when the server leaves running stage.
*/
-export function onShutdown(callback: () => void) { SHUTDOWN.on(callback); }
+export function onShutdown(callback: () => void): void {
+ SHUTDOWN.on(callback);
+}
// --------------------------------------------------------------------------
// --- Status Update
// --------------------------------------------------------------------------
-function _status(newStatus: Status) {
+function _status(newStatus: Status): void {
if (newStatus !== status) {
const oldStatus = status;
status = newStatus;
STATUS.emit(newStatus);
- if (oldStatus === Status.ON) SHUTDOWN.emit();
- if (newStatus === Status.ON) READY.emit();
+ const oldRun = running(oldStatus);
+ const newRun = running(newStatus);
+ if (oldRun && !newRun) SHUTDOWN.emit();
+ if (!oldRun && newRun) READY.emit();
}
}
+const _update: () => void = debounce(() => STATUS.emit(status), 100);
+
// --------------------------------------------------------------------------
// --- Server Control (Start)
// --------------------------------------------------------------------------
@@ -205,7 +221,7 @@ function _status(newStatus: Status) {
* - If the server is halting, it will restart.
* - Otherwise, the Frama-C server is spawned.
*/
-export async function start() {
+export async function start(): Promise<void> {
switch (status) {
case Status.OFF:
case Status.FAILURE:
@@ -221,8 +237,12 @@ export async function start() {
case Status.HALTING:
_status(Status.RESTARTING);
return;
- default:
+ case Status.ON:
+ case Status.CMD:
+ case Status.STARTING:
return;
+ default:
+ unreachable(status);
}
}
@@ -235,20 +255,31 @@ export async function start() {
*
* - If the server is starting, it is hard killed.
* - If the server is running, it is shutdown gracefully.
+ * - If the server is halting, it is hard killed.
* - Otherwise, this is a no-op.
*/
-export function stop() {
+export function stop(): void {
switch (status) {
case Status.STARTING:
_status(Status.HALTING);
_kill();
return;
case Status.ON:
+ case Status.CMD:
+ case Status.HALTING:
_status(Status.HALTING);
_shutdown();
return;
- default:
+ case Status.RESTARTING:
+ _status(Status.HALTING);
+ return;
+ case Status.OFF:
+ return;
+ case Status.FAILURE:
+ _status(Status.OFF);
return;
+ default:
+ unreachable(status);
}
}
@@ -260,20 +291,26 @@ export function stop() {
* Terminate the server.
*
* - If the server is either starting, running or shutting down,
- * it is hard killed and restart is canceled.
+ * it is hard killed.
* - Otherwise, this is a no-op.
*/
-export function kill() {
+export function kill(): void {
switch (status) {
- case Status.STARTING:
case Status.ON:
+ case Status.CMD:
case Status.HALTING:
+ case Status.STARTING:
case Status.RESTARTING:
_status(Status.HALTING);
_kill();
return;
- default:
+ case Status.OFF:
return;
+ case Status.FAILURE:
+ _status(Status.OFF);
+ return;
+ default:
+ unreachable(status);
}
}
@@ -289,21 +326,25 @@ export function kill() {
* and finally schedule a reboot on exit.
* - Otherwise, this is a no-op.
*/
-export function restart() {
+export function restart(): void {
switch (status) {
case Status.OFF:
case Status.FAILURE:
start();
return;
case Status.ON:
+ case Status.CMD:
_status(Status.RESTARTING);
_shutdown();
return;
case Status.HALTING:
_status(Status.RESTARTING);
return;
- default:
+ case Status.STARTING:
+ case Status.RESTARTING:
return;
+ default:
+ unreachable(status);
}
}
@@ -318,16 +359,14 @@ export function restart() {
* clear the console and set server stage to [[OFF]].
* - Otherwise, this is a no-op.
*/
-export function clear() {
+export function clear(): void {
switch (status) {
- case Status.FAILURE:
case Status.OFF:
+ case Status.FAILURE:
buffer.clear();
_clear();
_status(Status.OFF);
return;
- default:
- return;
}
}
@@ -365,7 +404,7 @@ let config: Configuration = { command: 'frama-c', params: [] };
* Set the current server configuration.
* @param {Configuration} sc Server configuration.
*/
-export function setConfig(sc: Configuration) {
+export function setConfig(sc: Configuration): void {
config = { ...sc };
}
@@ -381,7 +420,7 @@ export function getConfig(): Configuration {
// --- Low-level Launching
// --------------------------------------------------------------------------
-async function _launch() {
+async function _launch(): Promise<void> {
let {
env,
cwd,
@@ -426,7 +465,7 @@ async function _launch() {
};
// Launch Process
process = await System.spawn(command, params, options);
- const logger = (text: string | string[]) => {
+ const logger = (text: string | string[]): void => {
buffer.append(text);
if (text.indexOf('\n') >= 0) {
buffer.scroll();
@@ -435,49 +474,66 @@ async function _launch() {
process?.stdout?.on('data', logger);
process?.stderr?.on('data', logger);
process?.on('exit', (code: number | null, signal: string | null) => {
- if (signal) {
- // [signal] is non-null.
+ if (signal !== null) {
buffer.log('[frama-c]', signal);
_exit(false);
return;
}
- // [signal] is null, hence [code] is non-null (cf. NodeJS doc).
- if (code) {
+ if (code !== 0) {
buffer.log('[frama-c] exit', code);
- _exit(false);
- } else {
- // [code] is zero: normal exit w/o error.
_exit(true);
+ return;
}
+ if (Dome.DEVEL)
+ buffer.log('[frama-c] terminated.');
+ _exit(false);
+ return;
});
// Connect to Server
client.connect(sockaddr);
}
// --------------------------------------------------------------------------
-// --- Low-level Killing
+// --- Polling Management
// --------------------------------------------------------------------------
-function _clear() {
- rqCount = 0;
- pending.forEach((p: PendingRequest) => p.reject());
- pending.clear();
+function _startPolling(): void {
+ if (!pollingTimer) {
+ const polling = (config && config.polling) || pollingTimeout;
+ pollingTimer = setInterval(() => {
+ client.poll();
+ }, polling);
+ }
+}
+
+function _stopPolling(): void {
if (pollingTimer) {
- clearTimeout(pollingTimer);
+ clearInterval(pollingTimer);
pollingTimer = undefined;
}
+}
+
+// --------------------------------------------------------------------------
+// --- Low-level Killing
+// --------------------------------------------------------------------------
+
+function _clear(): void {
+ rqCount = 0;
+ pending.forEach((p: PendingRequest) => p.reject('clear'));
+ pending.clear();
+ _stopPolling();
if (killingTimer) {
clearTimeout(killingTimer);
killingTimer = undefined;
}
}
-function _kill() {
+function _kill(): void {
client.disconnect();
if (process) process.kill();
}
-async function _shutdown() {
+async function _shutdown(): Promise<void> {
_clear();
client.shutdown();
const killingPromise = new Promise((resolve) => {
@@ -494,7 +550,7 @@ async function _shutdown() {
await killingPromise;
}
-function _exit(error: boolean) {
+function _exit(error: boolean): void {
_clear();
client.disconnect();
process = undefined;
@@ -525,7 +581,7 @@ class SignalHandler {
this.unplug = this.unplug.bind(this);
}
- on(callback: () => void) {
+ on(callback: () => void): void {
const e = this.event;
const n = e.listenerCount();
@@ -536,7 +592,7 @@ class SignalHandler {
}
}
- off(callback: () => void) {
+ off(callback: () => void): void {
const e = this.event;
e.off(callback);
const n = e.listenerCount();
@@ -547,7 +603,7 @@ class SignalHandler {
}
/* Bound to this */
- sigon() {
+ sigon(): void {
if (this.active && !this.listen) {
this.listen = true;
client.sigOn(this.id);
@@ -555,7 +611,7 @@ class SignalHandler {
}
/* Bound to this, Debounced */
- sigoff() {
+ sigoff(): void {
if (!this.active && this.listen) {
if (isRunning()) {
this.listen = false;
@@ -564,11 +620,11 @@ class SignalHandler {
}
}
- emit() {
+ emit(): void {
this.event.emit();
}
- unplug() {
+ unplug(): void {
this.listen = false;
this.handler.cancel();
}
@@ -597,7 +653,7 @@ function _signal(id: string): SignalHandler {
* @param {string} id The signal identifier to listen to.
* @param {function} callback The callback to call upon signal.
*/
-export function onSignal(s: Signal, callback: () => void) {
+export function onSignal(s: Signal, callback: () => void): void {
_signal(s.name).on(callback);
}
@@ -609,7 +665,7 @@ export function onSignal(s: Signal, callback: () => void) {
* @param {string} id The signal identifier that was listen to.
* @param {function} callback The callback to remove.
*/
-export function offSignal(s: Signal, callback: () => void) {
+export function offSignal(s: Signal, callback: () => void): void {
_signal(s.name).off(callback);
}
@@ -618,7 +674,7 @@ export function offSignal(s: Signal, callback: () => void) {
* @param {string} id The signal identifier to listen to.
* @param {function} callback The callback to call upon signal.
*/
-export function useSignal(s: Signal, callback: () => void) {
+export function useSignal(s: Signal, callback: () => void): void {
React.useEffect(() => {
onSignal(s, callback);
return () => { offSignal(s, callback); };
@@ -694,23 +750,23 @@ export function send<In, Out>(
const rid = `RQ.${rqCount}`;
rqCount += 1;
const response: Response<Out> = new Promise<Out>((resolve, reject) => {
- const unwrap = (js: Json.json) => {
- const data = request.output(js);
- if (data !== undefined)
- resolve(data);
- else
- reject('Wrong response type');
+ const unwrap = (js: Json.json): void => {
+ try {
+ const data = request.output(js);
+ if (data !== undefined)
+ resolve(data);
+ else
+ reject('Wrong response type');
+ } catch (err) {
+ reject(`Decoding Error (${err})`);
+ }
};
pending.set(rid, { resolve: unwrap, reject });
});
- response.kill = () => pending.get(rid)?.reject();
+ response.kill = () => pending.get(rid)?.reject('kill');
client.send(request.kind, rid, request.name, param as unknown as Json.json);
- if (!pollingTimer) {
- const polling = (config && config.polling) || pollingTimeout;
- pollingTimer = setInterval(() => {
- client.poll();
- }, polling);
- }
+ _startPolling();
+ _update();
return response;
}
@@ -718,22 +774,22 @@ export function send<In, Out>(
// --- Client Events
// --------------------------------------------------------------------------
-function _resolved(id: string) {
+function _resolved(id: string): void {
pending.delete(id);
- if (pending.size === 0) {
+ if (pending.size === 0 && status === Status.ON) {
rqCount = 0;
- if (pollingTimer) {
- clearInterval(pollingTimer);
- pollingTimer = undefined;
- }
+ _stopPolling();
+ _update();
}
}
client.onConnect((err?: Error) => {
if (err) {
_status(Status.FAILURE);
+ _clear();
} else {
- _status(Status.ON);
+ _status(Status.CMD);
+ _startPolling();
}
});
@@ -748,7 +804,7 @@ client.onData((id: string, data: Json.json) => {
client.onKilled((id: string) => {
const p = pending.get(id);
if (p) {
- p.reject();
+ p.reject('killed');
_resolved(id);
}
});
@@ -764,7 +820,7 @@ client.onRejected((id: string) => {
client.onError((id: string, msg: string) => {
const p = pending.get(id);
if (p) {
- p.reject(msg);
+ p.reject(`{error (${msg})`);
_resolved(id);
}
});
@@ -773,4 +829,14 @@ client.onSignal((id: string) => {
_signal(id).emit();
});
+client.onCmdLine((cmd: boolean) => {
+ _status(cmd ? Status.CMD : Status.ON);
+ if (cmd)
+ _startPolling();
+ else {
+ if (pending.size === 0)
+ _stopPolling();
+ }
+});
+
// --------------------------------------------------------------------------
diff --git a/ivette/src/frama-c/states.ts b/ivette/src/frama-c/states.ts
index 04c0dedbaa1512a0f1fe28a3c5f50a271a493be1..c0d940c7f09c3083b19e9882d26889712d1812cf 100644
--- a/ivette/src/frama-c/states.ts
+++ b/ivette/src/frama-c/states.ts
@@ -188,7 +188,7 @@ export function useRequest<In, Out>(
}
});
- const signals = options.onSignals ?? rq.signals;
+ const signals = rq.signals.concat(options.onSignals ?? []);
React.useEffect(() => {
signals.forEach((s) => Server.onSignal(s, trigger));
return () => {
@@ -304,6 +304,7 @@ class SyncState<A> {
`Fail to set value of SyncState '${this.handler.name}'.`,
`${error}`,
);
+ this.UPDATE.emit();
}
}
@@ -311,16 +312,18 @@ class SyncState<A> {
try {
this.upToDate = true;
this.value = undefined;
+ this.UPDATE.emit();
if (Server.isRunning()) {
const v = await Server.send(this.handler.getter, null);
this.value = v;
+ this.UPDATE.emit();
}
- this.UPDATE.emit();
} catch (error) {
D.error(
`Fail to update SyncState '${this.handler.name}'.`,
`${error}`,
);
+ this.UPDATE.emit();
}
}
}
@@ -411,8 +414,8 @@ class SyncArray<K, A> {
/* eslint-enable no-await-in-loop */
} catch (error) {
D.error(
- `Fail to retrieve the value of syncArray '${this.handler.name}.`,
- `${error}`,
+ `Fail to retrieve the value of syncArray '${this.handler.name}'.`,
+ error,
);
} finally {
this.fetching = false;
@@ -764,11 +767,18 @@ const emptySelection = {
},
};
+export type Hovered = Location | undefined;
export const MetaSelection = new Dome.Event<Location>('frama-c-meta-selection');
+export const GlobalHovered = new GlobalState<Hovered>(undefined);
export const GlobalSelection = new GlobalState<Selection>(emptySelection);
Server.onShutdown(() => GlobalSelection.setValue(emptySelection));
+export function setHovered(h: Hovered) { GlobalHovered.setValue(h); }
+export function useHovered(): [Hovered, (h: Hovered) => void] {
+ return useGlobalState(GlobalHovered);
+}
+
export function setSelection(location: Location, meta = false) {
const s = GlobalSelection.getValue();
GlobalSelection.setValue(reducer(s, { location }));
@@ -778,7 +788,10 @@ export function setSelection(location: Location, meta = false) {
/** Current selection. */
export function useSelection(): [Selection, (a: SelectionActions) => void] {
const [current, setCurrent] = useGlobalState(GlobalSelection);
- return [current, (action) => setCurrent(reducer(current, action))];
+ const callback = React.useCallback((action) => {
+ setCurrent(reducer(current, action));
+ }, [ current, setCurrent ]);
+ return [current, callback];
}
/** Resets the selected locations. */
diff --git a/ivette/src/renderer/Controller.tsx b/ivette/src/renderer/Controller.tsx
index b1a72c19ebb353790e911c237aa478b834b6687e..996c3c0878b8d1b8ae46831698fb6e446c77c0ce 100644
--- a/ivette/src/renderer/Controller.tsx
+++ b/ivette/src/renderer/Controller.tsx
@@ -45,14 +45,19 @@ import * as Server from 'frama-c/server';
// --- Configure Server
// --------------------------------------------------------------------------
-const quoteRe = new RegExp('^[-./:a-zA-Z0-9]+$');
-const quote = (s: string) => (quoteRe.test(s) ? s : `"${s}"`);
+const quoteRe = new RegExp('^[-_./:a-zA-Z0-9]+$');
+const quote = (s: string): string =>
+ (quoteRe.test(s) ? s : `"${s}"`);
+
+const unquoteRe = new RegExp('^".*"$');
+const unquote = (s: string): string =>
+ (unquoteRe.test(s) ? s.substring(1, s.length - 1) : s);
function dumpServerConfig(sc: Server.Configuration): string {
let buffer = '';
const { cwd, command, sockaddr, params } = sc;
if (cwd) buffer += `--cwd ${quote(cwd)}\n`;
- if (command) buffer += `--command ${command}\n`;
+ if (command) buffer += `--command ${quote(command)}\n`;
if (sockaddr) buffer += `--socket ${sockaddr}\n`;
if (params) {
params.forEach((v: string, i: number) => {
@@ -73,17 +78,17 @@ function buildServerConfig(argv: string[], cwd?: string) {
const params = [];
let command;
let sockaddr;
- let cwdir = cwd;
+ let cwdir = cwd ? unquote(cwd) : undefined;
for (let k = 0; k < (argv ? argv.length : 0); k++) {
const v = argv[k];
switch (v) {
case '--cwd':
k += 1;
- cwdir = argv[k];
+ cwdir = unquote(argv[k]);
break;
case '--command':
k += 1;
- command = argv[k];
+ command = unquote(argv[k]);
break;
case '--socket':
k += 1;
@@ -155,6 +160,7 @@ export const Control = () => {
play = { enabled: true, onClick: Server.start };
break;
case Server.Status.ON:
+ case Server.Status.CMD:
case Server.Status.FAILURE:
stop = { enabled: true, onClick: Server.stop };
reload = { enabled: true, onClick: Server.restart };
@@ -220,8 +226,10 @@ const RenderConsole = () => {
const doReload = () => {
const cfg = Server.getConfig();
const hst = insertConfig(history, cfg);
+ const cmd = hst[0];
scratch.current = hst.slice();
- editor.setValue(hst[0]);
+ editor.setValue(cmd);
+ setEmpty(cmd === '');
setHistory(hst);
setCursor(0);
};
@@ -251,7 +259,9 @@ const RenderConsole = () => {
const cmd = editor.getValue();
const pad = scratch.current;
pad[cursor] = cmd;
- editor.setValue(pad[target]);
+ const cmd2 = pad[target];
+ editor.setValue(cmd2);
+ setEmpty(cmd2 === '');
setCursor(target);
};
return undefined;
@@ -363,36 +373,50 @@ export const Status = () => {
const status = Server.useStatus();
const pending = Server.getPending();
let led: LEDstatus = 'inactive';
+ let title = undefined;
let icon = undefined;
- let running = false;
+ let running = 'OFF';
let blink = false;
switch (status) {
case Server.Status.OFF:
+ title = 'Server is off';
break;
case Server.Status.STARTING:
led = 'active';
blink = true;
- running = true;
+ running = 'BOOT';
+ title = 'Server is starting';
break;
case Server.Status.ON:
- led = pending > 0 ? 'positive' : 'active';
- running = true;
+ led = 'active';
+ blink = pending > 0;
+ running = 'ON';
+ title = 'Server is running';
+ break;
+ case Server.Status.CMD:
+ led = 'positive';
+ blink = true;
+ running = 'CMD';
+ title = 'Command-line processing';
break;
case Server.Status.HALTING:
led = 'negative';
blink = true;
- running = true;
+ running = 'HALT';
+ title = 'Server is halting';
break;
case Server.Status.RESTARTING:
led = 'warning';
blink = true;
- running = true;
+ running = 'REBOOT';
+ title = 'Server is restarting';
break;
case Server.Status.FAILURE:
led = 'negative';
blink = true;
- running = false;
+ running = 'ERR';
+ title = 'Server halted because of failure';
icon = 'WARNING';
break;
}
@@ -400,7 +424,7 @@ export const Status = () => {
return (
<>
<LED status={led} blink={blink} />
- <Code icon={icon} label={running ? 'ON' : 'OFF'} />
+ <Code icon={icon} label={running} title={title} />
<Toolbars.Separator />
</>
);
diff --git a/ivette/src/renderer/Extensions.tsx b/ivette/src/renderer/Extensions.tsx
index ae5019ccca54d54bea76c9de8232fc2909e1edf4..2d33b9f1dc520ca6f916bfc61161923db6f73a48 100644
--- a/ivette/src/renderer/Extensions.tsx
+++ b/ivette/src/renderer/Extensions.tsx
@@ -133,9 +133,12 @@ function byPanel(p: ElementProps, q: ElementProps) {
export class ElementRack {
+ private rank = 1;
private readonly items = new Map<string, ElementProps>();
register(elt: ElementProps) {
+ if (elt.rank === undefined) elt.rank = this.rank;
+ this.rank++;
this.items.set(elt.id, elt);
UPDATED.emit();
}
diff --git a/nix/default.nix b/nix/default.nix
index 0d009e770468eb9641ab54d1309c618baf303d22..d159657d295dcd3f032d8eb3edc4c02ffb38e451 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -92,7 +92,7 @@ pkgs.lib.makeExtensible
lint = mk_deriv {
name = "frama-c-lint";
src = self.src;
- opamPackages = [ "ocp-indent=1.7.0" "headache=1.05"];
+ opamPackages = [ "ocp-indent=1.8.1" "headache=1.05"];
buildInputs =
self.mk_buildInputs { nixPackages = [ pkgs.bc pkgs.clang_10 ]; };
outputs = [ "out" ];
diff --git a/share/analysis-scripts/benchmark_database.py b/share/analysis-scripts/benchmark_database.py
index 8a597930eac496ffe92a979c3fbe969c17ba87c7..ccce93970efa9ceac1bb1a9772795c9207c3256c 100644
--- a/share/analysis-scripts/benchmark_database.py
+++ b/share/analysis-scripts/benchmark_database.py
@@ -20,13 +20,13 @@
# #
##########################################################################
-import time
import os
import csv
import sqlite3
import git_utils
+
def dict_factory(cursor, row):
d = {}
for idx, col in enumerate(cursor.description):
@@ -47,7 +47,7 @@ class Database:
self.analyzer_hash = git_utils.rev_parse(gitdir, analyzer_rev)
self.analyzer = git_utils.name_rev(gitdir, analyzer_rev)
self.reference_hash = git_utils.rev_parse(gitdir, reference_rev)
- self.connection = sqlite3.connect('benchmark-results.db')
+ self.connection = sqlite3.connect("benchmark-results.db")
self.connection.row_factory = dict_factory
self.setup_rdb()
self.reference_results = self.query_rdb(self.reference_hash)
@@ -61,8 +61,9 @@ class Database:
self.inserted_targets[result["target"]] = True
for result in results:
- if result['target'] in self.reference_results:
- ref = self.reference_results[result['target']]
+ if result["target"] in self.reference_results:
+ ref = self.reference_results[result["target"]]
+
def compute_diff(column, ratio):
nonlocal result, ref
try:
@@ -71,47 +72,60 @@ class Database:
else:
diff = result[column] - ref[column]
except TypeError:
- diff =None
- result['diff_' + column] = diff
-
- compute_diff('alarms', False)
- compute_diff('warnings', False)
- compute_diff('user_time', True)
- compute_diff('memory', True)
- compute_diff('coverage', False)
+ diff = None
+ result["diff_" + column] = diff
+
+ compute_diff("alarms", False)
+ compute_diff("warnings", False)
+ compute_diff("user_time", True)
+ compute_diff("memory", True)
+ compute_diff("coverage", False)
else:
- result['diff_alarms'] = None
- result['diff_warnings'] = None
- result['diff_user_time'] = None
- result['diff_memory'] = None
- result['diff_coverage'] = None
+ result["diff_alarms"] = None
+ result["diff_warnings"] = None
+ result["diff_user_time"] = None
+ result["diff_memory"] = None
+ result["diff_coverage"] = None
def insert_csv(self, result):
- filename="benchmark-results.csv"
- file_already_exists=os.path.isfile(filename)
+ filename = "benchmark-results.csv"
+ file_already_exists = os.path.isfile(filename)
fieldnames = [
- 'benchmark_tag', 'timestamp',
- 'analyzer', 'analyzer_hash',
- 'target', 'target_hash',
- 'user_time', 'memory', 'alarms', 'warnings',
- 'sem_reach_fun', 'syn_reach_fun', 'total_fun',
- 'sem_reach_stmt', 'syn_reach_stmt',
- 'cmd_args', 'benchmark_comment']
- with open(filename, 'a', newline='') as file:
- writer = csv.DictWriter(file,
- fieldnames=fieldnames, extrasaction='ignore',
- delimiter="\t", quotechar='"')
+ "benchmark_tag",
+ "timestamp",
+ "analyzer",
+ "analyzer_hash",
+ "target",
+ "target_hash",
+ "user_time",
+ "memory",
+ "alarms",
+ "warnings",
+ "sem_reach_fun",
+ "syn_reach_fun",
+ "total_fun",
+ "sem_reach_stmt",
+ "syn_reach_stmt",
+ "cmd_args",
+ "benchmark_comment",
+ ]
+ with open(filename, "a", newline="") as file:
+ writer = csv.DictWriter(
+ file, fieldnames=fieldnames, extrasaction="ignore", delimiter="\t", quotechar='"'
+ )
if not file_already_exists:
writer.writeheader()
writer.writerow(result)
def insert(self, result):
- completed_result = { **result,
- 'benchmark_tag' : self.benchmark_tag,
- 'benchmark_comment' : self.benchmark_comment,
- 'target_hash' : git_utils.current_rev(result["target"]),
- 'analyzer' : self.analyzer,
- 'analyzer_hash' : self.analyzer_hash }
+ completed_result = {
+ **result,
+ "benchmark_tag": self.benchmark_tag,
+ "benchmark_comment": self.benchmark_comment,
+ "target_hash": git_utils.current_rev(result["target"]),
+ "analyzer": self.analyzer,
+ "analyzer_hash": self.analyzer_hash,
+ }
self.insert_csv(completed_result)
self.insert_rdb(completed_result)
@@ -119,59 +133,64 @@ class Database:
cursor = self.connection.cursor()
cursor.execute(
"CREATE TABLE IF NOT EXISTS benchmark_results ("
- "benchmark_tag TEXT NOT NULL,"
- "timestamp TEXT NOT NULL,"
- "analyzer TEXT NOT NULL,"
- "analyzer_hash TEXT NOT NULL,"
- "target TEXT NOT NULL,"
- "target_hash TEXT NOT NULL,"
- "user_time REAL NOT NULL,"
- "memory INTEGER NOT NULL,"
- "alarms INTEGER NOT NULL,"
- "warnings INTEGER NOT NULL,"
- "sem_reach_fun INTEGER NOT NULL,"
- "syn_reach_fun INTEGER NOT NULL,"
- "total_fun INTEGER NOT NULL,"
- "sem_reach_stmt INTEGER NOT NULL,"
- "syn_reach_stmt INTEGER NOT NULL,"
- "cmd_args TEXT NOT NULL,"
- "benchmark_comment TEXT);")
+ "benchmark_tag TEXT NOT NULL,"
+ "timestamp TEXT NOT NULL,"
+ "analyzer TEXT NOT NULL,"
+ "analyzer_hash TEXT NOT NULL,"
+ "target TEXT NOT NULL,"
+ "target_hash TEXT NOT NULL,"
+ "user_time REAL NOT NULL,"
+ "memory INTEGER NOT NULL,"
+ "alarms INTEGER NOT NULL,"
+ "warnings INTEGER NOT NULL,"
+ "sem_reach_fun INTEGER NOT NULL,"
+ "syn_reach_fun INTEGER NOT NULL,"
+ "total_fun INTEGER NOT NULL,"
+ "sem_reach_stmt INTEGER NOT NULL,"
+ "syn_reach_stmt INTEGER NOT NULL,"
+ "cmd_args TEXT NOT NULL,"
+ "benchmark_comment TEXT);"
+ )
self.connection.commit()
def insert_rdb(self, result):
cursor = self.connection.cursor()
cursor.execute(
"INSERT INTO benchmark_results("
- "benchmark_tag, timestamp, "
- "analyzer, analyzer_hash, target, target_hash, "
- "user_time, memory, alarms, warnings, "
- "sem_reach_fun, syn_reach_fun, total_fun, "
- "sem_reach_stmt, syn_reach_stmt, "
- "cmd_args, benchmark_comment) "
+ "benchmark_tag, timestamp, "
+ "analyzer, analyzer_hash, target, target_hash, "
+ "user_time, memory, alarms, warnings, "
+ "sem_reach_fun, syn_reach_fun, total_fun, "
+ "sem_reach_stmt, syn_reach_stmt, "
+ "cmd_args, benchmark_comment) "
"VALUES("
- "DATETIME('now','localtime'), "
- ":benchmark_tag, :analyzer, "
- ":analyzer_hash, :target, :target_hash, "
- ":user_time, :memory, :alarms, :warnings, "
- ":sem_reach_fun, :syn_reach_fun, :total_fun, "
- ":sem_reach_stmt, :syn_reach_stmt, "
- ":cmd_args, :benchmark_comment)", result)
+ "DATETIME('now','localtime'), "
+ ":benchmark_tag, :analyzer, "
+ ":analyzer_hash, :target, :target_hash, "
+ ":user_time, :memory, :alarms, :warnings, "
+ ":sem_reach_fun, :syn_reach_fun, :total_fun, "
+ ":sem_reach_stmt, :syn_reach_stmt, "
+ ":cmd_args, :benchmark_comment)",
+ result,
+ )
self.connection.commit()
def query_rdb(self, analyzer_hash):
cursor = self.connection.cursor()
cursor.execute(
"SELECT "
- "target, "
- "avg(user_time) as user_time, avg(memory) as memory, "
- "min(alarms) as alarms, min(warnings) as warnings, "
- "max(sem_reach_stmt) as sem_reach_stmt, "
- "max(syn_reach_stmt) as syn_reach_stmt "
+ "target, "
+ "avg(user_time) as user_time, avg(memory) as memory, "
+ "min(alarms) as alarms, min(warnings) as warnings, "
+ "max(sem_reach_stmt) as sem_reach_stmt, "
+ "max(syn_reach_stmt) as syn_reach_stmt "
"FROM benchmark_results "
"WHERE analyzer_hash=? "
- "GROUP BY target", (analyzer_hash,))
+ "GROUP BY target",
+ (analyzer_hash,),
+ )
results = {}
for r in cursor.fetchall():
- r['coverage'] = r['sem_reach_stmt'] / r['syn_reach_stmt']
- results[r['target']] = r
+ r["coverage"] = r["sem_reach_stmt"] / r["syn_reach_stmt"]
+ results[r["target"]] = r
return results
diff --git a/share/analysis-scripts/build.py b/share/analysis-scripts/build.py
index f6da389562c9dbc1290fc1829ebc3e7f5bdf0453..854fb82d011f36cb5fa593fee0b5e3a5a78e64d9 100755
--- a/share/analysis-scripts/build.py
+++ b/share/analysis-scripts/build.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
-#-*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
##########################################################################
# #
# This file is part of Frama-C. #
@@ -22,14 +22,14 @@
# #
##########################################################################
-# This script uses blug and a build_commands.json file to produce an
-# analysis GNUmakefile, as automatically as possible.
+"""This script uses blug and a build_commands.json file to produce an
+analysis GNUmakefile, as automatically as possible."""
import argparse
import json
import logging
import os
-from pathlib import Path
+from pathlib import Path
import re
import shutil
import sys
@@ -42,26 +42,46 @@ script_dir = os.path.dirname(sys.argv[0])
# Command-line parsing ########################################################
-parser = argparse.ArgumentParser(description="""Produces a GNUmakefile
+parser = argparse.ArgumentParser(
+ description="""Produces a GNUmakefile
for analysis with Frama-C. Tries to use a build_commands.json file if
-available.""")
-parser.add_argument('--debug', metavar='FILE',
- help='enable debug mode and redirect output to the specified file')
-parser.add_argument('--force', action="store_true",
- help='overwrite files without prompting')
-parser.add_argument('--jbdb', metavar='FILE', default="build_commands.json",
- help='path to JBDB (default: build_commands.json)')
-parser.add_argument('--machdep', metavar='MACHDEP',
- help="analysis machdep (default: Frama-C's default)")
-parser.add_argument('--main', metavar='FUNCTION', default="main",
- help='name of the main function (default: main)')
-parser.add_argument('--sources', metavar='FILE', nargs='+',
- help='list of sources to parse (overrides --jbdb)',
- type=Path)
-parser.add_argument('--targets', metavar='FILE', nargs='+',
- help='targets to build. When using --sources, ' +
- 'only a single target is allowed.',
- type=Path)
+available."""
+)
+parser.add_argument(
+ "--debug",
+ metavar="FILE",
+ help="enable debug mode and redirect output to the specified file",
+)
+parser.add_argument("--force", action="store_true", help="overwrite files without prompting")
+parser.add_argument(
+ "--jbdb",
+ metavar="FILE",
+ default="build_commands.json",
+ help="path to JBDB (default: build_commands.json)",
+)
+parser.add_argument(
+ "--machdep", metavar="MACHDEP", help="analysis machdep (default: Frama-C's default)"
+)
+parser.add_argument(
+ "--main",
+ metavar="FUNCTION",
+ default="main",
+ help="name of the main function (default: main)",
+)
+parser.add_argument(
+ "--sources",
+ metavar="FILE",
+ nargs="+",
+ help="list of sources to parse (overrides --jbdb)",
+ type=Path,
+)
+parser.add_argument(
+ "--targets",
+ metavar="FILE",
+ nargs="+",
+ help="targets to build. When using --sources, " + "only a single target is allowed.",
+ type=Path,
+)
args = parser.parse_args()
force = args.force
@@ -75,23 +95,24 @@ debug = args.debug
debug_level = logging.DEBUG if debug else logging.INFO
# special values for debug filename
if debug == "stdout":
- logging.basicConfig(stream=sys.stdout, level=debug_level,
- format='[%(levelname)s] %(message)s')
+ logging.basicConfig(stream=sys.stdout, level=debug_level, format="[%(levelname)s] %(message)s")
elif debug == "stderr":
- logging.basicConfig(stream=sys.stderr, level=debug_level,
- format='[%(levelname)s] %(message)s')
+ logging.basicConfig(stream=sys.stderr, level=debug_level, format="[%(levelname)s] %(message)s")
elif debug:
- logging.basicConfig(filename=debug, level=debug_level, filemode='w',
- format='[%(levelname)s] %(message)s')
+ logging.basicConfig(
+ filename=debug,
+ level=debug_level,
+ filemode="w",
+ format="[%(levelname)s] %(message)s",
+ )
else:
- logging.basicConfig(level=logging.INFO,
- format='[%(levelname)s] %(message)s')
+ logging.basicConfig(level=logging.INFO, format="[%(levelname)s] %(message)s")
dot_framac_dir = Path(".frama-c")
# Check required environment variables and commands in the PATH ###############
-framac_bin = os.getenv('FRAMAC_BIN')
+framac_bin = os.getenv("FRAMAC_BIN")
if not framac_bin:
sys.exit("error: FRAMAC_BIN not in environment (set by frama-c-script)")
framac_bin = Path(framac_bin)
@@ -100,14 +121,13 @@ under_test = os.getenv("PTESTS_TESTING")
# Prepare blug-related variables and functions ################################
-blug = os.getenv('BLUG')
+blug = os.getenv("BLUG")
if not blug:
blug = shutil.which("blug")
if not blug:
sys.exit("error: path to 'blug' binary must be in PATH or variable BLUG")
blug = Path(blug)
blug_dir = blug.resolve().parent
-blug_print = blug_dir / "blug-print"
# to import blug_jbdb
sys.path.insert(0, blug_dir.as_posix())
import blug_jbdb
@@ -116,26 +136,30 @@ from blug_jbdb import prettify
# Auxiliary functions #########################################################
+
def call_and_get_output(command_and_args):
try:
return subprocess.check_output(command_and_args, stderr=subprocess.STDOUT).decode()
except subprocess.CalledProcessError as e:
sys.exit(f"error running command: {command_and_args}\n{e}")
+
def ask_if_overwrite(path):
yn = input(f"warning: {path} already exists. Overwrite? [y/N] ")
if yn == "" or not (yn[0] == "Y" or yn[0] == "y"):
sys.exit("Exiting without overwriting.")
+
def insert_lines_after(lines, line_pattern, new_lines):
re_line = re.compile(line_pattern)
for i, line in enumerate(lines):
if re_line.search(line):
for j, new_line in enumerate(new_lines):
- lines.insert(i+1+j, new_line)
+ lines.insert(i + 1 + j, new_line)
return
sys.exit(f"error: no lines found matching pattern: {line_pattern}")
+
# delete the first occurrence of [line_pattern]
def delete_line(lines, line_pattern):
re_line = re.compile(line_pattern)
@@ -145,6 +169,7 @@ def delete_line(lines, line_pattern):
return
sys.exit(f"error: no lines found matching pattern: {line_pattern}")
+
def replace_line(lines, line_pattern, value, all_occurrences=False):
replaced = False
re_line = re.compile(line_pattern)
@@ -158,22 +183,29 @@ def replace_line(lines, line_pattern, value, all_occurrences=False):
return
sys.exit(f"error: no lines found matching pattern: {line_pattern}")
+
# replaces '/' and '.' with '_' so that a valid target name is created
def make_target_name(target):
- return prettify(target).replace('/', '_').replace('.', '_')
+ return prettify(target).replace("/", "_").replace(".", "_")
+
# sources are pretty-printed relatively to the .frama-c directory, where the
# GNUmakefile will reside
def rel_prefix(path):
return path if os.path.isabs(path) else os.path.relpath(path, start=dot_framac_dir)
+
def pretty_sources(sources):
return [f" {rel_prefix(source)} \\" for source in sources]
+
def lines_of_file(path):
return path.read_text().splitlines()
+
fc_stubs_copied = False
+
+
def copy_fc_stubs():
global fc_stubs_copied
dest = dot_framac_dir / "fc_stubs.c"
@@ -186,12 +218,13 @@ def copy_fc_stubs():
fc_stubs[i] = re.sub(re_main, main, line)
if not force and dest.exists():
ask_if_overwrite(dest)
- with open(dest,"w") as f:
+ with open(dest, "w") as f:
f.write("\n".join(fc_stubs))
logging.info("wrote: %s", dest)
fc_stubs_copied = True
return dest
+
# Returns pairs (line_number, has_args) for each likely definition of
# [funcname] in [filename].
# [has_args] is used to distinguish between main(void) and main(int, char**).
@@ -199,20 +232,41 @@ def find_definitions(funcname, filename):
file_content = source_filter.open_and_filter(filename, not under_test)
file_lines = file_content.splitlines(keepends=True)
newlines = function_finder.compute_newline_offsets(file_lines)
- defs = function_finder.find_definitions_and_declarations(True, False, filename, file_content, file_lines, newlines, funcname)
+ defs = function_finder.find_definitions_and_declarations(
+ True, False, filename, file_content, file_lines, newlines, funcname
+ )
res = []
for d in defs:
- defining_line = file_lines[d[2]-1]
- after_funcname = defining_line[defining_line.find(funcname)+len(funcname):]
+ defining_line = file_lines[d[2] - 1]
+ after_funcname = defining_line[defining_line.find(funcname) + len(funcname) :]
# heuristics: if there is a comma after the function name,
# it is very likely the signature contains arguments;
# otherwise, the function is either defined in several lines,
# or we somehow missed it. By default, we assume it has no arguments
# if we miss it.
- has_args = ',' in after_funcname
+ has_args = "," in after_funcname
res.append((d[2], has_args))
return res
+
+def list_partition(f, l):
+ """Equivalent to OCaml's List.partition: returns 2 lists with the elements of l,
+ partitioned according to predicate f."""
+ l1 = []
+ l2 = []
+ for e in l:
+ if f(l):
+ l1.append(e)
+ else:
+ l2.append(e)
+ return l1, l2
+
+
+def pp_list(l):
+ """Applies prettify to a list of sources/targets and sorts the result."""
+ return sorted([prettify(e) for e in l])
+
+
# End of auxiliary functions ##################################################
sources_map = dict()
@@ -220,34 +274,48 @@ if sources:
if not targets:
sys.exit("error: option --targets is mandatory when --sources is specified")
if len(targets) > 1:
- sys.exit("error: option --targets can only have a single target when --sources is specified")
- sources_map[targets[0]] = [s for s in sources if blug_jbdb.filter_source(s)]
+ sys.exit(
+ "error: option --targets can only have a single target when --sources is specified"
+ )
+ sources_map[targets[0]] = sources
elif os.path.isfile(jbdb_path):
# JBDB exists
with open(jbdb_path, "r") as data:
jbdb = json.load(data)
blug_jbdb.absolutize_jbdb(jbdb)
- jbdb_targets = []
+ filter_source, filter_target = blug_jbdb.get_filters("c-programs")
+ # program_targets are those we prefer, and the only ones used in "automatic" mode;
+ # non_program_targets are only used if the user specified them in the command line.
+ program_targets = []
+ non_program_targets = []
for f in jbdb:
- jbdb_targets += [t for t in f["targets"] if blug_jbdb.filter_target(t)]
- if not jbdb_targets:
+ programs, other_targets = list_partition(filter_target, f["targets"])
+ program_targets += programs
+ non_program_targets += other_targets
+ logging.debug("program_targets: %s", pp_list(program_targets))
+ logging.debug("non_program_targets: %s", pp_list(non_program_targets))
+ all_jbdb_targets = program_targets + non_program_targets
+ if not all_jbdb_targets:
sys.exit(f"no targets found in JBDB ({jbdb_path})")
if not targets:
- # no targets specified in command line; use all from JBDB
- targets = jbdb_targets
+ # no targets specified in command line; use all programs from JBDB
+ targets = program_targets
logging.info("Computing sources for each target (%d target(s))...", len(targets))
- unknown_targets = []
+ unknown_targets_from_cmdline = []
graph = blug_jbdb.build_graph(jbdb)
for target in targets:
- if target not in jbdb_targets:
- unknown_targets.append(target)
+ if target not in all_jbdb_targets:
+ unknown_targets_from_cmdline.append(target)
+ # do not return immediately; we want to report all invalid targets at once
else:
- if unknown_targets != []:
- continue # already found a problem; avoid useless computations
- sources = [s for s in blug_jbdb.collect_leaves(graph, [target]) if blug_jbdb.filter_source(s)]
- sources_map[target] = sorted(sources)
- if unknown_targets:
- targets_pretty = "\n".join(unknown_targets)
+ if unknown_targets_from_cmdline != []:
+ continue # keep looping to accumulate all invalid targets, but avoid extra work
+ sources = blug_jbdb.collect_leaves(graph, [target])
+ c_sources, non_c_sources = list_partition(filter_source, sources)
+ logging.debug("non_c_sources: %s", pp_list(non_c_sources))
+ sources_map[target] = c_sources
+ if unknown_targets_from_cmdline:
+ targets_pretty = "\n".join(unknown_targets_from_cmdline)
sys.exit("target(s) not found in JBDB:\n{targets_pretty}")
else:
if not jbdb_path:
@@ -255,13 +323,16 @@ else:
else:
sys.exit(f"error: invalid JBDB path: '{jbdb_path}'")
-logging.debug("sources_map: %s", sorted([prettify(k) + ": " + ', '.join(sorted([prettify(s) for s in v])) for (k, v) in sources_map.items()]))
-logging.debug("targets: %s", sorted([prettify(t) for t in targets]))
+logging.debug(
+ "sources_map: %s",
+ sorted([prettify(k) + ": " + ", ".join(pp_list(v)) for (k, v) in sources_map.items()]),
+)
+logging.debug("targets: %s", pp_list(targets))
# check that source files exist
unknown_sources = sorted({s for sources in sources_map.values() for s in sources if not s.exists()})
if unknown_sources:
- sys.exit("error: source(s) not found:\n" + "\n".join([prettify(s) for s in unknown_sources]))
+ sys.exit("error: source(s) not found:\n" + "\n".join(pp_list(unknown_sources)))
# Check that the main function is defined exactly once per target.
# note: this is only based on heuristics (and fails on a few real case studies),
@@ -276,9 +347,17 @@ for target, sources in sources_map.items():
fundefs = find_definitions(main, source)
main_definitions[target] += [(source, fundef[0], fundef[1]) for fundef in fundefs]
if main_definitions[target] == []:
- logging.warning("function '%s' seems to be never defined in the sources of target '%s'", main, prettify(target))
+ logging.warning(
+ "function '%s' seems to be never defined in the sources of target '%s'",
+ main,
+ prettify(target),
+ )
elif len(main_definitions[target]) > 1:
- logging.warning("function '%s' seems to be defined multiple times in the sources of target '%s':", main, prettify(target))
+ logging.warning(
+ "function '%s' seems to be defined multiple times in the sources of target '%s':",
+ main,
+ prettify(target),
+ )
for (filename, line, _) in main_definitions[target]:
print(f"- definition at {filename}:{line}")
@@ -289,7 +368,7 @@ if not dot_framac_dir.is_dir():
dot_framac_dir.mkdir(parents=True, exist_ok=False)
fc_config = json.loads(call_and_get_output([framac_bin / "frama-c", "-print-config-json"]))
-share_dir = Path(fc_config['datadir'])
+share_dir = Path(fc_config["datadir"])
# copy fc_stubs if at least one main function has arguments
any_has_arguments = False
@@ -302,7 +381,10 @@ if any_has_arguments:
fc_stubs = copy_fc_stubs()
for target in targets:
if any(d[2] for d in main_definitions[target]):
- logging.debug("target %s has main with args, adding fc_stubs.c to its sources", prettify(target))
+ logging.debug(
+ "target %s has main with args, adding fc_stubs.c to its sources",
+ prettify(target),
+ )
sources_map[target].insert(0, fc_stubs)
gnumakefile = dot_framac_dir / "GNUmakefile"
@@ -310,15 +392,23 @@ gnumakefile = dot_framac_dir / "GNUmakefile"
template = lines_of_file(share_dir / "analysis-scripts" / "template.mk")
if machdep:
- machdeps = fc_config['machdeps']
+ machdeps = fc_config["machdeps"]
if machdep not in machdeps:
- logging.warning("unknown machdep (%s) not in Frama-C's default machdeps:\n%s", machdep, " ".join(machdeps))
+ logging.warning(
+ "unknown machdep (%s) not in Frama-C's default machdeps:\n%s",
+ machdep,
+ " ".join(machdeps),
+ )
replace_line(template, "^MACHDEP = .*", f"MACHDEP = {machdep}")
if jbdb_path:
- insert_lines_after(template, "^FCFLAGS", [f" -json-compilation-database {rel_prefix(jbdb_path)} \\"])
+ insert_lines_after(
+ template,
+ "^FCFLAGS",
+ [f" -json-compilation-database {rel_prefix(jbdb_path)} \\"],
+ )
-targets_eva = ([f" {make_target_name(target)}.eva \\" for target in targets])
+targets_eva = [f" {make_target_name(target)}.eva \\" for target in targets]
replace_line(template, "^TARGETS = main.eva", "TARGETS = \\")
insert_lines_after(template, r"^TARGETS = \\", targets_eva)
@@ -328,7 +418,10 @@ for target, sources in reversed(sources_map.items()):
pp_target = make_target_name(target)
new_lines = [f"{pp_target}.parse: \\"] + pretty_sources(sources) + [""]
if any(d[2] for d in main_definitions[target]):
- logging.debug("target %s has main with args, adding -main eva_main to its FCFLAGS", prettify(target))
+ logging.debug(
+ "target %s has main with args, adding -main eva_main to its FCFLAGS",
+ prettify(target),
+ )
new_lines += [f"{pp_target}.parse: FCFLAGS += -main eva_main", ""]
insert_lines_after(template, "^### Each target <t>.eva", new_lines)
@@ -341,12 +434,14 @@ path_mk = dot_framac_dir / "path.mk"
if not force and path_mk.exists():
logging.info("%s already exists, will not overwrite it", path_mk)
else:
- path_mk.write_text(f"""FRAMAC_BIN={framac_bin}
+ path_mk.write_text(
+ f"""FRAMAC_BIN={framac_bin}
ifeq ($(wildcard $(FRAMAC_BIN)),)
# Frama-C not installed locally; using the version in the PATH
else
FRAMAC=$(FRAMAC_BIN)/frama-c
FRAMAC_GUI=$(FRAMAC_BIN)/frama-c-gui
endif
-""")
+"""
+ )
logging.info("wrote: %s", path_mk)
diff --git a/share/analysis-scripts/build_callgraph.py b/share/analysis-scripts/build_callgraph.py
index 313717b964c086541dc0cabebcfe01aeb376e64f..8edc32655e804bacfbb7dd8ca1ccdc1faee21bc0 100755
--- a/share/analysis-scripts/build_callgraph.py
+++ b/share/analysis-scripts/build_callgraph.py
@@ -1,5 +1,4 @@
-#!/usr/bin/env python3
-#-*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
##########################################################################
# #
# This file is part of Frama-C. #
@@ -22,11 +21,10 @@
# #
##########################################################################
-# This script finds files containing likely declarations and definitions
-# for a given function name, via heuristic syntactic matching.
+"""This script finds files containing likely declarations and definitions
+for a given function name, via heuristic syntactic matching."""
import os
-import re
import sys
import function_finder
@@ -34,16 +32,9 @@ import source_filter
under_test = os.getenv("PTESTS_TESTING")
-arg = ""
-if len(sys.argv) < 2:
- print(f"usage: {sys.argv[0]} file...")
- print(" builds a heuristic callgraph for the specified files.")
- sys.exit(1)
-else:
- files = sys.argv[1:]
-
debug = os.getenv("DEBUG")
+
class Callgraph:
"""
Heuristics-based callgraphs.
@@ -77,13 +68,16 @@ class Callgraph:
def __repr__(self):
return f"Callgraph({self.succs}, {self.edges})"
+
def compute(files):
cg = Callgraph()
for f in files:
file_content = source_filter.open_and_filter(f, not under_test)
file_lines = file_content.splitlines(keepends=True)
newlines = function_finder.compute_newline_offsets(file_lines)
- defs = function_finder.find_definitions_and_declarations(True, False, f, file_content, file_lines, newlines)
+ defs = function_finder.find_definitions_and_declarations(
+ True, False, f, file_content, file_lines, newlines
+ )
calls = function_finder.find_calls(file_content, newlines)
for call in calls:
caller = function_finder.find_caller(defs, call)
@@ -95,15 +89,21 @@ def compute(files):
cg.add_edge(caller, called, loc)
return cg
+
def print_edge(cg, caller, called, padding="", end="\n"):
locs = cg.edges[(caller, called)]
for (filename, line) in locs:
- print(f"{padding}{os.path.relpath(filename)}:{line}: {caller} -> {called}", end=end)
+ print(
+ f"{padding}{os.path.relpath(filename)}:{line}: {caller} -> {called}",
+ end=end,
+ )
+
def print_cg(cg):
for (caller, called) in cg.edges:
print_edge(cg, caller, called)
+
# note: out _must_ exist (the caller must create it if needed)
def print_cg_dot(cg, out=sys.stdout):
print("digraph callgraph {", file=out)
@@ -111,6 +111,7 @@ def print_cg_dot(cg, out=sys.stdout):
print(f" {caller} -> {called};", file=out)
print("}", file=out)
+
# succs: dict, input, not modified
# visited: set, input-output, modified
# just_visited: set, input-output, modified
@@ -143,9 +144,10 @@ def cycle_bfs(cg, visited, just_visited, n):
return [(n, caller)] + res
return []
+
def compute_recursive_cycles(cg, acc):
to_visit = set(cg.nodes())
- if not to_visit: # empty graph -> no recursion
+ if not to_visit: # empty graph -> no recursion
return
visited = set()
while to_visit:
@@ -159,9 +161,10 @@ def compute_recursive_cycles(cg, acc):
acc.append((cycle_start_loc, cycle))
to_visit -= visited
+
def detect_recursion(cg):
to_visit = set(cg.nodes())
- if not to_visit: # empty graph -> no recursion
+ if not to_visit: # empty graph -> no recursion
return False
visited = set()
has_cycle = False
@@ -172,9 +175,9 @@ def detect_recursion(cg):
visited = visited.union(just_visited)
if cycle:
has_cycle = True
- print(f"recursive cycle detected: ")
+ print("recursive cycle detected: ")
for (caller, called) in cycle:
print_edge(cg, caller, called, padding=" ")
to_visit -= visited
if not has_cycle:
- print(f"no recursive calls detected")
+ print("no recursive calls detected")
diff --git a/share/analysis-scripts/detect_recursion.py b/share/analysis-scripts/detect_recursion.py
index 21887cdbc24b283d8f6e045faa7ea1fc79c63b69..4e9787be7900fd0ff4c23742873d885b5803a840 100755
--- a/share/analysis-scripts/detect_recursion.py
+++ b/share/analysis-scripts/detect_recursion.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
-#-*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
##########################################################################
# #
# This file is part of Frama-C. #
@@ -22,8 +22,8 @@
# #
##########################################################################
-# This script finds files containing likely declarations and definitions
-# for a given function name, via heuristic syntactic matching.
+"""This script finds files containing likely declarations and definitions
+for a given function name, via heuristic syntactic matching."""
import sys
import build_callgraph
diff --git a/share/analysis-scripts/estimate_difficulty.py b/share/analysis-scripts/estimate_difficulty.py
index 25d6f8e395927a0c928e2d1dd154e84f957e5cc1..c8dcf2155da073f69ca173d02f251eaf3e19223b 100755
--- a/share/analysis-scripts/estimate_difficulty.py
+++ b/share/analysis-scripts/estimate_difficulty.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
-#-*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
##########################################################################
# #
# This file is part of Frama-C. #
@@ -22,32 +22,38 @@
# #
##########################################################################
-# This script uses several heuristics to try and estimate the difficulty
-# of analyzing a new code base with Frama-C.
+"""This script uses several heuristics to try and estimate the difficulty
+of analyzing a new code base with Frama-C."""
import argparse
import json
import os
-from pathlib import Path
+from pathlib import Path
import re
import subprocess
-import sys
import tempfile
import build_callgraph
-import function_finder
import source_filter
-#TODO : avoid relativizing paths when introducing too many ".." ;
-#TODO : accept directory as argument (--full-tree), and then do glob **/*.{c,i} inside
-#TODO : try to check the presence of compiler builtins
-#TODO : try to check for pragmas
-
-parser = argparse.ArgumentParser(description="""
-Estimates the difficulty of analyzing a given code base""")
-parser.add_argument("--header-dirs", "-d", metavar='DIR', nargs='+',
- help='directories containing headers (default: .frama-c)')
-parser.add_argument("files", nargs='+', help='source files')
+# TODO : avoid relativizing paths when introducing too many ".." ;
+# TODO : accept directory as argument (--full-tree), and then do glob **/*.{c,i} inside
+# TODO : try to check the presence of compiler builtins
+# TODO : try to check for pragmas
+# TODO : detect absence of 'main' function (library)
+
+parser = argparse.ArgumentParser(
+ description="""
+Estimates the difficulty of analyzing a given code base"""
+)
+parser.add_argument(
+ "--header-dirs",
+ "-d",
+ metavar="DIR",
+ nargs="+",
+ help="directories containing headers (default: .frama-c)",
+)
+parser.add_argument("files", nargs="+", help="source files")
args = vars(parser.parse_args())
header_dirs = args["header_dirs"]
@@ -59,26 +65,48 @@ under_test = os.getenv("PTESTS_TESTING")
# gather information from several sources
+
def extract_keys(l):
return [list(key.keys())[0] for key in l]
+
def get_framac_libc_function_statuses(framac, framac_share):
- (_metrics_handler, metrics_tmpfile) = tempfile.mkstemp(prefix="fc_script_est_diff", suffix=".json")
- if debug:
- print(f"metrics_tmpfile: {metrics_tmpfile}")
- fc_runtime = framac_share / "libc" / "__fc_runtime.c"
- fc_libc_headers = framac_share / "libc" / "__fc_libc.h"
- subprocess.run([framac, "-no-autoload-plugins", fc_runtime, fc_libc_headers,
- "-load-module", "metrics", "-metrics", "-metrics-libc",
- "-metrics-output", metrics_tmpfile], stdout=subprocess.DEVNULL, check=True)
- with open(metrics_tmpfile) as f:
- metrics_json = json.load(f)
- os.remove(metrics_tmpfile)
+ if framac:
+ (_handler, metrics_tmpfile) = tempfile.mkstemp(prefix="fc_script_est_diff", suffix=".json")
+ if debug:
+ print("metrics_tmpfile: %s", metrics_tmpfile)
+ fc_runtime = framac_share / "libc" / "__fc_runtime.c"
+ fc_libc_headers = framac_share / "libc" / "__fc_libc.h"
+ subprocess.run(
+ [
+ framac,
+ "-no-autoload-plugins",
+ fc_runtime,
+ fc_libc_headers,
+ "-load-module",
+ "metrics",
+ "-metrics",
+ "-metrics-libc",
+ "-metrics-output",
+ metrics_tmpfile,
+ ],
+ stdout=subprocess.DEVNULL,
+ check=True,
+ )
+ with open(metrics_tmpfile) as f:
+ metrics_json = json.load(f)
+ os.remove(metrics_tmpfile)
+ else:
+ with open(framac_share / "libc_metrics.json") as f:
+ metrics_json = json.load(f)
defined = extract_keys(metrics_json["defined-functions"])
spec_only = extract_keys(metrics_json["specified-only-functions"])
return (defined, spec_only)
+
re_include = re.compile(r'\s*#\s*include\s*("|<)([^">]+)("|>)')
+
+
def grep_includes_in_file(filename):
file_content = source_filter.open_and_filter(filename, not under_test)
i = 0
@@ -88,47 +116,58 @@ def grep_includes_in_file(filename):
if m:
kind = m.group(1)
header = m.group(2)
- yield((i,kind,header))
+ yield (i, kind, header)
+
def get_includes(files):
quote_includes = {}
chevron_includes = {}
for filename in files:
for line, kind, header in grep_includes_in_file(filename):
- if kind == '<':
+ if kind == "<":
includes = chevron_includes[header] if header in chevron_includes else []
else:
includes = quote_includes[header] if header in quote_includes else []
includes.append((filename, line))
- if kind == '<':
+ if kind == "<":
chevron_includes[header] = includes
else:
quote_includes[header] = includes
return chevron_includes, quote_includes
+
debug = os.getenv("DEBUG")
verbose = False
-print("Building callgraph...")
-cg = build_callgraph.compute(files)
-
-framac_bin = os.getenv('FRAMAC_BIN')
+framac_bin = os.getenv("FRAMAC_BIN")
if not framac_bin:
- sys.exit("error: FRAMAC_BIN not in environment")
-framac = Path(framac_bin) / "frama-c"
+ print(
+ "Running script in no-Frama-C mode (set FRAMAC_BIN to the directory containing frama-c if you want to use it)."
+ )
+ framac = None
+ script_dir = os.path.dirname(os.path.realpath(__file__))
+ framac_share = Path(script_dir) / "share"
+else:
+ framac = Path(framac_bin) / "frama-c"
+ framac_share = Path(
+ subprocess.check_output([framac, "-no-autoload-plugins", "-print-share-path"]).decode()
+ )
-framac_share = Path(subprocess.check_output([framac, '-no-autoload-plugins', '-print-share-path']).decode())
+print("Building callgraph...")
+cg = build_callgraph.compute(files)
print("Computing data about libc/POSIX functions...")
-libc_defined_functions, libc_specified_functions = get_framac_libc_function_statuses(framac, framac_share)
+libc_defined_functions, libc_specified_functions = get_framac_libc_function_statuses(
+ framac, framac_share
+)
-with open(framac_share / "compliance" / "c11_functions.json") as f:
+with open(framac_share / "compliance" / "c11_functions.json", encoding="utf-8") as f:
c11_functions = json.load(f)["data"]
-with open(framac_share / "compliance" / "c11_headers.json") as f:
+with open(framac_share / "compliance" / "c11_headers.json", encoding="utf-8") as f:
c11_headers = json.load(f)["data"]
-with open(framac_share / "compliance" / "posix_identifiers.json") as f:
+with open(framac_share / "compliance" / "posix_identifiers.json", encoding="utf-8") as f:
all_data = json.load(f)
posix_identifiers = all_data["data"]
posix_headers = all_data["headers"]
@@ -159,16 +198,21 @@ print(f"Estimating difficulty for {len(callees)} function calls...")
warnings = 0
for callee in sorted(callees):
+
def callee_status(status, standard, reason):
global warnings
if status == "warning":
warnings += 1
if verbose or debug or status == "warning":
print(f"- {status}: {callee} ({standard}) {reason}")
- is_problematic = callee in posix_identifiers and "notes" in posix_identifiers[callee] and "fc-support" in posix_identifiers[callee]["notes"] and posix_identifiers[callee]["notes"]["fc-support"] == "problematic"
+
+ try:
+ is_problematic = posix_identifiers[callee]["notes"]["fc-support"] == "problematic"
+ except KeyError:
+ is_problematic = False
if callee in posix_identifiers:
used_headers.add(posix_identifiers[callee]["header"])
- status_emitted = False # to avoid re-emitting a message for functions in both C11 and POSIX
+ status_emitted = False # to avoid re-emitting a message for functions in both C11 and POSIX
if callee in c11_functions:
standard = "C11"
# check that the callee is not a macro or type (e.g. va_arg);
@@ -205,7 +249,11 @@ for callee in sorted(callees):
callee_status("ok", standard, "is handled by the Variadic plug-in")
status_emitted = True
elif is_problematic:
- callee_status("warning", standard, "is known to be problematic for code analysis")
+ callee_status(
+ "warning",
+ standard,
+ "is known to be problematic for code analysis",
+ )
status_emitted = True
if not status_emitted:
callee_status("warning", standard, "has neither code nor spec in Frama-C's libc")
@@ -213,12 +261,13 @@ for callee in sorted(callees):
print(f"Function-related warnings: {warnings}")
if (verbose or debug) and used_headers:
- print(f"used headers:")
+ print("used headers:")
for header in sorted(used_headers):
print(f" <{header}>")
(chevron_includes, quote_includes) = get_includes(files)
+
def is_local_header(header_dirs, header):
for d in header_dirs:
path = Path(d)
@@ -226,6 +275,7 @@ def is_local_header(header_dirs, header):
return True
return False
+
print(f"Estimating difficulty for {len(chevron_includes)} '#include <header>' directives...")
non_posix_headers = []
header_warnings = 0
@@ -260,22 +310,31 @@ if dyncallees:
# unsupported C11-specific features
-c11_unsupported = ["_Alignas", "_Alignof", "_Complex", "_Generic", "_Imaginary",
- "alignas", "alignof" # stdalign.h may use these symbols instead of the C11 keywords
- ];
+c11_unsupported = [
+ "_Alignas",
+ "_Alignof",
+ "_Complex",
+ "_Generic",
+ "_Imaginary",
+ "alignas",
+ "alignof", # stdalign.h may use these symbols
+]
for keyword in c11_unsupported:
- out = subprocess.Popen(["grep", "-n", '\\b' + keyword + '\\b'] + files + ["/dev/null"],
- stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
- lines = out.communicate()[0].decode('utf-8').splitlines()
+ out = subprocess.Popen(
+ ["grep", "-n", "\\b" + keyword + "\\b"] + files + ["/dev/null"],
+ stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT,
+ )
+ lines = out.communicate()[0].decode("utf-8").splitlines()
if lines:
n = len(lines)
- print(f"- warning: found {n} line{'s' if n > 1 else ''} with occurrences of unsupported C11 construct '{keyword}'")
+ print(
+ f"- warning: found {n} line{'s' if n > 1 else ''} with occurrences of "
+ f"unsupported C11 construct '{keyword}'"
+ )
# assembly code
if "asm" in callees or "__asm" in callees or "__asm__" in callees:
- print(f"- warning: code seems to contain inline assembly ('asm(...)')")
-
-# TODO:
-# - detect absence of 'main' function (library)
+ print("- warning: code seems to contain inline assembly ('asm(...)')")
diff --git a/share/analysis-scripts/find_fun.py b/share/analysis-scripts/find_fun.py
index 8bb1f735716ac48ea48eabcde85032eab21e5f4f..9afa58db8e55b17b14f589eb90a4121c22db4457 100755
--- a/share/analysis-scripts/find_fun.py
+++ b/share/analysis-scripts/find_fun.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
-#-*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
##########################################################################
# #
# This file is part of Frama-C. #
@@ -22,34 +22,48 @@
# #
##########################################################################
-# This script finds files containing likely declarations and definitions
-# for a given function name, via heuristic syntactic matching.
+"""This script finds files containing likely declarations and definitions
+for a given function name, via heuristic syntactic matching."""
import argparse
-import function_finder
import os
import re
import sys
from pathlib import Path
-parser = argparse.ArgumentParser(description="""
+import function_finder
+
+parser = argparse.ArgumentParser(
+ description="""
Looks for likely declarations/definitions of a function
in files with extensions '.c', '.h' and '.i'.
If any directories are specified, looks inside them,
otherwise looks inside PWD and /usr/include.
-Subdirectories are always considered recursively.""")
+Subdirectories are always considered recursively."""
+)
-parser.add_argument('--directory', '-C', metavar='DIR', default=".", nargs=1,
- help='print paths relative to directory DIR (default: .)')
-parser.add_argument('funcname', help='function name to search')
-parser.add_argument('dir', nargs='*', help='directories where to search (if empty: PWD /usr/include)')
+parser.add_argument(
+ "--directory",
+ "-C",
+ metavar="DIR",
+ default=".",
+ nargs=1,
+ help="print paths relative to directory DIR (default: .)",
+)
+parser.add_argument("funcname", help="function name to search")
+parser.add_argument(
+ "dir",
+ nargs="*",
+ type=Path,
+ help="directories where to search (if empty: PWD /usr/include)",
+)
args = vars(parser.parse_args())
reldir = args["directory"][0]
fname = args["funcname"]
dirs = args["dir"]
-if re.match('[a-zA-Z_][a-zA-Z0-9_]*$', fname) == None:
+if re.match("[a-zA-Z_][a-zA-Z0-9_]*$", fname) is None:
print("error: function name contains invalid characters: %s" % fname)
print(" (only letters/digits/underscore allowed)")
sys.exit(1)
@@ -57,16 +71,16 @@ if re.match('[a-zA-Z_][a-zA-Z0-9_]*$', fname) == None:
dirs = set(dirs)
if not dirs:
pwd = os.getcwd()
- dirs = [pwd, "/usr/include"]
+ dirs = [Path(pwd), Path("/usr/include")]
else:
- dirs = set(sys.argv[2:])
+ dirs = [Path(p) for p in set(sys.argv[2:])]
files = set()
for d in dirs:
# The usage of Path.glob here prevents symbolic links from being
# followed, which is desirable in some situations. However, if you
# need them, try using glob.glob instead.
- files.update(Path(d).glob("**/*.[ich]"))
+ files.update(d.glob("**/*.[ich]"))
print("Looking for '%s' inside %d file(s)..." % (fname, len(files)))
@@ -84,20 +98,31 @@ for f in files:
except OSError as e:
print(f"error opening '{f}' ({e.errno}, {e.strerror}), skipping file")
+
def relative_path_to(start):
return lambda p: os.path.relpath(p, start=start)
-if possible_declarators == [] and possible_definers == []:
+
+if not possible_declarators and not possible_definers:
print("No declaration/definition found for function '%s'" % fname)
+ sys.exit(0)
+
+if reldir != ".":
+ reldir_msg = f" (relative to '{reldir}')"
else:
- if reldir != ".":
- reldir_msg = f" (relative to '{reldir}')"
- else:
- reldir_msg = ""
- relative_path = relative_path_to(reldir)
- if possible_declarators != []:
- print(f"Possible declarations for function '{fname}' in the following file(s){reldir_msg}:")
- print(" " + "\n ".join(sorted([os.path.relpath(path, start=reldir) for path in possible_declarators])))
- if possible_definers != []:
- print(f"Possible definitions for function '{fname}' in the following file(s){reldir_msg}:")
- print(" " + "\n ".join(sorted([os.path.relpath(path, start=reldir) for path in possible_definers])))
+ reldir_msg = ""
+relative_path = relative_path_to(reldir)
+if possible_declarators:
+ print(f"Possible declarations for function '{fname}' in the following file(s){reldir_msg}:")
+ print(
+ " "
+ + "\n ".join(
+ sorted([os.path.relpath(path, start=reldir) for path in possible_declarators])
+ )
+ )
+if possible_definers:
+ print(f"Possible definitions for function '{fname}' in the following file(s){reldir_msg}:")
+ print(
+ " "
+ + "\n ".join(sorted([os.path.relpath(path, start=reldir) for path in possible_definers]))
+ )
diff --git a/share/analysis-scripts/frama_c_results.py b/share/analysis-scripts/frama_c_results.py
index 5efef7fadfc5793ace1e9c1b1331aa39d90fd926..764ecccffe41ea30d11bb3dbacfeea9524d7a222 100644
--- a/share/analysis-scripts/frama_c_results.py
+++ b/share/analysis-scripts/frama_c_results.py
@@ -24,31 +24,35 @@ import re
stat_file_re = re.compile("^([^=]*)=(.*)$", re.MULTILINE)
+
def load(filename):
data = {}
try:
- with open(filename, 'r') as file:
+ with open(filename, "r") as file:
content = file.read()
- for (key,value) in stat_file_re.findall(content):
+ for (key, value) in stat_file_re.findall(content):
data[key] = value
except OSError:
pass
return data
-re_escape_space = re.compile(r'\\ ')
+
+re_escape_space = re.compile(r"\\ ")
+
def convert(data, key, to_type, default=None):
try:
value = data[key].strip()
if to_type is str:
- value = re.sub(r'\\ ', ' ', value)
- value = re.sub(r'\\,', ',', value)
+ value = re.sub(r"\\ ", " ", value)
+ value = re.sub(r"\\,", ",", value)
return value
else:
return to_type(value)
except (ValueError, TypeError, KeyError):
return default
+
def parse(data):
result = {}
result["timestamp"] = convert(data, "timestamp", str)
@@ -63,11 +67,12 @@ def parse(data):
result["memory"] = convert(data, "memory", int)
result["cmd_args"] = convert(data, "cmd_args", str)
result["benchmark_tag"] = convert(data, "benchmark_tag", str)
- if result["sem_reach_stmt"] != None and result["syn_reach_stmt"] != None:
+ if result["sem_reach_stmt"] is not None and result["syn_reach_stmt"] is not None:
result["coverage"] = result["sem_reach_stmt"] / result["syn_reach_stmt"]
else:
result["coverage"] = None
return result
+
def read(filename):
return parse(load(filename))
diff --git a/share/analysis-scripts/function_finder.py b/share/analysis-scripts/function_finder.py
old mode 100755
new mode 100644
index 7aef53cef0644df796ea85810fb9545c8de7c849..22af511f79059b026127417874d7509f98a309bb
--- a/share/analysis-scripts/function_finder.py
+++ b/share/analysis-scripts/function_finder.py
@@ -1,5 +1,4 @@
-#!/usr/bin/env python3
-#-*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
##########################################################################
# #
# This file is part of Frama-C. #
@@ -22,7 +21,7 @@
# #
##########################################################################
-# Exports find_function_in_file, to be used by other scripts
+"""Exports find_function_in_file, to be used by other scripts"""
import bisect
import os
@@ -41,48 +40,70 @@ import re
# auxiliary regexes
c_identifier = "[a-zA-Z_][a-zA-Z0-9_]*"
-c_id_maybe_pointer = c_identifier + "\**"
+c_id_maybe_pointer = c_identifier + "[*]*"
optional_c_id = "(?:" + c_identifier + ")?"
-non_empty_whitespace = "[ \t\r\n]+" # includes newline/CR
-whitespace = "[ \t\r\n]*" # includes newline/CR
-type_prefix = c_id_maybe_pointer + "(?:\s+\**" + c_id_maybe_pointer + ")*" + non_empty_whitespace + "\**"
+non_empty_whitespace = r"[ \t\r\n]+" # includes newline/CR
+whitespace = "[ \t\r\n]*" # includes newline/CR
+type_prefix = (
+ c_id_maybe_pointer + r"(?:\s+[*]*" + c_id_maybe_pointer + ")*" + non_empty_whitespace + "[*]*"
+)
optional_type_prefix = "(?:" + type_prefix + whitespace + ")?"
-argument_list = "\([^)]*\)"
+argument_list = r"\([^)]*\)"
-debug = bool(os.getenv("DEBUG", False))
+debug = os.getenv("DEBUG", False)
# Precomputes the regex for 'fname'
def prepare_re_specific_name(fname):
- re_fun = re.compile("^" + optional_type_prefix + fname + whitespace +
- argument_list + whitespace +
- optional_c_id + whitespace + "(;|{)", flags=re.DOTALL | re.MULTILINE)
+ re_fun = re.compile(
+ "^"
+ + optional_type_prefix
+ + fname
+ + whitespace
+ + argument_list
+ + whitespace
+ + optional_c_id
+ + whitespace
+ + "(;|{)",
+ flags=re.DOTALL | re.MULTILINE,
+ )
return re_fun
+
# Returns 0 if not found, 1 if declaration, 2 if definition
def find_specific_name(prepared_re, f):
- with open(f, encoding="ascii", errors='ignore') as data:
- file_content = data.read()
- has_decl_or_def = prepared_re.search(file_content)
- if has_decl_or_def is None:
- return 0
- else:
- is_decl = has_decl_or_def.group(1) == ";"
- return 1 if is_decl else 2
+ with open(f, encoding="ascii", errors="ignore") as data:
+ file_content = data.read()
+ has_decl_or_def = prepared_re.search(file_content)
+ if has_decl_or_def is None:
+ return 0
+ else:
+ is_decl = has_decl_or_def.group(1) == ";"
+ return 1 if is_decl else 2
# matches function definitions or declarations
# if funcname is not None, only matches for the specified
# function name
def compute_re_def_or_decl(funcname):
- id = funcname if funcname else c_identifier
- return re.compile("^" + optional_type_prefix +
- "(" + id + ")" + whitespace +
- argument_list + whitespace +
- optional_c_id + whitespace + "(;|{)",
- flags=re.DOTALL | re.MULTILINE)
+ ident = funcname if funcname else c_identifier
+ return re.compile(
+ "^"
+ + optional_type_prefix
+ + "("
+ + ident
+ + ")"
+ + whitespace
+ + argument_list
+ + whitespace
+ + optional_c_id
+ + whitespace
+ + "(;|{)",
+ flags=re.DOTALL | re.MULTILINE,
+ )
+
# matches function calls
-re_funcall = re.compile("(" + c_identifier + ")" + whitespace + "\(")
+re_funcall = re.compile("(" + c_identifier + ")" + whitespace + r"\(")
# Computes the offset (in bytes) of each '\n' in the file,
# returning them as a list
@@ -94,12 +115,14 @@ def compute_newline_offsets(file_lines):
offsets.append(current)
return offsets
+
# Returns the line number (starting at 1) containing the character
# of offset [offset].
# [offsets] is the sorted list of offsets for newline characters in the file.
def line_of_offset(offsets, offset):
return bisect.bisect_right(offsets, offset) + 1
+
# Returns the line number (starting at 1) of each line starting with '}'
# as its first character.
#
@@ -110,17 +133,18 @@ def compute_closing_braces(file_lines):
braces = []
for i, line in enumerate(file_lines, start=1):
# note: lines contain '\n', so they are never empty
- if line[0] == '}':
+ if line[0] == "}":
braces.append(i)
# Special heuristics: if the last line contains whitespace + '}',
# assume it closes a function.
- last_line_number = len(file_lines)+1
- if file_lines != [] and not (last_line_number in braces):
+ last_line_number = len(file_lines) + 1
+ if file_lines != [] and last_line_number not in braces:
last_line = file_lines[-1].lstrip()
- if len(last_line) >= 1 and last_line[0] == '}':
+ if len(last_line) >= 1 and last_line[0] == "}":
braces.append(last_line_number)
return braces
+
# Returns the first element of [line_numbers] greater than [n], or [None]
# if all numbers are smaller than [n] (this may happen e.g. when no
# closing braces were found).
@@ -133,6 +157,7 @@ def get_first_line_after(line_numbers, n):
# could not find line (e.g. for closing braces); return None
return None
+
# Returns a list of tuples (fname, is_def, line_start, line_end, terminator_offset)
# for each function definition or declaration.
# If [want_defs] is True, definitions are included.
@@ -143,7 +168,9 @@ def get_first_line_after(line_numbers, n):
# [terminator_offset] is used by the caller to filter the function prototype
# itself and avoid considering it as a call. For function definitions,
# this is the opening brace; for function declarations, this is the semicolon.
-def find_definitions_and_declarations(want_defs, want_decls, filename, file_content, file_lines, newlines, funcname=None):
+def find_definitions_and_declarations(
+ want_defs, want_decls, filename, file_content, file_lines, newlines, funcname=None
+):
braces = compute_closing_braces(file_lines)
res = []
re_fundef_or_decl = compute_re_def_or_decl(funcname)
@@ -162,7 +189,7 @@ def find_definitions_and_declarations(want_defs, want_decls, filename, file_cont
else:
if not want_defs:
continue
- definition = file_content[match.start(1):newlines[start-1]]
+ definition = file_content[match.start(1) : newlines[start - 1]]
# try "single-line function heuristic":
# assume the function is defined as 'type f(...) { code; }',
# in a single line
@@ -172,21 +199,26 @@ def find_definitions_and_declarations(want_defs, want_decls, filename, file_cont
end = get_first_line_after(braces, start)
if not end:
# no closing braces found; try again the "single-line function heuristic"
- def_start_newline_offset = newlines[start-1]
line_of_opening_brace = line_of_offset(newlines, terminator_offset)
- if start == line_of_opening_brace and definition.rstrip()[-1] == '}':
+ if start == line_of_opening_brace and definition.rstrip()[-1] == "}":
# assume the '}' is closing the '{' from the same line
end = line_of_opening_brace
else:
# no opening brace; assume a false positive and skip definition
- print(f"{os.path.relpath(filename)}:{start}:closing brace not found, " +
- f"skipping potential definition of '{funcname}'")
+ print(
+ f"{os.path.relpath(filename)}:{start}:closing brace not found, "
+ f"skipping potential definition of '{funcname}'"
+ )
continue
if debug:
- print(f"function_finder: {'def' if is_def else 'decl'} of {funcname} between {start} and {end}")
+ print(
+ f"function_finder: {'def' if is_def else 'decl'} of "
+ f"{funcname} between {start} and {end}"
+ )
res.append((funcname, is_def, start, end, terminator_offset))
return res
+
# list of identifiers which are never function calls
calls_blacklist = ["if", "while", "for", "return", "sizeof", "switch", "_Alignas"]
@@ -205,15 +237,16 @@ def find_calls(file_content, newlines):
res.append((funcname, line, offset))
return res
+
# Returns the caller of [call], that is, the function whose definition
# contains the line where [call] happens.
# Returns [None] if there is no function at such line (i.e. a false positive).
#
# [defs] must be sorted in ascending order.
def find_caller(defs, call):
- (called, line, offset) = call
+ (_called, line, offset) = call
for (fname, _is_def, start, end, brace_offset) in defs:
- if line >= start and line <= end and offset > brace_offset:
+ if start <= line <= end and offset > brace_offset:
return fname
elif start > line:
return None
diff --git a/share/analysis-scripts/git_utils.py b/share/analysis-scripts/git_utils.py
index c44aa67d026cef3ffbc7db6eaf84bbdcc200092f..a680d48de5ef51cc85a52889852d100dc766d734 100644
--- a/share/analysis-scripts/git_utils.py
+++ b/share/analysis-scripts/git_utils.py
@@ -22,38 +22,44 @@
import subprocess
+
def rev_parse(gitdir, rev):
res = subprocess.run(
- ['git', 'rev-parse', rev],
+ ["git", "rev-parse", rev],
stdout=subprocess.PIPE,
stderr=subprocess.DEVNULL,
- encoding='ascii',
- cwd=gitdir)
+ encoding="ascii",
+ cwd=gitdir,
+ )
name = res.stdout.strip()
return name if name else None
+
def name_rev(gitdir, rev):
res = subprocess.run(
- ['git', 'name-rev', '--name-only', rev],
+ ["git", "name-rev", "--name-only", rev],
stdout=subprocess.PIPE,
stderr=subprocess.DEVNULL,
- encoding='ascii',
- cwd=gitdir)
+ encoding="ascii",
+ cwd=gitdir,
+ )
name = res.stdout.strip()
return name if name else None
+
def current_rev(gitdir):
return name_rev(gitdir, "HEAD")
+
def is_clean(gitdir):
# git diff and diff-index are not working on some of our case studies to
# decide whether the workingin dir is clean or not ; git status is more
# reliable
res = subprocess.run(
- ['git', 'status', '--untracked-files=no', '--porcelain'],
+ ["git", "status", "--untracked-files=no", "--porcelain"],
stdout=subprocess.PIPE,
stderr=subprocess.DEVNULL,
- encoding='ascii',
- cwd=gitdir)
+ encoding="ascii",
+ cwd=gitdir,
+ )
return res.returncode == 0 and not res.stdout
-
diff --git a/share/analysis-scripts/heuristic_list_functions.py b/share/analysis-scripts/heuristic_list_functions.py
index 7d86e74613fc0015bc4d59849f7045c0c0f67a32..6d650a6995a486ff986ed05c95ef32e097d3037c 100755
--- a/share/analysis-scripts/heuristic_list_functions.py
+++ b/share/analysis-scripts/heuristic_list_functions.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
-#-*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
##########################################################################
# #
# This file is part of Frama-C. #
@@ -22,22 +22,22 @@
# #
##########################################################################
-# This script uses heuristics to list all function definitions and
-# declarations in a set of files.
+"""This script uses heuristics to list all function definitions and
+declarations in a set of files."""
import sys
import os
-import re
import function_finder
-debug = bool(os.getenv("DEBUG", False))
+debug = os.getenv("DEBUG")
arg = ""
if len(sys.argv) < 4:
- print("usage: %s want_defs want_decls file..." % sys.argv[0])
- print(" looks for likely function definitions and/or declarations")
- print(" in the specified files.")
- sys.exit(1)
+ print("usage: %s want_defs want_decls file..." % sys.argv[0])
+ print(" looks for likely function definitions and/or declarations")
+ print(" in the specified files.")
+ sys.exit(1)
+
def boolish_string(s):
if s.lower() == "true" or s == "1":
@@ -46,16 +46,19 @@ def boolish_string(s):
return False
sys.exit(f"error: expected 'true', 'false', 0 or 1; got: {s}")
+
want_defs = boolish_string(sys.argv[1])
want_decls = boolish_string(sys.argv[2])
files = sys.argv[3:]
for f in files:
- with open(f, encoding="ascii", errors='ignore') as data:
+ with open(f, encoding="ascii", errors="ignore") as data:
file_content = data.read()
file_lines = file_content.splitlines(keepends=True)
newlines = function_finder.compute_newline_offsets(file_lines)
- defs_and_decls = function_finder.find_definitions_and_declarations(want_defs, want_decls, f, file_content, file_lines, newlines)
+ defs_and_decls = function_finder.find_definitions_and_declarations(
+ want_defs, want_decls, f, file_content, file_lines, newlines
+ )
for (funcname, is_def, start, end, _offset) in defs_and_decls:
if is_def:
print(f"{os.path.relpath(f)}:{start}:{end}: {funcname} (definition)")
diff --git a/share/analysis-scripts/list_files.py b/share/analysis-scripts/list_files.py
index 5d0a86444e2f30a74785c98e00bbabb777ded14e..691ef6ac04e66ffe535defeb241a95ed2beb9183 100755
--- a/share/analysis-scripts/list_files.py
+++ b/share/analysis-scripts/list_files.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
-#-*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
##########################################################################
# #
# This file is part of Frama-C. #
@@ -22,10 +22,9 @@
# #
##########################################################################
-# This script parses a compile_commands.json[1] file and lists the C files
-# in it.
-#
-# [1] See: http://clang.llvm.org/docs/JSONCompilationDatabase.html
+"""This script parses a compile_commands.json file and lists the C files in it."""
+
+# See: http://clang.llvm.org/docs/JSONCompilationDatabase.html
import sys
import os
@@ -34,62 +33,65 @@ import re
from pathlib import Path
if len(sys.argv) < 2:
- # no argument, assume default name
- arg = Path("compile_commands.json")
+ # no argument, assume default name
+ arg = Path("compile_commands.json")
else:
- arg = Path(sys.argv[1])
+ arg = Path(sys.argv[1])
if not arg.exists():
- print(f"error: file '{arg}' not found")
- sys.exit(f"usage: {sys.argv[0]} [compile_commands.json]")
+ sys.exit(f"error: file '{arg}' not found")
# check if arg has a known extension
def is_known_c_extension(ext):
- return ext == ".c" or ext == ".i" or ext == ".h"
+ return ext in (".c", ".i", ".ci", ".h")
+
pwd = os.getcwd()
-fcmake_pwd = pwd / Path(".frama-c") # pwd as seen by the Frama-C makefile
-json = json.loads(open(arg).read())
+fcmake_pwd = Path(pwd) / ".frama-c" # pwd as seen by the Frama-C makefile
+with open(arg) as data:
+ jcdb = json.load(data)
jcdb_dir = arg.parent
includes = set()
defines = set()
-files = set() # set of pairs of (file, file_for_fcmake)
-for entry in json:
- arg_includes = [] # before normalization
- if not "file" in entry:
- # ignore entries without a filename
- continue
- file = Path(entry["file"])
- dir = Path(entry["directory"]) if "directory" in entry else None
- if file.is_absolute():
- filepath = file
- elif dir and dir.is_absolute():
- filepath = dir / file
- elif dir:
- filepath = jcdb_dir / dir / file
- else:
- filepath = jcdb_dir / file
- if not is_known_c_extension(filepath.suffix):
- print(f"warning: ignoring file of unknown type: {filepath}")
- else:
- files.add((os.path.relpath(filepath, pwd), os.path.relpath(filepath, fcmake_pwd)))
+files = set() # set of pairs of (file, file_for_fcmake)
+for entry in jcdb:
+ arg_includes = [] # before normalization
+ if not "file" in entry:
+ # ignore entries without a filename
+ continue
+ filename = Path(entry["file"])
+ directory = Path(entry["directory"]) if "directory" in entry else None
+ if filename.is_absolute():
+ filepath = filename
+ elif directory and directory.is_absolute():
+ filepath = directory / filename
+ elif directory:
+ filepath = jcdb_dir / directory / filename
+ else:
+ filepath = jcdb_dir / filename
+ if not is_known_c_extension(filepath.suffix):
+ print(f"warning: ignoring file of unknown type: {filepath}")
+ else:
+ files.add((os.path.relpath(filepath, pwd), os.path.relpath(filepath, fcmake_pwd)))
-files_for_fcmake = map (lambda x:(x[1]), files)
+files_for_fcmake = map(lambda x: (x[1]), files)
print("# Paths as seen by a makefile inside subdirectory '.frama-c':")
print("SRCS=\\\n" + " \\\n".join(sorted(files_for_fcmake)) + " \\")
print("")
files_defining_main = set()
-re_main = re.compile("(int|void)\s+main\s*\([^)]*\)\s*\{")
-for (file, file_for_fcmake) in files:
- assert os.path.exists(file), "file does not exist: %s" % file
- with open(file, 'r') as content_file:
- content = content_file.read()
- res = re.search(re_main, content)
- if res is not None:
- files_defining_main.add(file_for_fcmake)
+re_main = re.compile(r"(int|void)\s+main\s*\([^)]*\)\s*\{")
+for (filename, file_for_fcmake) in files:
+ assert os.path.exists(filename), "file does not exist: %s" % filename
+ with open(filename, "r") as content_file:
+ content = content_file.read()
+ res = re.search(re_main, content)
+ if res is not None:
+ files_defining_main.add(file_for_fcmake)
if files_defining_main != []:
- print("")
- print("# Possible definition of main function in the following file(s), as seen from '.frama-c':")
- print("\n".join(sorted(files_defining_main)))
+ print("")
+ print(
+ "# Possible definition of main function in the following file(s), as seen from '.frama-c':"
+ )
+ print("\n".join(sorted(files_defining_main)))
diff --git a/share/analysis-scripts/make_template.py b/share/analysis-scripts/make_template.py
deleted file mode 100755
index 2fa8d29359730685922efce47b12c755a4133ac4..0000000000000000000000000000000000000000
--- a/share/analysis-scripts/make_template.py
+++ /dev/null
@@ -1,251 +0,0 @@
-#!/usr/bin/env python3
-#-*- coding: utf-8 -*-
-##########################################################################
-# #
-# This file is part of Frama-C. #
-# #
-# Copyright (C) 2007-2021 #
-# CEA (Commissariat à l'énergie atomique et aux énergies #
-# alternatives) #
-# #
-# you can redistribute it and/or modify it under the terms of the GNU #
-# Lesser General Public License as published by the Free Software #
-# Foundation, version 2.1. #
-# #
-# It is distributed in the hope that it will be useful, #
-# but WITHOUT ANY WARRANTY; without even the implied warranty of #
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
-# GNU Lesser General Public License for more details. #
-# #
-# See the GNU Lesser General Public License version 2.1 #
-# for more details (enclosed in the file licenses/LGPLv2.1). #
-# #
-##########################################################################
-
-# This script is used to interactively fill template.mk, converting it
-# into a GNUmakefile ready for analysis.
-
-import sys
-import os
-import re
-import shutil
-import shlex
-import glob
-import json
-from subprocess import Popen, PIPE
-from pathlib import Path
-import function_finder
-
-if len(sys.argv) > 2:
- print(f"usage: {sys.argv[0]} [dir]")
- print(" creates a Frama-C makefile in [dir] (default: .frama-c)")
- sys.exit(1)
-
-framac_bin = os.getenv('FRAMAC_BIN')
-if not framac_bin:
- sys.exit("error: FRAMAC_BIN not in environment (set by frama-c-script)")
-framac_bin = Path(framac_bin)
-
-jcdb = Path("compile_commands.json")
-
-dir = Path(sys.argv[1] if len(sys.argv) == 2 else ".frama-c")
-fc_stubs_c = dir / "fc_stubs.c"
-gnumakefile = dir / "GNUmakefile"
-
-print(f"Preparing template: {gnumakefile}")
-
-# relative prefix, due to GNUmakefile possibly being in a sub-directory of PWD
-relprefix = os.path.relpath(os.getcwd(), dir)
-
-if "PTESTS_TESTING" in os.environ:
- print("Running ptests: setting up mock files...")
- jcdb.touch()
- Path(dir).mkdir(parents=True, exist_ok=True)
- fc_stubs_c.touch()
- gnumakefile.touch()
-
-process = Popen([framac_bin / "frama-c", "-no-autoload-plugins", "-print-config-json"], stdout=PIPE)
-(output, err) = process.communicate()
-exit_code = process.wait()
-if exit_code != 0:
- sys.exit(f"error running frama-c -print-config-json")
-
-fc_config = json.loads(output.decode('utf-8'))
-sharedir = Path(fc_config['datadir'])
-default_machdep = fc_config['current_machdep']
-machdeps = fc_config['machdeps']
-
-def check_path_exists(path):
- if path.exists():
- yn = input(f"warning: {path} already exists. Overwrite? [y/N] ")
- if yn == "" or not (yn[0] == "Y" or yn[0] == "y"):
- print("Exiting without overwriting.")
- sys.exit(0)
- pathdir = path.parent
- if not pathdir.exists():
- yn = input(f"warning: directory '{pathdir}' does not exit. Create it? [y/N] ")
- if yn == "" or not (yn[0] == "Y" or yn[0] == "y"):
- print("Exiting without creating.")
- sys.exit(0)
- pathdir.mkdir(parents=True, exist_ok=False)
-
-check_path_exists(gnumakefile)
-main = input("Main target name: ")
-if not re.match("^[a-zA-Z_0-9-]+$", main):
- sys.exit("error: invalid main target name (can only contain letters, digits, dash or underscore)")
-
-main_fun_finder_re = function_finder.prepare_re_specific_name("main")
-
-# returns 0 if none, 1 if declaration, 2 if definition
-def defines_or_declares_main(f):
- return function_finder.find_specific_name(main_fun_finder_re, f)
-
-def expand_and_normalize_sources(expression, relprefix):
- subexps = shlex.split(expression)
- sources_lists = [glob.glob(exp, recursive=True) for exp in subexps]
- sources = sorted(set([item for sublist in sources_lists for item in sublist]))
- return sources
-
-def rel_prefix(f):
- return f"{f}" if os.path.isabs(f) else f"{relprefix}/{f}"
-
-def sources_list_for_makefile(sources):
- return "\n".join([f" {rel_prefix(source)} \\" for source in sources])
-
-def main_suffix(f):
- main = defines_or_declares_main(f)
- if main == 2:
- return "\t# defines 'main'"
- elif main == 1:
- return "\t# declares 'main'"
- else:
- return ""
-
-while True:
- sources = input("Source files (default: **/*.c): ")
- if not sources:
- sources="**/*.c"
- source_list = expand_and_normalize_sources(sources, relprefix)
- if not source_list:
- print(f"error: no sources were matched for '{sources}'.")
- else:
- print(f"The following sources were matched (relative to {dir}):")
- print("\n".join([" " + rel_prefix(source) + main_suffix(source) for source in source_list]))
- print()
- definitions_of_main = len([source for source in source_list if defines_or_declares_main(source)])
- if definitions_of_main > 1:
- print("warning: 'main' seems to be defined multiple times.")
- yn = input("Is this ok? [Y/n] ")
- if yn == "" or not (yn[0] == "N" or yn[0] == "n"):
- break
-
-json_compilation_database = None
-if jcdb.is_file():
- yn = input("compile_commands.json exists, add option -json-compilation-database? [Y/n] ")
- if yn == "" or not (yn[0] == "N" or yn[0] == "n"):
- json_compilation_database = f"{relprefix}/compile_commands.json"
- else:
- print("Option not added; you can later add it to FCFLAGS.")
-
-add_main_stub = False
-yn = input("Add stub for function main (only needed if it uses command-line arguments)? [y/N] ")
-if yn != "" and (yn[0] == "Y" or yn[0] == "y"):
- add_main_stub = True
-
-print("Please define the architectural model (machdep) of the target machine.")
-print("Known machdeps: " + " ".join(machdeps))
-machdep_chosen = False
-while not machdep_chosen:
- machdep = input(f"Please enter the machdep [{default_machdep}]: ")
- if not machdep:
- machdep = default_machdep
- machdep_chosen = True
- else:
- if not (machdep in machdeps):
- yn = input(f"'{machdep}' is not a standard machdep. Proceed anyway? [y/N]")
- if yn != "" and (yn[0] == "Y" or yn[0] == "y"):
- machdep_chosen = True
- else:
- machdep_chosen = True
-
-def insert_line_after(lines, line_pattern, newline):
- re_line = re.compile(line_pattern)
- for i in range(0, len(lines)):
- if re_line.search(lines[i]):
- lines.insert(i+1, newline)
- return lines
- sys.exit(f"error: no lines found matching pattern: {line_pattern}")
-
-def replace_line(lines, line_pattern, value, all_occurrences=False):
- replaced = False
- re_line = re.compile(line_pattern)
- for i in range(0, len(lines)):
- if re_line.search(lines[i]):
- lines[i] = value
- replaced = True
- if not all_occurrences:
- return lines
- if replaced:
- return lines
- else:
- sys.exit(f"error: no lines found matching pattern: {line_pattern}")
-
-def remove_lines_between(lines, start_pattern, end_pattern):
- re_start = re.compile(start_pattern)
- re_end = re.compile(end_pattern)
- first_to_remove = -1
- last_to_remove = -1
- for i in range(0, len(lines)):
- if first_to_remove == -1 and re_start.search(lines[i]):
- first_to_remove = i
- elif re_end.search(lines[i]):
- last_to_remove = i
- break
- if first_to_remove == -1:
- sys.exit("error: could not find start pattern: " + start_pattern)
- elif last_to_remove == -1:
- sys.exit("error: could not find end pattern: " + end_pattern)
- return (lines[:first_to_remove-1] if first_to_remove > 0 else []) + (lines[last_to_remove+1:] if last_to_remove < len(lines)-1 else [])
-
-with open(sharedir / "analysis-scripts" / "template.mk") as f:
- lines = list(f)
- lines = replace_line(lines, "^MACHDEP = .*", f"MACHDEP = {machdep}\n")
- if add_main_stub:
- lines = insert_line_after(lines, "^main.parse: \\\\", f" fc_stubs.c \\\n")
- check_path_exists(fc_stubs_c)
- shutil.copyfile(sharedir / "analysis-scripts" / "fc_stubs.c", fc_stubs_c)
- lines = insert_line_after(lines, "^FCFLAGS", " -main eva_main \\\n")
- print(f"Created stub for main function: {dir / 'fc_stubs.c'}")
- lines = replace_line(lines, "^main.parse: \\\\", f"{main}.parse: \\\n")
- lines = replace_line(lines, "^TARGETS = main.eva", f"TARGETS = {main}.eva\n")
- lines = replace_line(lines, "^ main.c \\\\", sources_list_for_makefile(source_list) + "\n")
- if json_compilation_database:
- lines = insert_line_after(lines, "^FCFLAGS", f" -json-compilation-database {json_compilation_database} \\\n")
- if relprefix != "..":
- lines = replace_line(lines, "^ -add-symbolic-path=..:. \\\\", f" -add-symbolic-path={relprefix}:. \\\n", all_occurrences=True)
-
-gnumakefile.write_text("".join(lines))
-
-print(f"Template created: {gnumakefile}")
-
-# write path.mk
-path_mk = dir / "path.mk"
-
-with open(path_mk, "w") as f:
- f.write(f"""FRAMAC_BIN={framac_bin}
-ifeq ($(wildcard $(FRAMAC_BIN)),)
-# Frama-C not installed locally; using the version in the PATH
-else
-FRAMAC=$(FRAMAC_BIN)/frama-c
-FRAMAC_GUI=$(FRAMAC_BIN)/frama-c-gui
-endif
-""")
-
-print(f"Path to Frama-C binaries written to: {path_mk}")
-
-if "PTESTS_TESTING" in os.environ:
- print("Running ptests: cleaning up after tests...")
- jcdb.unlink(missing_ok=True)
- fc_stubs_c.unlink(missing_ok=True)
- path_mk.unlink(missing_ok=True)
- # gnumakefile is not erased because we want it as an oracle
diff --git a/share/analysis-scripts/make_wrapper.py b/share/analysis-scripts/make_wrapper.py
index a5c79f80e8dea2ea7bb4c2181356433b9b14698f..7025db38a3d861520ef5a8fca21fb4f43a6a3d25 100755
--- a/share/analysis-scripts/make_wrapper.py
+++ b/share/analysis-scripts/make_wrapper.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
-#-*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
##########################################################################
# #
# This file is part of Frama-C. #
@@ -22,9 +22,9 @@
# #
##########################################################################
-# This script serves as wrapper to GNU make (when using the analysis-scripts
-# GNUmakefile template): it parses the output and suggests useful commands
-# whenever it can, by calling frama-c-script itself.
+"""This script serves as wrapper to GNU make (when using the analysis-scripts
+GNUmakefile template): it parses the output and suggests useful commands
+whenever it can, by calling frama-c-script itself."""
import argparse
import os
@@ -32,51 +32,65 @@ import re
import subprocess
import sys
from functools import partial
-import tempfile
# Check if GNU make is available and has the minimal required version
# (4.0). Otherwise, this script will fail.
# We first test with 'gmake', then 'make', then fail.
make_cmd = "gmake"
-get_make_major_version_args = r" --version | grep 'GNU Make\s\+\([0-9]\+\)\..*$' | sed -E 's|GNU Make +([0-9]+)\..*|\1|'"
-if os.system(f"command -v {make_cmd} >{os.devnull} && test \"$({make_cmd} {get_make_major_version_args})\" -ge 4 2>{os.devnull}") != 0:
+get_make_major_version_args = (
+ r" --version | grep 'GNU Make\s\+\([0-9]\+\)\..*$' | sed -E 's|GNU Make +([0-9]+)\..*|\1|'"
+)
+
+cmd = (
+ f"command -v {make_cmd} >{os.devnull} && "
+ f'test "$({make_cmd} {get_make_major_version_args})" -ge 4 2>{os.devnull}'
+)
+if os.system(cmd) != 0:
make_cmd = "make"
- if os.system(f"command -v {make_cmd} >{os.devnull} && test \"$({make_cmd} {get_make_major_version_args})\" -ge 4 2>{os.devnull}") != 0:
+ cmd = (
+ f"command -v {make_cmd} >{os.devnull} && "
+ f'test "$({make_cmd} {get_make_major_version_args})" -ge 4 2>{os.devnull}'
+ )
+ if os.system(cmd) != 0:
sys.exit("error: could not find GNU make >= 4.0 (tried 'gmake' and 'make')")
-parser = argparse.ArgumentParser(description="""
+parser = argparse.ArgumentParser(
+ description="""
Builds the specified target, parsing the output to identify and recommend
-actions in case of failure.""")
-parser.add_argument('--make-dir', metavar='DIR', default=".frama-c",
- help='directory containing the makefile (default: .frama-c)')
+actions in case of failure."""
+)
+parser.add_argument(
+ "--make-dir",
+ metavar="DIR",
+ default=".frama-c",
+ help="directory containing the makefile (default: .frama-c)",
+)
(make_dir_arg, args) = parser.parse_known_args()
make_dir = vars(make_dir_arg)["make_dir"]
args = args[1:]
-framac_bin = os.getenv('FRAMAC_BIN')
+framac_bin = os.getenv("FRAMAC_BIN")
if not framac_bin:
- sys.exit("error: FRAMAC_BIN not in environment (set by frama-c-script)")
+ sys.exit("error: FRAMAC_BIN not in environment (set by frama-c-script)")
framac_script = f"{framac_bin}/frama-c-script"
output_lines = []
cmd_list = [make_cmd, "-C", make_dir] + args
-with subprocess.Popen(cmd_list,
- stdout=subprocess.PIPE,
- stderr=subprocess.PIPE) as proc:
- while True:
- line = proc.stdout.readline()
- if line:
- sys.stdout.buffer.write(line)
- sys.stdout.flush()
- output_lines.append(line.decode('utf-8'))
- else:
- break
+with subprocess.Popen(cmd_list, stdout=subprocess.PIPE, stderr=subprocess.PIPE) as proc:
+ while True:
+ line = proc.stdout.readline()
+ if line:
+ sys.stdout.buffer.write(line)
+ sys.stdout.flush()
+ output_lines.append(line.decode("utf-8"))
+ else:
+ break
re_missing_spec = re.compile("Neither code nor specification for function ([^,]+),")
re_recursive_call_start = re.compile("detected recursive call")
-re_recursive_call_stack_start = re.compile("^\s+stack:")
-re_recursive_call_stack_end = re.compile("^\[")
+re_recursive_call_stack_start = re.compile(r"^\s+stack:")
+re_recursive_call_stack_end = re.compile(r"^\[")
tips = []
@@ -84,82 +98,101 @@ lines = iter(output_lines)
for line in lines:
match = re_recursive_call_start.search(line)
if match:
- def action():
- print("Consider patching, stubbing or adding an ACSL " +
- "specification to the recursive call, " +
- "then re-run the analysis.")
- while True:
- msg_lines = []
- match = re_recursive_call_start.search(line)
- try:
- while not match:
- line = next(lines)
- match = re_recursive_call_start.search(line)
- match = None
- while not match:
- line = next(lines)
- match = re_recursive_call_stack_start.search(line)
- match = None
- while not match:
- msg_lines.append(line)
- line = next(lines)
- match = re_recursive_call_stack_end.search(line)
- # note: this ending line can also match re_missing_spec
- tip = {"message": "Found recursive call at:\n" +
- "".join(msg_lines),
- "action":action
- }
- tips.append(tip)
- break
- except StopIteration:
- print("** Error: did not match expected regex before EOF")
- assert False
+
+ def _action():
+ print(
+ "Consider patching, stubbing or adding an ACSL "
+ + "specification to the recursive call, "
+ + "then re-run the analysis."
+ )
+
+ while True:
+ msg_lines = []
+ match = re_recursive_call_start.search(line)
+ try:
+ while not match:
+ line = next(lines)
+ match = re_recursive_call_start.search(line)
+ match = None
+ while not match:
+ line = next(lines)
+ match = re_recursive_call_stack_start.search(line)
+ match = None
+ while not match:
+ msg_lines.append(line)
+ line = next(lines)
+ match = re_recursive_call_stack_end.search(line)
+ # note: this ending line can also match re_missing_spec
+ tip = {
+ "message": "Found recursive call at:\n" + "".join(msg_lines),
+ "action": _action,
+ }
+ tips.append(tip)
+ break
+ except StopIteration:
+ print("** Error: did not match expected regex before EOF")
+ assert False
match = re_missing_spec.search(line)
if match:
- fname = match.group(1)
- def action(fname):
- out = subprocess.Popen([framac_script, "find-fun", "-C", make_dir, fname],
- stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
- output = out.communicate()[0].decode('utf-8')
- re_possible_definers = re.compile("Possible definitions for function")
- find_fun_lines = iter(output.splitlines())
- for find_fun_line in find_fun_lines:
- if re_possible_definers.match(find_fun_line):
- found_files = [next(find_fun_lines)]
- while True:
- try:
- found_files.append(next(find_fun_lines))
- except StopIteration:
- if len(found_files) > 1:
- print("Found several files defining function '"
- + fname + "', cannot recommend automatically.")
- print("Check which one is appropriate and add it " +
- "to the list of sources to be parsed:")
- print("\n".join(found_files))
- else:
- print("Add the following file to the list of "
- + "sources to be parsed:\n" + found_files[0])
- return
- print("Could not find any files defining " + fname + ".")
- print("Find the sources defining it and add them, " +
- "or provide a stub.")
- tip = {"message": "Found function with missing spec: " + fname + "\n" +
- " Looking for files defining it...",
- "action":partial(action, fname)
- }
- tips.append(tip)
+ fname = match.group(1)
+
+ def _action(fname):
+ out = subprocess.Popen(
+ [framac_script, "find-fun", "-C", make_dir, fname],
+ stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT,
+ )
+ output = out.communicate()[0].decode("utf-8")
+ re_possible_definers = re.compile("Possible definitions for function")
+ find_fun_lines = iter(output.splitlines())
+ for find_fun_line in find_fun_lines:
+ if re_possible_definers.match(find_fun_line):
+ found_files = [next(find_fun_lines)]
+ while True:
+ try:
+ found_files.append(next(find_fun_lines))
+ except StopIteration:
+ if len(found_files) > 1:
+ print(
+ "Found several files defining function '"
+ + fname
+ + "', cannot recommend automatically."
+ )
+ print(
+ "Check which one is appropriate and add it "
+ + "to the list of sources to be parsed:"
+ )
+ print("\n".join(found_files))
+ else:
+ print(
+ "Add the following file to the list of "
+ + "sources to be parsed:\n"
+ + found_files[0]
+ )
+ return
+ print("Could not find any files defining " + fname + ".")
+ print("Find the sources defining it and add them, " + "or provide a stub.")
+
+ tip = {
+ "message": "Found function with missing spec: "
+ + fname
+ + "\n"
+ + " Looking for files defining it...",
+ "action": partial(_action, fname),
+ }
+ tips.append(tip)
if tips != []:
- print("")
- print("***** make-wrapper recommendations *****")
- print("")
- counter = 1
- print("*** recommendation #" + str(counter) + " ***")
- print("")
- for tip in tips:
- if counter > 1:
- print("")
- print("*** recommendation #" + str(counter) + " ***")
- print(str(counter) + ". " + tip["message"])
- counter += 1
- tip["action"]()
+ print("")
+ print("***** make-wrapper recommendations *****")
+ print("")
+ counter = 1
+ print("*** recommendation #" + str(counter) + " ***")
+ print("")
+ for tip in tips:
+ if counter > 1:
+ print("")
+ print("*** recommendation #" + str(counter) + " ***")
+ print(str(counter) + ". " + tip["message"])
+ counter += 1
+ tip["action"]()
diff --git a/share/analysis-scripts/normalize_jcdb.py b/share/analysis-scripts/normalize_jcdb.py
index 58036d10ed43c675734ce83db85d9478193b6f71..64bf31d6aed119023c217a821387c792b8e26c52 100755
--- a/share/analysis-scripts/normalize_jcdb.py
+++ b/share/analysis-scripts/normalize_jcdb.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
-#-*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
##########################################################################
# #
# This file is part of Frama-C. #
@@ -22,27 +22,27 @@
# #
##########################################################################
-# This script removes absolute path references in a JSON Compilation Database.
-#
+"""This script removes absolute path references in a JSON Compilation Database."""
+
# See: http://clang.llvm.org/docs/JSONCompilationDatabase.html
import sys
import os
import json
-import re
from pathlib import Path
if len(sys.argv) < 2:
- # no argument, assume default name
- arg = Path("compile_commands.json")
+ # no argument, assume default name
+ arg = Path("compile_commands.json")
else:
- arg = Path(sys.argv[1])
+ arg = Path(sys.argv[1])
if not arg.exists():
- print(f"error: file '{arg}' not found")
- sys.exit(f"usage: {sys.argv[0]} [compile_commands.json]")
+ print(f"error: file '{arg}' not found")
+ sys.exit(f"usage: {sys.argv[0]} [compile_commands.json]")
-jcdb_json = json.loads(open(arg).read())
+with open(arg) as data:
+ jcdb_json = json.load(data)
jcdb_dir = arg.parent
out_json = {}
@@ -50,32 +50,32 @@ replacements = set()
nb_diffs = 0
for entry in jcdb_json:
- if "file" in entry and os.path.isabs(entry["file"]):
- old_entry = entry["file"]
- entry["file"] = os.path.relpath(entry["file"], jcdb_dir)
- if old_entry != entry["file"]:
- nb_diffs += 1
- replacements.add(f"{old_entry} -> {entry['file']}")
- else:
- print(f"warning: absolute path could not be normalized: {entry['file']}")
- elif "directory" in entry and os.path.isabs(entry["directory"]):
- old_entry = entry["directory"]
- entry["directory"] = os.path.relpath(entry["directory"], jcdb_dir)
- if old_entry != entry["directory"]:
- nb_diffs += 1
- replacements.add(f"{old_entry} -> {entry['directory']}")
- else:
- print(f"warning: absolute path could not be normalized: {entry['directory']}")
+ if "file" in entry and os.path.isabs(entry["file"]):
+ old_entry = entry["file"]
+ entry["file"] = os.path.relpath(entry["file"], jcdb_dir)
+ if old_entry != entry["file"]:
+ nb_diffs += 1
+ replacements.add(f"{old_entry} -> {entry['file']}")
+ else:
+ print(f"warning: absolute path could not be normalized: {entry['file']}")
+ elif "directory" in entry and os.path.isabs(entry["directory"]):
+ old_entry = entry["directory"]
+ entry["directory"] = os.path.relpath(entry["directory"], jcdb_dir)
+ if old_entry != entry["directory"]:
+ nb_diffs += 1
+ replacements.add(f"{old_entry} -> {entry['directory']}")
+ else:
+ print(f"warning: absolute path could not be normalized: {entry['directory']}")
if nb_diffs == 0:
- print(f"No changes to be applied to {arg}")
+ print(f"No changes to be applied to {arg}")
else:
- replacements_str = "\n".join(sorted(replacements))
- print(f"Replacements to be made:\n{replacements_str}")
- yn = input(f"{nb_diffs} replacements to be applied. Normalize {arg}? [y/N] ")
- if yn.lower() == "y":
- with open(arg, 'w', encoding='utf-8') as outfile:
- json.dump(jcdb_json, outfile, ensure_ascii=False, indent=4)
- print(f"Normalization applied to {arg}")
- else:
- print("Exiting without overwriting.")
+ replacements_str = "\n".join(sorted(replacements))
+ print(f"Replacements to be made:\n{replacements_str}")
+ yn = input(f"{nb_diffs} replacements to be applied. Normalize {arg}? [y/N] ")
+ if yn.lower() == "y":
+ with open(arg, "w", encoding="utf-8") as outfile:
+ json.dump(jcdb_json, outfile, ensure_ascii=False, indent=4)
+ print(f"Normalization applied to {arg}")
+ else:
+ print("Exiting without overwriting.")
diff --git a/share/analysis-scripts/print_callgraph.py b/share/analysis-scripts/print_callgraph.py
index 8b81ff79182983be300a69260c6a45532ef146f8..1e0b8ed121e3040087fdf359f62429a4740b7ea2 100755
--- a/share/analysis-scripts/print_callgraph.py
+++ b/share/analysis-scripts/print_callgraph.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
-#-*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
##########################################################################
# #
# This file is part of Frama-C. #
@@ -22,8 +22,8 @@
# #
##########################################################################
-# This script finds files containing likely declarations and definitions
-# for a given function name, via heuristic syntactic matching.
+"""This script finds files containing likely declarations and definitions
+for a given function name, via heuristic syntactic matching."""
import sys
import build_callgraph
@@ -32,25 +32,28 @@ dotfile = None
args = sys.argv[1:]
if "--dot" in args:
dotarg = args.index("--dot")
- dotfile = args[dotarg+1]
- args_before = args[:dotarg-1] if dotarg > 0 else []
- args_after = args[dotarg+2:]
+ dotfile = args[dotarg + 1]
+ args_before = args[: dotarg - 1] if dotarg > 0 else []
+ args_after = args[dotarg + 2 :]
args = args_before + args_after
if not args:
- print(f"usage: {sys.argv[0]} [--dot outfile] file1 file2 ...")
- print(" prints a heuristic callgraph for the specified files.")
- print(" If --dot is specified, print in DOT (Graphviz) format")
- print(" to file outfile, or to stdout if outfile is '-'.")
- sys.exit(1)
+ sys.exit(
+ f"""\
+usage: {sys.argv[0]} [--dot outfile] file1 file2 ...
+prints a heuristic callgraph for the specified files.
+If --dot is specified, print in DOT (Graphviz) format
+to file outfile, or to stdout if outfile is '-'."""
+ )
cg = build_callgraph.compute(args)
if dotfile:
if dotfile == "-":
out = sys.stdout
else:
- out = open(dotfile, 'w')
+ out = open(dotfile, "w")
build_callgraph.print_cg_dot(cg, out)
if dotfile != "-":
+ out.close()
print(f"wrote {dotfile}")
else:
build_callgraph.print_cg(cg)
diff --git a/share/analysis-scripts/pyproject.toml b/share/analysis-scripts/pyproject.toml
new file mode 100644
index 0000000000000000000000000000000000000000..6a34d6a74cb1789581a1e2fea38ce373dcf50026
--- /dev/null
+++ b/share/analysis-scripts/pyproject.toml
@@ -0,0 +1,12 @@
+[tool.black]
+line-length = 100
+include = '\.py$'
+extend-exclude = '''
+# If you modify this list of files, run "black -v ." to confirm which files are
+# properly excluded.
+ benchmark_database.py
+| frama_c_results.py
+| git_utils.py
+| results_display.py
+| summary.py
+'''
diff --git a/share/analysis-scripts/results_display.py b/share/analysis-scripts/results_display.py
index ad5f02286ea288d17839f03c6a3c5026e3c3db85..732784ea6ddfd9ca73f3436aedb753418fd8de30 100644
--- a/share/analysis-scripts/results_display.py
+++ b/share/analysis-scripts/results_display.py
@@ -28,6 +28,7 @@ import curses
sensitivity = 0.02
+
class ResultsFormatter(string.Formatter):
@staticmethod
def format_memory(kilobytes):
@@ -37,14 +38,14 @@ class ResultsFormatter(string.Formatter):
if megabytes < 4096:
return str(megabytes) + " MiB"
gigabytes = round(megabytes / 1024)
- return str(gygabytes) + " GiB"
+ return str(gigabytes) + " GiB"
@staticmethod
def format_time(seconds):
if seconds < 10:
- return str(round(seconds,2)) + "s"
+ return str(round(seconds, 2)) + "s"
if seconds < 100:
- return str(round(seconds,1)) + "s"
+ return str(round(seconds, 1)) + "s"
if seconds < 600:
return str(round(seconds)) + "s"
minutes = round(seconds / 60)
@@ -66,29 +67,31 @@ class ResultsFormatter(string.Formatter):
try:
return super().get_field(field_name, args, kwargs)
except (KeyError, AttributeError):
- return None,field_name
+ return None, field_name
def format_field(self, value, format_spec):
- if value == None:
+ if value is None:
return ""
- elif format_spec.startswith('+cmp:'):
+ elif format_spec.startswith("+cmp:"):
remainder = format_spec.split("+cmp:",1)[1]
return (self.attribute(value, False) +
self.format_field(value, remainder) + "@=")
- elif format_spec.startswith('-cmp:'):
+ elif format_spec.startswith("-cmp:"):
remainder = format_spec.split("-cmp:",1)[1]
return (self.attribute(value, True) +
self.format_field(value, remainder) + "@=")
- elif format_spec == 'time':
+ elif format_spec == "time":
return self.format_time(value)
- elif format_spec == 'memory':
+ elif format_spec == "memory":
return self.format_memory(value)
else:
return super().format_field(value, format_spec)
-class UserExitRequest (Exception):
+
+class UserExitRequest(Exception):
pass
+
class PlainDisplay:
NEGATIVE = 1
POSITIVE = 2
@@ -122,7 +125,7 @@ class PlainDisplay:
def rich_write(self, text, override=None, size=0):
attributes = 0
n = 0
- for s in re.split(r'(@.)', text):
+ for s in re.split(r"(@.)", text):
if s == "@=":
attributes = 0
elif s == "@+":
@@ -133,7 +136,7 @@ class PlainDisplay:
n += len(s)
self.write(s, attributes if override is None else override)
if n < size:
- self.write(' ' * (size - n), attributes if override is None else override)
+ self.write(" " * (size - n), attributes if override is None else override)
fmt = ResultsFormatter()
@@ -143,12 +146,12 @@ class PlainDisplay:
def print_table(self, results):
self.write(" ", self.HEADER)
for column in self.columns:
- self.write(self.format('{caption:^{size}}', **column), self.HEADER)
+ self.write(self.format("{caption:^{size}}", **column), self.HEADER)
self.write(" ", self.HEADER)
self.write("\n-")
for column in self.columns:
- self.write(self.format('{:-^{size}}', "", **column))
+ self.write(self.format("{:-^{size}}", "", **column))
self.write("-")
self.write("\n")
@@ -162,7 +165,7 @@ class PlainDisplay:
attribute = self.OBSOLETE
else:
attribute = None
- self.rich_write(s, attribute, size=column['size'])
+ self.rich_write(s, attribute, size=column["size"])
self.write(" ")
self.write("\n")
@@ -177,9 +180,9 @@ class PlainDisplay:
class CursesDisplay(PlainDisplay):
def __init__(self, stdscr):
self.stdscr = stdscr
- #curses.mousemask(curses.ALL_MOUSE_EVENTS)
+ # curses.mousemask(curses.ALL_MOUSE_EVENTS)
stdscr.nodelay(True)
- stdscr.refresh() # Needs to be done once or nothing will be output
+ stdscr.refresh() # Needs to be done once or nothing will be output
self.window = curses.newpad(400, 160)
curses.init_color(curses.COLOR_YELLOW, 300, 300, 300)
@@ -202,19 +205,18 @@ class CursesDisplay(PlainDisplay):
PlainDisplay.print_table(self, results)
height, width = self.stdscr.getmaxyx()
try:
- self.window.refresh(0, 0, 0, 0, 1, width-1)
- self.window.refresh(self.scroll_y+2, 0, 2, 0, height-1, width-1)
+ self.window.refresh(0, 0, 0, 0, 1, width - 1)
+ self.window.refresh(self.scroll_y + 2, 0, 2, 0, height - 1, width - 1)
except Exception:
# getmaxyx may be out of date, especially when resizing down the
# window ; just ignore errors
pass
-
def process_inputs(self):
previous_y = self.scroll_y
c = self.stdscr.getch()
while c != -1:
- if c == ord('q'):
+ if c == ord("q"):
raise UserExitRequest
elif c == curses.KEY_UP:
self.scroll_y -= 1
@@ -225,7 +227,7 @@ class CursesDisplay(PlainDisplay):
elif c == curses.KEY_PPAGE:
self.scroll_y -= 10
elif c == curses.KEY_MOUSE:
- id,x,y,z,bstate = curses.getmouse()
+ id, x, y, z, bstate = curses.getmouse()
if z > 0:
self.scroll_y += 1
elif z < 0:
@@ -237,19 +239,20 @@ class CursesDisplay(PlainDisplay):
def wrapper(f, *args, **kwargs):
- if 'curses' in kwargs:
- use_curses = kwargs['curses']
- del kwargs['curses']
+ if "curses" in kwargs:
+ use_curses = kwargs["curses"]
+ del kwargs["curses"]
else:
use_curses = False
if use_curses:
+
def g(stdscr):
nonlocal f, args, kwargs
display = CursesDisplay(stdscr)
return f(display, *args, **kwargs)
+
return curses.wrapper(g)
else:
display = PlainDisplay()
return f(display, *args, **kwargs)
-
diff --git a/share/analysis-scripts/source_filter.py b/share/analysis-scripts/source_filter.py
index 90556ffc842157ffdf499430660efcb5267f76df..c255e89c28a0906f14964152f4fbb18ad914db00 100644
--- a/share/analysis-scripts/source_filter.py
+++ b/share/analysis-scripts/source_filter.py
@@ -1,4 +1,4 @@
-#-*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
##########################################################################
# #
# This file is part of Frama-C. #
@@ -21,9 +21,9 @@
# #
##########################################################################
-# This file provides some functions to open and filter source files
-# before they are used by other scripts. These filters help improve
-# the efficiency of regex-based heuristics.
+"""This file provides some functions to open and filter source files
+before they are used by other scripts. These filters help improve
+the efficiency of regex-based heuristics."""
# These filters require external tools, either in the PATH, or in
# environment variables (the latter has higher priority than the former).
@@ -38,34 +38,62 @@
# does _not_ lead to an error.
import os
-from pathlib import Path
+from pathlib import Path
import shutil
import subprocess
import sys
# warnings about missing commands are disabled during testing
-emit_warns = os.getenv("PTESTS_TESTING") == None
+emit_warns = os.getenv("PTESTS_TESTING") is None
+
+# Cache for get_command
+cached_commands = {}
+
+
+def resource_path(relative_path):
+ """Get absolute path to resource; only used by the pyinstaller standalone distribution"""
+ base_path = getattr(sys, "_MEIPASS", os.path.dirname(os.path.abspath(__file__)))
+ return os.path.join(base_path, relative_path)
+
-# Returns a Path to the command binary, or None if it is not found
-# Emits a warning the first time it looks for a command
-warned = {}
def get_command(command, env_var_name):
+ """Returns a Path to the command; priority goes to the environment variable,
+ then in the PATH, then in the resource directory (for a pyinstaller binary)."""
+ if command in cached_commands:
+ return cached_commands[command]
p = os.getenv(env_var_name)
- if not p:
+ if p:
+ p = Path(p)
+ else:
p = shutil.which(command)
- if not p:
- if emit_warns and command not in warned:
- print(f"info: optional external command '{command}' not found in PATH; consider installing it or setting environment variable {env_var_name}")
- warned[command] = True
- return None
- return Path(p)
+ if p:
+ p = Path(p)
+ else:
+ p = Path(resource_path(command))
+ if not p.exists():
+ if emit_warns:
+ print(
+ f"info: optional external command '{command}' not found in PATH; "
+ f"consider installing it or setting environment variable {env_var_name}"
+ )
+ p = None
+ cached_commands[command] = p
+ return p
+
def run_and_check(command_and_args, input_data):
try:
- return subprocess.check_output(command_and_args, input=input_data, stderr=None, encoding="ascii", errors="ignore")
+ return subprocess.check_output(
+ command_and_args,
+ input=input_data,
+ stderr=None,
+ encoding="ascii",
+ errors="ignore",
+ )
except subprocess.CalledProcessError as e:
sys.exit(f"error running command: {command_and_args}\n{e}")
+
def filter_with_scc(input_data):
scc = get_command("scc", "SCC")
if scc:
@@ -73,17 +101,21 @@ def filter_with_scc(input_data):
else:
return input_data
+
def filter_with_astyle(input_data):
astyle = get_command("astyle", "ASTYLE")
if astyle:
- return run_and_check([astyle, "--keep-one-line-blocks", "--keep-one-line-statements"], input_data)
+ return run_and_check(
+ [astyle, "--keep-one-line-blocks", "--keep-one-line-statements"], input_data
+ )
else:
return input_data
+
def open_and_filter(filename, apply_filters):
# we ignore encoding errors and use ASCII to avoid issues when
# opening files with different encodings (UTF-8, ISO-8859, etc)
- with open(filename, "r", encoding="ascii", errors='ignore') as f:
+ with open(filename, "r", encoding="ascii", errors="ignore") as f:
data = f.read()
if apply_filters:
data = filter_with_astyle(filter_with_scc(data))
diff --git a/share/analysis-scripts/summary.py b/share/analysis-scripts/summary.py
index 3346fde1ffe31f46b071f823140adba2bc62058a..8c9949fa10ab2cc036ab80477dc0e848506c0ce7 100755
--- a/share/analysis-scripts/summary.py
+++ b/share/analysis-scripts/summary.py
@@ -1,5 +1,5 @@
#!/usr/bin/env python3
-#-*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
##########################################################################
# #
# This file is part of Frama-C. #
@@ -35,21 +35,24 @@ import frama_c_results
import results_display
import benchmark_database
+
class OperationException(Exception):
pass
+
def build_make_environment(framac):
if framac is None:
- env = { **os.environ }
+ env = {**os.environ}
args = []
else:
- env = { **os.environ, 'PATH' : f"{framac}/bin:{os.environ['PATH']}" }
+ env = { **os.environ, "PATH" : f"{framac}/bin:{os.environ['PATH']}" }
args = [
f"FRAMAC_BIN={framac}/bin",
f"FRAMAC={framac}/bin/frama-c"
]
return env, args
+
def list_targets(dir):
if not os.path.isdir(dir):
raise OperationException(f"target is not a directory: {dir}")
@@ -59,7 +62,8 @@ def list_targets(dir):
["make", "--directory", dir, "--quiet", "display-targets"] + args,
env=env,
stdout=subprocess.PIPE,
- encoding='ascii')
+ encoding="ascii",
+ )
targets = res.stdout.split()
res = []
for target in targets:
@@ -69,28 +73,34 @@ def list_targets(dir):
res += list_targets(target)
return res
+
def clone_frama_c(clonedir, hash):
print("Cloning Frama-C", hash, "...")
res = subprocess.run(
["./scripts/clone.sh", "--clone-dir", clonedir, hash],
stdout=subprocess.PIPE,
- encoding='ascii')
+ encoding="ascii",
+ )
if res.returncode != 0:
raise OperationException("Cannot clone repository. Try to manually"
"remove the broken clone in " + clonedir)
- return res.stdout.strip() + '/build'
+ return res.stdout.strip() + "/build"
def run_make(framac, benchmark_tag=None):
- args = ['make', '--keep-going', 'all']
+ args = ["make", "--keep-going", "all"]
env, var_args = build_make_environment(framac)
if benchmark_tag is None:
- args += ['-j', str(os.cpu_count ())]
+ args += ["-j", str(os.cpu_count())]
else:
- args += ['BENCHMARK=' + benchmark_tag]
- return subprocess.Popen(args + var_args, env=env,
+ args += ["BENCHMARK=" + benchmark_tag]
+ return subprocess.Popen(
+ args + var_args,
+ env=env,
stdout=subprocess.DEVNULL,
stderr=subprocess.PIPE,
- preexec_fn=os.setsid)
+ preexec_fn=os.setsid,
+ )
+
def terminate_process(process):
if process is None:
@@ -101,30 +111,33 @@ def terminate_process(process):
pass
except ProcessLookupError:
pass
- output,errors = process.communicate()
+ output, errors = process.communicate()
return errors
+
def smart_rename(target):
- target = re.sub('^\./', '', target)
- target = re.sub('main\.eva$', '', target)
- target = re.sub('\.eva$', '', target)
- target = re.sub('\.frama-c/', '', target)
- target = re.sub('qds/frama-c', 'qds', target)
+ target = re.sub("^\./", "", target)
+ target = re.sub("main\.eva$", "", target)
+ target = re.sub("\.eva$", "", target)
+ target = re.sub("\.frama-c/", "", target)
+ target = re.sub("qds/frama-c", "qds", target)
return target
+
def is_running(target):
- return os.path.isfile(target + '/running')
+ return os.path.isfile(target + "/running")
+
def poll_results(targets, benchmark_tag):
results = []
for target in targets:
- filename = target + '/stats.txt'
+ filename = target + "/stats.txt"
result = frama_c_results.read(filename)
result["target"] = target
result["target_name"] = smart_rename(target)
result["is_running"] = is_running(target)
- result["up_to_date"] = benchmark_tag is None or benchmark_tag == result['benchmark_tag']
- results.append(result);
+ result["up_to_date"] = benchmark_tag is None or benchmark_tag == result["benchmark_tag"]
+ results.append(result)
return results
@@ -136,7 +149,7 @@ def run_analyses(display, database, framac, benchmark_tag):
next_poll = time.time()
def update():
- nonlocal display, database, targets, benchmark_tag, results
+ nonlocal display, database, targets, benchmark_tag, results
results = poll_results(targets, benchmark_tag)
if not database is None:
database.update(results)
@@ -156,11 +169,11 @@ def run_analyses(display, database, framac, benchmark_tag):
print("Analyzes interrupted by user.")
except Exception as e:
# terminate_process below is somehow blocking the exception printing
- errors += bytearray(str(e), 'ascii')
+ errors += bytearray(str(e), "ascii")
raise e
finally:
errors += terminate_process(process)
- return results,errors
+ return results, errors
parser = argparse.ArgumentParser(
@@ -168,25 +181,25 @@ parser = argparse.ArgumentParser(
"directory with a Makefile having two rules: 'all', a target "
"that runs the analysis, and 'display-targets', the target that "
"lists the built results.")
-parser.add_argument('rev', nargs='?', metavar="REVISION",
+parser.add_argument("rev", nargs="?", metavar="REVISION",
help="a Frama-C revision to use for analyses (default: use the "
"default configuration for Frama-C)")
-parser.add_argument('-b', '--benchmark',
+parser.add_argument("-b", "--benchmark",
action="store_true",
help="sets benchmark mode: do not run analyses in parallel and rerun all "
"analyses")
-parser.add_argument('-v', '--vs',
+parser.add_argument("-v", "--vs",
action="store", metavar="REVISION", default="master",
help="a revision to compare the results to")
-parser.add_argument('-c', '--comment',
+parser.add_argument("-c", "--comment",
action="store", metavar="COMMENT",
help="when benchmarking, add this comment inside the database")
-parser.add_argument('-p', '--repository-path',
+parser.add_argument("-p", "--repository-path",
action="store", metavar="PATH",
help="don't clone Frama-C, use this git repository instead")
-errors = b''
+errors = b""
try:
args = parser.parse_args()
@@ -204,10 +217,10 @@ try:
gitdir = framac
if args.benchmark:
- benchmark_tag=str(uuid.uuid1())
+ benchmark_tag = str(uuid.uuid1())
print("Running benchmarks with benchmark tag", benchmark_tag, "...")
else:
- benchmark_tag=None
+ benchmark_tag = None
print("Running analyses ...")
benchmark_comment = args.comment
@@ -225,6 +238,6 @@ try:
results_display.PlainDisplay().print_table(results)
except OperationException as e:
- errors += bytearray(str(e), 'ascii')
+ errors += bytearray(str(e), "ascii")
-sys.stderr.buffer.write(errors + b'\n')
+sys.stderr.buffer.write(errors + b"\n")
diff --git a/share/dune b/share/dune
index 64fd75965747ad89722616b81793cb3788af2c91..ecda8fe4361601e2d13a3e2fb9baf0377d3db79a 100644
--- a/share/dune
+++ b/share/dune
@@ -255,13 +255,13 @@
(analysis-scripts/heuristic_list_functions.py as analysis-scripts/heuristic_list_functions.py)
(analysis-scripts/list_files.py as analysis-scripts/list_files.py)
(analysis-scripts/list_functions.ml as analysis-scripts/list_functions.ml)
-(analysis-scripts/make_template.py as analysis-scripts/make_template.py)
(analysis-scripts/make_wrapper.py as analysis-scripts/make_wrapper.py)
(analysis-scripts/normalize_jcdb.py as analysis-scripts/normalize_jcdb.py)
(analysis-scripts/parse-coverage.sh as analysis-scripts/parse-coverage.sh)
(analysis-scripts/plot.sh as analysis-scripts/plot.sh)
(analysis-scripts/print_callgraph.py as analysis-scripts/print_callgraph.py)
(analysis-scripts/prologue.mk as analysis-scripts/prologue.mk)
+(analysis-scripts/pyproject.toml as analysis-scripts/pyproject.toml)
(analysis-scripts/readme-graph.graphml as analysis-scripts/readme-graph.graphml)
(analysis-scripts/readme-graph.svg as analysis-scripts/readme-graph.svg)
(analysis-scripts/README.md as analysis-scripts/README.md)
diff --git a/share/libc/sys/socket.h b/share/libc/sys/socket.h
index bbfa44c8c4870a434e4ad392dd8e6f673e9bbe3d..114226d440b98d6ddeb1f02ee7ef9249709a3be9 100644
--- a/share/libc/sys/socket.h
+++ b/share/libc/sys/socket.h
@@ -443,11 +443,10 @@ extern int listen(int sockfd, int backlog);
*/
extern ssize_t recv(int sockfd, void * buf, size_t len, int flags);
-
/*@
requires valid_sockfd: 0 <= sockfd < __FC_MAX_OPEN_SOCKETS;
requires valid_buffer_length: \valid((char *)buf+(0 .. len-1));
- requires valid_addrbuf_or_null: (\valid(addrbuf_len) &&
+ requires valid_addrbuf_or_null:initialization: (\valid(addrbuf_len) &&
\initialized(addrbuf_len) &&
\valid((char *)addrbuf+(0 .. *addrbuf_len-1)))
|| (addrbuf == \null && addrbuf_len == \null);
@@ -503,7 +502,23 @@ extern ssize_t recvmsg(int sockfd, struct msghdr *hdr, int flags);
ensures error_or_chars_sent: \result == -1 || 0 <= \result <= len;
*/
extern ssize_t send(int sockfd, const void *buf, size_t len, int flags);
-extern ssize_t sendmsg(int, const struct msghdr *, int);
+
+/*@
+ requires available_sockfd: 0 <= sockfd < __FC_MAX_OPEN_SOCKETS;
+ requires valid_message: \valid_read(message);
+ requires valid_msg_iov:
+ \valid_read(message->msg_iov+(0 .. message->msg_iovlen - 1));
+ assigns __fc_sockfds[sockfd]
+ \from __fc_sockfds[sockfd],
+ indirect:*message,
+ indirect:message->msg_iov[0 .. message->msg_iovlen - 1],
+ indirect:flags;
+ assigns \result \from indirect:sockfd, indirect:__fc_sockfds[sockfd],
+ indirect:*message,
+ indirect:message->msg_iov[0 .. message->msg_iovlen - 1];
+ ensures error_or_chars_sent: \result == -1 || 0 <= \result;
+ */
+extern ssize_t sendmsg(int sockfd, const struct msghdr *message, int flags);
/*@
requires available_sockfd: 0 <= sockfd < __FC_MAX_OPEN_SOCKETS;
diff --git a/share/libc/unistd.h b/share/libc/unistd.h
index 34961a42ef36a7b529797e1df57f6a644cc90a8a..f26a5b8ed9b284074e578891a1bd46a8c3d6d20b 100644
--- a/share/libc/unistd.h
+++ b/share/libc/unistd.h
@@ -947,7 +947,21 @@ extern char *getwd(char *);
extern int isatty(int fd);
extern int lchown(const char *, uid_t, gid_t);
-extern int link(const char *, const char *);
+
+/*@ //missing: may assign to errno: EACCES, EEXIST, ELOOP, EMLINK, ENAMETOOLONG,
+ // ENOENT, ENOSPC, ENOTDIR, EPERM, EROFS,
+ // EXDEV, EBADF, ENOTDIR, EINVAL;
+ // missing: assigns 'filesystem' \from path1[0..strlen(path1)],
+ // path2[0..strlen(path2)];
+ // missing: assigns \result \from 'paths in filesystem'
+ requires valid_path: valid_read_string(path1);
+ requires valid_path: valid_read_string(path2);
+ assigns \result \from indirect:path1[0 .. strlen(path1)],
+ indirect:path2[0 .. strlen(path2)];
+ ensures result_ok_or_error: \result == 0 || \result == -1;
+ */
+extern int link(const char *path1, const char *path2);
+
extern int lockf(int, int, off_t);
/*@ //missing: may assign to errno: EBADF, EINVAL, EOVERFLOW, ESPIPE, ENXIO (Linux);
@@ -1108,7 +1122,7 @@ extern useconds_t ualarm(useconds_t, useconds_t);
// missing: assigns 'filesystem' \from path[0..];
// missing: assigns \result \from 'filesystem';
requires valid_string_path: valid_read_string(path);
- assigns \result \from path[0..];
+ assigns \result \from indirect:path[0..strlen(path)];
ensures result_ok_or_error: \result == 0 || \result == -1;
*/
extern int unlink(const char *path);
diff --git a/src/kernel_internals/typing/cabs2cil.ml b/src/kernel_internals/typing/cabs2cil.ml
index 6565c42e26b90484061688e74f20ca9fdb638c8e..56bdc4be01fa55488dceaaea12694183e084388d 100644
--- a/src/kernel_internals/typing/cabs2cil.ml
+++ b/src/kernel_internals/typing/cabs2cil.ml
@@ -1388,7 +1388,7 @@ let fail_if_incompatible_sizeof ~ensure_complete op typ =
(Cil.allowed_machdep "GCC/MSVC");
if ensure_complete && not (Cil.isCompleteType typ) && not is_void then
Kernel.error ~current:true
- "%s on incomplete type '%a'" op Cil_printer.pp_typ typ
+ "%s on incomplete type '%a'" op Cil_datatype.Typ.pretty typ
(******** CASTS *********)
@@ -1439,7 +1439,7 @@ let is_scalar_type t =
Abort if invalid *)
let checkBool (ot : typ) (_ : exp) =
if not (is_scalar_type ot) then
- Kernel.fatal ~current:true "castToBool %a" Cil_printer.pp_typ ot
+ Kernel.fatal ~current:true "castToBool %a" Cil_datatype.Typ.pretty ot
(* Evaluate constants to CTrue (non-zero) or CFalse (zero) *)
let rec isConstTrueFalse c: [ `CTrue | `CFalse ] =
@@ -2150,7 +2150,7 @@ struct
Kernel.feedback ~once:true ~source:(fst e.eloc)
"Case label %a exceeds range of %a for switch expression. \
Nothing to worry."
- Cil_printer.pp_exp e Cil_printer.pp_typ t;
+ Cil_printer.pp_exp e Cil_datatype.Typ.pretty t;
| _ -> ()
);
Case (e'', loc)
@@ -2764,7 +2764,7 @@ let rec combineTypes (what: combineWhat) (oldt: typ) (t: typ) : typ =
oldargslist argslist;
(* Go over the arguments and update the old ones with the
* adjusted types *)
- (* Format.printf "new type is %a@." Cil_printer.pp_typ t; *)
+ (* Format.printf "new type is %a@." Cil_datatype.Typ.pretty t; *)
let what =
match what with
| CombineFundef b -> CombineFunarg b
@@ -2815,7 +2815,7 @@ let rec combineTypes (what: combineWhat) (oldt: typ) (t: typ) : typ =
| _ -> raise (Cannot_combine
(Format.asprintf "different type constructors:@ %a and %a"
- Cil_printer.pp_typ oldt Cil_printer.pp_typ t))
+ Cil_datatype.Typ.pretty oldt Cil_datatype.Typ.pretty t))
let get_qualifiers t = Cil.filter_qualifier_attributes (Cil.typeAttrs t)
@@ -2905,18 +2905,16 @@ let rec castTo ?context ?(fromsource=false)
(ot : typ) (nt : typ) (e : exp) : (typ * exp ) =
Kernel.debug ~dkey:Kernel.dkey_typing_cast "@[%t: castTo:%s %a->%a@\n@]"
Cil.pp_thisloc (if fromsource then "(source)" else "")
- Cil_printer.pp_typ ot Cil_printer.pp_typ nt;
- let ot' = unrollType ot in
- let nt' = unrollType nt in
- if not fromsource && not (need_cast ot' nt') then begin
+ Cil_datatype.Typ.pretty ot Cil_datatype.Typ.pretty nt;
+ if not fromsource && not (need_cast ot nt) then begin
(* Do not put the cast if it is not necessary, unless it is from the
* source. *)
Kernel.debug ~dkey:Kernel.dkey_typing_cast "no cast to perform";
(ot, e)
end else begin
- let nt' = if fromsource then nt' else !typeForInsertedCast e ot' nt' in
- let result = (nt', if theMachine.insertImplicitCasts || fromsource then
- Cil.mkCastT ~force:true ~oldt:ot ~newt:nt' e else e)
+ let nt = if fromsource then nt else !typeForInsertedCast e ot nt in
+ let result = (nt, if theMachine.insertImplicitCasts || fromsource then
+ Cil.mkCastT ~force:true ~oldt:ot ~newt:nt e else e)
in
let error s =
if fromsource then abort_context s else Kernel.fatal ~current:true s
@@ -2925,10 +2923,10 @@ let rec castTo ?context ?(fromsource=false)
ignore (check_strict_attributes true ot nt && check_strict_attributes false nt ot);*)
Kernel.debug ~dkey:Kernel.dkey_typing_cast
"@[castTo: ot=%a nt=%a\n result is %a@\n@]"
- Cil_printer.pp_typ ot Cil_printer.pp_typ nt'
+ Cil_datatype.Typ.pretty ot Cil_datatype.Typ.pretty nt
Cil_printer.pp_exp (snd result);
(* Now see if we can have a cast here *)
- match ot', nt' with
+ match Cil.unrollType ot, Cil.unrollType nt with
| TNamed _, _
| _, TNamed _ -> Kernel.fatal ~current:true "unrollType failed in castTo"
| t, TInt(IBool,_) when is_scalar_type t ->
@@ -2936,7 +2934,7 @@ let rec castTo ?context ?(fromsource=false)
else
nt,
Cil.mkCastT
- ~oldt:ot ~newt:nt'
+ ~oldt:ot ~newt:nt
(constFold true
(new_exp ~loc:e.eloc
(BinOp(Ne,e,Cil.integer ~loc:e.eloc 0,intType))))
@@ -2955,14 +2953,14 @@ let rec castTo ?context ?(fromsource=false)
error
"conversion between function types with \
different number of arguments:@ %a@ and@ %a"
- Cil_printer.pp_typ ot Cil_printer.pp_typ nt;
+ Cil_datatype.Typ.pretty ot Cil_datatype.Typ.pretty nt;
if not (areCompatibleTypes ?context ot nt) then
Kernel.warning
~wkey:Kernel.wkey_incompatible_types_call
~current:true
"implicit conversion between incompatible function types:@ \
%a@ and@ %a"
- Cil_printer.pp_typ ot Cil_printer.pp_typ nt;
+ Cil_datatype.Typ.pretty ot Cil_datatype.Typ.pretty nt;
result
| TFun _, TPtr(TFun _, _) ->
@@ -2971,7 +2969,7 @@ let rec castTo ?context ?(fromsource=false)
| Lval lv -> Cil.mkAddrOf ~loc:e.eloc lv
| _ -> e (* function decay into pointer anyway *)
in
- castTo ?context ~fromsource (TPtr (ot', [])) nt' clean_e
+ castTo ?context ~fromsource (TPtr (ot, [])) nt clean_e
(* accept converting a ptr to function to/from a ptr to void, even though
not really accepted by the standard. gcc supports it. though
@@ -2999,16 +2997,16 @@ let rec castTo ?context ?(fromsource=false)
Kernel.warning
~wkey:Kernel.wkey_incompatible_pointer_types
~current:true
- "casting function to %a" Cil_printer.pp_typ nt;
+ "casting function to %a" Cil_datatype.Typ.pretty nt;
result
| TPtr _, TPtr (TFun _,_) ->
Kernel.warning
~wkey:Kernel.wkey_incompatible_pointer_types
~current:true
- "casting function from %a" Cil_printer.pp_typ ot;
+ "casting function from %a" Cil_datatype.Typ.pretty ot;
result
| _, TPtr (TFun _, _) ->
- error "cannot cast %a to function type" Cil_printer.pp_typ ot
+ error "cannot cast %a to function type" Cil_datatype.Typ.pretty ot
| TPtr _, TPtr _ -> result
| TInt _, TPtr _ -> result
@@ -3025,10 +3023,10 @@ let rec castTo ?context ?(fromsource=false)
| TArray _, TPtr _ -> result
| TArray(t1,_,_), TArray(t2,None,_)
- when Cil_datatype.Typ.equal t1 t2 -> (nt', e)
+ when Cil_datatype.Typ.equal t1 t2 -> (nt, e)
| TPtr _, TArray(_,_,_) ->
- error "Cast over a non-scalar type %a" Cil_printer.pp_typ nt';
+ error "Cast over a non-scalar type %a" Cil_datatype.Typ.pretty nt;
| TEnum _, TInt _ -> result
| TFloat _, (TInt _|TEnum _) -> result
@@ -3039,7 +3037,7 @@ let rec castTo ?context ?(fromsource=false)
| Const (CEnum { eihost = ei'})
when ei.ename = ei'.ename && not fromsource &&
Cil.bytesSizeOfInt ik = Cil.bytesSizeOfInt ei'.ekind
- -> (nt',e)
+ -> (nt,e)
| _ -> result)
| TEnum _, TEnum _ -> result
@@ -3049,7 +3047,7 @@ let rec castTo ?context ?(fromsource=false)
| (TInt _ | TPtr _), TBuiltin_va_list _ ->
Kernel.debug ~dkey:Kernel.dkey_typing_cast ~current:true
- "Casting %a to __builtin_va_list" Cil_printer.pp_typ ot ;
+ "Casting %a to __builtin_va_list" Cil_datatype.Typ.pretty ot ;
result
| TPtr _, TEnum _ ->
@@ -3077,7 +3075,7 @@ let rec castTo ?context ?(fromsource=false)
match isTransparentUnion ot with
| None ->
Kernel.fatal ~current:true "castTo %a -> %a"
- Cil_printer.pp_typ ot Cil_printer.pp_typ nt'
+ Cil_datatype.Typ.pretty ot Cil_datatype.Typ.pretty nt
| Some fstfield -> begin
(* We do it now only if the expression is an lval *)
let e' =
@@ -3091,11 +3089,11 @@ let rec castTo ?context ?(fromsource=false)
Cil_printer.pp_exp e
in
(* Continue casting *)
- castTo ?context ~fromsource:fromsource fstfield.ftype nt' e'
+ castTo ?context ~fromsource:fromsource fstfield.ftype nt e'
end
end
| _ ->
- error "cannot cast from %a to %a@\n" Cil_printer.pp_typ ot Cil_printer.pp_typ nt'
+ error "cannot cast from %a to %a@\n" Cil_datatype.Typ.pretty ot Cil_datatype.Typ.pretty nt
end
(* Create and cache varinfo's for globals. Starts with a varinfo but if the
@@ -3187,8 +3185,8 @@ let makeGlobalVarinfo (isadef: bool) (vi: varinfo) : varinfo * bool =
with Cannot_combine reason ->
Kernel.debug ~dkey:Kernel.dkey_typing_global
"old type = %a\nnew type = %a\n"
- Cil_printer.pp_typ oldvi.vtype
- Cil_printer.pp_typ vi.vtype ;
+ Cil_datatype.Typ.pretty oldvi.vtype
+ Cil_datatype.Typ.pretty vi.vtype ;
Kernel.error ~once:true ~current:true
"Declaration of %s does not match previous declaration from \
%a (%s)."
@@ -3347,13 +3345,13 @@ let conditionalConversion (t2: typ) (t3: typ) : typ =
try combineTypes CombineOther t2' t3'
with Cannot_combine msg -> begin
Kernel.warning ~current:true "A.QUESTION: %a does not match %a (%s)"
- Cil_printer.pp_typ (unrollType t2) Cil_printer.pp_typ (unrollType t3) msg;
+ Cil_datatype.Typ.pretty (unrollType t2) Cil_datatype.Typ.pretty (unrollType t3) msg;
t2 (* Just pick one *)
end
end
| _, _ ->
Kernel.fatal ~current:true "invalid implicit conversion from %a to %a"
- Cil_printer.pp_typ t2 Cil_printer.pp_typ t3
+ Cil_datatype.Typ.pretty t2 Cil_datatype.Typ.pretty t3
in
tresult
@@ -3361,7 +3359,7 @@ let logicConditionalConversion t1 t2 =
match unrollType t1, unrollType t2 with
| TPtr _ , TInt _ | TInt _, TPtr _ ->
Kernel.fatal ~current:true "invalid implicit conversion from %a to %a"
- Cil_printer.pp_typ t2 Cil_printer.pp_typ t1
+ Cil_datatype.Typ.pretty t2 Cil_datatype.Typ.pretty t1
| _ -> conditionalConversion t1 t2
(* Some utilities for doing initializers *)
@@ -3468,18 +3466,18 @@ let rec collectInitializer
let loc = CurrentLoc.get() in
if this = NoInitPre then begin
Kernel.debug ~dkey "zero-initializing object of type %a"
- Cil_printer.pp_typ thistype;
+ Cil_datatype.Typ.pretty thistype;
(makeZeroInit ~loc thistype), thistype, reads
end else
match unrollType thistype, this with
| _ , SinglePre (e, r) ->
Kernel.debug ~dkey "Initializing object of type %a to %a"
- Cil_printer.pp_typ thistype Cil_printer.pp_exp e;
+ Cil_datatype.Typ.pretty thistype Cil_printer.pp_exp e;
SingleInit e, thistype, Cil_datatype.Lval.Set.union r reads
| TArray (bt, leno, at), CompoundPre (pMaxIdx, pArray) ->
Kernel.debug ~dkey
"Initialization of an array object of type %a with index max %d"
- Cil_printer.pp_typ thistype !pMaxIdx;
+ Cil_datatype.Typ.pretty thistype !pMaxIdx;
let len, initializer_len_used =
(* normal case: use array's declared length, newtype=thistype *)
match leno with
@@ -3553,7 +3551,7 @@ let rec collectInitializer
*)
Kernel.debug ~dkey
"Detected initialization of a flexible array member \
- (length %d, parenttype %a)" len Cil_printer.pp_typ parenttype;
+ (length %d, parenttype %a)" len Cil_datatype.Typ.pretty parenttype;
Kernel.error ~once:true ~current:true
"static initialization of flexible array members is an \
unsupported GNU extension";
@@ -3576,7 +3574,7 @@ let rec collectInitializer
CompoundPre (pMaxIdx, pArray) when comp.cstruct ->
Kernel.debug ~dkey
"Initialization of an object of type %a with at least %d components"
- Cil_printer.pp_typ thistype !pMaxIdx;
+ Cil_datatype.Typ.pretty thistype !pMaxIdx;
let rec collect (idx: int) reads = function
[] -> [], reads
| [ _ ] when Cil.has_flexible_array_member t && idx > !pMaxIdx ->
@@ -3604,7 +3602,7 @@ let rec collectInitializer
| TComp (comp, _), CompoundPre (pMaxIdx, pArray) when not comp.cstruct ->
Kernel.debug ~dkey
"Initialization of an object of type %a with at least %d components"
- Cil_printer.pp_typ thistype !pMaxIdx;
+ Cil_datatype.Typ.pretty thistype !pMaxIdx;
(* Find the field to initialize *)
let rec findField (idx: int) = function
| [] -> abort_context "collectInitializer: union"
@@ -3987,7 +3985,7 @@ let integral_cast ty t =
raise
(Failure
(Format.asprintf "term %a has type %a, but %a is expected"
- Cil_printer.pp_term t Cil_printer.pp_logic_type Linteger Cil_printer.pp_typ ty))
+ Cil_printer.pp_term t Cil_printer.pp_logic_type Linteger Cil_datatype.Typ.pretty ty))
(* Exception raised by the instance of Logic_typing local to this module.
See document of [error] below. *)
@@ -5189,11 +5187,11 @@ and doType (ghost:bool) isFuncArg
if Cil.isFunctionType bt then
Kernel.error ~once:true ~current:true
"declaration of array of function type '%a`"
- Cil_printer.pp_typ bt
+ Cil_datatype.Typ.pretty bt
else if not (Cil.isCompleteType ~allowZeroSizeArrays:true bt) then
Kernel.error ~once:true ~current:true
"declaration of array of incomplete type '%a`"
- Cil_printer.pp_typ bt
+ Cil_datatype.Typ.pretty bt
else if not allowZeroSizeArrays &&
not (Cil.isCompleteType ~allowZeroSizeArrays:false bt)
then
@@ -5203,12 +5201,12 @@ and doType (ghost:bool) isFuncArg
Kernel.warning ~once:true ~current:true
"declaration of array of 'zero-length arrays' ('%a`);@ \
zero-length arrays are a compiler extension"
- Cil_printer.pp_typ bt
+ Cil_datatype.Typ.pretty bt
else
Kernel.error ~once:true ~current:true
"declaration of array of 'zero-length arrays' ('%a`);@ \
zero-length arrays are not allowed in C99"
- Cil_printer.pp_typ bt;
+ Cil_datatype.Typ.pretty bt;
let lo =
match len.expr_node with
| Cabs.NOTHING -> None
@@ -5527,13 +5525,13 @@ and makeCompType ghost (isstruct: bool)
Kernel.error ~source
"flexible array member '%s' (type %a) \
not allowed in otherwise empty struct"
- n Cil_printer.pp_typ ftype
+ n Cil_datatype.Typ.pretty ftype
else (* valid flexible array member *) ()
end
| _ ->
Kernel.error ~source
"field `%s' is declared with incomplete type %a"
- n Cil_printer.pp_typ ftype
+ n Cil_datatype.Typ.pretty ftype
end;
let fbitfield, ftype =
match widtho with
@@ -5558,11 +5556,11 @@ and makeCompType ghost (isstruct: bool)
if s > Cil.bitsSizeOf ftype then
Kernel.error ~source
"bitfield width (%d) exceeds its type (%a, %d bits)"
- s Cil_printer.pp_typ ftype (Cil.bitsSizeOf ftype)
+ s Cil_datatype.Typ.pretty ftype (Cil.bitsSizeOf ftype)
with
SizeOfError _ ->
Kernel.fatal ~source
- "Unable to compute size of %a" Cil_printer.pp_typ ftype
+ "Unable to compute size of %a" Cil_datatype.Typ.pretty ftype
end;
let ftype =
typeAddAttributes
@@ -5664,7 +5662,7 @@ and makeCompType ghost (isstruct: bool)
Kernel.error ~source
"field %s occurs multiple times in aggregate %a. \
Previous occurrence is at line %d."
- f.fname Cil_printer.pp_typ (TComp(comp,[]))
+ f.fname Cil_datatype.Typ.pretty (TComp(comp,[]))
(fst oldf.floc).Filepath.pos_lnum
with Not_found ->
(* Do not add unnamed bitfields: they can share the empty name. *)
@@ -5906,7 +5904,7 @@ and doExp local_env
let typ = Cil.typeOf item.eival in
(*Kernel.debug "Looking for %s got enum %s : %a of type %a"
n item.einame Cil_printer.pp_exp item.eival
- Cil_printer.pp_typ typ; *)
+ Cil_datatype.Typ.pretty typ; *)
if Cil.theMachine.Cil.lowerConstants then
finishExp [] (unspecified_chunk empty) item.eival typ
else
@@ -5948,7 +5946,7 @@ and doExp local_env
"Expecting exactly one pointer type in array access %a[%a] (%a \
and %a)"
Cil_printer.pp_exp e1' Cil_printer.pp_exp e2'
- Cil_printer.pp_typ t1 Cil_printer.pp_typ t2
+ Cil_datatype.Typ.pretty t1 Cil_datatype.Typ.pretty t2
in
(* We have to distinguish the construction based on the type of e1'' *)
let res =
@@ -5981,7 +5979,7 @@ and doExp local_env
| _ ->
Kernel.fatal ~current:true
"Expecting a pointer type in *. Got %a."
- Cil_printer.pp_typ t
+ Cil_datatype.Typ.pretty t
in
let res = mkMem ~addr:e' ~off:NoOffset in
let reads =
@@ -6044,7 +6042,7 @@ and doExp local_env
| x ->
Kernel.fatal ~current:true
"expecting a struct with field %s. Found %a. t1 is %a"
- str Cil_printer.pp_typ x Cil_printer.pp_typ t'
+ str Cil_datatype.Typ.pretty x Cil_datatype.Typ.pretty t'
in
let lv' = mkMem ~addr:e' ~off:field_offset in
let field_type = typeOfLval lv' in
@@ -6353,7 +6351,7 @@ and doExp local_env
doExp local_env CNoConst e (AExp None)
in
(* ignore (E.log "ADDROF on %a : %a\n" Cil_printer.pp_exp e'
- Cil_printer.pp_typ t); *)
+ Cil_datatype.Typ.pretty t); *)
match e'.enode with
| Lval x | CastE(_, {enode = Lval x}) | StartOf x ->
(* Recover type qualifiers that were dropped by dropQualifiers
@@ -6771,12 +6769,12 @@ and doExp local_env
| x ->
Kernel.fatal ~current:true
"Unexpected type of the called function %a: %a"
- Cil_printer.pp_exp f' Cil_printer.pp_typ x
+ Cil_printer.pp_exp f' Cil_datatype.Typ.pretty x
end
| x ->
Kernel.fatal ~current:true
"Unexpected type of the called function %a: %a"
- Cil_printer.pp_exp f' Cil_printer.pp_typ x
+ Cil_printer.pp_exp f' Cil_datatype.Typ.pretty x
in
let argTypesList = argsToList argTypes in
let warn_no_proto f =
@@ -6881,8 +6879,8 @@ and doExp local_env
Kernel.warning ~wkey:Kernel.wkey_implicit_conv_void_ptr
~current:true ~once:true
"implicit conversion from %a to %a"
- Cil_printer.pp_typ Cil.voidPtrType
- Cil_printer.pp_typ texpected;
+ Cil_datatype.Typ.pretty Cil.voidPtrType
+ Cil_datatype.Typ.pretty texpected;
true
end else
false
@@ -6892,7 +6890,7 @@ and doExp local_env
Kernel.warning ~wkey:Kernel.wkey_incompatible_types_call
~current:true ~once:true
"expected '%a' but got argument of type '%a': %a"
- Cil_printer.pp_typ texpected Cil_printer.pp_typ att
+ Cil_datatype.Typ.pretty texpected Cil_datatype.Typ.pretty att
Cil_printer.pp_exp a';
(ss @@ (sa, ghost), a'' :: args')
@@ -7795,13 +7793,13 @@ and doBinOp loc (bop: binop) (e1: exp) (t1: typ) (e2: exp) (t2: typ) =
tres
| _ ->
Kernel.fatal ~current:true "%a operator on non-integer type %a"
- Cil_printer.pp_binop bop Cil_printer.pp_typ tres
+ Cil_printer.pp_binop bop Cil_datatype.Typ.pretty tres
in
(* Invariant: t1 and t2 are pointers types *)
let pointerComparison e1 t1 e2 t2 =
if false then Kernel.debug "%a %a %a %a"
- Cil_printer.pp_exp e1 Cil_printer.pp_typ t1
- Cil_printer.pp_exp e2 Cil_printer.pp_typ t2;
+ Cil_printer.pp_exp e1 Cil_datatype.Typ.pretty t1
+ Cil_printer.pp_exp e2 Cil_datatype.Typ.pretty t2;
let t1p = Cil.(unrollType (typeOf_pointed t1)) in
let t2p = Cil.(unrollType (typeOf_pointed t2)) in
(* We are more lenient than the norm here (C99 6.5.8, 6.5.9), and cast
@@ -8118,7 +8116,7 @@ and doInitializer local_env (vi: varinfo) (inite: Cabs.init_expression)
Kernel.debug ~dkey:Kernel.dkey_typing_init
"@\nStarting a new initializer for %s : %a@\n"
- vi.vname Cil_printer.pp_typ vi.vtype;
+ vi.vname Cil_datatype.Typ.pretty vi.vtype;
let acc, preinit, restl =
let so = makeSubobj vi vi.vtype NoOffset in
let asconst = if vi.vglob then CConst else CNoConst in
@@ -8139,7 +8137,7 @@ and doInitializer local_env (vi: varinfo) (inite: Cabs.init_expression)
in
Kernel.debug ~dkey:Kernel.dkey_typing_init
"Finished the initializer for %s@\n init=%a@\n typ=%a@\n acc=%a@\n"
- vi.vname Cil_printer.pp_init init Cil_printer.pp_typ typ' d_chunk acc;
+ vi.vname Cil_printer.pp_init init Cil_datatype.Typ.pretty typ' d_chunk acc;
empty @@ (acc, local_env.is_ghost), init, typ'', reads
(* Consume some initializers. This is used by both global and local variables
@@ -8394,8 +8392,8 @@ and doInit local_env asconst add_implicit_ensures preinit so acc initl =
in
let r = Cil_datatype.Lval.Set.of_list r in
Kernel.debug ~dkey:Kernel.dkey_typing_init "oneinit'=%a, t'=%a, so.soTyp=%a"
- Cil_printer.pp_exp oneinit' Cil_printer.pp_typ t'
- Cil_printer.pp_typ so.soTyp;
+ Cil_printer.pp_exp oneinit' Cil_datatype.Typ.pretty t'
+ Cil_datatype.Typ.pretty so.soTyp;
let init_expr =
if theMachine.insertImplicitCasts then snd (castTo t' so.soTyp oneinit')
else oneinit'
@@ -8518,7 +8516,7 @@ and doInit local_env asconst add_implicit_ensures preinit so acc initl =
with Not_found ->
abort_context
"scalar value (of type %a) initialized by compound initializer"
- Cil_printer.pp_typ t
+ Cil_datatype.Typ.pretty t
end
(* We have a designator *)
| _, (what, ie) :: restil when what != Cabs.NEXT_INIT ->
@@ -8632,7 +8630,7 @@ and doInit local_env asconst add_implicit_ensures preinit so acc initl =
in
expandRange (fun x -> x) what
| t, (_what, _ie) :: _ ->
- abort_context "doInit: cases for t=%a" Cil_printer.pp_typ t
+ abort_context "doInit: cases for t=%a" Cil_datatype.Typ.pretty t
(* Create and add to the file (if not already added) a global. Return the
* varinfo *)
@@ -9360,7 +9358,7 @@ and doDecl local_env (isglobal: bool) : Cabs.definition -> chunk = function
(*
ignore (E.log "makefunvar:%s@\n type=%a@\n vattr=%a@\n"
- n Cil_printer.pp_typ thisFunctionVI.vtype
+ n Cil_datatype.Typ.pretty thisFunctionVI.vtype
d_attrlist thisFunctionVI.vattr);
*)
@@ -9424,7 +9422,7 @@ and doDecl local_env (isglobal: bool) : Cabs.definition -> chunk = function
f.vattr)) formals),
isvararg, funta) in
- (*log "Funtype of %s: %a\n" n Cil_printer.pp_typ ftype;*)
+ (*log "Funtype of %s: %a\n" n Cil_datatype.Typ.pretty ftype;*)
(* Now fix the names of the formals in the type of the function
* as well *)
@@ -9776,7 +9774,7 @@ and doTypedef ghost ((specs, nl): Cabs.name_group) =
if not (Kernel.C11.get ()) then error_c11_redefinition ()
| _ -> (* because of the compatibility test, this should not happen *)
Kernel.fatal ~current:true "typeinfo.ttype (%a) should be TComp"
- Cil_printer.pp_typ typeinfo.ttype
+ Cil_datatype.Typ.pretty typeinfo.ttype
end
| TEnum _ -> (* GCC/Clang: "conflicting types" *)
error_conflicting_types ()
@@ -10115,7 +10113,7 @@ and doStatement local_env (s : Cabs.statement) : chunk =
if not (isVoidType !currentReturnType) then
Kernel.error ~current:true
"Return statement without a value in function returning %a\n"
- Cil_printer.pp_typ !currentReturnType;
+ Cil_datatype.Typ.pretty !currentReturnType;
returnChunk ~ghost None loc'
| Cabs.RETURN (e, loc) ->
diff --git a/src/kernel_internals/typing/mergecil.ml b/src/kernel_internals/typing/mergecil.ml
index a120eb377d97ce076dd354d03df9501e65f2e98c..d962659e2cc55eabdf59a0b335dd47644f2db42d 100644
--- a/src/kernel_internals/typing/mergecil.ml
+++ b/src/kernel_internals/typing/mergecil.ml
@@ -1212,6 +1212,7 @@ and matchCompInfo (oldfidx: int) (oldci: compinfo)
aggregate_name oldci.cname aggregate_name ci.cname
old_len len
in
+ undo ();
raise (Failure msg)
end;
(* We check the fields but watch for Failure. We only do the check when
diff --git a/src/kernel_services/abstract_interp/bottom.ml b/src/kernel_services/abstract_interp/bottom.ml
deleted file mode 100644
index b420661b852603263dd60a303203bd1f345ceab3..0000000000000000000000000000000000000000
--- a/src/kernel_services/abstract_interp/bottom.ml
+++ /dev/null
@@ -1,186 +0,0 @@
-(**************************************************************************)
-(* *)
-(* This file is part of Frama-C. *)
-(* *)
-(* Copyright (C) 2007-2022 *)
-(* CEA (Commissariat à l'énergie atomique et aux énergies *)
-(* alternatives) *)
-(* *)
-(* you can redistribute it and/or modify it under the terms of the GNU *)
-(* Lesser General Public License as published by the Free Software *)
-(* Foundation, version 2.1. *)
-(* *)
-(* It is distributed in the hope that it will be useful, *)
-(* but WITHOUT ANY WARRANTY; without even the implied warranty of *)
-(* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *)
-(* GNU Lesser General Public License for more details. *)
-(* *)
-(* See the GNU Lesser General Public License version 2.1 *)
-(* for more details (enclosed in the file licenses/LGPLv2.1). *)
-(* *)
-(**************************************************************************)
-
-
-module Type = struct
-
- type 'a or_bottom = [ `Value of 'a | `Bottom ]
-
- (* This monad propagates the `Bottom value if needed. *)
- let (>>-) t f = match t with
- | `Bottom -> `Bottom
- | `Value t -> f t
-
- (* Use this monad if the following function returns a simple value. *)
- let (>>-:) t f = match t with
- | `Bottom -> `Bottom
- | `Value t -> `Value (f t)
-
-end
-
-include Type
-
-let is_bottom = function
- | `Bottom -> true
- | `Value _ -> false
-
-let non_bottom = function
- | `Value v -> v
- | `Bottom -> assert false
-
-let value ~bottom = function
- | `Value v -> v
- | `Bottom -> bottom
-
-let equal equal x y = match x, y with
- | `Bottom, `Bottom -> true
- | `Value vx, `Value vy -> equal vx vy
- | _ -> false
-
-let compare compare a b = match a, b with
- | `Bottom, `Bottom -> 0
- | `Bottom, _ -> -1
- | _, `Bottom -> 1
- | `Value v, `Value w -> compare v w
-
-let is_included is_included x y = match x, y with
- | `Bottom, _ -> true
- | _, `Bottom -> false
- | `Value vx, `Value vy -> is_included vx vy
-
-let join join x y = match x, y with
- | `Value vx, `Value vy -> `Value (join vx vy)
- | `Bottom, (`Value _ as v)
- | (`Value _ as v), `Bottom
- | (`Bottom as v), `Bottom -> v
-
-let join_list j l = List.fold_left (join j) `Bottom l
-
-let narrow narrow x y = match x, y with
- | `Value vx, `Value vy -> narrow vx vy
- | `Bottom, `Value _
- | `Value _, `Bottom
- | `Bottom, `Bottom -> `Bottom
-
-let pretty pretty fmt = function
- | `Bottom -> Format.fprintf fmt "Bottom"
- | `Value v -> pretty fmt v
-
-let iter f = function
- | `Bottom -> ()
- | `Value v -> f v
-
-let fold ~bottom f = function
- | `Bottom -> bottom
- | `Value v -> f v
-
-let counter = ref 0
-
-module Make_Datatype
- (Domain: Datatype.S)
- =
- Datatype.Make (
- struct
- include Datatype.Serializable_undefined
- type t = Domain.t or_bottom
- let () = incr counter
- let name = Domain.name ^ "+bottom(" ^ string_of_int !counter ^ ")"
- let reprs = [`Bottom; `Value (List.hd Domain.reprs)]
- let structural_descr = Structural_descr.t_unknown
- (* Structural_descr.t_sum [| [| Domain.packed_descr |] |] *)
-
- let equal a b = match a, b with
- | `Bottom, `Bottom -> true
- | `Value v, `Value w -> Domain.equal v w
- | _, _ -> false
-
- let compare a b = match a, b with
- | `Bottom, `Bottom -> 0
- | `Bottom, _ -> -1
- | _, `Bottom -> 1
- | `Value v, `Value w -> Domain.compare v w
-
- let hash = function
- | `Bottom -> 0
- | `Value v -> Domain.hash v
-
- let rehash = Datatype.identity
-
- let copy = function
- | `Bottom -> `Bottom
- | `Value v -> `Value (Domain.copy v)
-
- let pretty fmt = function
- | `Bottom -> Format.fprintf fmt "Bottom"
- | `Value v -> Domain.pretty fmt v
-
- let mem_project = Datatype.never_any_project
- end)
-
-
-module Bound_Lattice
- (Lattice: Lattice_type.Join_Semi_Lattice)
-= struct
- include Make_Datatype (Lattice)
-
- let bottom = `Bottom
- let join = join Lattice.join
- let is_included = is_included Lattice.is_included
-end
-
-let to_option = function
- | `Bottom -> None
- | `Value v -> Some v
-
-let to_list = function
- | `Bottom -> []
- | `Value v -> [v]
-
-let bot_of_list = function
- | [] -> `Bottom
- | l -> `Value l
-
-let list_of_bot = function
- | `Bottom -> []
- | `Value l -> l
-
-let add_to_list elt list = match elt with
- | `Bottom -> list
- | `Value elt -> elt :: list
-
-let all l =
- List.fold_left (fun l elt -> add_to_list elt l) [] l
-
-module Top = struct
-
- type 'a or_top_bottom = [ 'a or_bottom | `Top ]
-
- let join vjoin x y = match x, y with
- | `Top, _ | _, `Top -> `Top
- | (#or_bottom as x), (#or_bottom as y) -> join vjoin x y
-
- let narrow vnarrow x y = match x, y with
- | `Top, v | v, `Top -> v
- | (#or_bottom as x), (#or_bottom as y) ->
- (narrow vnarrow x y :> _ or_top_bottom)
-
-end
diff --git a/src/kernel_services/abstract_interp/bottom.mli b/src/kernel_services/abstract_interp/bottom.mli
deleted file mode 100644
index fad87be41a342bee62ce8fe041c9ba0e4aa7c0ca..0000000000000000000000000000000000000000
--- a/src/kernel_services/abstract_interp/bottom.mli
+++ /dev/null
@@ -1,98 +0,0 @@
-(**************************************************************************)
-(* *)
-(* This file is part of Frama-C. *)
-(* *)
-(* Copyright (C) 2007-2022 *)
-(* CEA (Commissariat à l'énergie atomique et aux énergies *)
-(* alternatives) *)
-(* *)
-(* you can redistribute it and/or modify it under the terms of the GNU *)
-(* Lesser General Public License as published by the Free Software *)
-(* Foundation, version 2.1. *)
-(* *)
-(* It is distributed in the hope that it will be useful, *)
-(* but WITHOUT ANY WARRANTY; without even the implied warranty of *)
-(* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *)
-(* GNU Lesser General Public License for more details. *)
-(* *)
-(* See the GNU Lesser General Public License version 2.1 *)
-(* for more details (enclosed in the file licenses/LGPLv2.1). *)
-(* *)
-(**************************************************************************)
-
-(** Types, monads and utilitary functions for lattices in which the bottom is
- managed separately from other values. *)
-
-module Type : sig
-
- type 'a or_bottom = [ `Value of 'a | `Bottom ]
-
- (** This monad propagates the `Bottom value if needed. *)
- val (>>-) : 'a or_bottom -> ('a -> 'b or_bottom) -> 'b or_bottom
-
- (** Use this monad if the following function returns a simple value. *)
- val (>>-:) : 'a or_bottom -> ('a -> 'b) -> 'b or_bottom
-
-end
-
-include module type of Type
-
-val is_bottom: 'a or_bottom -> bool
-val non_bottom: 'a or_bottom -> 'a
-val value: bottom: 'a -> 'a or_bottom -> 'a
-
-val equal: ('a -> 'a -> bool) -> 'a or_bottom -> 'a or_bottom -> bool
-val compare: ('a -> 'a -> int) -> 'a or_bottom -> 'a or_bottom -> int
-val is_included: ('a -> 'b -> bool) -> 'a or_bottom -> 'b or_bottom -> bool
-val join: ('a -> 'a -> 'a) -> 'a or_bottom -> 'a or_bottom -> 'a or_bottom
-val join_list: ('a -> 'a -> 'a) -> 'a or_bottom list -> 'a or_bottom
-val narrow: ('a -> 'a -> 'a or_bottom) -> 'a or_bottom -> 'a or_bottom -> 'a or_bottom
-
-val pretty :
- (Format.formatter -> 'a -> unit) ->
- Format.formatter -> 'a or_bottom -> unit
-
-val iter: ('a -> unit) -> 'a or_bottom -> unit
-val fold: bottom: 'b -> ('a -> 'b) -> 'a or_bottom -> 'b
-
-(** Datatype constructor. *)
-module Make_Datatype
- (Domain: Datatype.S)
- : Datatype.S with type t = Domain.t or_bottom
-
-
-(** Bounds a semi-lattice. *)
-module Bound_Lattice
- (Lattice: Lattice_type.Join_Semi_Lattice)
- : Lattice_type.Bounded_Join_Semi_Lattice with type t = Lattice.t or_bottom
-
-
-
-(** In a lattice where the elements are lists of non-bottom values,
- the empty list is the bottom case. *)
-
-(** Conversion functions. *)
-val to_option : 'a or_bottom -> 'a option
-val to_list: 'a or_bottom -> 'a list
-val bot_of_list: 'a list -> 'a list or_bottom
-val list_of_bot: 'a list or_bottom -> 'a list
-val all: 'a or_bottom list -> 'a list
-
-(** [elt >:: list] adds [elt] to the [list] if it is not bottom. *)
-val add_to_list : 'a or_bottom -> 'a list -> 'a list
-
-
-(** Lattices in which both top and bottom are managed separately *)
-module Top: sig
-
- type 'a or_top_bottom = [ 'a or_bottom | `Top ]
-
- val join:
- ('a -> 'a -> 'a) ->
- 'a or_top_bottom -> 'a or_top_bottom -> 'a or_top_bottom
-
- val narrow:
- ('a -> 'a -> 'a or_bottom) ->
- 'a or_top_bottom -> 'a or_top_bottom -> 'a or_top_bottom
-
-end
diff --git a/src/kernel_services/abstract_interp/eva_lattice_type.ml b/src/kernel_services/abstract_interp/eva_lattice_type.ml
index 8c5e10c62fded3e273207b4d847b732420cc76eb..e05c1ee9c49e5d9c7de08120923ecea494ddbe53 100644
--- a/src/kernel_services/abstract_interp/eva_lattice_type.ml
+++ b/src/kernel_services/abstract_interp/eva_lattice_type.ml
@@ -25,7 +25,7 @@
when needed. Except that, they are identical to the module signatures in
{!Lattice_type}. *)
-open Bottom.Type
+open Lattice_bounds
module type Join_Semi_Lattice = Lattice_type.Join_Semi_Lattice
module type With_Top = Lattice_type.With_Top
diff --git a/src/kernel_services/abstract_interp/float_interval.ml b/src/kernel_services/abstract_interp/float_interval.ml
index aa8216f716a3171f1d8bcc34d6a8d022487179d0..1f5d34a2f4a01a74a6e140559324e5f234011673 100644
--- a/src/kernel_services/abstract_interp/float_interval.ml
+++ b/src/kernel_services/abstract_interp/float_interval.ml
@@ -21,7 +21,8 @@
(**************************************************************************)
module Comp = Abstract_interp.Comp
-open Bottom.Type
+open Lattice_bounds
+open Bottom.Operators
type round = Float_sig.round = Up | Down | Near | Zero
type prec = Float_sig.prec = Single | Double | Long_Double | Real
diff --git a/src/kernel_services/abstract_interp/float_interval_sig.ml b/src/kernel_services/abstract_interp/float_interval_sig.ml
index 560d6f692d142bc05a396c2256a84eac6920c4ec..b1b3561dcee85cc4f0c706bf3d67bd6c25607dee 100644
--- a/src/kernel_services/abstract_interp/float_interval_sig.ml
+++ b/src/kernel_services/abstract_interp/float_interval_sig.ml
@@ -22,7 +22,7 @@
(** Signature for the floating-point interval semantics. *)
-open Bottom.Type
+open Lattice_bounds
(** Precision of the intervals. *)
type prec = Float_sig.prec
@@ -116,7 +116,7 @@ module type S = sig
[f1] into [f1'] so that the relation [f1' op f2] holds.
[prec] is the precision of [f1] and [f1'], but not necessarily of [f2]. *)
val backward_comp_left_true:
- Abstract_interp.Comp.t -> prec -> t -> t -> t Bottom.or_bottom
+ Abstract_interp.Comp.t -> prec -> t -> t -> t or_bottom
(** [backward_comp_left_false op prec f1 f2] attempts to reduce
[f1] into [f1'] so that the relation [f1' op f2] doesn't holds.
diff --git a/src/kernel_services/abstract_interp/fval.mli b/src/kernel_services/abstract_interp/fval.mli
index 93aa5e24a914d858537e5e50fe84b9615fbac907..30e3e709536d52435094415029b9b94166a53bab 100644
--- a/src/kernel_services/abstract_interp/fval.mli
+++ b/src/kernel_services/abstract_interp/fval.mli
@@ -89,7 +89,7 @@ val e: t (** Real representation of \e. *)
val contains_plus_zero : t -> bool
-val meet: t -> t -> t Bottom.or_bottom
+val meet: t -> t -> t Lattice_bounds.or_bottom
val is_singleton : t -> bool
(** Returns [true] on NaN. We expect this function to be e.g. to perform
@@ -134,7 +134,7 @@ val ceil: kind -> t -> t
val trunc: kind -> t -> t
val fround: kind -> t -> t
-val backward_cast_float_to_double: t -> t Bottom.or_bottom
+val backward_cast_float_to_double: t -> t Lattice_bounds.or_bottom
(** [backward_cast_float_to_double d] return all possible float32 [f] such that
[(double)f = d]. The double of [d] that have no float32 equivalent are
discarded. *)
diff --git a/src/kernel_services/abstract_interp/int_interval.ml b/src/kernel_services/abstract_interp/int_interval.ml
index 9d72418a04c039447427c931d35c7881e5f5ff35..f1eb54dada1209a83225a2b0b5017fb34e7be71b 100644
--- a/src/kernel_services/abstract_interp/int_interval.ml
+++ b/src/kernel_services/abstract_interp/int_interval.ml
@@ -699,7 +699,7 @@ let div x y =
`Value (div_range x min gneg)
else `Bottom
in
- Bottom.join join result_neg result_pos
+ Lattice_bounds.Bottom.join join result_neg result_pos
(* ----------------------------------- Misc --------------------------------- *)
diff --git a/src/kernel_services/abstract_interp/int_interval.mli b/src/kernel_services/abstract_interp/int_interval.mli
index dbdbcba5db2233ff1e0d29f7e973a8ce13689c09..1e52aa926a144e2311b8f68fc4ed9e86ab4e8da1 100644
--- a/src/kernel_services/abstract_interp/int_interval.mli
+++ b/src/kernel_services/abstract_interp/int_interval.mli
@@ -26,7 +26,7 @@
A value of [None] for [min] (resp. [max]) represents -infinity
(resp. +infinity). [modu] is > 0, and [0 <= rem < modu]. *)
-open Bottom.Type
+open Lattice_bounds
include Datatype.S_with_collections
diff --git a/src/kernel_services/abstract_interp/int_set.ml b/src/kernel_services/abstract_interp/int_set.ml
index 72ad214057be997c0278b060c33c9a04dda5588e..1d5a7fad690e76287ed21e296371fcd9b25df308 100644
--- a/src/kernel_services/abstract_interp/int_set.ml
+++ b/src/kernel_services/abstract_interp/int_set.ml
@@ -21,7 +21,7 @@
(**************************************************************************)
open Abstract_interp
-open Bottom.Type
+open Lattice_bounds
(* Make sure all this is synchronized with the default value of -ilevel *)
let small_cardinal = ref 8
diff --git a/src/kernel_services/abstract_interp/int_set.mli b/src/kernel_services/abstract_interp/int_set.mli
index 0eab36f019c0ff870f1a29e5f7618144a8c61383..d3aac28587ccc2bf78c127d5710a0a4cc4501fba 100644
--- a/src/kernel_services/abstract_interp/int_set.mli
+++ b/src/kernel_services/abstract_interp/int_set.mli
@@ -30,7 +30,7 @@
Sets are always non-empty. The functions reducing the sets returns a
[set or_bottom] type: either the result is non-empty, or it is `Bottom. *)
-open Bottom.Type
+open Lattice_bounds
(** Returns the limit above which integer sets are converted into intervals. *)
val get_small_cardinal: unit -> int
diff --git a/src/kernel_services/abstract_interp/int_val.ml b/src/kernel_services/abstract_interp/int_val.ml
index 5cade9d5c4948b35ff016ea83e86dfbed557a055..6e661036c0cc91facfb7fc2c1d62a1e384b8146e 100644
--- a/src/kernel_services/abstract_interp/int_val.ml
+++ b/src/kernel_services/abstract_interp/int_val.ml
@@ -21,7 +21,8 @@
(**************************************************************************)
open Abstract_interp
-open Bottom.Type
+open Lattice_bounds
+open Bottom.Operators
let small_cardinal = Int_set.get_small_cardinal
let small_cardinal_Int () = Int.of_int (small_cardinal ())
diff --git a/src/kernel_services/abstract_interp/int_val.mli b/src/kernel_services/abstract_interp/int_val.mli
index 47b23b1d145c9f366da0773fbd2d2071dca790e1..86b7f208542a3b944d820a41f48a214d18ddba55 100644
--- a/src/kernel_services/abstract_interp/int_val.mli
+++ b/src/kernel_services/abstract_interp/int_val.mli
@@ -26,7 +26,7 @@
(** Abstractions do not represent the empty set. Instead, operations creating
empty sets return `Bottom. *)
-open Bottom.Type
+open Lattice_bounds
include Datatype.S_with_collections
diff --git a/src/kernel_services/abstract_interp/ival.ml b/src/kernel_services/abstract_interp/ival.ml
index c6495c9d001045a770e8dc1b0e7d4d880b6712c1..5022d6fd6adde061e50d9b15851be9c0391ad98c 100644
--- a/src/kernel_services/abstract_interp/ival.ml
+++ b/src/kernel_services/abstract_interp/ival.ml
@@ -21,7 +21,8 @@
(**************************************************************************)
open Abstract_interp
-open Bottom.Type
+open Lattice_bounds
+open Bottom.Operators
let emitter = Lattice_messages.register "Ival"
let log_imprecision s = Lattice_messages.emit_imprecision emitter s
@@ -1031,7 +1032,6 @@ let reinterpret_as_float kind i =
then [`Value Fval.nan]
else []
in
- let open Bottom in
let range mn mx = Fval.inject kind (conv mn) (conv mx) in
(* convert positive floats; increasing on positive range *)
let pos = bounds_narrow f_pos >>-: (fun (b, e) -> range b e) in
diff --git a/src/kernel_services/abstract_interp/ival.mli b/src/kernel_services/abstract_interp/ival.mli
index 5e072bc1ecb175e16a86eaeb73675f3a214517e4..82740fff771c53814b332b5658c12f92214bba01 100644
--- a/src/kernel_services/abstract_interp/ival.mli
+++ b/src/kernel_services/abstract_interp/ival.mli
@@ -272,7 +272,7 @@ val create_all_values: signed:bool -> size:int -> t
representable in [size] bits. *)
val all_values: size:Integer.t -> t -> bool
-val backward_mult_int_left: right:t -> result:t -> t option Bottom.or_bottom
+val backward_mult_int_left: right:t -> result:t -> t option Lattice_bounds.or_bottom
val backward_comp_int_left : Comp.t -> t -> t -> t
(** [backward_comp_int op l r] reduces [l] into [l'] so that
@@ -319,7 +319,7 @@ val reinterpret_as_int: size:Integer.t -> signed:bool -> t -> t
(** Bitwise reinterpretation of the given value, of size [size], as an integer
of the given signedness (and size). *)
-val complement_int_under: size:int -> signed:bool -> t -> t Bottom.or_bottom
+val complement_int_under: size:int -> signed:bool -> t -> t Lattice_bounds.or_bottom
(** Returns an under-approximation of the integers of the given size and
signedness that are *not* represented by the given ival. *)
diff --git a/src/kernel_services/abstract_interp/lattice_bounds.ml b/src/kernel_services/abstract_interp/lattice_bounds.ml
new file mode 100644
index 0000000000000000000000000000000000000000..3b7fb552f534d8b9ec6c53b4d6fbc7ef19be2367
--- /dev/null
+++ b/src/kernel_services/abstract_interp/lattice_bounds.ml
@@ -0,0 +1,328 @@
+(**************************************************************************)
+(* *)
+(* This file is part of Frama-C. *)
+(* *)
+(* Copyright (C) 2007-2022 *)
+(* CEA (Commissariat à l'énergie atomique et aux énergies *)
+(* alternatives) *)
+(* *)
+(* you can redistribute it and/or modify it under the terms of the GNU *)
+(* Lesser General Public License as published by the Free Software *)
+(* Foundation, version 2.1. *)
+(* *)
+(* It is distributed in the hope that it will be useful, *)
+(* but WITHOUT ANY WARRANTY; without even the implied warranty of *)
+(* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *)
+(* GNU Lesser General Public License for more details. *)
+(* *)
+(* See the GNU Lesser General Public License version 2.1 *)
+(* for more details (enclosed in the file licenses/LGPLv2.1). *)
+(* *)
+(**************************************************************************)
+
+type 'a or_bottom = [ `Value of 'a | `Bottom ]
+type 'a or_top = [ `Value of 'a | `Top ]
+type 'a or_top_bottom = [ `Value of 'a | `Bottom | `Top ]
+
+(** Common functions *)
+
+module Common =
+struct
+
+ (* Pretty-printing *)
+
+ let pretty_top fmt =
+ Format.pp_print_string fmt (Unicode.top_string ())
+
+ let pretty_bottom fmt =
+ Format.pp_print_string fmt (Unicode.bottom_string ())
+
+ let pretty pretty_value fmt = function
+ | `Bottom -> pretty_bottom fmt
+ | `Top -> pretty_top fmt
+ | `Value v -> pretty_value fmt v
+
+ (* Datatype *)
+
+ let hash hash_value = function
+ | `Bottom -> 7
+ | `Top -> 13
+ | `Value v -> hash_value v
+
+ let equal equal_value x y =
+ match x, y with
+ | `Bottom, `Bottom -> true
+ | `Top, `Top -> true
+ | `Value vx, `Value vy -> equal_value vx vy
+ | (`Value _ | `Bottom | `Top), (`Value _ | `Bottom | `Top) -> false
+
+ let compare compare_value a b = match a, b with
+ | `Bottom, `Bottom -> 0
+ | `Bottom, (`Top | `Value _) -> -1
+ | (`Top | `Value _), `Bottom -> 1
+ | `Top, `Top -> 0
+ | `Top, `Value _ -> -1
+ | `Value _, `Top -> 1
+ | `Value vx, `Value vy -> compare_value vx vy
+
+ (* Tests *)
+
+ let is_bottom = function
+ | `Bottom -> true
+ | `Value _ | `Top -> false
+
+ let is_top = function
+ | `Top -> true
+ | `Value _ | `Bottom -> false
+
+ let is_included is_included x y =
+ match x, y with
+ | `Bottom, _ | _, `Top -> true
+ | _, `Bottom | `Top, _ -> false
+ | `Value vx, `Value vy -> is_included vx vy
+
+ (* Iterator *)
+ let iter f = function
+ | `Bottom | `Top -> ()
+ | `Value v -> f v
+
+ (* Conversion *)
+ let to_option = function
+ | `Bottom | `Top -> None
+ | `Value x -> Some x
+
+end
+
+module Bottom = struct
+ type 'a t = 'a or_bottom
+
+ include Common
+
+ (** Access *)
+
+ let non_bottom = function
+ | `Value v -> v
+ | `Bottom -> assert false
+
+ let value ~bottom = function
+ | `Value v -> v
+ | `Bottom -> bottom
+
+ (* Lattice operators *)
+
+ let join join x y = match x, y with
+ | `Value vx, `Value vy -> `Value (join vx vy)
+ | `Bottom, (`Value _ as v)
+ | (`Value _ as v), `Bottom
+ | (`Bottom as v), `Bottom -> v
+
+ let join_list j l = List.fold_left (join j) `Bottom l
+
+ let narrow narrow x y = match x, y with
+ | `Value vx, `Value vy -> narrow vx vy
+ | `Bottom, `Value _
+ | `Value _, `Bottom
+ | `Bottom, `Bottom -> `Bottom
+
+ (* Iterators *)
+
+ let fold ~bottom f = function
+ | `Bottom -> bottom
+ | `Value v -> f v
+
+ let map f = function
+ | `Bottom -> `Bottom
+ | `Value v -> `Value (f v)
+
+ (* Combination *)
+
+ let zip x y =
+ match x, y with
+ | `Bottom, _ | _, `Bottom -> `Bottom
+ | `Value x, `Value y -> `Value (x,y)
+
+ (** Conversion *)
+
+ let of_option = function
+ | None -> `Bottom
+ | Some v -> `Value v
+
+ let to_list = function
+ | `Bottom -> []
+ | `Value v -> [v]
+
+ let bot_of_list = function
+ | [] -> `Bottom
+ | l -> `Value l
+
+ let list_of_bot = function
+ | `Bottom -> []
+ | `Value l -> l
+
+ let add_to_list elt list = match elt with
+ | `Bottom -> list
+ | `Value elt -> elt :: list
+
+ let list_values l =
+ List.fold_left (fun l elt -> add_to_list elt l) [] l
+
+ (** Operators *)
+
+ module Operators =
+ struct
+ let (>>-) t f = match t with
+ | `Bottom -> `Bottom
+ | `Value t -> f t
+
+ let (>>-:) t f = match t with
+ | `Bottom -> `Bottom
+ | `Value t -> `Value (f t)
+
+ let (let+) = (>>-:)
+ let (and+) = zip
+ let (let*) = (>>-)
+ let (and*) = zip
+ end
+
+ (** Datatype construction *)
+ let counter = ref 0
+
+ module Make_Datatype
+ (Domain: Datatype.S)
+ =
+ Datatype.Make (
+ struct
+ include Datatype.Serializable_undefined
+ type t = Domain.t or_bottom
+ let () = incr counter
+ let name = Domain.name ^ "+bottom(" ^ string_of_int !counter ^ ")"
+ let reprs = `Bottom :: (List.map (fun v -> `Value v) Domain.reprs)
+ let structural_descr = Structural_descr.t_unknown
+ let hash = Common.hash Domain.hash
+ let equal = (Common.equal Domain.equal :> t -> t -> bool)
+ let compare = Common.compare Domain.compare
+ let rehash = Datatype.identity
+ let copy = map Domain.copy
+ let pretty = Common.pretty Domain.pretty
+ let mem_project = Datatype.never_any_project
+ end)
+
+ (* Bound lattice *)
+
+ module Bound_Lattice
+ (Lattice: Lattice_type.Join_Semi_Lattice)
+ = struct
+ include Make_Datatype (Lattice)
+
+ let bottom = `Bottom
+ let join = join Lattice.join
+ let is_included = is_included Lattice.is_included
+ end
+end
+
+
+module Top =
+struct
+ type 'a t = 'a or_top
+
+ include Common
+
+ (** Access *)
+
+ let non_top = function
+ | `Value v -> v
+ | `Top -> assert false
+
+ let value ~top = function
+ | `Value v -> v
+ | `Top -> top
+
+ (** Lattice *)
+
+ let join join_value x y =
+ match x, y with
+ | `Top, _ | _, `Top -> `Top
+ | `Value vx, `Value vy -> join_value vx vy
+
+ let narrow narrow_value x y =
+ match x, y with
+ | `Top, v | v, `Top -> v
+ | `Value vx, `Value vy -> `Value (narrow_value vx vy)
+
+ (** Combination *)
+
+ let zip x y =
+ match x, y with
+ | `Top, _ | _, `Top -> `Top
+ | `Value x, `Value y -> `Value (x,y)
+
+ (** Conversion. *)
+
+ let of_option = function
+ | None -> `Top
+ | Some x -> `Value x
+
+ (** Operators *)
+
+ module Operators = struct
+ let (>>-) t f = match t with
+ | `Top -> `Top
+ | `Value t -> f t
+
+ let (>>-:) t f = match t with
+ | `Top -> `Top
+ | `Value t -> `Value (f t)
+
+ let (let+) = (>>-:)
+ let (and+) = zip
+ let (let*) = (>>-)
+ let (and*) = zip
+ end
+end
+
+
+module TopBottom =
+struct
+ type 'a t = 'a or_top_bottom
+
+ include Common
+
+ (* Lattice operators *)
+
+ let join join_value x y = match x, y with
+ | `Top, _ | _, `Top -> `Top
+ | `Bottom, x | x, `Bottom -> x
+ | `Value vx, `Value vy -> (join_value vx vy :> 'a t)
+
+ let narrow narrow_value x y = match x, y with
+ | `Top, v | v, `Top -> v
+ | `Bottom, _ | _, `Bottom -> `Bottom
+ | `Value vx, `Value vy -> (narrow_value vx vy :> 'a t)
+
+ (** Combination *)
+
+ let zip x y =
+ match x, y with
+ | `Bottom, _ | _, `Bottom -> `Bottom
+ | `Top, _ | _, `Top -> `Top
+ | `Value x, `Value y -> `Value (x,y)
+
+ (** Operators *)
+
+ module Operators = struct
+ let (>>-) t f = match t with
+ | `Top -> `Top
+ | `Bottom -> `Bottom
+ | `Value t -> f t
+
+ let (>>-:) t f = match t with
+ | `Top -> `Top
+ | `Bottom -> `Bottom
+ | `Value t -> `Value (f t)
+
+ let (let+) = (>>-:)
+ let (and+) = zip
+ let (let*) = (>>-)
+ let (and*) = zip
+ end
+end
diff --git a/src/kernel_services/abstract_interp/lattice_bounds.mli b/src/kernel_services/abstract_interp/lattice_bounds.mli
new file mode 100644
index 0000000000000000000000000000000000000000..1d4ff6f981953528b5ca07ac081628344cf9e855
--- /dev/null
+++ b/src/kernel_services/abstract_interp/lattice_bounds.mli
@@ -0,0 +1,191 @@
+(**************************************************************************)
+(* *)
+(* This file is part of Frama-C. *)
+(* *)
+(* Copyright (C) 2007-2022 *)
+(* CEA (Commissariat à l'énergie atomique et aux énergies *)
+(* alternatives) *)
+(* *)
+(* you can redistribute it and/or modify it under the terms of the GNU *)
+(* Lesser General Public License as published by the Free Software *)
+(* Foundation, version 2.1. *)
+(* *)
+(* It is distributed in the hope that it will be useful, *)
+(* but WITHOUT ANY WARRANTY; without even the implied warranty of *)
+(* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *)
+(* GNU Lesser General Public License for more details. *)
+(* *)
+(* See the GNU Lesser General Public License version 2.1 *)
+(* for more details (enclosed in the file licenses/LGPLv2.1). *)
+(* *)
+(**************************************************************************)
+
+(** Types, monads and utilitary functions for lattices in which the bottom
+ and/or the top are managed separately from other values. *)
+
+type 'a or_bottom = [ `Value of 'a | `Bottom ]
+type 'a or_top = [ `Value of 'a | `Top ]
+type 'a or_top_bottom = [ `Value of 'a | `Bottom | `Top ]
+
+
+module Bottom : sig
+ type 'a t = 'a or_bottom
+
+ (** Operators *)
+ module Operators : sig
+ (** This monad propagates `Bottom and or `Top if needed. *)
+ val (>>-) : [< 'a t] -> ('a -> ([> 'b t] as 'c)) -> 'c
+
+ (** Use this monad if the following function returns a simple value. *)
+ val (>>-:) : [< 'a t] -> ('a -> 'b) -> [> 'b t]
+
+ (* Binding operators, applicative syntax *)
+ val (let+) : [< 'a t] -> ('a -> 'b) -> [> 'b t]
+ val (and+) : [< 'a t] -> [< 'b t] -> [> ('a * 'b) t]
+
+ (* Binding operators, monad syntax *)
+ val (let*) : [< 'a t] -> ('a -> ([> 'b t] as 'c)) -> 'c
+ val (and*) : [< 'a t] -> [< 'b t] -> [> ('a * 'b) t]
+ end
+
+ (** Datatype constructor *)
+ module Make_Datatype
+ (Domain: Datatype.S)
+ : Datatype.S with type t = Domain.t or_bottom
+
+ (** Bounds a semi-lattice *)
+ module Bound_Lattice
+ (Lattice: Lattice_type.Join_Semi_Lattice)
+ : Lattice_type.Bounded_Join_Semi_Lattice with type t = Lattice.t or_bottom
+
+ (** Access *)
+ val is_bottom: 'a t -> bool
+ val non_bottom: 'a t -> 'a
+ val value: bottom: 'a -> 'a t -> 'a
+
+ (** Datatype *)
+ val hash: ('a -> int) -> 'a t -> int
+ val equal: ('a -> 'a -> bool) -> 'a t -> 'a t -> bool
+ val compare: ('a -> 'a -> int) -> 'a t -> 'a t -> int
+
+ (** Pretty-printing *)
+ val pretty_bottom :Format.formatter -> unit (* for %t specifier *)
+ val pretty :
+ (Format.formatter -> 'a -> unit) ->
+ Format.formatter -> 'a t -> unit
+
+ (* Lattice operators *)
+ val is_included: ('a -> 'b -> bool) -> 'a t -> 'b t -> bool
+ val join: ('a -> 'a -> 'a) -> 'a t -> 'a t -> 'a t
+ val join_list: ('a -> 'a -> 'a) -> 'a t list -> 'a t
+ val narrow: ('a -> 'a -> 'a t) -> 'a t -> 'a t -> 'a t
+
+ (* Iterators *)
+ val iter: ('a -> unit) -> 'a t -> unit
+ val fold: bottom: 'b -> ('a -> 'b) -> 'a t -> 'b
+ val map: ('a -> 'b) -> 'a t -> 'b t
+
+ (* Combination *)
+ val zip: 'a t -> 'b t -> ('a * 'b) t (* `Bottom if any is `Bottom *)
+
+ (** In a lattice where the elements are lists of non-bottom values,
+ the empty list is the bottom case. *)
+
+ (** Conversion *)
+ val to_option: 'a t -> 'a option
+ val of_option: 'a option -> 'a t
+ val to_list: 'a t -> 'a list
+ val bot_of_list: 'a list -> 'a list t
+ val list_of_bot: 'a list t -> 'a list
+ val list_values: 'a t list -> 'a list
+
+ (** [elt >:: list] adds [elt] to the [list] if it is not bottom. *)
+ val add_to_list: 'a t -> 'a list -> 'a list
+end
+
+
+module Top : sig
+ type 'a t = 'a or_top
+
+ (** Operators *)
+ module Operators : sig
+ (** This monad propagates `Bottom and or `Top if needed. *)
+ val (>>-) : [< 'a t] -> ('a -> ([> 'b t] as 'c)) -> 'c
+
+ (** Use this monad if the following function returns a simple value. *)
+ val (>>-:) : [< 'a t] -> ('a -> 'b) -> [> 'b t]
+
+ (* Binding operators, applicative syntax *)
+ val (let+) : [< 'a t] -> ('a -> 'b) -> [> 'b t]
+ val (and+) : [< 'a t] -> [< 'b t] -> [> ('a * 'b) t]
+
+ (* Binding operators, monad syntax *)
+ val (let*) : [< 'a t] -> ('a -> ([> 'b t] as 'c)) -> 'c
+ val (and*) : [< 'a t] -> [< 'b t] -> [> ('a * 'b) t]
+ end
+
+ (** Access *)
+ val is_top: 'a t -> bool
+ val non_top: 'a t -> 'a
+ val value: top: 'a -> 'a t -> 'a
+
+ (** Datatype *)
+ val hash: ('a -> int) -> 'a t -> int
+ val equal: ('a -> 'a -> bool) -> 'a t -> 'a t -> bool
+ val compare: ('a -> 'a -> int) -> 'a t -> 'a t -> int
+
+ (** Pretty-printing *)
+ val pretty_top :Format.formatter -> unit (* for %t specifier *)
+ val pretty :
+ (Format.formatter -> 'a -> unit) ->
+ Format.formatter -> 'a t -> unit
+
+ (** Lattice operators *)
+ val join: ('a -> 'a -> 'a t) -> 'a t -> 'a t -> 'a t
+ val narrow: ('a -> 'a -> 'a) -> 'a t -> 'a t -> 'a t
+
+ (** Combination *)
+ val zip: 'a t -> 'b t -> ('a * 'b) t (* `Top if any is `Top *)
+
+ (** Conversion *)
+ val to_option : 'a t -> 'a option
+ val of_option : 'a option -> 'a t
+end
+
+
+module TopBottom: sig
+ type 'a t = 'a or_top_bottom
+
+ (** Operators *)
+ (* In presence of simultaneous `Bottom and `Top in and+ / and*, everything
+ narrows down to `Bottom *)
+ module Operators : sig
+ (** This monad propagates `Bottom and or `Top if needed. *)
+ val (>>-) : [< 'a t] -> ('a -> ([> 'b t] as 'c)) -> 'c
+
+ (** Use this monad if the following function returns a simple value. *)
+ val (>>-:) : [< 'a t] -> ('a -> 'b) -> [> 'b t]
+
+ (* Binding operators, applicative syntax *)
+ val (let+) : [< 'a t] -> ('a -> 'b) -> [> 'b t]
+ val (and+) : [< 'a t] -> [< 'b t] -> [> ('a * 'b) t]
+
+ (* Binding operators, monad syntax *)
+ val (let*) : [< 'a t] -> ('a -> ([> 'b t] as 'c)) -> 'c
+ val (and*) : [< 'a t] -> [< 'b t] -> [> ('a * 'b) t]
+ end
+
+ (** Datatype *)
+ val hash: ('a -> int) -> 'a t -> int
+ val equal: ('a -> 'a -> bool) -> 'a t -> 'a t -> bool
+ val compare: ('a -> 'a -> int) -> 'a t -> 'a t -> int
+
+ (** Pretty-printing *)
+ val pretty :
+ (Format.formatter -> 'a -> unit) ->
+ Format.formatter -> 'a t -> unit
+
+ (* Lattice operators *)
+ val join: ('a -> 'a -> [< 'a t]) -> 'a t -> 'a t -> 'a t
+ val narrow: ('a -> 'a -> [< 'a t]) -> 'a t -> 'a t -> 'a t
+end
diff --git a/src/kernel_services/abstract_interp/lmap.ml b/src/kernel_services/abstract_interp/lmap.ml
index 389602d77e7d0a8ddab7f831d51a08583641933f..58fd5940db064e06da2ad1028f698b5e526a1299 100644
--- a/src/kernel_services/abstract_interp/lmap.ml
+++ b/src/kernel_services/abstract_interp/lmap.ml
@@ -22,6 +22,7 @@
open Abstract_interp
open Locations
+open Lattice_bounds
let msg_emitter = Lattice_messages.register "Lmap";;
@@ -41,7 +42,7 @@ module Make_LOffset
and type widen_hint = V.numerical_widen_hint)
(Default_offsetmap: sig
val name: string
- val default_offsetmap : Base.t -> Offsetmap.t Bottom.or_bottom
+ val default_offsetmap : Base.t -> Offsetmap.t or_bottom
val default_contents: V.t default_contents
end)
=
@@ -631,7 +632,7 @@ struct
let find_base_or_default b = function
| Bottom -> `Bottom
| Top -> `Top
- | Map m -> (M.find_or_default b m :> _ Bottom.Top.or_top_bottom)
+ | Map m -> (M.find_or_default b m :> _ or_top_bottom)
let remove_base b = function
| Bottom -> Bottom
diff --git a/src/kernel_services/abstract_interp/lmap.mli b/src/kernel_services/abstract_interp/lmap.mli
index 13714676fd4dc997ed253f5b402f0f3554cdb782..20e1d5f5990d8f942b28d8f8aa23d368c5c4d94b 100644
--- a/src/kernel_services/abstract_interp/lmap.mli
+++ b/src/kernel_services/abstract_interp/lmap.mli
@@ -44,7 +44,7 @@ module Make_LOffset
val name: string
(** Used to create different datatypes each time the functor is applied *)
- val default_offsetmap : Base.t -> Offsetmap.t Bottom.or_bottom
+ val default_offsetmap : Base.t -> Offsetmap.t Lattice_bounds.or_bottom
(** Value returned when a map is queried, and the base is not present.
[`Bottom] indicates that the base is never bound in such a map. *)
diff --git a/src/kernel_services/abstract_interp/lmap_bitwise.ml b/src/kernel_services/abstract_interp/lmap_bitwise.ml
index 76aafdf4b3f9b3876d3d6c72ba11b06ba33483b2..f4b59a15465fc23a20976b74246d47abc40a19cc 100644
--- a/src/kernel_services/abstract_interp/lmap_bitwise.ml
+++ b/src/kernel_services/abstract_interp/lmap_bitwise.ml
@@ -21,6 +21,7 @@
(**************************************************************************)
open Locations
+open Lattice_bounds
exception Bitwise_cannot_copy
diff --git a/src/kernel_services/abstract_interp/lmap_sig.ml b/src/kernel_services/abstract_interp/lmap_sig.ml
index d70ce4bea6b109f2107842d9cb8adf5a9552426a..6030665d5cc7ae99e879663d2c99dc68aa2f05c1 100644
--- a/src/kernel_services/abstract_interp/lmap_sig.ml
+++ b/src/kernel_services/abstract_interp/lmap_sig.ml
@@ -97,7 +97,7 @@ module type S = sig
is no Top value in the type {!v}. *)
val copy_offsetmap :
- Location_Bits.t -> Integer.t -> t -> offsetmap Bottom.or_bottom
+ Location_Bits.t -> Integer.t -> t -> offsetmap Lattice_bounds.or_bottom
(** [copy_offsetmap alarms loc size m] returns the superposition of the
ranges of [size] bits starting at [loc] within [m]. [size] must be
strictly greater than zero. Return [None] if all pointed addresses are
@@ -106,10 +106,11 @@ module type S = sig
@raise Error_Top when the location or the state are Top, and there
is no Top value in the type {!v}. *)
- val find_base : Base.t -> t -> offsetmap Bottom.Top.or_top_bottom
+ val find_base : Base.t -> t -> offsetmap Lattice_bounds.or_top_bottom
(** @raise Not_found if the varid is not present in the map. *)
- val find_base_or_default : Base.t -> t -> offsetmap Bottom.Top.or_top_bottom
+ val find_base_or_default :
+ Base.t -> t -> offsetmap Lattice_bounds.or_top_bottom
(** Same as [find_base], but return the default values for bases
that are not currently present in the map. Prefer the use of this function
to [find_base], unless you explicitly want to see if the base is bound. *)
diff --git a/src/kernel_services/abstract_interp/offsetmap_bitwise_sig.ml b/src/kernel_services/abstract_interp/offsetmap_bitwise_sig.ml
index d2d971e92ac25a7932fafc316fcfa4ce001d281a..ff0c3857d4822ee92be6cde70b415048d447f001 100644
--- a/src/kernel_services/abstract_interp/offsetmap_bitwise_sig.ml
+++ b/src/kernel_services/abstract_interp/offsetmap_bitwise_sig.ml
@@ -68,11 +68,11 @@ module type S = sig
val add_binding_intervals :
validity:Base.validity ->
- exact:bool -> intervals -> v -> t -> t Bottom.or_bottom
+ exact:bool -> intervals -> v -> t -> t Lattice_bounds.or_bottom
val add_binding_ival :
validity:Base.validity ->
- exact:bool -> Ival.t -> size:Int_Base.t -> v -> t -> t Bottom.or_bottom
+ exact:bool -> Ival.t -> size:Int_Base.t -> v -> t -> t Lattice_bounds.or_bottom
(** {2 Creating an offsetmap} *)
@@ -84,7 +84,7 @@ module type S = sig
(** offsetmap containing no interval. *)
val size_from_validity:
- Base.validity -> Integer.t Bottom.or_bottom
+ Base.validity -> Integer.t Lattice_bounds.or_bottom
(** [size_from_validity v] returns the size to be used when creating a
new offsetmap for a base with validity [v]. This is a convention that
should be shared by all modules that create offsetmaps.
diff --git a/src/kernel_services/abstract_interp/offsetmap_sig.ml b/src/kernel_services/abstract_interp/offsetmap_sig.ml
index 6f4953cff18219faf36f277b82bef8a5320d6989..a3eaddf8e10463cb7e50d33ae405c9fd0524e65b 100644
--- a/src/kernel_services/abstract_interp/offsetmap_sig.ml
+++ b/src/kernel_services/abstract_interp/offsetmap_sig.ml
@@ -67,7 +67,7 @@ module type S = sig
val empty: t
(** offsetmap containing no interval. *)
- val size_from_validity: Base.validity -> Integer.t Bottom.or_bottom
+ val size_from_validity: Base.validity -> Integer.t Lattice_bounds.or_bottom
(** [size_from_validity v] returns the size to be used when creating a
new offsetmap for a base with validity [v]. This is a convention that
must be shared by all modules that create offsetmaps, because operations
@@ -200,7 +200,7 @@ module type S = sig
val copy_slice:
validity:Base.validity ->
offsets:Ival.t -> size:Integer.t ->
- t -> t Bottom.or_bottom
+ t -> t Lattice_bounds.or_bottom
(** [copy_slice ~validity ~offsets ~size m] copies and merges the slices of
[m] starting at offsets [offsets] and of size [size]. Offsets invalid
according to [validity] are removed. [size] must be strictly greater
@@ -224,7 +224,7 @@ module type S = sig
offsets:Ival.t ->
size:Int.t ->
v ->
- t -> t Bottom.or_bottom
+ t -> t Lattice_bounds.or_bottom
(** [update ?origin ~validity ~exact ~offsets ~size v m] writes [v],
of size [size], each [offsets] in [m]; [m] must be of the size implied by
[validity]. [~exact=true] results in a strong update, while
@@ -239,7 +239,7 @@ module type S = sig
offsets:Ival.t ->
size:Int.t ->
v ->
- t -> t Bottom.or_bottom
+ t -> t Lattice_bounds.or_bottom
(** Same as {!update}, except that no over-approximation on the set
of offsets or on the value written occurs. In case of imprecision,
[m] is not updated. *)
@@ -248,7 +248,7 @@ module type S = sig
val update_imprecise_everywhere:
validity:Base.validity ->
Origin.t -> v ->
- t -> t Bottom.or_bottom
+ t -> t Lattice_bounds.or_bottom
(** [update_everywhere ~validity o v m] computes the offsetmap resulting
from imprecisely writing [v] potentially anywhere where [m] is valid
according to [validity]. If a value becomes too imprecise, [o] is used
@@ -260,7 +260,7 @@ module type S = sig
from:t ->
size:Int.t ->
offsets:Ival.t ->
- t -> t Bottom.or_bottom
+ t -> t Lattice_bounds.or_bottom
(** {2 Shape} *)
diff --git a/src/kernel_services/ast_queries/cil.ml b/src/kernel_services/ast_queries/cil.ml
index 3c082c2656e4f9c8b15fa9af9cba1c1600c90af4..1e01739034f7bc04df3c61063925c1a94465234e 100644
--- a/src/kernel_services/ast_queries/cil.ml
+++ b/src/kernel_services/ast_queries/cil.ml
@@ -387,6 +387,8 @@ let setTypeAttrs t a =
let qualifier_attributes = [ "const"; "restrict"; "volatile"; "ghost" ]
+let fc_internal_attributes = ["declspec"; "arraylen"; "fc_stdlib"]
+
let filter_qualifier_attributes al =
List.filter
(fun a -> List.mem (attributeName a) qualifier_attributes) al
@@ -4604,7 +4606,8 @@ and constFold (machdep: bool) (e: exp) : exp =
Kernel.debug ~dkey "ConstFold CAST to %a@." !pp_typ_ref t ;
let e = constFold machdep e in
match e.enode, unrollType t with
- | Const(CInt64(i,_k,_)),(TInt(nk,a)|TEnum({ekind = nk},a)) when a = [] ->
+ | Const(CInt64(i,_k,_)),(TInt(nk,a)|TEnum({ekind = nk},a))
+ when dropAttributes fc_internal_attributes a = [] ->
begin
(* If the cast has attributes, leave it alone. *)
Kernel.debug ~dkey "ConstFold to %a : %a@."
@@ -4978,20 +4981,25 @@ let mk_behavior ?(name=default_behavior_name) ?(assumes=[]) ?(requires=[])
}
let spare_attributes_for_c_cast =
- "declspec"::"arraylen"::"fc_stdlib"::qualifier_attributes
+ fc_internal_attributes @ qualifier_attributes
-let type_remove_attributes_for_c_cast =
- typeRemoveAttributes spare_attributes_for_c_cast
+let type_remove_attributes_for_c_cast t =
+ let t = typeRemoveAttributesDeep fc_internal_attributes t in
+ typeRemoveAttributes spare_attributes_for_c_cast t
let spare_attributes_for_logic_cast =
spare_attributes_for_c_cast
-let type_remove_attributes_for_logic_type =
- typeRemoveAttributes spare_attributes_for_logic_cast
+let type_remove_attributes_for_logic_type t =
+ let t = typeRemoveAttributesDeep fc_internal_attributes t in
+ typeRemoveAttributes spare_attributes_for_logic_cast t
let () = Cil_datatype.drop_non_logic_attributes :=
dropAttributes spare_attributes_for_logic_cast
+let () = Cil_datatype.drop_fc_internal_attributes :=
+ dropAttributes fc_internal_attributes
+
let need_cast ?(force=false) oldt newt =
let oldt = type_remove_attributes_for_c_cast (unrollType oldt) in
let newt = type_remove_attributes_for_c_cast (unrollType newt) in
@@ -5829,16 +5837,12 @@ let mkCastT ?(force=false) ~(oldt: typ) ~(newt: typ) e =
(match e.enode with | Const(CEnum _) -> false | _ -> true)
in *)
if need_cast ~force oldt newt then begin
- let target_type =
- match newt with
- | TNamed _ -> newt
- | _ -> type_remove_attributes_for_c_cast newt
- in
let mk_cast exp = (* to new type [newt] *)
- new_exp ~loc (CastE(target_type,exp))
+ new_exp ~loc (CastE(type_remove_qualifier_attributes newt,exp))
in
+ let normalized_type = type_remove_attributes_for_c_cast (unrollType newt) in
(* Watch out for constants and cast of cast to pointer *)
- match unrollType newt, e.enode with
+ match normalized_type, e.enode with
(* In the case were we have a representation for the literal,
explicitly add the cast. *)
| TInt(newik, []), Const(CInt64(i, _, None)) ->
@@ -6905,7 +6909,7 @@ module Switch_cases =
let switch_case_state_self = Switch_cases.self
let separate_switch_succs = Switch_cases.memo separate_switch_succs
-class dropAttributes ?select () = object
+class dropAttributes ?select () = object(self)
inherit genericCilVisitor (Visitor_behavior.copy (Project.current ()))
method! vattr a =
match select with
@@ -6918,8 +6922,9 @@ class dropAttributes ?select () = object
| TNamed (internal_ty, attrs) ->
let tty = typeAddAttributes attrs internal_ty.ttype in
(* keep the original type whenever possible *)
- ChangeDoChildrenPost
- (tty, fun x -> if x == internal_ty.ttype then ty else x)
+ ChangeToPost
+ (visitCilType (self:>cilVisitor) tty,
+ fun x -> if x == internal_ty.ttype then ty else x)
| TVoid _ | TInt _ | TFloat _ | TPtr _ | TArray _ | TFun _
| TComp _ | TEnum _ | TBuiltin_va_list _ -> DoChildren
end
diff --git a/src/kernel_services/ast_queries/cil_datatype.ml b/src/kernel_services/ast_queries/cil_datatype.ml
index e88814b2d0328c72ddfb3e7134739ae4ecdb1a2b..bbee2f5bcc4a4bd554a6836df84f1fbdcca20f1e 100644
--- a/src/kernel_services/ast_queries/cil_datatype.ml
+++ b/src/kernel_services/ast_queries/cil_datatype.ml
@@ -436,6 +436,7 @@ let constfoldtoint = Extlib.mk_fun "constfoldtoint"
let punrollType = Extlib.mk_fun "punrollType"
let punrollLogicType = Extlib.mk_fun "punrollLogicType"
let drop_non_logic_attributes = ref (fun a -> a)
+let drop_fc_internal_attributes = ref (fun a -> a)
let compare_exp_struct_eq = Extlib.mk_fun "compare_exp_struct_eq"
type type_compare_config =
@@ -455,7 +456,8 @@ and compare_attributes config l1 l2 =
else
let l1, l2 = if config.logic_type
then !drop_non_logic_attributes l1, !drop_non_logic_attributes l2
- else l1,l2
+ else
+ !drop_fc_internal_attributes l1, !drop_fc_internal_attributes l2
in compare_list (compare_attribute config) l1 l2
and compare_attrparam_list config l1 l2 =
compare_list (compare_attrparam config) l1 l2
diff --git a/src/kernel_services/ast_queries/cil_datatype.mli b/src/kernel_services/ast_queries/cil_datatype.mli
index c25bec64338e2c11fb6f5513d201d8445d7823a1..fbd5d96363fae549ff60f49bce11bfe26c386346 100644
--- a/src/kernel_services/ast_queries/cil_datatype.mli
+++ b/src/kernel_services/ast_queries/cil_datatype.mli
@@ -375,6 +375,7 @@ module Lexpr: S with type t = Logic_ptree.lexpr
(* Forward declarations from Cil et al. *)
val drop_non_logic_attributes : (attributes -> attributes) ref
+val drop_fc_internal_attributes : (attributes -> attributes) ref
val constfoldtoint : (exp -> Integer.t option) ref
val punrollType: (typ -> typ) ref
val punrollLogicType: (logic_type -> logic_type) ref
diff --git a/src/kernel_services/ast_queries/file.ml b/src/kernel_services/ast_queries/file.ml
index 8e13ffb974ce79618efe86de7e99d265efd93474..2ef99461cb121d60fe36e8073e4bfd579743b693 100644
--- a/src/kernel_services/ast_queries/file.ml
+++ b/src/kernel_services/ast_queries/file.ml
@@ -38,9 +38,10 @@ type file =
Filepath.Normalized.t (* Filename of the [.c] to preprocess. *)
* string (* Preprocessing command, as given by -cpp-command, or
the default value, but without extra arguments. *)
- * string list (* Extra arguments (already included in the command)
- which must also be given to the logic preprocessor
- (since Frama-C may preprocess twice each source). *)
+ * string list (* Extra arguments, specific to this file (that is,
+ obtained via a JCDB, or -cpp-extra-args-per-file,
+ but _not_ those via -cpp-extra-args), to be given
+ to the C preprocessor. *)
* cpp_opt_kind (* Whether the preprocessor is known to be compatible with
GCC-style options (mostly, -D and -I). *)
| NoCPP of Filepath.Normalized.t (** filename of a preprocessed [.c] *)
@@ -126,7 +127,7 @@ let from_filename ?cpp f =
else if cpp = None then get_preprocessor_command ()
else Option.get cpp
in
- let extra =
+ let extra_for_this_file =
let extra_by_file =
try Kernel.CppExtraArgsPerFile.find f
with Not_found -> ""
@@ -156,7 +157,7 @@ let from_filename ?cpp f =
Kernel.warning ~once:true
"Default pre-processor does not keep comments. Any ACSL annotation \
on non-pre-processed file will be discarded.";
- NeedCPP (f, cpp, extra, is_cpp_gnu_like ())
+ NeedCPP (f, cpp, extra_for_this_file, is_cpp_gnu_like ())
end else
Kernel.abort "No working pre-processor found. You can only analyze \
pre-processed .i files."
@@ -467,7 +468,7 @@ let adjust_pwd fp cpp_command =
let build_cpp_cmd = function
| NoCPP _ | External _ -> None
- | NeedCPP (f, cmdl, extra, is_gnu_like) ->
+ | NeedCPP (f, cmdl, extra_for_this_file, is_gnu_like) ->
if not (Sys.file_exists (f :> string)) then
Kernel.abort "source file %a does not exist"
Filepath.Normalized.pretty f;
@@ -490,16 +491,16 @@ let build_cpp_cmd = function
let ppf = create_temp_file ~debug (Filename.basename (f :> string)) ".i" in
(* Hypothesis: the preprocessor is POSIX compliant,
hence understands -I and -D. *)
- let include_args =
+ let fc_include_args =
if Kernel.FramaCStdLib.get () then [(Fc_config.framac_libc:>string)]
else []
in
- let define_args =
+ let fc_define_args =
if not (existing_machdep_macro ())
then [machdep_macro (Kernel.Machdep.get ())]
else []
in
- let define_args = "__FRAMAC__" :: define_args in
+ let fc_define_args = "__FRAMAC__" :: fc_define_args in
(* Hypothesis: the preprocessor does support the arch-related
options tested when 'configure' was run. *)
let required_cpp_arch_args = (get_machdep ()).cpp_arch_flags in
@@ -539,10 +540,13 @@ let build_cpp_cmd = function
in
let supp_args =
string_of_supp_args
- (Kernel.CppExtraArgs.get () @ gnu_implicit_args @ supported_cpp_arch_args @ extra)
- include_args define_args
+ (gnu_implicit_args @ supported_cpp_arch_args @
+ extra_for_this_file @ (Kernel.CppExtraArgs.get ()))
+ fc_include_args fc_define_args
+ in
+ let cpp_command =
+ replace_in_cpp_cmd cmdl supp_args (f:>string) (ppf:>string)
in
- let cpp_command = replace_in_cpp_cmd cmdl supp_args (f:>string) (ppf:>string) in
let workdir, cpp_command_with_chdir = adjust_pwd f cpp_command in
if workdir <> None then
Parse_env.set_workdir ppf (Option.get workdir);
@@ -551,6 +555,33 @@ let build_cpp_cmd = function
cpp_command_with_chdir;
Some (cpp_command_with_chdir, ppf, supported_cpp_arch_args)
+let abort_with_detailed_pp_message f cpp_command =
+ let possible_cause =
+ if Kernel.JsonCompilationDatabase.is_set () then
+ if not (Json_compilation_database.has_entry f) then
+ Format.asprintf "note: %s is set but \
+ contains no entries for '%a'.@ "
+ Kernel.JsonCompilationDatabase.option_name
+ Datatype.Filepath.pretty f
+ else ""
+ else
+ if not (Kernel.CppExtraArgs.is_set ()) &&
+ not (Kernel.CppExtraArgsPerFile.is_set ()) &&
+ not (Kernel.CppCommand.is_set ()) then
+ Format.asprintf
+ "this is possibly due to missing preprocessor flags;@ \
+ consider options %s, %s or %s.@ "
+ Kernel.CppExtraArgs.option_name
+ Kernel.JsonCompilationDatabase.option_name
+ Kernel.CppCommand.option_name
+ else ""
+ in
+ Kernel.abort
+ "failed to run: %s@\n\
+ %sSee chapter \"Preparing the Sources\" in the Frama-C user manual \
+ for more details."
+ cpp_command possible_cause
+
let parse_cabs cpp_command = function
| NoCPP f ->
if not (Sys.file_exists (f:>string)) then
@@ -559,37 +590,13 @@ let parse_cabs cpp_command = function
Kernel.feedback "Parsing %a (no preprocessing)"
Datatype.Filepath.pretty f;
Frontc.parse f ()
- | NeedCPP (f, cmdl, _extra, is_gnu_like) ->
+ | NeedCPP (f, cmdl, _extra_for_this_file, is_gnu_like) ->
let cpp_command, ppf, logic_pp_args = Option.get cpp_command in
Kernel.feedback "Parsing %a (with preprocessing)"
Datatype.Filepath.pretty f;
if Sys.command cpp_command <> 0 then begin
safe_remove_file ppf;
- let possible_cause =
- if Kernel.JsonCompilationDatabase.is_set () then
- if not (Json_compilation_database.has_entry f) then
- Format.asprintf "note: %s is set but \
- contains no entries for '%a'.@ "
- Kernel.JsonCompilationDatabase.option_name
- Datatype.Filepath.pretty f
- else ""
- else
- if not (Kernel.CppExtraArgs.is_set ()) &&
- not (Kernel.CppExtraArgsPerFile.is_set ()) &&
- not (Kernel.CppCommand.is_set ()) then
- Format.asprintf
- "this is possibly due to missing preprocessor flags;@ \
- consider options %s, %s or %s.@ "
- Kernel.CppExtraArgs.option_name
- Kernel.JsonCompilationDatabase.option_name
- Kernel.CppCommand.option_name
- else ""
- in
- Kernel.abort
- "failed to run: %s@\n\
- %sSee chapter \"Preparing the Sources\" in the Frama-C user manual \
- for more details."
- cpp_command possible_cause
+ abort_with_detailed_pp_message f cpp_command
end;
let ppf =
if Kernel.ReadAnnot.get() &&
diff --git a/src/kernel_services/ast_queries/filecheck.ml b/src/kernel_services/ast_queries/filecheck.ml
index 3a1cad261993528fc7b8c93dd1c0e06cc1705d2d..42996576ae75391881fca771af1ed42491192f57 100644
--- a/src/kernel_services/ast_queries/filecheck.ml
+++ b/src/kernel_services/ast_queries/filecheck.ml
@@ -24,10 +24,18 @@ open Cil_types
open Cil_datatype
+let same_integral_types t1 t2 =
+ match Cil.unrollType t1, Cil.unrollType t2 with
+ | TInt(ik1,[]), TInt(ik2,[]) ->
+ Cil.bitsSizeOfInt ik1 = Cil.bitsSizeOfInt ik2 &&
+ Cil.isSigned ik1 = Cil.isSigned ik2
+ | _ -> false
+
let is_admissible_conversion e ot nt =
let ot' = Cil.typeDeepDropAllAttributes ot in
let nt' = Cil.typeDeepDropAllAttributes nt in
not (Cil.need_cast ot' nt') ||
+ same_integral_types ot' nt' ||
(match e.enode, Cil.unrollType nt with
| Const(CEnum { eihost = ei }), TEnum(ei',_) -> ei.ename = ei'.ename
| _ -> false)
@@ -1310,6 +1318,15 @@ module Base_checker = struct
| Local_init (v, ConsInit(f,args,k),loc) ->
self#check_initialized_var v;
Cil.treat_constructor_as_func treat_call v f args k loc
+ | Set(lv, rv, _) ->
+ let t1 = Cil.typeOfLval lv in
+ let t2 = Cil.typeOf rv in
+ if not (is_admissible_conversion rv t2 t1) then
+ check_abort
+ "Incompatible types in assignment %a:\
+ location has type %a, value has type %a"
+ Printer.pp_instr i Printer.pp_typ t1 Printer.pp_typ t2;
+ Cil.DoChildren
| Asm(_,_,Some { asm_gotos },_) ->
List.iter self#check_label asm_gotos; Cil.DoChildren
| _ -> Cil.DoChildren
diff --git a/src/kernel_services/ast_queries/logic_utils.ml b/src/kernel_services/ast_queries/logic_utils.ml
index abaf9ce3212b52599eced4dfbaf1bb3944fe671d..c9775138c1983f756ddfe885a5cfe1115caf46ef 100644
--- a/src/kernel_services/ast_queries/logic_utils.ml
+++ b/src/kernel_services/ast_queries/logic_utils.ml
@@ -225,24 +225,26 @@ let equal_ltype = Cil_datatype.Logic_type.equal
(* Does the same kind of optimization than [Cil.mkCastT] for [Ctype]. *)
let mk_cast ?loc ?(force=false) newt t =
- let newt = Cil.type_remove_attributes_for_logic_type newt in
- if equal_ltype (Ctype newt) t.term_type then t else
+ let newt' = Cil.type_remove_attributes_for_logic_type newt in
+ if equal_ltype (Ctype newt') t.term_type then t else
let rec unroll_cast e = match e.term_node with
| TCastE(oldt,e)
- when (Cil.isPointerType newt && Cil.isPointerType oldt)
- || equal_ltype (Ctype oldt) (Ctype newt)
+ when (Cil.isPointerType newt' && Cil.isPointerType oldt)
+ || equal_ltype
+ (Ctype (Cil.type_remove_attributes_for_logic_type oldt))
+ (Ctype newt')
-> unroll_cast e
| TLogic_coerce(Linteger,e)
- when Cil.isArithmeticOrPointerType newt
+ when Cil.isArithmeticOrPointerType newt'
-> unroll_cast e
| TLogic_coerce(Lreal,e)
- when Cil.isFloatingType newt
+ when Cil.isFloatingType newt'
-> unroll_cast e
| _ -> e
in
let tres = if force then t else unroll_cast t in
let loc = match loc with None -> t.term_loc | Some loc -> loc in
- Logic_const.term ~loc (TCastE (newt, tres)) (Ctype newt)
+ Logic_const.term ~loc (TCastE (newt, tres)) (Ctype newt')
(* -------------------------------------------------------------------------- *)
diff --git a/src/plugins/aorai/tests/ltl/oracle/test_boucle.res.oracle b/src/plugins/aorai/tests/ltl/oracle/test_boucle.res.oracle
index 161d7fffc02421fc61a825afe2974879ff43fc2f..ed67037b7e49523b2c56191bee3dda3139efe290 100644
--- a/src/plugins/aorai/tests/ltl/oracle/test_boucle.res.oracle
+++ b/src/plugins/aorai/tests/ltl/oracle/test_boucle.res.oracle
@@ -345,9 +345,7 @@ int main(void)
loop invariant Aorai: 0 ≡ T0_init;
loop invariant Aorai: 1 ≡ accept_S1 ∨ 0 ≡ accept_S1;
loop invariant Aorai: 1 ≡ T0_S2 ∨ 1 ≡ accept_S1;
- loop invariant
- Aorai:
- aorai_Loop_Init_7 ≢ 0 ⇒ \at(1 ≡ T0_init,Pre) ⇒ 0 ≡ T0_S2;
+ loop invariant Aorai: aorai_Loop_Init_7 ≢ 0 ⇒ 0 ≡ T0_S2;
loop invariant Aorai: aorai_Loop_Init_7 ≡ 0 ⇒ 0 ≡ accept_S1;
*/
while (x < 10) {
diff --git a/src/plugins/aorai/tests/ltl/oracle/test_boucle2.res.oracle b/src/plugins/aorai/tests/ltl/oracle/test_boucle2.res.oracle
index e7a1820d0d8bea6a21495045420ed80caa71742a..d3157f00b33b6a3b14f5410e7859164729bff932 100644
--- a/src/plugins/aorai/tests/ltl/oracle/test_boucle2.res.oracle
+++ b/src/plugins/aorai/tests/ltl/oracle/test_boucle2.res.oracle
@@ -498,10 +498,7 @@ int main(void)
loop invariant Aorai: 0 ≡ accept_S5;
loop invariant Aorai: 0 ≡ accept_all;
loop invariant Aorai: 1 ≡ T0_S2 ∨ 1 ≡ accept_S3;
- loop invariant
- Aorai:
- aorai_Loop_Init_7 ≢ 0 ⇒
- \at(1 ≡ T0_init,Pre) ⇒ 0 ≡ accept_S3;
+ loop invariant Aorai: aorai_Loop_Init_7 ≢ 0 ⇒ 0 ≡ accept_S3;
*/
while (rr < 50) {
/*@ ghost aorai_Loop_Init_7 = 0; */
diff --git a/src/plugins/callgraph/cg.ml b/src/plugins/callgraph/cg.ml
index a5363fdb19eb75b280969f96a61ade45c75e37e2..5daf8249498f3ebf1ed13cff9c0a9929fd05e3cb 100644
--- a/src/plugins/callgraph/cg.ml
+++ b/src/plugins/callgraph/cg.ml
@@ -205,7 +205,7 @@ let syntactic_compute g =
let semantic_compute g =
Globals.Functions.iter
(fun kf ->
- let callers = !Db.Value.callers kf in
+ let callers = Eva.Results.callsites kf in
let must_add =
callers <> [] (* the function is called *)
|| is_entry_point kf
diff --git a/src/plugins/e-acsl/scripts/e-acsl-gcc.sh b/src/plugins/e-acsl/scripts/e-acsl-gcc.sh
index 305398daa90f9c17a50a2d74d520a05501dd9b2d..2a0fd719ccfcf85ab8fc46f787edf0936dc7935b 100755
--- a/src/plugins/e-acsl/scripts/e-acsl-gcc.sh
+++ b/src/plugins/e-acsl/scripts/e-acsl-gcc.sh
@@ -424,9 +424,13 @@ Options:
-c compile instrumented code
-C assume that the input files have already been instrumented
-l pass additional options to the linker
+ (e.g. -l -lm)
-e pass additional options to the prepreprocessor
+ (e.g. -e \"-DPI=3.14 -DE_ACSL_DEBUG_ASSERT\")
-E pass additional arguments to the Frama-C preprocessor
+ (e.g. -E \"-Iinclude -DMACRO=1\")
-F pass additional options to the Frama-C command line
+ (e.g. -F -c11)
-o <file> output the generated code to <file> [a.out.frama.c]
-O <file> output the generated executables to <file> [a.out, a.out.e-acsl]
-M maximize memory-related instrumentation
diff --git a/src/plugins/e-acsl/share/e-acsl/observation_model/internals/e_acsl_safe_locations.c b/src/plugins/e-acsl/share/e-acsl/observation_model/internals/e_acsl_safe_locations.c
index 4169419fdbf5030345e5414704ab2888925a738b..6e0d5403e95fe600ef421349c21dbfa62d829120 100644
--- a/src/plugins/e-acsl/share/e-acsl/observation_model/internals/e_acsl_safe_locations.c
+++ b/src/plugins/e-acsl/share/e-acsl/observation_model/internals/e_acsl_safe_locations.c
@@ -42,14 +42,43 @@ static __thread int safe_location_counter = 0;
safe_location_counter++; \
} while (0)
+struct segment_boundaries safe_locations_boundaries = {
+ .start = 0,
+ .end = 0,
+};
+
+uintptr_t get_safe_locations_start() {
+ uintptr_t min = get_safe_location(0)->address;
+ for (int i = 1; i < get_safe_locations_count(); i++) {
+ memory_location *location = get_safe_location(i);
+ if (min >= location->address)
+ min = location->address;
+ }
+ return min;
+}
+
+uintptr_t get_safe_locations_end() {
+ uintptr_t max = get_safe_location(0)->address;
+ for (int i = 1; i < get_safe_locations_count(); i++) {
+ memory_location *location = get_safe_location(i);
+ if (max <= location->address)
+ max = location->address;
+ }
+ return max;
+}
+
void collect_safe_locations() {
/* Tracking of errno and standard streams */
add_safe_location((uintptr_t)&errno, sizeof(int), 1, E_ACSL_OS_IS_LINUX);
add_safe_location((uintptr_t)stdout, sizeof(FILE), 1, E_ACSL_OS_IS_LINUX);
add_safe_location((uintptr_t)stderr, sizeof(FILE), 1, E_ACSL_OS_IS_LINUX);
add_safe_location((uintptr_t)stdin, sizeof(FILE), 1, E_ACSL_OS_IS_LINUX);
+ safe_locations_boundaries.start = get_safe_locations_start();
+ safe_locations_boundaries.end = get_safe_locations_end();
}
+/* collect_safe_locations(); */
+
size_t get_safe_locations_count() {
return safe_location_counter;
}
diff --git a/src/plugins/e-acsl/share/e-acsl/observation_model/internals/e_acsl_safe_locations.h b/src/plugins/e-acsl/share/e-acsl/observation_model/internals/e_acsl_safe_locations.h
index 19c05fec0687b9af6b35c7628e81a2b2962cf20f..f77a3ca4c0f7890abe4da678cd129552219cc315 100644
--- a/src/plugins/e-acsl/share/e-acsl/observation_model/internals/e_acsl_safe_locations.h
+++ b/src/plugins/e-acsl/share/e-acsl/observation_model/internals/e_acsl_safe_locations.h
@@ -50,6 +50,14 @@ struct memory_location {
};
typedef struct memory_location memory_location;
+struct segment_boundaries {
+ uintptr_t start;
+ uintptr_t end;
+};
+typedef struct segment_boundaries segment_boundaries;
+
+struct segment_boundaries safe_locations_boundaries;
+
/*! Initialize the array of safe locations */
void collect_safe_locations();
diff --git a/src/plugins/e-acsl/share/e-acsl/observation_model/segment_model/e_acsl_shadow_concurrency.c b/src/plugins/e-acsl/share/e-acsl/observation_model/segment_model/e_acsl_shadow_concurrency.c
index 042eef56fbcf55f56be63002d2825d290ccc6570..3d92f1977f81bc31634a6c04888742941d62047f 100644
--- a/src/plugins/e-acsl/share/e-acsl/observation_model/segment_model/e_acsl_shadow_concurrency.c
+++ b/src/plugins/e-acsl/share/e-acsl/observation_model/segment_model/e_acsl_shadow_concurrency.c
@@ -183,7 +183,11 @@ static void fill_thread_layout_stack(memory_partition *pstack,
static void fill_thread_layout_tls(memory_partition *ptls) {
// Since the TLS is by design specific to each thread, we can reuse the
// method used to identify the TLS segment in the main thread
- set_application_segment(&ptls->application, get_tls_start(), get_tls_size(),
+ // We first need to collect the safe locations of the current thread,
+ // since we need to register them in case the program uses one of them
+ // inside the thread
+ collect_safe_locations();
+ set_application_segment(&ptls->application, get_tls_start(0), get_tls_size(),
"thread_tls", NULL);
set_shadow_segment(&ptls->primary, &ptls->application, 1,
"thread_tls_primary");
diff --git a/src/plugins/e-acsl/share/e-acsl/observation_model/segment_model/e_acsl_shadow_layout.c b/src/plugins/e-acsl/share/e-acsl/observation_model/segment_model/e_acsl_shadow_layout.c
index 258cc25fde89442abd39671ac57a6d50ace6b9d0..15870873f1afe6e642d76b62ec3760a7d881f700 100644
--- a/src/plugins/e-acsl/share/e-acsl/observation_model/segment_model/e_acsl_shadow_layout.c
+++ b/src/plugins/e-acsl/share/e-acsl/observation_model/segment_model/e_acsl_shadow_layout.c
@@ -53,6 +53,9 @@ extern char end;
/*!\brief The first address of a program. */
extern char __executable_start;
+uintptr_t actual_tls_size = 0;
+uintptr_t registered_tls_start = 0;
+
size_t increase_stack_limit(const size_t size) {
rlim_t stacksz = (rlim_t)size;
struct rlimit rl;
@@ -166,7 +169,7 @@ static size_t get_global_size() {
/*! \brief Return byte-size of the TLS segment */
inline size_t get_tls_size() {
- return PGM_TLS_SIZE;
+ return (actual_tls_size == 0 ? PGM_TLS_SIZE : actual_tls_size);
}
static __thread int id_tdata = 1;
@@ -220,13 +223,40 @@ static void grow_bounds_for_size(uintptr_t *min_bound, uintptr_t *max_bound,
}
}
+// We do not exactly know the bounds of the TLS, we can only guess an
+// approximation. To do that, we take TLS's known addresses and add a buffer
+// around them. Since the TLS in Linux is positionned around the heap, we can
+// check if the approximation overlaps with heap space and adjust it
+// accordingly. The heap spaces allocated for E-ACSL are of course application
+// heap and rtl spaces, but also shadow memory spaces. We also add as a condition
+// that the [safe_locations] should be in the TLS, by construction. It might
+// happen that those addresses are separated by a more than half the size of
+// our initial guess. If this is the case, we have to increase the size of
+// our guess in order to fit both the TLS that we see and its shadow model.
+static void init_tls_size() {
+ uintptr_t data = (uintptr_t)&id_tdata, bss = (uintptr_t)&id_tbss;
+ uintptr_t min_safe_loc = safe_locations_boundaries.start;
+ uintptr_t max_safe_loc = safe_locations_boundaries.end;
+ uintptr_t min_addr = data < bss ? data : bss;
+ uintptr_t max_addr = data > bss ? data : bss;
+ min_addr = min_addr < min_safe_loc ? min_addr : min_safe_loc;
+ max_addr = max_addr > max_safe_loc ? max_addr : max_safe_loc;
+ uintptr_t size = (max_addr - min_addr + 1) * 2;
+ actual_tls_size = size > PGM_TLS_SIZE ? size : PGM_TLS_SIZE;
+}
+
/*! \brief Return start address of a program's TLS */
-uintptr_t get_tls_start() {
+uintptr_t get_tls_start(int main_thread) {
size_t tls_size = get_tls_size();
uintptr_t data = (uintptr_t)&id_tdata, bss = (uintptr_t)&id_tbss;
+ uintptr_t min_safe_loc = safe_locations_boundaries.start;
+ uintptr_t max_safe_loc = safe_locations_boundaries.end;
uintptr_t min_addr = data < bss ? data : bss;
uintptr_t max_addr = data > bss ? data : bss;
-
+ if (main_thread) {
+ min_addr = min_addr < min_safe_loc ? min_addr : min_safe_loc;
+ max_addr = max_addr > max_safe_loc ? max_addr : max_safe_loc;
+ }
// We do not exactly know the bounds of the TLS, we can only guess an
// approximation. To do that, we take TLS's known addresses and add a buffer
// around them. Since the TLS in Linux is positionned around the heap, we can
@@ -287,15 +317,19 @@ uintptr_t get_tls_start() {
private_abort("Unsupported TLS area in the middle of heap area.\n"
"Example bss TLS address: %a\n"
"Example data TLS address: %a\n"
- "Estimated bounds of heap area: [%a, %a]\n",
- bss, data, min_bound, max_bound);
+ "Range of safe locations data: [%a, %a]\n"
+ "Estimated bounds of heap area: [%a, %a]\n"
+ "Minimal TLS address: %a\n",
+ bss, data, min_safe_loc, max_safe_loc, min_bound, max_bound,
+ min_addr);
}
-
private_assert(tls_start <= min_addr && max_addr <= tls_end,
"Configured TLS size smaller than actual TLS size\n"
"Configured TLS size: %" PRIxPTR " MB\n"
"Minimum supported TLS size for this execution: %" PRIxPTR
- " MB (%" PRIxPTR " B)\n",
+ " MB (%" PRIxPTR " B)\n"
+ "Please ensure that the TLS size has been initialize with "
+ "[init_tls_size()]",
MB_SZ(tls_size),
// The minimum actual size is found by substracting the lesser
// known TLS address to the greater one. Since we estimate the
@@ -328,7 +362,10 @@ static void init_shadow_layout_global() {
static void init_shadow_layout_tls() {
memory_partition *ptls = &mem_layout.tls;
- set_application_segment(&ptls->application, get_tls_start(), get_tls_size(),
+ /* Collect the safe locations of the main thread */
+ collect_safe_locations();
+ init_tls_size();
+ set_application_segment(&ptls->application, get_tls_start(1), get_tls_size(),
"tls", NULL);
/* Changes of the ratio in the following would require changes in get_tls_start */
set_shadow_segment(&ptls->primary, &ptls->application, 1, "tls_primary");
@@ -709,7 +746,6 @@ void init_shadow_layout_main(int *argc_ref, char ***argv_ref) {
}
void register_safe_locations(int thread_only) {
- collect_safe_locations();
int count = get_safe_locations_count();
for (int i = 0; i < count; ++i) {
memory_location *loc = get_safe_location(i);
diff --git a/src/plugins/e-acsl/share/e-acsl/observation_model/segment_model/e_acsl_shadow_layout.h b/src/plugins/e-acsl/share/e-acsl/observation_model/segment_model/e_acsl_shadow_layout.h
index 0dc8ade8124565c23a3218867afc3c9ca51c6d93..5a7bf7272c4637f4605e4266535b5b816b44c400 100644
--- a/src/plugins/e-acsl/share/e-acsl/observation_model/segment_model/e_acsl_shadow_layout.h
+++ b/src/plugins/e-acsl/share/e-acsl/observation_model/segment_model/e_acsl_shadow_layout.h
@@ -120,7 +120,7 @@ size_t get_heap_size();
size_t get_tls_size();
/*! \brief Return start address of a program's TLS */
-uintptr_t get_tls_start();
+uintptr_t get_tls_start(int main_thread);
/** }}} */
/** Shadow Layout {{{ */
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_arith.c b/src/plugins/e-acsl/tests/arith/oracle/gen_arith.c
index 43aaec7eacd2592aa67157b4caf47aeb9ae6c097..a9569cdb54c0fa8669b87d25dd2a4e320d2017b8 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_arith.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_arith.c
@@ -11,7 +11,7 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
int x = -3;
int y = 2;
long z = 2L;
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_array.c b/src/plugins/e-acsl/tests/arith/oracle/gen_array.c
index de262a615a363112e6d708bbb214a00d2e103c45..f6d5820bc95c3fae909ece295da321122f387977 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_array.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_array.c
@@ -14,10 +14,10 @@ void arrays(void)
{
int a[3] = {1, 2, 3};
int b[3] = {4, 5, 6};
- __e_acsl_store_block((void *)(b),(size_t)12);
+ __e_acsl_store_block((void *)(b),12UL);
__e_acsl_full_init((void *)(& b));
int c[3] = {1, 2, 3};
- __e_acsl_store_block((void *)(c),(size_t)12);
+ __e_acsl_store_block((void *)(c),12UL);
__e_acsl_full_init((void *)(& c));
int d[6] = {1, 2, 3, 4, 5, 6};
{
@@ -114,10 +114,10 @@ void arrays(void)
/*@ assert a != d; */ ;
int *e = a;
int *f = b;
- __e_acsl_store_block((void *)(& f),(size_t)8);
+ __e_acsl_store_block((void *)(& f),8UL);
__e_acsl_full_init((void *)(& f));
int *g = c;
- __e_acsl_store_block((void *)(& g),(size_t)8);
+ __e_acsl_store_block((void *)(& g),8UL);
__e_acsl_full_init((void *)(& g));
int *h = a;
{
@@ -476,13 +476,13 @@ void arrays(void)
}
/*@ assert a != *((int (*)[])f); */ ;
int i[6] = {1, 2, 3, 4, 5, 6};
- __e_acsl_store_block((void *)(i),(size_t)24);
+ __e_acsl_store_block((void *)(i),24UL);
__e_acsl_full_init((void *)(& i));
int j[6] = {4, 5, 6, 1, 2, 3};
- __e_acsl_store_block((void *)(j),(size_t)24);
+ __e_acsl_store_block((void *)(j),24UL);
__e_acsl_full_init((void *)(& j));
int k[6] = {4, 5, 6, 4, 5, 6};
- __e_acsl_store_block((void *)(k),(size_t)24);
+ __e_acsl_store_block((void *)(k),24UL);
__e_acsl_full_init((void *)(& k));
{
int __gen_e_acsl_ne_5;
@@ -578,13 +578,13 @@ void arrays(void)
}
/*@ assert j != k; */ ;
int *l = & i[3];
- __e_acsl_store_block((void *)(& l),(size_t)8);
+ __e_acsl_store_block((void *)(& l),8UL);
__e_acsl_full_init((void *)(& l));
int *m = & j[3];
- __e_acsl_store_block((void *)(& m),(size_t)8);
+ __e_acsl_store_block((void *)(& m),8UL);
__e_acsl_full_init((void *)(& m));
int *n = & k[3];
- __e_acsl_store_block((void *)(& n),(size_t)8);
+ __e_acsl_store_block((void *)(& n),8UL);
__e_acsl_full_init((void *)(& n));
{
int __gen_e_acsl_ne_8;
@@ -1025,7 +1025,7 @@ void vlas(int n)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
{
int i = 0;
while (i < 3) {
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_at.c b/src/plugins/e-acsl/tests/arith/oracle/gen_at.c
index fc16d53dd1fc412895d4b1ea4afbe73552f7f2b7..0831d63b160cca4cacb1fae80395032016c0f975 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_at.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_at.c
@@ -151,8 +151,8 @@ void g(int *p, int *q)
int __gen_e_acsl_at_3;
int __gen_e_acsl_at_2;
int __gen_e_acsl_at;
- __e_acsl_store_block((void *)(& q),(size_t)8);
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& q),8UL);
+ __e_acsl_store_block((void *)(& p),8UL);
__e_acsl_initialize((void *)p,sizeof(int));
*p = 0;
__e_acsl_initialize((void *)(p + 1),sizeof(int));
@@ -310,7 +310,7 @@ int __gen_e_acsl_h(int x);
int h(int x)
{
- __e_acsl_store_block((void *)(& x),(size_t)4);
+ __e_acsl_store_block((void *)(& x),4UL);
__e_acsl_delete_block((void *)(& x));
return x;
}
@@ -367,9 +367,9 @@ int main(void)
int __retres;
int x;
int t[2];
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
- __e_acsl_store_block((void *)(t),(size_t)8);
- __e_acsl_store_block((void *)(& x),(size_t)4);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+ __e_acsl_store_block((void *)(t),8UL);
+ __e_acsl_store_block((void *)(& x),4UL);
__e_acsl_full_init((void *)(& x));
x = __gen_e_acsl_h(0);
L:
@@ -453,8 +453,8 @@ int __gen_e_acsl_h(int x)
{
int __gen_e_acsl_at;
int __retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
- __e_acsl_store_block((void *)(& x),(size_t)4);
+ __e_acsl_store_block((void *)(& __retres),4UL);
+ __e_acsl_store_block((void *)(& x),4UL);
__gen_e_acsl_at = x;
__retres = h(x);
{
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_at_on-purely-logic-variables.c b/src/plugins/e-acsl/tests/arith/oracle/gen_at_on-purely-logic-variables.c
index cae72156516869acc9f2964bf479d16baafaa71a..684d4c7951352107943ba0eddcdc3905bf0c5614 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_at_on-purely-logic-variables.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_at_on-purely-logic-variables.c
@@ -17,7 +17,7 @@ void __gen_e_acsl_f(int *t);
void f(int *t)
{
- __e_acsl_store_block((void *)(& t),(size_t)8);
+ __e_acsl_store_block((void *)(& t),8UL);
__e_acsl_delete_block((void *)(& t));
return;
}
@@ -26,7 +26,7 @@ void g(void)
{
int *__gen_e_acsl_at;
int m;
- __gen_e_acsl_at = (int *)malloc((size_t)12);
+ __gen_e_acsl_at = (int *)malloc(12UL);
m = 8;
Q:
{
@@ -110,15 +110,15 @@ int main(void)
int *__gen_e_acsl_at;
int __retres;
int n;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
- __gen_e_acsl_at_8 = (long *)malloc((size_t)64);
- __gen_e_acsl_at_7 = (int *)malloc((size_t)12000);
- __gen_e_acsl_at_6 = (long *)malloc((size_t)3072);
- __gen_e_acsl_at_5 = (int *)malloc((size_t)528);
- __gen_e_acsl_at_3 = (int *)malloc((size_t)12);
- __gen_e_acsl_at_2 = (long *)malloc((size_t)8);
- __gen_e_acsl_at = (int *)malloc((size_t)4);
- __e_acsl_store_block((void *)(& n),(size_t)4);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+ __gen_e_acsl_at_8 = (long *)malloc(64UL);
+ __gen_e_acsl_at_7 = (int *)malloc(12000UL);
+ __gen_e_acsl_at_6 = (long *)malloc(3072UL);
+ __gen_e_acsl_at_5 = (int *)malloc(528UL);
+ __gen_e_acsl_at_3 = (int *)malloc(12UL);
+ __gen_e_acsl_at_2 = (long *)malloc(8UL);
+ __gen_e_acsl_at = (int *)malloc(4UL);
+ __e_acsl_store_block((void *)(& n),4UL);
__e_acsl_full_init((void *)(& n));
n = 7;
L:
@@ -620,7 +620,7 @@ int main(void)
*/
;
int t[5] = {9, 12, 12, 12, -4};
- __e_acsl_store_block((void *)(t),(size_t)20);
+ __e_acsl_store_block((void *)(t),20UL);
__e_acsl_full_init((void *)(& t));
__gen_e_acsl_f(t);
g();
@@ -773,11 +773,11 @@ void __gen_e_acsl_f(int *t)
int *__gen_e_acsl_at_3;
int *__gen_e_acsl_at_2;
int *__gen_e_acsl_at;
- __gen_e_acsl_at_4 = (int *)malloc((size_t)8);
- __gen_e_acsl_at_3 = (int *)malloc((size_t)8);
- __gen_e_acsl_at_2 = (int *)malloc((size_t)4);
- __gen_e_acsl_at = (int *)malloc((size_t)4);
- __e_acsl_store_block((void *)(& t),(size_t)8);
+ __gen_e_acsl_at_4 = (int *)malloc(8UL);
+ __gen_e_acsl_at_3 = (int *)malloc(8UL);
+ __gen_e_acsl_at_2 = (int *)malloc(4UL);
+ __gen_e_acsl_at = (int *)malloc(4UL);
+ __e_acsl_store_block((void *)(& t),8UL);
{
int __gen_e_acsl_m;
__gen_e_acsl_m = 4;
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_bitwise.c b/src/plugins/e-acsl/tests/arith/oracle/gen_bitwise.c
index 262014a4609013613a0241ef1674eb31e7b9b168..80633be36765727a39a7efcbb2e7b2eac9f6bedf 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_bitwise.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_bitwise.c
@@ -1145,7 +1145,7 @@ void g_unsigned(unsigned int a, unsigned int b)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
int a = 4;
int b = 8;
f_signed(a,b);
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_cast.c b/src/plugins/e-acsl/tests/arith/oracle/gen_cast.c
index 9528698b9d91328d2608f4db779a8351c78da9d7..1fb741243cd28e8482e2fc9899c25d294d3bfce3 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_cast.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_cast.c
@@ -11,7 +11,7 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
long x = (long)0;
int y = 0;
{
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_comparison.c b/src/plugins/e-acsl/tests/arith/oracle/gen_comparison.c
index 0aff0e2c744bd1cd03a12e73baeef372abc4eab7..bc8c548f39195ed0ea4fd9f6da2dea350bc21245 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_comparison.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_comparison.c
@@ -11,7 +11,7 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
int x = 0;
int y = 1;
{
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_extended_quantifiers.c b/src/plugins/e-acsl/tests/arith/oracle/gen_extended_quantifiers.c
index 3bd32e0bc30b1aaefdb3c8e82303c15af738d7ed..33868c6acdda2183ef129a30a837ed56c863e262 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_extended_quantifiers.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_extended_quantifiers.c
@@ -11,7 +11,7 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
unsigned long x = (unsigned long)4294967295U;
int y = 10;
{
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_functions.c b/src/plugins/e-acsl/tests/arith/oracle/gen_functions.c
index c8d40b091b95658d8648aa2d13d72ad5c5092f97..30a4bf2cb6874440a8b4963f5bfb00ee60b97c3c 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_functions.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_functions.c
@@ -94,7 +94,7 @@ int main(void)
{
int __retres;
mystruct m;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
int x = 1;
int y = 2;
{
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_functions_rec.c b/src/plugins/e-acsl/tests/arith/oracle/gen_functions_rec.c
index ec0918b38258cc90d2a7551280e4bb1c60514c39..e193388060a9fb5701a170975887e316130d7f92 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_functions_rec.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_functions_rec.c
@@ -68,7 +68,7 @@ void __gen_e_acsl_f5_3(__e_acsl_mpz_t *__retres_arg, __e_acsl_mpz_struct * n);
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
{
__e_acsl_mpz_t __gen_e_acsl_f1_8;
__e_acsl_mpz_t __gen_e_acsl__7;
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_integer_constant.c b/src/plugins/e-acsl/tests/arith/oracle/gen_integer_constant.c
index 94b8940d0169f8d1a4f7bc778e5f3db0cad3d8e0..8e722b1ec7c1303c4ee1343db9b119ec3faddb9a 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_integer_constant.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_integer_constant.c
@@ -12,7 +12,7 @@ int main(void)
{
int __retres;
int x;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
{
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__gen_e_acsl_assert_data.blocking = 1;
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_let.c b/src/plugins/e-acsl/tests/arith/oracle/gen_let.c
index 439187eb639e5f3aaa9a46de1419ad6479eacbac..dcc0f5794a4fe375c7b282a85f5703b717d3089e 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_let.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_let.c
@@ -20,7 +20,7 @@ int main(void)
{
int __retres;
union __anonunion_s_2 s;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
int n = -2;
{
long __gen_e_acsl_u;
@@ -179,7 +179,7 @@ int main(void)
}
/*@ assert \let u = 'b'; c < u; */ ;
float f = 1.0f;
- __e_acsl_store_block((void *)(& f),(size_t)4);
+ __e_acsl_store_block((void *)(& f),4UL);
__e_acsl_full_init((void *)(& f));
{
float __gen_e_acsl_u_10;
@@ -236,7 +236,7 @@ int main(void)
}
/*@ assert (\let u = &t[1]; 1) == 1; */ ;
struct __anonstruct_r_1 r = {.x = 1, .y = 2};
- __e_acsl_store_block((void *)(& r),(size_t)8);
+ __e_acsl_store_block((void *)(& r),8UL);
__e_acsl_full_init((void *)(& r));
{
struct __anonstruct_r_1 __gen_e_acsl_u_13;
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_longlong.c b/src/plugins/e-acsl/tests/arith/oracle/gen_longlong.c
index 801f24611f78dc26b779c7b7eac09089c6a6d038..2e45f5d0a6ba91ce2b93f36ad6ff7debdb0f48d5 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_longlong.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_longlong.c
@@ -31,7 +31,7 @@ unsigned long long my_pow(unsigned int x, unsigned int n)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
unsigned long long x = my_pow((unsigned int)2,(unsigned int)63);
{
__e_acsl_mpz_t __gen_e_acsl_;
@@ -47,8 +47,7 @@ int main(void)
__gmpz_init_set_si(__gen_e_acsl_,2L);
__e_acsl_assert_register_ulonglong(& __gen_e_acsl_assert_data,"x",0,x);
__gmpz_init(__gen_e_acsl_x);
- __gmpz_import(__gen_e_acsl_x,(size_t)1,1,(size_t)8,0,(size_t)0,
- (void const *)(& x));
+ __gmpz_import(__gen_e_acsl_x,1UL,1,8UL,0,0UL,(void const *)(& x));
__gmpz_init(__gen_e_acsl_mul);
__gmpz_mul(__gen_e_acsl_mul,(__e_acsl_mpz_struct const *)(__gen_e_acsl_),
(__e_acsl_mpz_struct const *)(__gen_e_acsl_x));
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_not.c b/src/plugins/e-acsl/tests/arith/oracle/gen_not.c
index b665a1b486ffd039813f4d6e9a83e1df54557db9..260e8a913d7a887c887c56059e817be894c09b6c 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_not.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_not.c
@@ -11,7 +11,7 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
int x = 0;
{
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_quantif.c b/src/plugins/e-acsl/tests/arith/oracle/gen_quantif.c
index c930ac243e77ebfbba98efd7b00a17da97eb21e6..6a2abd1e2af9cf2c28175751293e73467c29c429 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_quantif.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_quantif.c
@@ -34,7 +34,7 @@ int __gen_e_acsl_p4(int i, int j, int k);
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
{
int __gen_e_acsl_forall;
int __gen_e_acsl_x;
@@ -338,7 +338,7 @@ int main(void)
;
{
int buf[10];
- __e_acsl_store_block((void *)(buf),(size_t)40);
+ __e_acsl_store_block((void *)(buf),40UL);
unsigned long len = (unsigned long)9;
{
int __gen_e_acsl_forall_9;
diff --git a/src/plugins/e-acsl/tests/arith/oracle/gen_rationals.c b/src/plugins/e-acsl/tests/arith/oracle/gen_rationals.c
index 43188869d2bf8a7e6e5d346fb82881ec4d3da6c7..a00d280f7593272f92e87151f5380ca0c5b7f63f 100644
--- a/src/plugins/e-acsl/tests/arith/oracle/gen_rationals.c
+++ b/src/plugins/e-acsl/tests/arith/oracle/gen_rationals.c
@@ -24,7 +24,7 @@ double avg(double a, double b)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
{
__e_acsl_mpq_t __gen_e_acsl_;
__e_acsl_mpq_t __gen_e_acsl__2;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1304.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1304.c
index 7147183bf3fb157f75309747efb00303eb685093..dbfe1f01298a4f9c3e08e919de7f126d8a85141f 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1304.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1304.c
@@ -26,7 +26,7 @@ union msg {
};
void read_sensor_4(unsigned int *m)
{
- __e_acsl_store_block((void *)(& m),(size_t)8);
+ __e_acsl_store_block((void *)(& m),8UL);
__e_acsl_initialize((void *)m,sizeof(unsigned int));
*m = (unsigned int)0;
__e_acsl_delete_block((void *)(& m));
@@ -38,8 +38,8 @@ int main(void)
int __retres;
unsigned char buf[sizeof(union msg)];
int i;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
- __e_acsl_store_block((void *)(buf),(size_t)16);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+ __e_acsl_store_block((void *)(buf),16UL);
i = 0;
while ((unsigned long)i < sizeof(buf) / (unsigned long)4) {
read_sensor_4((unsigned int *)(buf) + i);
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1307.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1307.c
index d88f9586db8b11110e08dd704a21edac2a41f861..d2617cab17cef3746770664edc7780746a2c551a 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1307.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1307.c
@@ -22,9 +22,9 @@ void __gen_e_acsl_foo(float *Mtmax_in, float *Mwmax, float *Mtmax_out);
void foo(float *Mtmax_in, float *Mwmax, float *Mtmax_out)
{
- __e_acsl_store_block((void *)(& Mtmax_out),(size_t)8);
- __e_acsl_store_block((void *)(& Mwmax),(size_t)8);
- __e_acsl_store_block((void *)(& Mtmax_in),(size_t)8);
+ __e_acsl_store_block((void *)(& Mtmax_out),8UL);
+ __e_acsl_store_block((void *)(& Mwmax),8UL);
+ __e_acsl_store_block((void *)(& Mtmax_in),8UL);
__e_acsl_initialize((void *)Mtmax_out,sizeof(float));
*Mtmax_out = (float)((double)*Mtmax_in + ((double)5 - (double)((float)(
5 / 80) * *Mwmax) * 0.4));
@@ -49,9 +49,9 @@ void __gen_e_acsl_bar(float *Mtmin_in, float *Mwmin, float *Mtmin_out);
void bar(float *Mtmin_in, float *Mwmin, float *Mtmin_out)
{
- __e_acsl_store_block((void *)(& Mtmin_out),(size_t)8);
- __e_acsl_store_block((void *)(& Mwmin),(size_t)8);
- __e_acsl_store_block((void *)(& Mtmin_in),(size_t)8);
+ __e_acsl_store_block((void *)(& Mtmin_out),8UL);
+ __e_acsl_store_block((void *)(& Mwmin),8UL);
+ __e_acsl_store_block((void *)(& Mtmin_in),8UL);
__e_acsl_initialize((void *)Mtmin_out,sizeof(float));
*Mtmin_out = (float)(0.85 * (double)*Mwmin);
__e_acsl_delete_block((void *)(& Mtmin_out));
@@ -64,13 +64,13 @@ int main(void)
{
int __retres;
float h;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
- __e_acsl_store_block((void *)(& h),(size_t)4);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+ __e_acsl_store_block((void *)(& h),4UL);
float f = (float)1.0;
- __e_acsl_store_block((void *)(& f),(size_t)4);
+ __e_acsl_store_block((void *)(& f),4UL);
__e_acsl_full_init((void *)(& f));
float g = (float)1.0;
- __e_acsl_store_block((void *)(& g),(size_t)4);
+ __e_acsl_store_block((void *)(& g),4UL);
__e_acsl_full_init((void *)(& g));
__gen_e_acsl_foo(& f,& g,& h);
__gen_e_acsl_bar(& f,& g,& h);
@@ -103,13 +103,13 @@ void __gen_e_acsl_bar(float *Mtmin_in, float *Mwmin, float *Mtmin_out)
int __gen_e_acsl_valid;
int __gen_e_acsl_valid_2;
int __gen_e_acsl_valid_3;
- __e_acsl_store_block((void *)(& Mtmin_out),(size_t)8);
- __e_acsl_store_block((void *)(& Mwmin),(size_t)8);
- __e_acsl_store_block((void *)(& Mtmin_in),(size_t)8);
+ __e_acsl_store_block((void *)(& Mtmin_out),8UL);
+ __e_acsl_store_block((void *)(& Mwmin),8UL);
+ __e_acsl_store_block((void *)(& Mtmin_in),8UL);
__gen_e_acsl_at = Mtmin_in;
__gen_e_acsl_at_2 = Mwmin;
__gen_e_acsl_at_3 = Mtmin_out;
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)1);
+ __gen_e_acsl_contract = __e_acsl_contract_init(1UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"Mtmin_in",
(void *)Mtmin_in);
@@ -165,13 +165,13 @@ void __gen_e_acsl_bar(float *Mtmin_in, float *Mwmin, float *Mtmin_out)
__gen_e_acsl_assert_data_3.line = 22;
__e_acsl_assert(__gen_e_acsl_valid_3,& __gen_e_acsl_assert_data_3);
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_3);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,1);
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,1);
}
bar(Mtmin_in,Mwmin,Mtmin_out);
{
int __gen_e_acsl_assumes_value;
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
if (__gen_e_acsl_assumes_value) {
int __gen_e_acsl_valid_read;
int __gen_e_acsl_valid_read_2;
@@ -342,13 +342,13 @@ void __gen_e_acsl_foo(float *Mtmax_in, float *Mwmax, float *Mtmax_out)
int __gen_e_acsl_valid;
int __gen_e_acsl_valid_2;
int __gen_e_acsl_valid_3;
- __e_acsl_store_block((void *)(& Mtmax_out),(size_t)8);
- __e_acsl_store_block((void *)(& Mwmax),(size_t)8);
- __e_acsl_store_block((void *)(& Mtmax_in),(size_t)8);
+ __e_acsl_store_block((void *)(& Mtmax_out),8UL);
+ __e_acsl_store_block((void *)(& Mwmax),8UL);
+ __e_acsl_store_block((void *)(& Mtmax_in),8UL);
__gen_e_acsl_at = Mtmax_in;
__gen_e_acsl_at_2 = Mwmax;
__gen_e_acsl_at_3 = Mtmax_out;
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)1);
+ __gen_e_acsl_contract = __e_acsl_contract_init(1UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"Mtmax_in",
(void *)Mtmax_in);
@@ -404,13 +404,13 @@ void __gen_e_acsl_foo(float *Mtmax_in, float *Mwmax, float *Mtmax_out)
__gen_e_acsl_assert_data_3.line = 7;
__e_acsl_assert(__gen_e_acsl_valid_3,& __gen_e_acsl_assert_data_3);
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_3);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,1);
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,1);
}
foo(Mtmax_in,Mwmax,Mtmax_out);
{
int __gen_e_acsl_assumes_value;
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
if (__gen_e_acsl_assumes_value) {
__e_acsl_mpq_t __gen_e_acsl_;
__e_acsl_mpq_t __gen_e_acsl__2;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1324.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1324.c
index b666ed548a1ee4dffba65c1a4b0c4f2af1506137..f954d6658c5f085f61d7fdcba02670659d515178 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1324.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1324.c
@@ -37,9 +37,9 @@ int sorted(int *t, int n)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
int t[7] = {1, 4, 4, 5, 5, 5, 7};
- __e_acsl_store_block((void *)(t),(size_t)28);
+ __e_acsl_store_block((void *)(t),28UL);
__e_acsl_full_init((void *)(& t));
int n = __gen_e_acsl_sorted(t,7);
{
@@ -72,8 +72,8 @@ int __gen_e_acsl_sorted(int *t, int n)
{
int __gen_e_acsl_forall;
int __gen_e_acsl_i;
- __e_acsl_store_block((void *)(& t),(size_t)8);
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)1);
+ __e_acsl_store_block((void *)(& t),8UL);
+ __gen_e_acsl_contract = __e_acsl_contract_init(1UL);
__gen_e_acsl_forall = 1;
__gen_e_acsl_i = 0 + 1;
while (1) {
@@ -133,14 +133,14 @@ int __gen_e_acsl_sorted(int *t, int n)
__gen_e_acsl_i ++;
}
e_acsl_end_loop1: ;
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
__gen_e_acsl_forall);
}
__retres = sorted(t,n);
{
int __gen_e_acsl_assumes_value;
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
if (__gen_e_acsl_assumes_value) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_3 =
{.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1326.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1326.c
index 0e7391910046bb16db211d8452a20138dcd04a7c..565954f254d5cd6691312b21837639324c550e58 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1326.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1326.c
@@ -21,8 +21,8 @@ void __gen_e_acsl_atp_NORMAL_computeAverageAccel(ArrayInt *Accel,
void atp_NORMAL_computeAverageAccel(ArrayInt *Accel, int *AverageAccel)
{
- __e_acsl_store_block((void *)(& AverageAccel),(size_t)8);
- __e_acsl_store_block((void *)(& Accel),(size_t)8);
+ __e_acsl_store_block((void *)(& AverageAccel),8UL);
+ __e_acsl_store_block((void *)(& Accel),8UL);
__e_acsl_initialize((void *)AverageAccel,sizeof(int));
*AverageAccel = (((((*Accel)[4] + (*Accel)[3]) + (*Accel)[2]) + (*Accel)[1]) + (*Accel)[0]) / 5;
__e_acsl_delete_block((void *)(& AverageAccel));
@@ -34,10 +34,10 @@ int main(void)
{
int __retres;
int av;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
- __e_acsl_store_block((void *)(& av),(size_t)4);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+ __e_acsl_store_block((void *)(& av),4UL);
ArrayInt Accel = {1, 2, 3, 4, 5};
- __e_acsl_store_block((void *)(Accel),(size_t)20);
+ __e_acsl_store_block((void *)(Accel),20UL);
__e_acsl_full_init((void *)(& Accel));
__gen_e_acsl_atp_NORMAL_computeAverageAccel(& Accel,& av);
__retres = 0;
@@ -59,8 +59,8 @@ void __gen_e_acsl_atp_NORMAL_computeAverageAccel(ArrayInt *Accel,
{
int *__gen_e_acsl_at_2;
ArrayInt *__gen_e_acsl_at;
- __e_acsl_store_block((void *)(& AverageAccel),(size_t)8);
- __e_acsl_store_block((void *)(& Accel),(size_t)8);
+ __e_acsl_store_block((void *)(& AverageAccel),8UL);
+ __e_acsl_store_block((void *)(& Accel),8UL);
__gen_e_acsl_at = Accel;
__gen_e_acsl_at_2 = AverageAccel;
atp_NORMAL_computeAverageAccel(Accel,AverageAccel);
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1386_complex_flowgraph.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1386_complex_flowgraph.c
index 0082fd032004bcf32f5972821b5db71d45e642ea..bbb7e386a6796e6dd89716ce9775ab5f5419549a 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1386_complex_flowgraph.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1386_complex_flowgraph.c
@@ -10,8 +10,8 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
void duffcopy(char *to, char *from, int count)
{
- __e_acsl_store_block((void *)(& from),(size_t)8);
- __e_acsl_store_block((void *)(& to),(size_t)8);
+ __e_acsl_store_block((void *)(& from),8UL);
+ __e_acsl_store_block((void *)(& to),8UL);
int n = (count + 7) / 8;
switch (count % 8)
case 0:
@@ -33,22 +33,22 @@ void duffcopy(char *to, char *from, int count)
char *tmp_12;
char *tmp_13;
char *tmp_14;
- __e_acsl_store_block((void *)(& tmp_14),(size_t)8);
- __e_acsl_store_block((void *)(& tmp_13),(size_t)8);
- __e_acsl_store_block((void *)(& tmp_12),(size_t)8);
- __e_acsl_store_block((void *)(& tmp_11),(size_t)8);
- __e_acsl_store_block((void *)(& tmp_10),(size_t)8);
- __e_acsl_store_block((void *)(& tmp_9),(size_t)8);
- __e_acsl_store_block((void *)(& tmp_8),(size_t)8);
- __e_acsl_store_block((void *)(& tmp_7),(size_t)8);
- __e_acsl_store_block((void *)(& tmp_6),(size_t)8);
- __e_acsl_store_block((void *)(& tmp_5),(size_t)8);
- __e_acsl_store_block((void *)(& tmp_4),(size_t)8);
- __e_acsl_store_block((void *)(& tmp_3),(size_t)8);
- __e_acsl_store_block((void *)(& tmp_2),(size_t)8);
- __e_acsl_store_block((void *)(& tmp_1),(size_t)8);
- __e_acsl_store_block((void *)(& tmp_0),(size_t)8);
- __e_acsl_store_block((void *)(& tmp),(size_t)8);
+ __e_acsl_store_block((void *)(& tmp_14),8UL);
+ __e_acsl_store_block((void *)(& tmp_13),8UL);
+ __e_acsl_store_block((void *)(& tmp_12),8UL);
+ __e_acsl_store_block((void *)(& tmp_11),8UL);
+ __e_acsl_store_block((void *)(& tmp_10),8UL);
+ __e_acsl_store_block((void *)(& tmp_9),8UL);
+ __e_acsl_store_block((void *)(& tmp_8),8UL);
+ __e_acsl_store_block((void *)(& tmp_7),8UL);
+ __e_acsl_store_block((void *)(& tmp_6),8UL);
+ __e_acsl_store_block((void *)(& tmp_5),8UL);
+ __e_acsl_store_block((void *)(& tmp_4),8UL);
+ __e_acsl_store_block((void *)(& tmp_3),8UL);
+ __e_acsl_store_block((void *)(& tmp_2),8UL);
+ __e_acsl_store_block((void *)(& tmp_1),8UL);
+ __e_acsl_store_block((void *)(& tmp_0),8UL);
+ __e_acsl_store_block((void *)(& tmp),8UL);
__e_acsl_full_init((void *)(& tmp));
tmp = to;
to ++;
@@ -58,22 +58,22 @@ void duffcopy(char *to, char *from, int count)
__e_acsl_initialize((void *)tmp,sizeof(char));
*tmp = *tmp_0;
case 7:
- __e_acsl_store_block_duplicate((void *)(& tmp),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_0),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_1),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_2),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_3),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_4),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_5),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_6),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_7),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_8),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_9),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_10),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_11),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_12),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_13),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_14),(size_t)8);
+ __e_acsl_store_block_duplicate((void *)(& tmp),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_0),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_1),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_2),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_3),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_4),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_5),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_6),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_7),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_8),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_9),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_10),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_11),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_12),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_13),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_14),8UL);
__e_acsl_full_init((void *)(& tmp_1));
tmp_1 = to;
to ++;
@@ -83,22 +83,22 @@ void duffcopy(char *to, char *from, int count)
__e_acsl_initialize((void *)tmp_1,sizeof(char));
*tmp_1 = *tmp_2;
case 6:
- __e_acsl_store_block_duplicate((void *)(& tmp),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_0),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_1),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_2),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_3),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_4),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_5),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_6),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_7),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_8),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_9),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_10),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_11),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_12),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_13),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_14),(size_t)8);
+ __e_acsl_store_block_duplicate((void *)(& tmp),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_0),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_1),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_2),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_3),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_4),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_5),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_6),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_7),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_8),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_9),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_10),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_11),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_12),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_13),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_14),8UL);
__e_acsl_full_init((void *)(& tmp_3));
tmp_3 = to;
to ++;
@@ -108,22 +108,22 @@ void duffcopy(char *to, char *from, int count)
__e_acsl_initialize((void *)tmp_3,sizeof(char));
*tmp_3 = *tmp_4;
case 5:
- __e_acsl_store_block_duplicate((void *)(& tmp),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_0),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_1),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_2),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_3),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_4),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_5),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_6),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_7),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_8),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_9),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_10),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_11),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_12),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_13),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_14),(size_t)8);
+ __e_acsl_store_block_duplicate((void *)(& tmp),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_0),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_1),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_2),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_3),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_4),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_5),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_6),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_7),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_8),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_9),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_10),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_11),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_12),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_13),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_14),8UL);
__e_acsl_full_init((void *)(& tmp_5));
tmp_5 = to;
to ++;
@@ -133,22 +133,22 @@ void duffcopy(char *to, char *from, int count)
__e_acsl_initialize((void *)tmp_5,sizeof(char));
*tmp_5 = *tmp_6;
case 4:
- __e_acsl_store_block_duplicate((void *)(& tmp),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_0),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_1),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_2),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_3),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_4),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_5),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_6),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_7),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_8),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_9),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_10),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_11),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_12),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_13),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_14),(size_t)8);
+ __e_acsl_store_block_duplicate((void *)(& tmp),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_0),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_1),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_2),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_3),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_4),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_5),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_6),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_7),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_8),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_9),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_10),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_11),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_12),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_13),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_14),8UL);
__e_acsl_full_init((void *)(& tmp_7));
tmp_7 = to;
to ++;
@@ -158,22 +158,22 @@ void duffcopy(char *to, char *from, int count)
__e_acsl_initialize((void *)tmp_7,sizeof(char));
*tmp_7 = *tmp_8;
case 3:
- __e_acsl_store_block_duplicate((void *)(& tmp),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_0),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_1),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_2),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_3),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_4),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_5),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_6),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_7),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_8),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_9),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_10),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_11),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_12),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_13),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_14),(size_t)8);
+ __e_acsl_store_block_duplicate((void *)(& tmp),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_0),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_1),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_2),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_3),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_4),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_5),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_6),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_7),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_8),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_9),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_10),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_11),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_12),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_13),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_14),8UL);
__e_acsl_full_init((void *)(& tmp_9));
tmp_9 = to;
to ++;
@@ -183,22 +183,22 @@ void duffcopy(char *to, char *from, int count)
__e_acsl_initialize((void *)tmp_9,sizeof(char));
*tmp_9 = *tmp_10;
case 2:
- __e_acsl_store_block_duplicate((void *)(& tmp),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_0),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_1),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_2),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_3),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_4),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_5),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_6),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_7),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_8),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_9),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_10),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_11),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_12),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_13),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_14),(size_t)8);
+ __e_acsl_store_block_duplicate((void *)(& tmp),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_0),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_1),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_2),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_3),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_4),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_5),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_6),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_7),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_8),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_9),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_10),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_11),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_12),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_13),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_14),8UL);
__e_acsl_full_init((void *)(& tmp_11));
tmp_11 = to;
to ++;
@@ -208,22 +208,22 @@ void duffcopy(char *to, char *from, int count)
__e_acsl_initialize((void *)tmp_11,sizeof(char));
*tmp_11 = *tmp_12;
case 1:
- __e_acsl_store_block_duplicate((void *)(& tmp),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_0),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_1),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_2),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_3),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_4),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_5),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_6),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_7),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_8),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_9),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_10),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_11),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_12),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_13),(size_t)8);
- __e_acsl_store_block_duplicate((void *)(& tmp_14),(size_t)8);
+ __e_acsl_store_block_duplicate((void *)(& tmp),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_0),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_1),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_2),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_3),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_4),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_5),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_6),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_7),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_8),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_9),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_10),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_11),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_12),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_13),8UL);
+ __e_acsl_store_block_duplicate((void *)(& tmp_14),8UL);
__e_acsl_full_init((void *)(& tmp_13));
tmp_13 = to;
to ++;
@@ -260,7 +260,7 @@ void duffcopy(char *to, char *from, int count)
void initialize(char *arr, int length)
{
int i;
- __e_acsl_store_block((void *)(& arr),(size_t)8);
+ __e_acsl_store_block((void *)(& arr),8UL);
i = 0;
while (i < length) {
__e_acsl_initialize((void *)(arr + i),sizeof(char));
@@ -278,9 +278,9 @@ void __e_acsl_globals_init(void)
static char __e_acsl_already_run = 0;
if (! __e_acsl_already_run) {
__e_acsl_already_run = 1;
- __e_acsl_store_block((void *)(target),(size_t)100);
+ __e_acsl_store_block((void *)(target),100UL);
__e_acsl_full_init((void *)(& target));
- __e_acsl_store_block((void *)(source),(size_t)100);
+ __e_acsl_store_block((void *)(source),100UL);
__e_acsl_full_init((void *)(& source));
}
return;
@@ -296,7 +296,7 @@ void __e_acsl_globals_clean(void)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
initialize(source,100);
duffcopy(source,target,43);
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1390.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1390.c
index 1626dbd4ea419ee09b6a1d48eedcacd2f584b7df..04abe828aae0174d474092683d0601c331ea5e09 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1390.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1390.c
@@ -30,10 +30,10 @@ void *memchr(void const *buf, int c, size_t n)
{
void *__retres;
int i;
- __e_acsl_store_block((void *)(& __retres),(size_t)8);
- __e_acsl_store_block((void *)(& buf),(size_t)8);
+ __e_acsl_store_block((void *)(& __retres),8UL);
+ __e_acsl_store_block((void *)(& buf),8UL);
char *s = (char *)buf;
- __e_acsl_store_block((void *)(& s),(size_t)8);
+ __e_acsl_store_block((void *)(& s),8UL);
__e_acsl_full_init((void *)(& s));
i = 0;
while ((size_t)i < n) {
@@ -74,16 +74,16 @@ void *__gen_e_acsl_memchr(void const *buf, int c, size_t n)
int __gen_e_acsl_at_2;
void const *__gen_e_acsl_at;
void *__retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)8);
+ __e_acsl_store_block((void *)(& __retres),8UL);
{
int __gen_e_acsl_exists;
unsigned int __gen_e_acsl_i;
int __gen_e_acsl_forall;
unsigned int __gen_e_acsl_k;
- __e_acsl_store_block((void *)(& buf),(size_t)8);
+ __e_acsl_store_block((void *)(& buf),8UL);
__gen_e_acsl_at = buf;
__gen_e_acsl_at_2 = c;
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+ __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
__gen_e_acsl_exists = 0;
__gen_e_acsl_i = 0U;
while (1) {
@@ -121,7 +121,7 @@ void *__gen_e_acsl_memchr(void const *buf, int c, size_t n)
__gen_e_acsl_i ++;
}
e_acsl_end_loop1: ;
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
__gen_e_acsl_exists);
__gen_e_acsl_forall = 1;
__gen_e_acsl_k = 0U;
@@ -161,14 +161,14 @@ void *__gen_e_acsl_memchr(void const *buf, int c, size_t n)
__gen_e_acsl_k ++;
}
e_acsl_end_loop2: ;
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
__gen_e_acsl_forall);
}
__retres = memchr(buf,c,n);
{
int __gen_e_acsl_assumes_value;
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
if (__gen_e_acsl_assumes_value) {
int __gen_e_acsl_forall_2;
unsigned int __gen_e_acsl_j;
@@ -233,7 +233,7 @@ void *__gen_e_acsl_memchr(void const *buf, int c, size_t n)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_3);
}
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
if (__gen_e_acsl_assumes_value) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_5 =
{.values = (void *)0};
@@ -277,12 +277,12 @@ void __e_acsl_globals_init(void)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
__gen_e_acsl_memchr((void const *)__gen_e_acsl_literal_string,'o',
- (unsigned long)4);
+ (size_t)4);
__gen_e_acsl_memchr((void const *)__gen_e_acsl_literal_string_2,'o',
- (unsigned long)4);
+ (size_t)4);
__retres = 0;
__e_acsl_memory_clean();
return __retres;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1395.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1395.c
index 00d4049eb3b4771a7d6468aff3805454442b883f..4a8ea82155ebade60383be9dac5bb53e0f06fb45 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1395.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1395.c
@@ -28,7 +28,7 @@ int fact(int n)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
int x = __gen_e_acsl_fact(5);
{
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1398.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1398.c
index 2163ee05001e007cc64e7802c022d44572c85612..505aa569c92042374f5dfffb814a567cc28a69a9 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1398.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1398.c
@@ -27,7 +27,7 @@ int main(void)
{
int __retres;
int t[2];
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
int x = 0;
int i = 1;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1399.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1399.c
index 2142ccecad26e627213e0a57a4a8cccf5b1be542..3bd5ee23842ad19d5f7c2afb650fe770a13abcdc 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1399.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1399.c
@@ -18,9 +18,9 @@ typedef struct spongeStateStruct spongeState;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
spongeState *state = malloc(sizeof(spongeState));
- __e_acsl_store_block((void *)(& state),(size_t)8);
+ __e_acsl_store_block((void *)(& state),8UL);
__e_acsl_full_init((void *)(& state));
__e_acsl_initialize((void *)(& state->bitsInQueue),sizeof(unsigned int));
state->bitsInQueue = (unsigned int)16;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1478.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1478.c
index ccc94a40bda3569e1f37362f0ab6e0c2a3bf9cf8..a6a260e7b23803c56f7f80d3d2595227798aa44b 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1478.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1478.c
@@ -86,9 +86,9 @@ void __e_acsl_globals_init(void)
static char __e_acsl_already_run = 0;
if (! __e_acsl_already_run) {
__e_acsl_already_run = 1;
- __e_acsl_store_block((void *)(& global_i_ptr),(size_t)8);
+ __e_acsl_store_block((void *)(& global_i_ptr),8UL);
__e_acsl_full_init((void *)(& global_i_ptr));
- __e_acsl_store_block((void *)(& global_i),(size_t)4);
+ __e_acsl_store_block((void *)(& global_i),4UL);
__e_acsl_full_init((void *)(& global_i));
}
return;
@@ -104,7 +104,7 @@ void __e_acsl_globals_clean(void)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
__gen_e_acsl_loop();
__retres = 0;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1700.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1700.c
index 74eed7516c5e1ac0a905ea2728db8e6dd35663c0..12b064f615d03123a31385a1af057dd9abb60060 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1700.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1700.c
@@ -16,9 +16,9 @@ int main(void)
int __retres;
struct toto s;
struct toto *p;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
- __e_acsl_store_block((void *)(& p),(size_t)8);
- __e_acsl_store_block((void *)(& s),(size_t)0);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+ __e_acsl_store_block((void *)(& p),8UL);
+ __e_acsl_store_block((void *)(& s),0UL);
{
int __gen_e_acsl_valid;
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1717.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1717.c
index 6479ce655494794c9c7e30c795a6b8ab7666332e..5a4b4587b973626a095062ecfd75b5e65d5e2548 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1717.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1717.c
@@ -12,10 +12,10 @@ int main(void)
{
int __retres;
int *p;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+ __e_acsl_store_block((void *)(& p),8UL);
int a = 10;
- __e_acsl_store_block((void *)(& a),(size_t)4);
+ __e_acsl_store_block((void *)(& a),4UL);
__e_acsl_full_init((void *)(& a));
goto lbl_1;
lbl_2:
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1718.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1718.c
index 23f2cb2d589057594598230f68881c19fb4b07fe..15de627e69bd851f75b537e2fd0f1a08fabd2ca1 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1718.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1718.c
@@ -12,10 +12,10 @@ int main(void)
{
int __retres;
int *p;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+ __e_acsl_store_block((void *)(& p),8UL);
int a = 10;
- __e_acsl_store_block((void *)(& a),(size_t)4);
+ __e_acsl_store_block((void *)(& a),4UL);
__e_acsl_full_init((void *)(& a));
goto lbl_1;
lbl_2:
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1740.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1740.c
index b233499a4907e9e9f8098c7c3df2e9f524dcedd0..05a086336244c6aaaa407a19a96f6a04509fc684 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1740.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1740.c
@@ -12,11 +12,11 @@ int main(void)
{
int __retres;
int *p;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+ __e_acsl_store_block((void *)(& p),8UL);
{
int a = 0;
- __e_acsl_store_block((void *)(& a),(size_t)4);
+ __e_acsl_store_block((void *)(& a),4UL);
__e_acsl_full_init((void *)(& a));
__e_acsl_full_init((void *)(& p));
p = & a;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1837.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1837.c
index 75bbcf73b86380749c65849578a0f5d188a75217..e12f60d7fd00f5e79b3dd281b87968cd12c7f392 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts1837.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts1837.c
@@ -16,10 +16,10 @@ int f(void)
{
int __retres;
char *s1 = (char *)__gen_e_acsl_literal_string;
- __e_acsl_store_block((void *)(& s1),(size_t)8);
+ __e_acsl_store_block((void *)(& s1),8UL);
__e_acsl_full_init((void *)(& s1));
char *s2 = (char *)__gen_e_acsl_literal_string_2;
- __e_acsl_store_block((void *)(& s2),(size_t)8);
+ __e_acsl_store_block((void *)(& s2),8UL);
__e_acsl_full_init((void *)(& s2));
{
int __gen_e_acsl_valid_read;
@@ -145,7 +145,7 @@ void __e_acsl_globals_init(void)
__e_acsl_store_block((void *)__gen_e_acsl_literal_string_2,sizeof("bar"));
__e_acsl_full_init((void *)__gen_e_acsl_literal_string_2);
__e_acsl_mark_readonly((void *)__gen_e_acsl_literal_string_2);
- __e_acsl_store_block((void *)(& S),(size_t)8);
+ __e_acsl_store_block((void *)(& S),8UL);
__e_acsl_full_init((void *)(& S));
}
return;
@@ -160,7 +160,7 @@ void __e_acsl_globals_clean(void)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
int i = 4;
while (1) {
@@ -171,7 +171,7 @@ int main(void)
if (! tmp) break;
{
char *s = (char *)__gen_e_acsl_literal_string_3;
- __e_acsl_store_block((void *)(& s),(size_t)8);
+ __e_acsl_store_block((void *)(& s),8UL);
__e_acsl_full_init((void *)(& s));
{
int __gen_e_acsl_initialized;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2191.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2191.c
index 0f8a6d0b54f5175d807a7f39c78235c3da7cf08d..d8622c2f450245217b6d48622a2985a5b8fe0a58 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2191.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2191.c
@@ -32,7 +32,7 @@ void __e_acsl_globals_init(void)
sizeof("Struct_G[0]"));
__e_acsl_full_init((void *)__gen_e_acsl_literal_string_2);
__e_acsl_mark_readonly((void *)__gen_e_acsl_literal_string_2);
- __e_acsl_store_block((void *)(_G),(size_t)32);
+ __e_acsl_store_block((void *)(_G),32UL);
__e_acsl_full_init((void *)(& _G));
}
return;
@@ -47,7 +47,7 @@ void __e_acsl_globals_clean(void)
int main(int argc, char **argv)
{
int __retres;
- __e_acsl_memory_init(& argc,& argv,(size_t)8);
+ __e_acsl_memory_init(& argc,& argv,8UL);
__e_acsl_globals_init();
{
int __gen_e_acsl_initialized;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2192.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2192.c
index 6ffc1e9e03c6ded886466f1459adbe2272666ed0..c90d9bd61ae5e6f7e9c740a6b9108a1fff437fc0 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2192.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2192.c
@@ -27,7 +27,7 @@ int __gen_e_acsl_atoi(char const *nptr)
int __retres;
{
int __gen_e_acsl_valid_read;
- __e_acsl_store_block((void *)(& nptr),(size_t)8);
+ __e_acsl_store_block((void *)(& nptr),8UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"nptr",
(void *)nptr);
@@ -64,7 +64,7 @@ void __e_acsl_globals_init(void)
__e_acsl_store_block((void *)__gen_e_acsl_literal_string,sizeof("134"));
__e_acsl_full_init((void *)__gen_e_acsl_literal_string);
__e_acsl_mark_readonly((void *)__gen_e_acsl_literal_string);
- __e_acsl_store_block((void *)(& n),(size_t)8);
+ __e_acsl_store_block((void *)(& n),8UL);
__e_acsl_full_init((void *)(& n));
}
return;
@@ -79,7 +79,7 @@ void __e_acsl_globals_clean(void)
int main(int argc, char **argv)
{
int __retres;
- __e_acsl_memory_init(& argc,& argv,(size_t)8);
+ __e_acsl_memory_init(& argc,& argv,8UL);
__e_acsl_globals_init();
argc = __gen_e_acsl_atoi((char const *)n);
a = argc;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2231.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2231.c
index 9adaa695ef7e0d34aaf54f7f06f7d0a0298fdd50..0f76bca49c176391cdf5ea812ade8777bc2a492e 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2231.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2231.c
@@ -12,7 +12,7 @@ long A = (long)0;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
{
__e_acsl_mpz_t __gen_e_acsl_A;
__e_acsl_mpz_t __gen_e_acsl_;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2252.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2252.c
index fbedbcc8e9c436959dea0e2e4eb241ed4452f867..0cec43b9bcb4a4d5febfd5c8b091c6b4614183ac 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2252.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2252.c
@@ -84,13 +84,13 @@ char *__gen_e_acsl_strncpy(char * restrict dest, char const * restrict src,
unsigned long __gen_e_acsl__7;
unsigned long __gen_e_acsl_if_5;
int __gen_e_acsl_separated;
- __e_acsl_store_block((void *)(& src),(size_t)8);
- __e_acsl_store_block((void *)(& dest),(size_t)8);
+ __e_acsl_store_block((void *)(& src),8UL);
+ __e_acsl_store_block((void *)(& dest),8UL);
__gen_e_acsl_at = dest;
__gmpz_init_set_ui(__gen_e_acsl_n,n);
__gmpz_init_set(__gen_e_acsl_at_2,
(__e_acsl_mpz_struct const *)(__gen_e_acsl_n));
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+ __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data_2 =
{.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data_2,"dest",
@@ -240,7 +240,7 @@ char *__gen_e_acsl_strncpy(char * restrict dest, char const * restrict src,
__gen_e_acsl_size_5);
__gen_e_acsl_if_5 = __gen_e_acsl_size_5;
}
- __gen_e_acsl_separated = __e_acsl_separated((size_t)2,dest + 1 * 0,
+ __gen_e_acsl_separated = __e_acsl_separated(2UL,dest + 1 * 0,
__gen_e_acsl_if_4,
src + 1 * 0,
__gen_e_acsl_if_5);
@@ -371,14 +371,14 @@ int main(void)
{
int __retres;
int i;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
char *srcbuf = (char *)__gen_e_acsl_literal_string;
- __e_acsl_store_block((void *)(& srcbuf),(size_t)8);
+ __e_acsl_store_block((void *)(& srcbuf),8UL);
__e_acsl_full_init((void *)(& srcbuf));
int loc = 1;
char *destbuf = malloc((unsigned long)10 * sizeof(char));
- __e_acsl_store_block((void *)(& destbuf),(size_t)8);
+ __e_acsl_store_block((void *)(& destbuf),8UL);
__e_acsl_full_init((void *)(& destbuf));
char ch = (char)'o';
if (destbuf != (char *)0) {
@@ -415,7 +415,7 @@ int main(void)
i ++;
}
__gen_e_acsl_strncpy(destbuf + loc,(char const *)(srcbuf + loc),
- (unsigned long)1);
+ (size_t)1);
free((void *)destbuf);
}
__retres = 0;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2305.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2305.c
index 1e8760b7779f440f9329e0e91cca4831d1cd4572..a7ba41ff1757bb2b7af4daed0bde829ff41adee0 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2305.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2305.c
@@ -25,7 +25,7 @@ void __e_acsl_globals_init(void)
static char __e_acsl_already_run = 0;
if (! __e_acsl_already_run) {
__e_acsl_already_run = 1;
- __e_acsl_store_block((void *)(& t),(size_t)4);
+ __e_acsl_store_block((void *)(& t),4UL);
__e_acsl_full_init((void *)(& t));
}
return;
@@ -40,7 +40,7 @@ void __e_acsl_globals_clean(void)
int main(int argc, char **argv)
{
int tmp;
- __e_acsl_memory_init(& argc,& argv,(size_t)8);
+ __e_acsl_memory_init(& argc,& argv,8UL);
__e_acsl_globals_init();
/*@ assert \valid_read(&t.j); */ ;
/*@ assert \valid_read(&t.j + (1 .. 3)); */ ;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2386.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2386.c
index 3938fa0647bc5d7c1ac0a0a14d118d80c1912513..c95d2dd5ca11786f8332dbdf27d90a1e3c374aa9 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2386.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2386.c
@@ -11,9 +11,9 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
void f(void const *s, int c, unsigned long n)
{
- __e_acsl_store_block((void *)(& s),(size_t)8);
+ __e_acsl_store_block((void *)(& s),8UL);
unsigned char const *p = (unsigned char const *)s;
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
__e_acsl_full_init((void *)(& p));
{
__e_acsl_mpz_t __gen_e_acsl_;
@@ -84,10 +84,10 @@ void __e_acsl_globals_init(void)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
char const *s = __gen_e_acsl_literal_string;
- __e_acsl_store_block((void *)(& s),(size_t)8);
+ __e_acsl_store_block((void *)(& s),8UL);
__e_acsl_full_init((void *)(& s));
f((void const *)s,'0',(unsigned long)11);
__retres = 0;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2406.c b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2406.c
index 9591977d2fcaea4e7de01b1e2fb43075d11df682..909d44e55b8a19d3dc6e47d4576ca919ce2f7bd9 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_bts2406.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_bts2406.c
@@ -15,7 +15,7 @@ void __e_acsl_globals_init(void)
static char __e_acsl_already_run = 0;
if (! __e_acsl_already_run) {
__e_acsl_already_run = 1;
- __e_acsl_store_block((void *)(t),(size_t)10);
+ __e_acsl_store_block((void *)(t),10UL);
__e_acsl_full_init((void *)(& t));
}
return;
@@ -30,10 +30,10 @@ void __e_acsl_globals_clean(void)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
char *p = (char *)(tab);
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
__e_acsl_full_init((void *)(& p));
{
int __gen_e_acsl_size;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-105.c b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-105.c
index 34d4bc63358470c6503edc1afc1346353d95567b..bb6b00bfc417aa22965d45deda373f204bb20cdb 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-105.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-105.c
@@ -12,7 +12,7 @@ int f(void)
{
int __retres;
int a = 10;
- __e_acsl_store_block((void *)(& a),(size_t)4);
+ __e_acsl_store_block((void *)(& a),4UL);
__e_acsl_full_init((void *)(& a));
goto lbl_1;
lbl_2:
@@ -49,7 +49,7 @@ int f(void)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
f();
__retres = 0;
__e_acsl_memory_clean();
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-139.c b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-139.c
index 7bccd9add2462a018e73403d29cc190b08992e8a..c3b5d7a622373e1173003c0c30e669e672a20b1c 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-139.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-139.c
@@ -16,7 +16,7 @@ void __gen_e_acsl_f(struct X *item);
void f(struct X *item)
{
- __e_acsl_store_block((void *)(& item),(size_t)8);
+ __e_acsl_store_block((void *)(& item),8UL);
__e_acsl_delete_block((void *)(& item));
return;
}
@@ -24,9 +24,9 @@ void f(struct X *item)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
struct X x = {.i = 1};
- __e_acsl_store_block((void *)(& x),(size_t)4);
+ __e_acsl_store_block((void *)(& x),4UL);
__e_acsl_full_init((void *)(& x));
__gen_e_acsl_f(& x);
__retres = 0;
@@ -42,7 +42,7 @@ void __gen_e_acsl_f(struct X *item)
struct X *__gen_e_acsl_at;
{
int __gen_e_acsl_valid_read;
- __e_acsl_store_block((void *)(& item),(size_t)8);
+ __e_acsl_store_block((void *)(& item),8UL);
__gen_e_acsl_at = item;
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"item",
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-145.c b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-145.c
index 21d386c35a334b7a84bbfd5b05a36ec831084cb0..fca8df4be702c8b7748b91c67e38b174a067f268 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-145.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-145.c
@@ -14,7 +14,7 @@ void __e_acsl_globals_init(void)
static char __e_acsl_already_run = 0;
if (! __e_acsl_already_run) {
__e_acsl_already_run = 1;
- __e_acsl_store_block((void *)(& G),(size_t)4);
+ __e_acsl_store_block((void *)(& G),4UL);
__e_acsl_full_init((void *)(& G));
}
return;
@@ -29,7 +29,7 @@ void __e_acsl_globals_clean(void)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
{
int __gen_e_acsl_valid;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-149.c b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-149.c
index 2b0a6cbcfe125caa947ea9779e20b9bd0ab0febf..653cc715d841d60bba178d65d4d065e6338a0da6 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-149.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-149.c
@@ -11,7 +11,7 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
int main(int argc, char **argv)
{
int __retres;
- __e_acsl_memory_init(& argc,& argv,(size_t)8);
+ __e_acsl_memory_init(& argc,& argv,8UL);
{
int __gen_e_acsl_exists;
int __gen_e_acsl_x;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-172.c b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-172.c
index f32019a4288a74515f1ea5dcf876c9f6f44ebb24..3ba8b805f28e5094845437f30192241938c66bdf 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-172.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-172.c
@@ -12,7 +12,7 @@ double d2 = 11.;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
{
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_double(& __gen_e_acsl_assert_data,"d2",d2);
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-177.c b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-177.c
index f758e49b2b411017559a41216c7cb8a98b87fe05..9b3b82f7bad1b360453f5b6111bdb782e0d283be 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-177.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-177.c
@@ -22,7 +22,7 @@ void __gen_e_acsl_f_3(__e_acsl_mpz_t *__retres_arg, __e_acsl_mpz_struct * n);
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
{
__e_acsl_mpz_t __gen_e_acsl_f_8;
__e_acsl_mpz_t __gen_e_acsl__10;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-187.c b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-187.c
index 1b194d5d86dff9e9d2f06653da503a81f280a792..72135b496add2b6864b690efab013831e0728431 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-187.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-187.c
@@ -17,7 +17,7 @@ int __gen_e_acsl_p(int n);
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
{
int __gen_e_acsl_p_2;
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-40.c b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-40.c
index aecdee5351dadcd56fe95c8c4748633747def547..0521d11ed31a8b3a2f56bff672ab4fd8f5081862 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-40.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-40.c
@@ -79,8 +79,8 @@ size_t __gen_e_acsl_fread(void * restrict ptr, size_t size, size_t nmemb,
unsigned long __gen_e_acsl_size_4;
int __gen_e_acsl_valid;
int __gen_e_acsl_valid_2;
- __e_acsl_store_block((void *)(& stream),(size_t)8);
- __e_acsl_store_block((void *)(& ptr),(size_t)8);
+ __e_acsl_store_block((void *)(& stream),8UL);
+ __e_acsl_store_block((void *)(& ptr),8UL);
__gen_e_acsl_at = ptr;
__gmpz_init_set_ui(__gen_e_acsl_size,size);
__gmpz_init_set(__gen_e_acsl_at_2,
@@ -406,7 +406,7 @@ FILE *__gen_e_acsl_fopen(char const * restrict filename,
char const * restrict mode)
{
FILE *__retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)8);
+ __e_acsl_store_block((void *)(& __retres),8UL);
__retres = fopen(filename,mode);
__e_acsl_delete_block((void *)(& __retres));
return __retres;
@@ -434,19 +434,18 @@ int main(void)
{
int __retres;
char buf[4];
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
FILE *f =
__gen_e_acsl_fopen(__gen_e_acsl_literal_string_2,
__gen_e_acsl_literal_string);
- __e_acsl_store_block((void *)(& f),(size_t)8);
+ __e_acsl_store_block((void *)(& f),8UL);
__e_acsl_full_init((void *)(& f));
if (f) {
char buf_0[4];
size_t tmp_0;
- __e_acsl_store_block((void *)(buf_0),(size_t)4);
- tmp_0 = __gen_e_acsl_fread((void *)(buf_0),(unsigned long)1,
- (unsigned long)4,f);
+ __e_acsl_store_block((void *)(buf_0),4UL);
+ tmp_0 = __gen_e_acsl_fread((void *)(buf_0),(size_t)1,(size_t)4,f);
int res = (int)tmp_0;
if (res == 4) {
{
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-91.c b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-91.c
index 40c85c745e4dadb1643a406e3cd193bfd019876f..fcc437fd3e6ba21ef297246a482908c187342ecd 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-91.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_issue-eacsl-91.c
@@ -12,17 +12,17 @@ short a;
char b(void)
{
char __retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)1);
+ __e_acsl_store_block((void *)(& __retres),1UL);
switch ((int)a) {
int c = 0;
- __e_acsl_store_block((void *)(& c),(size_t)4);
+ __e_acsl_store_block((void *)(& c),4UL);
__e_acsl_full_init((void *)(& c));
case 0:
- __e_acsl_store_block_duplicate((void *)(& c),(size_t)4);
+ __e_acsl_store_block_duplicate((void *)(& c),4UL);
__e_acsl_delete_block((void *)(& c));
goto d;
int tmp = c;
- __e_acsl_store_block((void *)(& tmp),(size_t)4);
+ __e_acsl_store_block((void *)(& tmp),4UL);
__e_acsl_full_init((void *)(& tmp));
__e_acsl_delete_block((void *)(& tmp));
__e_acsl_delete_block((void *)(& c));
@@ -38,9 +38,9 @@ void __e_acsl_globals_init(void)
static char __e_acsl_already_run = 0;
if (! __e_acsl_already_run) {
__e_acsl_already_run = 1;
- __e_acsl_store_block((void *)(& b),(size_t)1);
+ __e_acsl_store_block((void *)(& b),1UL);
__e_acsl_full_init((void *)(& b));
- __e_acsl_store_block((void *)(& a),(size_t)2);
+ __e_acsl_store_block((void *)(& a),2UL);
__e_acsl_full_init((void *)(& a));
}
return;
@@ -56,9 +56,9 @@ void __e_acsl_globals_clean(void)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
+ __e_acsl_store_block((void *)(& __retres),4UL);
b();
__e_acsl_full_init((void *)(& __retres));
__retres = 0;
diff --git a/src/plugins/e-acsl/tests/bts/oracle/gen_issue69.c b/src/plugins/e-acsl/tests/bts/oracle/gen_issue69.c
index a6e1c019f5283f5a1b0dd7c0830eaf1c45ea2c20..6b9b1af1779c444785410d5419057466c6d7643b 100644
--- a/src/plugins/e-acsl/tests/bts/oracle/gen_issue69.c
+++ b/src/plugins/e-acsl/tests/bts/oracle/gen_issue69.c
@@ -11,7 +11,7 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
{
int __gen_e_acsl_forall;
int __gen_e_acsl_c;
diff --git a/src/plugins/e-acsl/tests/builtin/oracle/gen_builtin_literal_string.c b/src/plugins/e-acsl/tests/builtin/oracle/gen_builtin_literal_string.c
index d02f4b691460013a7c6a35d905f8d1720fc4ea61..c42390be1659d061cb497193b7ddc7d50ef068af 100644
--- a/src/plugins/e-acsl/tests/builtin/oracle/gen_builtin_literal_string.c
+++ b/src/plugins/e-acsl/tests/builtin/oracle/gen_builtin_literal_string.c
@@ -26,7 +26,7 @@ void __e_acsl_globals_init(void)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
__e_acsl_builtin_strlen(__gen_e_acsl_literal_string);
__retres = 0;
diff --git a/src/plugins/e-acsl/tests/builtin/oracle/gen_builtin_literal_string_local_init.c b/src/plugins/e-acsl/tests/builtin/oracle/gen_builtin_literal_string_local_init.c
index 853a9641d8d94beb8bfc807266f7ca2452044f9e..b3eb4f6d4cfbeefcd40a7e5ec7bff0f67403e14c 100644
--- a/src/plugins/e-acsl/tests/builtin/oracle/gen_builtin_literal_string_local_init.c
+++ b/src/plugins/e-acsl/tests/builtin/oracle/gen_builtin_literal_string_local_init.c
@@ -27,7 +27,7 @@ void __e_acsl_globals_init(void)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
size_t len = __e_acsl_builtin_strlen(__gen_e_acsl_literal_string);
__retres = 0;
diff --git a/src/plugins/e-acsl/tests/builtin/oracle/gen_strcat.c b/src/plugins/e-acsl/tests/builtin/oracle/gen_strcat.c
index 400997fa1086f106cf16f2ff9bc55709678f4724..4dd51eba552684f1387cb630eb11d80a311f6e0a 100644
--- a/src/plugins/e-acsl/tests/builtin/oracle/gen_strcat.c
+++ b/src/plugins/e-acsl/tests/builtin/oracle/gen_strcat.c
@@ -83,10 +83,10 @@ void test_memory_tracking(void)
{
{
char dest[4];
- __e_acsl_store_block((void *)(dest),(size_t)4);
+ __e_acsl_store_block((void *)(dest),4UL);
__e_acsl_builtin_strcpy(dest,__gen_e_acsl_literal_string_6);
char src[2] = {(char)'b', (char)'\000'};
- __e_acsl_store_block((void *)(src),(size_t)2);
+ __e_acsl_store_block((void *)(src),2UL);
__e_acsl_full_init((void *)(& src));
{
int __gen_e_acsl_size;
@@ -265,10 +265,10 @@ void test_memory_tracking(void)
}
{
char dest_0[4];
- __e_acsl_store_block((void *)(dest_0),(size_t)4);
+ __e_acsl_store_block((void *)(dest_0),4UL);
__e_acsl_builtin_strcpy(dest_0,__gen_e_acsl_literal_string_6);
char src_0[3] = {(char)'b', (char)'c', (char)'\000'};
- __e_acsl_store_block((void *)(src_0),(size_t)3);
+ __e_acsl_store_block((void *)(src_0),3UL);
__e_acsl_full_init((void *)(& src_0));
{
int __gen_e_acsl_size_5;
@@ -384,7 +384,7 @@ void test_memory_tracking(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_8);
}
/*@ assert \initialized(&src_0[0 .. 2]); */ ;
- __e_acsl_builtin_strncat(dest_0,(char const *)(src_0),(unsigned long)1);
+ __e_acsl_builtin_strncat(dest_0,(char const *)(src_0),(size_t)1);
{
int __gen_e_acsl_size_8;
int __gen_e_acsl_if_8;
@@ -452,10 +452,10 @@ void test_memory_tracking(void)
}
{
char dest_1[4];
- __e_acsl_store_block((void *)(dest_1),(size_t)4);
+ __e_acsl_store_block((void *)(dest_1),4UL);
__e_acsl_builtin_strcpy(dest_1,__gen_e_acsl_literal_string_6);
char src_1[2] = {(char)'b', (char)'\000'};
- __e_acsl_store_block((void *)(src_1),(size_t)2);
+ __e_acsl_store_block((void *)(src_1),2UL);
__e_acsl_full_init((void *)(& src_1));
{
int __gen_e_acsl_size_9;
@@ -571,7 +571,7 @@ void test_memory_tracking(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_13);
}
/*@ assert \initialized(&src_1[0 .. 1]); */ ;
- __e_acsl_builtin_strncat(dest_1,(char const *)(src_1),(unsigned long)2);
+ __e_acsl_builtin_strncat(dest_1,(char const *)(src_1),(size_t)2);
{
int __gen_e_acsl_size_12;
int __gen_e_acsl_if_12;
@@ -705,15 +705,15 @@ pid_t __gen_e_acsl_waitpid(pid_t pid, int *stat_loc, int options)
pid_t __retres;
{
int __gen_e_acsl_assumes_value;
- __e_acsl_store_block((void *)(& stat_loc),(size_t)8);
+ __e_acsl_store_block((void *)(& stat_loc),8UL);
__gen_e_acsl_at = stat_loc;
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+ __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
stat_loc == (int *)0);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
stat_loc != (int *)0);
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
if (__gen_e_acsl_assumes_value) {
int __gen_e_acsl_valid;
__e_acsl_assert_data_t __gen_e_acsl_assert_data =
@@ -983,41 +983,41 @@ void __e_acsl_globals_init(void)
int main(int argc, char const **argv)
{
int __retres;
- __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+ __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
__e_acsl_globals_init();
char *const_str = (char *)__gen_e_acsl_literal_string_7;
- char *unalloc_str = malloc((unsigned long)5);
- char *_barrier = malloc((unsigned long)1);
+ char *unalloc_str = malloc((size_t)5);
+ char *_barrier = malloc((size_t)1);
char *empty_str = (char *)__gen_e_acsl_literal_string_8;
free((void *)unalloc_str);
{
char dest1[9] =
{(char)'d', (char)'c', (char)'b', (char)'a', (char)'\000'};
- __e_acsl_store_block((void *)(dest1),(size_t)9);
+ __e_acsl_store_block((void *)(dest1),9UL);
__e_acsl_full_init((void *)(& dest1));
char dest2[8] =
{(char)'d', (char)'c', (char)'b', (char)'a', (char)'\000'};
- __e_acsl_store_block((void *)(dest2),(size_t)8);
+ __e_acsl_store_block((void *)(dest2),8UL);
__e_acsl_full_init((void *)(& dest2));
char dest3[5] =
{(char)'-', (char)'-', (char)'-', (char)'-', (char)'\000'};
- __e_acsl_store_block((void *)(dest3),(size_t)5);
+ __e_acsl_store_block((void *)(dest3),5UL);
__e_acsl_full_init((void *)(& dest3));
char dest4[10] =
{(char)'d', (char)'c', (char)'b', (char)'a', (char)'\000'};
- __e_acsl_store_block((void *)(dest4),(size_t)10);
+ __e_acsl_store_block((void *)(dest4),10UL);
__e_acsl_full_init((void *)(& dest4));
char *pd1 = (char *)(& dest1);
- __e_acsl_store_block((void *)(& pd1),(size_t)8);
+ __e_acsl_store_block((void *)(& pd1),8UL);
__e_acsl_full_init((void *)(& pd1));
char *pd2 = (char *)(& dest2);
- __e_acsl_store_block((void *)(& pd2),(size_t)8);
+ __e_acsl_store_block((void *)(& pd2),8UL);
__e_acsl_full_init((void *)(& pd2));
char *pd3 = (char *)(& dest3);
- __e_acsl_store_block((void *)(& pd3),(size_t)8);
+ __e_acsl_store_block((void *)(& pd3),8UL);
__e_acsl_full_init((void *)(& pd3));
char *pd4 = (char *)(& dest4);
- __e_acsl_store_block((void *)(& pd4),(size_t)8);
+ __e_acsl_store_block((void *)(& pd4),8UL);
__e_acsl_full_init((void *)(& pd4));
{
pid_t pid = __gen_e_acsl_fork();
@@ -1027,7 +1027,7 @@ int main(int argc, char const **argv)
}
else {
int process_status;
- __e_acsl_store_block((void *)(& process_status),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status),4UL);
__gen_e_acsl_waitpid(pid,& process_status,0);
signal_eval(process_status,0,__gen_e_acsl_literal_string_9);
__e_acsl_delete_block((void *)(& process_status));
@@ -1041,7 +1041,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_0;
- __e_acsl_store_block((void *)(& process_status_0),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_0),4UL);
__gen_e_acsl_waitpid(pid_0,& process_status_0,0);
signal_eval(process_status_0,0,__gen_e_acsl_literal_string_10);
__e_acsl_delete_block((void *)(& process_status_0));
@@ -1055,7 +1055,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_1;
- __e_acsl_store_block((void *)(& process_status_1),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_1),4UL);
__gen_e_acsl_waitpid(pid_1,& process_status_1,0);
signal_eval(process_status_1,1,__gen_e_acsl_literal_string_11);
__e_acsl_delete_block((void *)(& process_status_1));
@@ -1069,7 +1069,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_2;
- __e_acsl_store_block((void *)(& process_status_2),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_2),4UL);
__gen_e_acsl_waitpid(pid_2,& process_status_2,0);
signal_eval(process_status_2,1,__gen_e_acsl_literal_string_12);
__e_acsl_delete_block((void *)(& process_status_2));
@@ -1083,7 +1083,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_3;
- __e_acsl_store_block((void *)(& process_status_3),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_3),4UL);
__gen_e_acsl_waitpid(pid_3,& process_status_3,0);
signal_eval(process_status_3,1,__gen_e_acsl_literal_string_13);
__e_acsl_delete_block((void *)(& process_status_3));
@@ -1097,7 +1097,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_4;
- __e_acsl_store_block((void *)(& process_status_4),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_4),4UL);
__gen_e_acsl_waitpid(pid_4,& process_status_4,0);
signal_eval(process_status_4,1,__gen_e_acsl_literal_string_14);
__e_acsl_delete_block((void *)(& process_status_4));
@@ -1111,7 +1111,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_5;
- __e_acsl_store_block((void *)(& process_status_5),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_5),4UL);
__gen_e_acsl_waitpid(pid_5,& process_status_5,0);
signal_eval(process_status_5,1,__gen_e_acsl_literal_string_15);
__e_acsl_delete_block((void *)(& process_status_5));
@@ -1125,7 +1125,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_6;
- __e_acsl_store_block((void *)(& process_status_6),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_6),4UL);
__gen_e_acsl_waitpid(pid_6,& process_status_6,0);
signal_eval(process_status_6,1,__gen_e_acsl_literal_string_16);
__e_acsl_delete_block((void *)(& process_status_6));
@@ -1139,7 +1139,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_7;
- __e_acsl_store_block((void *)(& process_status_7),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_7),4UL);
__gen_e_acsl_waitpid(pid_7,& process_status_7,0);
signal_eval(process_status_7,1,__gen_e_acsl_literal_string_17);
__e_acsl_delete_block((void *)(& process_status_7));
@@ -1153,7 +1153,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_8;
- __e_acsl_store_block((void *)(& process_status_8),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_8),4UL);
__gen_e_acsl_waitpid(pid_8,& process_status_8,0);
signal_eval(process_status_8,1,__gen_e_acsl_literal_string_18);
__e_acsl_delete_block((void *)(& process_status_8));
@@ -1167,7 +1167,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_9;
- __e_acsl_store_block((void *)(& process_status_9),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_9),4UL);
__gen_e_acsl_waitpid(pid_9,& process_status_9,0);
signal_eval(process_status_9,1,__gen_e_acsl_literal_string_19);
__e_acsl_delete_block((void *)(& process_status_9));
@@ -1183,7 +1183,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_10;
- __e_acsl_store_block((void *)(& process_status_10),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_10),4UL);
__gen_e_acsl_waitpid(pid_10,& process_status_10,0);
signal_eval(process_status_10,0,__gen_e_acsl_literal_string_20);
__e_acsl_delete_block((void *)(& process_status_10));
@@ -1201,42 +1201,41 @@ int main(int argc, char const **argv)
{
char dest1_0[9] =
{(char)'d', (char)'c', (char)'b', (char)'a', (char)'\000'};
- __e_acsl_store_block((void *)(dest1_0),(size_t)9);
+ __e_acsl_store_block((void *)(dest1_0),9UL);
__e_acsl_full_init((void *)(& dest1_0));
char dest2_0[8] =
{(char)'d', (char)'c', (char)'b', (char)'a', (char)'\000'};
- __e_acsl_store_block((void *)(dest2_0),(size_t)8);
+ __e_acsl_store_block((void *)(dest2_0),8UL);
__e_acsl_full_init((void *)(& dest2_0));
char dest3_0[5] =
{(char)'-', (char)'-', (char)'-', (char)'-', (char)'\000'};
- __e_acsl_store_block((void *)(dest3_0),(size_t)5);
+ __e_acsl_store_block((void *)(dest3_0),5UL);
__e_acsl_full_init((void *)(& dest3_0));
char dest4_0[10] =
{(char)'d', (char)'c', (char)'b', (char)'a', (char)'\000'};
- __e_acsl_store_block((void *)(dest4_0),(size_t)10);
+ __e_acsl_store_block((void *)(dest4_0),10UL);
__e_acsl_full_init((void *)(& dest4_0));
char *pd1_0 = (char *)(& dest1_0);
- __e_acsl_store_block((void *)(& pd1_0),(size_t)8);
+ __e_acsl_store_block((void *)(& pd1_0),8UL);
__e_acsl_full_init((void *)(& pd1_0));
char *pd2_0 = (char *)(& dest2_0);
- __e_acsl_store_block((void *)(& pd2_0),(size_t)8);
+ __e_acsl_store_block((void *)(& pd2_0),8UL);
__e_acsl_full_init((void *)(& pd2_0));
char *pd3_0 = (char *)(& dest3_0);
- __e_acsl_store_block((void *)(& pd3_0),(size_t)8);
+ __e_acsl_store_block((void *)(& pd3_0),8UL);
__e_acsl_full_init((void *)(& pd3_0));
char *pd4_0 = (char *)(& dest4_0);
- __e_acsl_store_block((void *)(& pd4_0),(size_t)8);
+ __e_acsl_store_block((void *)(& pd4_0),8UL);
__e_acsl_full_init((void *)(& pd4_0));
{
pid_t pid_11 = __gen_e_acsl_fork();
if (! pid_11) {
- __e_acsl_builtin_strncat(dest1_0,(char const *)const_str,
- (unsigned long)4);
+ __e_acsl_builtin_strncat(dest1_0,(char const *)const_str,(size_t)4);
__gen_e_acsl_exit(0);
}
else {
int process_status_11;
- __e_acsl_store_block((void *)(& process_status_11),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_11),4UL);
__gen_e_acsl_waitpid(pid_11,& process_status_11,0);
signal_eval(process_status_11,0,__gen_e_acsl_literal_string_21);
__e_acsl_delete_block((void *)(& process_status_11));
@@ -1245,13 +1244,12 @@ int main(int argc, char const **argv)
{
pid_t pid_12 = __gen_e_acsl_fork();
if (! pid_12) {
- __e_acsl_builtin_strncat(dest2_0,(char const *)const_str,
- (unsigned long)4);
+ __e_acsl_builtin_strncat(dest2_0,(char const *)const_str,(size_t)4);
__gen_e_acsl_exit(0);
}
else {
int process_status_12;
- __e_acsl_store_block((void *)(& process_status_12),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_12),4UL);
__gen_e_acsl_waitpid(pid_12,& process_status_12,0);
signal_eval(process_status_12,1,__gen_e_acsl_literal_string_22);
__e_acsl_delete_block((void *)(& process_status_12));
@@ -1261,12 +1259,12 @@ int main(int argc, char const **argv)
pid_t pid_13 = __gen_e_acsl_fork();
if (! pid_13) {
__e_acsl_builtin_strncat(unalloc_str,(char const *)const_str,
- (unsigned long)1);
+ (size_t)1);
__gen_e_acsl_exit(0);
}
else {
int process_status_13;
- __e_acsl_store_block((void *)(& process_status_13),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_13),4UL);
__gen_e_acsl_waitpid(pid_13,& process_status_13,0);
signal_eval(process_status_13,1,__gen_e_acsl_literal_string_23);
__e_acsl_delete_block((void *)(& process_status_13));
@@ -1275,13 +1273,12 @@ int main(int argc, char const **argv)
{
pid_t pid_14 = __gen_e_acsl_fork();
if (! pid_14) {
- __e_acsl_builtin_strncat(dest2_0,(char const *)unalloc_str,
- (unsigned long)1);
+ __e_acsl_builtin_strncat(dest2_0,(char const *)unalloc_str,(size_t)1);
__gen_e_acsl_exit(0);
}
else {
int process_status_14;
- __e_acsl_store_block((void *)(& process_status_14),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_14),4UL);
__gen_e_acsl_waitpid(pid_14,& process_status_14,0);
signal_eval(process_status_14,1,__gen_e_acsl_literal_string_24);
__e_acsl_delete_block((void *)(& process_status_14));
@@ -1290,13 +1287,12 @@ int main(int argc, char const **argv)
{
pid_t pid_15 = __gen_e_acsl_fork();
if (! pid_15) {
- __e_acsl_builtin_strncat((char *)0,(char const *)const_str,
- (unsigned long)1);
+ __e_acsl_builtin_strncat((char *)0,(char const *)const_str,(size_t)1);
__gen_e_acsl_exit(0);
}
else {
int process_status_15;
- __e_acsl_store_block((void *)(& process_status_15),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_15),4UL);
__gen_e_acsl_waitpid(pid_15,& process_status_15,0);
signal_eval(process_status_15,1,__gen_e_acsl_literal_string_25);
__e_acsl_delete_block((void *)(& process_status_15));
@@ -1305,12 +1301,12 @@ int main(int argc, char const **argv)
{
pid_t pid_16 = __gen_e_acsl_fork();
if (! pid_16) {
- __e_acsl_builtin_strncat(dest2_0,(char const *)0,(unsigned long)1);
+ __e_acsl_builtin_strncat(dest2_0,(char const *)0,(size_t)1);
__gen_e_acsl_exit(0);
}
else {
int process_status_16;
- __e_acsl_store_block((void *)(& process_status_16),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_16),4UL);
__gen_e_acsl_waitpid(pid_16,& process_status_16,0);
signal_eval(process_status_16,1,__gen_e_acsl_literal_string_26);
__e_acsl_delete_block((void *)(& process_status_16));
@@ -1319,13 +1315,12 @@ int main(int argc, char const **argv)
{
pid_t pid_17 = __gen_e_acsl_fork();
if (! pid_17) {
- __e_acsl_builtin_strncat(const_str,(char const *)const_str,
- (unsigned long)1);
+ __e_acsl_builtin_strncat(const_str,(char const *)const_str,(size_t)1);
__gen_e_acsl_exit(0);
}
else {
int process_status_17;
- __e_acsl_store_block((void *)(& process_status_17),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_17),4UL);
__gen_e_acsl_waitpid(pid_17,& process_status_17,0);
signal_eval(process_status_17,1,__gen_e_acsl_literal_string_27);
__e_acsl_delete_block((void *)(& process_status_17));
@@ -1334,12 +1329,12 @@ int main(int argc, char const **argv)
{
pid_t pid_18 = __gen_e_acsl_fork();
if (! pid_18) {
- __e_acsl_builtin_strncat(pd1_0,(char const *)pd1_0,(unsigned long)1);
+ __e_acsl_builtin_strncat(pd1_0,(char const *)pd1_0,(size_t)1);
__gen_e_acsl_exit(0);
}
else {
int process_status_18;
- __e_acsl_store_block((void *)(& process_status_18),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_18),4UL);
__gen_e_acsl_waitpid(pid_18,& process_status_18,0);
signal_eval(process_status_18,1,__gen_e_acsl_literal_string_28);
__e_acsl_delete_block((void *)(& process_status_18));
@@ -1348,13 +1343,12 @@ int main(int argc, char const **argv)
{
pid_t pid_19 = __gen_e_acsl_fork();
if (! pid_19) {
- __e_acsl_builtin_strncat(pd1_0 + 3,(char const *)pd1_0,
- (unsigned long)5);
+ __e_acsl_builtin_strncat(pd1_0 + 3,(char const *)pd1_0,(size_t)5);
__gen_e_acsl_exit(0);
}
else {
int process_status_19;
- __e_acsl_store_block((void *)(& process_status_19),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_19),4UL);
__gen_e_acsl_waitpid(pid_19,& process_status_19,0);
signal_eval(process_status_19,1,__gen_e_acsl_literal_string_29);
__e_acsl_delete_block((void *)(& process_status_19));
@@ -1363,13 +1357,12 @@ int main(int argc, char const **argv)
{
pid_t pid_20 = __gen_e_acsl_fork();
if (! pid_20) {
- __e_acsl_builtin_strncat(pd4_0 + 4,(char const *)pd4_0,
- (unsigned long)5);
+ __e_acsl_builtin_strncat(pd4_0 + 4,(char const *)pd4_0,(size_t)5);
__gen_e_acsl_exit(0);
}
else {
int process_status_20;
- __e_acsl_store_block((void *)(& process_status_20),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_20),4UL);
__gen_e_acsl_waitpid(pid_20,& process_status_20,0);
signal_eval(process_status_20,1,__gen_e_acsl_literal_string_30);
__e_acsl_delete_block((void *)(& process_status_20));
diff --git a/src/plugins/e-acsl/tests/builtin/oracle/gen_strcmp.c b/src/plugins/e-acsl/tests/builtin/oracle/gen_strcmp.c
index e1307d5a6ae8d362bd4367097a60ef85c52bca36..e709190a8d4e6648e637df959d6d53e36a92fd4c 100644
--- a/src/plugins/e-acsl/tests/builtin/oracle/gen_strcmp.c
+++ b/src/plugins/e-acsl/tests/builtin/oracle/gen_strcmp.c
@@ -155,12 +155,12 @@ char *__gen_e_acsl_strdup(char const *s)
{
__e_acsl_contract_t *__gen_e_acsl_contract;
char *__retres;
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+ __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
__retres = strdup(s);
{
int __gen_e_acsl_assumes_value;
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
if (__gen_e_acsl_assumes_value) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_4 =
{.values = (void *)0};
@@ -246,15 +246,15 @@ pid_t __gen_e_acsl_waitpid(pid_t pid, int *stat_loc, int options)
pid_t __retres;
{
int __gen_e_acsl_assumes_value;
- __e_acsl_store_block((void *)(& stat_loc),(size_t)8);
+ __e_acsl_store_block((void *)(& stat_loc),8UL);
__gen_e_acsl_at = stat_loc;
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+ __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
stat_loc == (int *)0);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
stat_loc != (int *)0);
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
if (__gen_e_acsl_assumes_value) {
int __gen_e_acsl_valid;
__e_acsl_assert_data_t __gen_e_acsl_assert_data =
@@ -558,7 +558,7 @@ int main(int argc, char const **argv)
{
int __retres;
int res;
- __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+ __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
__e_acsl_globals_init();
char const *cl = __gen_e_acsl_literal_string_6;
char const *cr = __gen_e_acsl_literal_string_6;
@@ -578,7 +578,7 @@ int main(int argc, char const **argv)
}
else {
int process_status;
- __e_acsl_store_block((void *)(& process_status),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status),4UL);
__gen_e_acsl_waitpid(pid,& process_status,0);
signal_eval(process_status,0,__gen_e_acsl_literal_string_8);
__e_acsl_delete_block((void *)(& process_status));
@@ -596,7 +596,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_0;
- __e_acsl_store_block((void *)(& process_status_0),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_0),4UL);
__gen_e_acsl_waitpid(pid_0,& process_status_0,0);
signal_eval(process_status_0,0,__gen_e_acsl_literal_string_9);
__e_acsl_delete_block((void *)(& process_status_0));
@@ -614,7 +614,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_1;
- __e_acsl_store_block((void *)(& process_status_1),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_1),4UL);
__gen_e_acsl_waitpid(pid_1,& process_status_1,0);
signal_eval(process_status_1,0,__gen_e_acsl_literal_string_10);
__e_acsl_delete_block((void *)(& process_status_1));
@@ -633,7 +633,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_2;
- __e_acsl_store_block((void *)(& process_status_2),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_2),4UL);
__gen_e_acsl_waitpid(pid_2,& process_status_2,0);
signal_eval(process_status_2,1,__gen_e_acsl_literal_string_11);
__e_acsl_delete_block((void *)(& process_status_2));
@@ -653,7 +653,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_3;
- __e_acsl_store_block((void *)(& process_status_3),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_3),4UL);
__gen_e_acsl_waitpid(pid_3,& process_status_3,0);
signal_eval(process_status_3,1,__gen_e_acsl_literal_string_12);
__e_acsl_delete_block((void *)(& process_status_3));
@@ -672,7 +672,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_4;
- __e_acsl_store_block((void *)(& process_status_4),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_4),4UL);
__gen_e_acsl_waitpid(pid_4,& process_status_4,0);
signal_eval(process_status_4,1,__gen_e_acsl_literal_string_13);
__e_acsl_delete_block((void *)(& process_status_4));
@@ -692,7 +692,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_5;
- __e_acsl_store_block((void *)(& process_status_5),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_5),4UL);
__gen_e_acsl_waitpid(pid_5,& process_status_5,0);
signal_eval(process_status_5,1,__gen_e_acsl_literal_string_14);
__e_acsl_delete_block((void *)(& process_status_5));
@@ -710,7 +710,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_6;
- __e_acsl_store_block((void *)(& process_status_6),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_6),4UL);
__gen_e_acsl_waitpid(pid_6,& process_status_6,0);
signal_eval(process_status_6,1,__gen_e_acsl_literal_string_15);
__e_acsl_delete_block((void *)(& process_status_6));
@@ -728,7 +728,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_7;
- __e_acsl_store_block((void *)(& process_status_7),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_7),4UL);
__gen_e_acsl_waitpid(pid_7,& process_status_7,0);
signal_eval(process_status_7,1,__gen_e_acsl_literal_string_16);
__e_acsl_delete_block((void *)(& process_status_7));
@@ -748,7 +748,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_8;
- __e_acsl_store_block((void *)(& process_status_8),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_8),4UL);
__gen_e_acsl_waitpid(pid_8,& process_status_8,0);
signal_eval(process_status_8,1,__gen_e_acsl_literal_string_17);
__e_acsl_delete_block((void *)(& process_status_8));
@@ -766,7 +766,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_9;
- __e_acsl_store_block((void *)(& process_status_9),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_9),4UL);
__gen_e_acsl_waitpid(pid_9,& process_status_9,0);
signal_eval(process_status_9,1,__gen_e_acsl_literal_string_18);
__e_acsl_delete_block((void *)(& process_status_9));
@@ -781,14 +781,14 @@ int main(int argc, char const **argv)
if (! pid_10) {
int tmp_35;
int tmp_36;
- tmp_35 = __e_acsl_builtin_strncmp(cl,cr,(unsigned long)3);
- tmp_36 = __e_acsl_builtin_strncmp(cl,cr,(unsigned long)3);
+ tmp_35 = __e_acsl_builtin_strncmp(cl,cr,(size_t)3);
+ tmp_36 = __e_acsl_builtin_strncmp(cl,cr,(size_t)3);
fail_ncomp(tmp_36 != 0,(char *)__gen_e_acsl_literal_string_7,tmp_35,0);
__gen_e_acsl_exit(0);
}
else {
int process_status_10;
- __e_acsl_store_block((void *)(& process_status_10),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_10),4UL);
__gen_e_acsl_waitpid(pid_10,& process_status_10,0);
signal_eval(process_status_10,0,__gen_e_acsl_literal_string_19);
__e_acsl_delete_block((void *)(& process_status_10));
@@ -800,15 +800,15 @@ int main(int argc, char const **argv)
int tmp_38;
int tmp_39;
tmp_38 = __e_acsl_builtin_strncmp((char const *)(nal),
- (char const *)(nar),(unsigned long)3);
+ (char const *)(nar),(size_t)3);
tmp_39 = __e_acsl_builtin_strncmp((char const *)(nal),
- (char const *)(nar),(unsigned long)3);
+ (char const *)(nar),(size_t)3);
fail_ncomp(tmp_39 != 0,(char *)__gen_e_acsl_literal_string_7,tmp_38,0);
__gen_e_acsl_exit(0);
}
else {
int process_status_11;
- __e_acsl_store_block((void *)(& process_status_11),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_11),4UL);
__gen_e_acsl_waitpid(pid_11,& process_status_11,0);
signal_eval(process_status_11,0,__gen_e_acsl_literal_string_20);
__e_acsl_delete_block((void *)(& process_status_11));
@@ -820,15 +820,15 @@ int main(int argc, char const **argv)
int tmp_41;
int tmp_42;
tmp_41 = __e_acsl_builtin_strncmp((char const *)dl,(char const *)dr,
- (unsigned long)3);
+ (size_t)3);
tmp_42 = __e_acsl_builtin_strncmp((char const *)dl,(char const *)dr,
- (unsigned long)3);
+ (size_t)3);
fail_ncomp(tmp_42 != 0,(char *)__gen_e_acsl_literal_string_7,tmp_41,0);
__gen_e_acsl_exit(0);
}
else {
int process_status_12;
- __e_acsl_store_block((void *)(& process_status_12),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_12),4UL);
__gen_e_acsl_waitpid(pid_12,& process_status_12,0);
signal_eval(process_status_12,0,__gen_e_acsl_literal_string_21);
__e_acsl_delete_block((void *)(& process_status_12));
@@ -840,15 +840,15 @@ int main(int argc, char const **argv)
int tmp_44;
int tmp_45;
tmp_44 = __e_acsl_builtin_strncmp((char const *)(nal),
- (char const *)(nar),(unsigned long)6);
+ (char const *)(nar),(size_t)6);
tmp_45 = __e_acsl_builtin_strncmp((char const *)(nal),
- (char const *)(nar),(unsigned long)6);
+ (char const *)(nar),(size_t)6);
fail_ncomp(tmp_45 != 0,(char *)__gen_e_acsl_literal_string_7,tmp_44,0);
__gen_e_acsl_exit(0);
}
else {
int process_status_13;
- __e_acsl_store_block((void *)(& process_status_13),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_13),4UL);
__gen_e_acsl_waitpid(pid_13,& process_status_13,0);
signal_eval(process_status_13,0,__gen_e_acsl_literal_string_22);
__e_acsl_delete_block((void *)(& process_status_13));
@@ -860,15 +860,15 @@ int main(int argc, char const **argv)
int tmp_47;
int tmp_48;
tmp_47 = __e_acsl_builtin_strncmp((char const *)dl,(char const *)dr,
- (unsigned long)6);
+ (size_t)6);
tmp_48 = __e_acsl_builtin_strncmp((char const *)dl,(char const *)dr,
- (unsigned long)6);
+ (size_t)6);
fail_ncomp(tmp_48 != 0,(char *)__gen_e_acsl_literal_string_7,tmp_47,0);
__gen_e_acsl_exit(0);
}
else {
int process_status_14;
- __e_acsl_store_block((void *)(& process_status_14),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_14),4UL);
__gen_e_acsl_waitpid(pid_14,& process_status_14,0);
signal_eval(process_status_14,0,__gen_e_acsl_literal_string_23);
__e_acsl_delete_block((void *)(& process_status_14));
@@ -881,15 +881,15 @@ int main(int argc, char const **argv)
int tmp_50;
int tmp_51;
tmp_50 = __e_acsl_builtin_strncmp((char const *)(nal),
- (char const *)(nar),(unsigned long)4);
+ (char const *)(nar),(size_t)4);
tmp_51 = __e_acsl_builtin_strncmp((char const *)(nal),
- (char const *)(nar),(unsigned long)4);
+ (char const *)(nar),(size_t)4);
fail_ncomp(tmp_51 == 0,(char *)__gen_e_acsl_literal_string_24,tmp_50,0);
__gen_e_acsl_exit(0);
}
else {
int process_status_15;
- __e_acsl_store_block((void *)(& process_status_15),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_15),4UL);
__gen_e_acsl_waitpid(pid_15,& process_status_15,0);
signal_eval(process_status_15,0,__gen_e_acsl_literal_string_25);
__e_acsl_delete_block((void *)(& process_status_15));
@@ -903,15 +903,15 @@ int main(int argc, char const **argv)
int tmp_53;
int tmp_54;
tmp_53 = __e_acsl_builtin_strncmp((char const *)(nal),
- (char const *)(nar),(unsigned long)4);
+ (char const *)(nar),(size_t)4);
tmp_54 = __e_acsl_builtin_strncmp((char const *)(nal),
- (char const *)(nar),(unsigned long)4);
+ (char const *)(nar),(size_t)4);
fail_ncomp(tmp_54 == 0,(char *)__gen_e_acsl_literal_string_24,tmp_53,0);
__gen_e_acsl_exit(0);
}
else {
int process_status_16;
- __e_acsl_store_block((void *)(& process_status_16),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_16),4UL);
__gen_e_acsl_waitpid(pid_16,& process_status_16,0);
signal_eval(process_status_16,0,__gen_e_acsl_literal_string_26);
__e_acsl_delete_block((void *)(& process_status_16));
@@ -924,15 +924,15 @@ int main(int argc, char const **argv)
int tmp_56;
int tmp_57;
tmp_56 = __e_acsl_builtin_strncmp((char const *)dl,(char const *)dr,
- (unsigned long)4);
+ (size_t)4);
tmp_57 = __e_acsl_builtin_strncmp((char const *)dl,(char const *)dr,
- (unsigned long)4);
+ (size_t)4);
fail_ncomp(tmp_57 == 0,(char *)__gen_e_acsl_literal_string_24,tmp_56,0);
__gen_e_acsl_exit(0);
}
else {
int process_status_17;
- __e_acsl_store_block((void *)(& process_status_17),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_17),4UL);
__gen_e_acsl_waitpid(pid_17,& process_status_17,0);
signal_eval(process_status_17,0,__gen_e_acsl_literal_string_27);
__e_acsl_delete_block((void *)(& process_status_17));
@@ -946,15 +946,15 @@ int main(int argc, char const **argv)
int tmp_59;
int tmp_60;
tmp_59 = __e_acsl_builtin_strncmp((char const *)dl,(char const *)dr,
- (unsigned long)4);
+ (size_t)4);
tmp_60 = __e_acsl_builtin_strncmp((char const *)dl,(char const *)dr,
- (unsigned long)4);
+ (size_t)4);
fail_ncomp(tmp_60 == 0,(char *)__gen_e_acsl_literal_string_24,tmp_59,0);
__gen_e_acsl_exit(0);
}
else {
int process_status_18;
- __e_acsl_store_block((void *)(& process_status_18),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_18),4UL);
__gen_e_acsl_waitpid(pid_18,& process_status_18,0);
signal_eval(process_status_18,0,__gen_e_acsl_literal_string_28);
__e_acsl_delete_block((void *)(& process_status_18));
@@ -964,12 +964,12 @@ int main(int argc, char const **argv)
pid_t pid_19 = __gen_e_acsl_fork();
if (! pid_19) {
res = __e_acsl_builtin_strncmp((char const *)(nal),(char const *)(nar),
- (unsigned long)5);
+ (size_t)5);
__gen_e_acsl_exit(0);
}
else {
int process_status_19;
- __e_acsl_store_block((void *)(& process_status_19),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_19),4UL);
__gen_e_acsl_waitpid(pid_19,& process_status_19,0);
signal_eval(process_status_19,1,__gen_e_acsl_literal_string_29);
__e_acsl_delete_block((void *)(& process_status_19));
@@ -981,12 +981,12 @@ int main(int argc, char const **argv)
pid_t pid_20 = __gen_e_acsl_fork();
if (! pid_20) {
res = __e_acsl_builtin_strncmp((char const *)(al),(char const *)(ar),
- (unsigned long)5);
+ (size_t)5);
__gen_e_acsl_exit(0);
}
else {
int process_status_20;
- __e_acsl_store_block((void *)(& process_status_20),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_20),4UL);
__gen_e_acsl_waitpid(pid_20,& process_status_20,0);
signal_eval(process_status_20,1,__gen_e_acsl_literal_string_30);
__e_acsl_delete_block((void *)(& process_status_20));
@@ -996,12 +996,12 @@ int main(int argc, char const **argv)
pid_t pid_21 = __gen_e_acsl_fork();
if (! pid_21) {
res = __e_acsl_builtin_strncmp((char const *)dl,(char const *)dr,
- (unsigned long)5);
+ (size_t)5);
__gen_e_acsl_exit(0);
}
else {
int process_status_21;
- __e_acsl_store_block((void *)(& process_status_21),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_21),4UL);
__gen_e_acsl_waitpid(pid_21,& process_status_21,0);
signal_eval(process_status_21,1,__gen_e_acsl_literal_string_31);
__e_acsl_delete_block((void *)(& process_status_21));
@@ -1013,12 +1013,12 @@ int main(int argc, char const **argv)
pid_t pid_22 = __gen_e_acsl_fork();
if (! pid_22) {
res = __e_acsl_builtin_strncmp((char const *)dl,(char const *)dr,
- (unsigned long)5);
+ (size_t)5);
__gen_e_acsl_exit(0);
}
else {
int process_status_22;
- __e_acsl_store_block((void *)(& process_status_22),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_22),4UL);
__gen_e_acsl_waitpid(pid_22,& process_status_22,0);
signal_eval(process_status_22,1,__gen_e_acsl_literal_string_32);
__e_acsl_delete_block((void *)(& process_status_22));
diff --git a/src/plugins/e-acsl/tests/builtin/oracle/gen_strcpy.c b/src/plugins/e-acsl/tests/builtin/oracle/gen_strcpy.c
index e2b3df51a3a8260bf717e2d59813eea954bc1c1f..40ab8b6fa9ca3559cda06b4294bce0ea0d81f7bf 100644
--- a/src/plugins/e-acsl/tests/builtin/oracle/gen_strcpy.c
+++ b/src/plugins/e-acsl/tests/builtin/oracle/gen_strcpy.c
@@ -105,9 +105,9 @@ void test_memory_tracking(void)
{
{
char dest[4];
- __e_acsl_store_block((void *)(dest),(size_t)4);
+ __e_acsl_store_block((void *)(dest),4UL);
char src[2] = {(char)'b', (char)'\000'};
- __e_acsl_store_block((void *)(src),(size_t)2);
+ __e_acsl_store_block((void *)(src),2UL);
__e_acsl_full_init((void *)(& src));
{
int __gen_e_acsl_size;
@@ -262,9 +262,9 @@ void test_memory_tracking(void)
}
{
char dest_0[4];
- __e_acsl_store_block((void *)(dest_0),(size_t)4);
+ __e_acsl_store_block((void *)(dest_0),4UL);
char src_0[4] = {(char)'a', (char)'b', (char)'\000'};
- __e_acsl_store_block((void *)(src_0),(size_t)4);
+ __e_acsl_store_block((void *)(src_0),4UL);
__e_acsl_full_init((void *)(& src_0));
{
int __gen_e_acsl_size_5;
@@ -342,7 +342,7 @@ void test_memory_tracking(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_6);
}
/*@ assert \initialized(&src_0[0 .. 3]); */ ;
- __e_acsl_builtin_strncpy(dest_0,(char const *)(src_0),(unsigned long)1);
+ __e_acsl_builtin_strncpy(dest_0,(char const *)(src_0),(size_t)1);
{
int __gen_e_acsl_initialized_7;
__e_acsl_assert_data_t __gen_e_acsl_assert_data_7 =
@@ -410,9 +410,9 @@ void test_memory_tracking(void)
}
{
char dest_1[4];
- __e_acsl_store_block((void *)(dest_1),(size_t)4);
+ __e_acsl_store_block((void *)(dest_1),4UL);
char src_1[4] = {(char)'b', (char)'\000'};
- __e_acsl_store_block((void *)(src_1),(size_t)4);
+ __e_acsl_store_block((void *)(src_1),4UL);
__e_acsl_full_init((void *)(& src_1));
{
int __gen_e_acsl_size_8;
@@ -490,7 +490,7 @@ void test_memory_tracking(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_10);
}
/*@ assert \initialized(&src_1[0 .. 3]); */ ;
- __e_acsl_builtin_strncpy(dest_1,(char const *)(src_1),(unsigned long)3);
+ __e_acsl_builtin_strncpy(dest_1,(char const *)(src_1),(size_t)3);
{
int __gen_e_acsl_size_10;
int __gen_e_acsl_if_10;
@@ -589,12 +589,12 @@ char *__gen_e_acsl_strdup(char const *s)
{
__e_acsl_contract_t *__gen_e_acsl_contract;
char *__retres;
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+ __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
__retres = strdup(s);
{
int __gen_e_acsl_assumes_value;
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
if (__gen_e_acsl_assumes_value) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_4 =
{.values = (void *)0};
@@ -680,15 +680,15 @@ pid_t __gen_e_acsl_waitpid(pid_t pid, int *stat_loc, int options)
pid_t __retres;
{
int __gen_e_acsl_assumes_value;
- __e_acsl_store_block((void *)(& stat_loc),(size_t)8);
+ __e_acsl_store_block((void *)(& stat_loc),8UL);
__gen_e_acsl_at = stat_loc;
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+ __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
stat_loc == (int *)0);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
stat_loc != (int *)0);
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
if (__gen_e_acsl_assumes_value) {
int __gen_e_acsl_valid;
__e_acsl_assert_data_t __gen_e_acsl_assert_data =
@@ -929,18 +929,18 @@ void __e_acsl_globals_init(void)
int main(int argc, char const **argv)
{
int __retres;
- __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+ __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
__e_acsl_globals_init();
char empty_str[1] = {(char)'\000'};
char *const_str = (char *)__gen_e_acsl_literal_string_6;
char *src = __gen_e_acsl_strdup(__gen_e_acsl_literal_string_6);
- char *dest1 = malloc((unsigned long)5);
- char *dest2 = malloc((unsigned long)4);
+ char *dest1 = malloc((size_t)5);
+ char *dest2 = malloc((size_t)4);
char dest3[256] =
{(char)'a', (char)'b', (char)'c', (char)'d', (char)'\000'};
- size_t len = (unsigned long)0;
- char *unalloc_str = malloc((unsigned long)5);
- char *_barrier = malloc((unsigned long)1);
+ size_t len = (size_t)0;
+ char *unalloc_str = malloc((size_t)5);
+ char *_barrier = malloc((size_t)1);
free((void *)unalloc_str);
{
pid_t pid = __gen_e_acsl_fork();
@@ -950,7 +950,7 @@ int main(int argc, char const **argv)
}
else {
int process_status;
- __e_acsl_store_block((void *)(& process_status),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status),4UL);
__gen_e_acsl_waitpid(pid,& process_status,0);
signal_eval(process_status,0,__gen_e_acsl_literal_string_7);
__e_acsl_delete_block((void *)(& process_status));
@@ -964,7 +964,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_0;
- __e_acsl_store_block((void *)(& process_status_0),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_0),4UL);
__gen_e_acsl_waitpid(pid_0,& process_status_0,0);
signal_eval(process_status_0,0,__gen_e_acsl_literal_string_9);
__e_acsl_delete_block((void *)(& process_status_0));
@@ -978,7 +978,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_1;
- __e_acsl_store_block((void *)(& process_status_1),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_1),4UL);
__gen_e_acsl_waitpid(pid_1,& process_status_1,0);
signal_eval(process_status_1,1,__gen_e_acsl_literal_string_10);
__e_acsl_delete_block((void *)(& process_status_1));
@@ -992,7 +992,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_2;
- __e_acsl_store_block((void *)(& process_status_2),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_2),4UL);
__gen_e_acsl_waitpid(pid_2,& process_status_2,0);
signal_eval(process_status_2,1,__gen_e_acsl_literal_string_11);
__e_acsl_delete_block((void *)(& process_status_2));
@@ -1006,7 +1006,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_3;
- __e_acsl_store_block((void *)(& process_status_3),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_3),4UL);
__gen_e_acsl_waitpid(pid_3,& process_status_3,0);
signal_eval(process_status_3,1,__gen_e_acsl_literal_string_12);
__e_acsl_delete_block((void *)(& process_status_3));
@@ -1020,7 +1020,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_4;
- __e_acsl_store_block((void *)(& process_status_4),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_4),4UL);
__gen_e_acsl_waitpid(pid_4,& process_status_4,0);
signal_eval(process_status_4,0,__gen_e_acsl_literal_string_13);
__e_acsl_delete_block((void *)(& process_status_4));
@@ -1034,7 +1034,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_5;
- __e_acsl_store_block((void *)(& process_status_5),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_5),4UL);
__gen_e_acsl_waitpid(pid_5,& process_status_5,0);
signal_eval(process_status_5,1,__gen_e_acsl_literal_string_14);
__e_acsl_delete_block((void *)(& process_status_5));
@@ -1048,7 +1048,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_6;
- __e_acsl_store_block((void *)(& process_status_6),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_6),4UL);
__gen_e_acsl_waitpid(pid_6,& process_status_6,0);
signal_eval(process_status_6,0,__gen_e_acsl_literal_string_15);
__e_acsl_delete_block((void *)(& process_status_6));
@@ -1062,7 +1062,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_7;
- __e_acsl_store_block((void *)(& process_status_7),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_7),4UL);
__gen_e_acsl_waitpid(pid_7,& process_status_7,0);
signal_eval(process_status_7,1,__gen_e_acsl_literal_string_16);
__e_acsl_delete_block((void *)(& process_status_7));
@@ -1071,12 +1071,12 @@ int main(int argc, char const **argv)
{
pid_t pid_8 = __gen_e_acsl_fork();
if (! pid_8) {
- __e_acsl_builtin_strncpy(dest1,(char const *)src,(unsigned long)5);
+ __e_acsl_builtin_strncpy(dest1,(char const *)src,(size_t)5);
__gen_e_acsl_exit(0);
}
else {
int process_status_8;
- __e_acsl_store_block((void *)(& process_status_8),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_8),4UL);
__gen_e_acsl_waitpid(pid_8,& process_status_8,0);
signal_eval(process_status_8,0,__gen_e_acsl_literal_string_17);
__e_acsl_delete_block((void *)(& process_status_8));
@@ -1085,12 +1085,12 @@ int main(int argc, char const **argv)
{
pid_t pid_9 = __gen_e_acsl_fork();
if (! pid_9) {
- __e_acsl_builtin_strncpy(dest1,(char const *)src,(unsigned long)6);
+ __e_acsl_builtin_strncpy(dest1,(char const *)src,(size_t)6);
__gen_e_acsl_exit(0);
}
else {
int process_status_9;
- __e_acsl_store_block((void *)(& process_status_9),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_9),4UL);
__gen_e_acsl_waitpid(pid_9,& process_status_9,0);
signal_eval(process_status_9,1,__gen_e_acsl_literal_string_18);
__e_acsl_delete_block((void *)(& process_status_9));
@@ -1099,13 +1099,12 @@ int main(int argc, char const **argv)
{
pid_t pid_10 = __gen_e_acsl_fork();
if (! pid_10) {
- __e_acsl_builtin_strncpy(unalloc_str,(char const *)src,
- (unsigned long)5);
+ __e_acsl_builtin_strncpy(unalloc_str,(char const *)src,(size_t)5);
__gen_e_acsl_exit(0);
}
else {
int process_status_10;
- __e_acsl_store_block((void *)(& process_status_10),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_10),4UL);
__gen_e_acsl_waitpid(pid_10,& process_status_10,0);
signal_eval(process_status_10,1,__gen_e_acsl_literal_string_19);
__e_acsl_delete_block((void *)(& process_status_10));
@@ -1114,12 +1113,12 @@ int main(int argc, char const **argv)
{
pid_t pid_11 = __gen_e_acsl_fork();
if (! pid_11) {
- __e_acsl_builtin_strncpy(const_str,(char const *)src,(unsigned long)5);
+ __e_acsl_builtin_strncpy(const_str,(char const *)src,(size_t)5);
__gen_e_acsl_exit(0);
}
else {
int process_status_11;
- __e_acsl_store_block((void *)(& process_status_11),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_11),4UL);
__gen_e_acsl_waitpid(pid_11,& process_status_11,0);
signal_eval(process_status_11,1,__gen_e_acsl_literal_string_20);
__e_acsl_delete_block((void *)(& process_status_11));
@@ -1128,12 +1127,12 @@ int main(int argc, char const **argv)
{
pid_t pid_12 = __gen_e_acsl_fork();
if (! pid_12) {
- __e_acsl_builtin_strncpy(src,(char const *)const_str,(unsigned long)5);
+ __e_acsl_builtin_strncpy(src,(char const *)const_str,(size_t)5);
__gen_e_acsl_exit(0);
}
else {
int process_status_12;
- __e_acsl_store_block((void *)(& process_status_12),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_12),4UL);
__gen_e_acsl_waitpid(pid_12,& process_status_12,0);
signal_eval(process_status_12,0,__gen_e_acsl_literal_string_21);
__e_acsl_delete_block((void *)(& process_status_12));
@@ -1142,12 +1141,12 @@ int main(int argc, char const **argv)
{
pid_t pid_13 = __gen_e_acsl_fork();
if (! pid_13) {
- __e_acsl_builtin_strncpy(src,(char const *)src,(unsigned long)5);
+ __e_acsl_builtin_strncpy(src,(char const *)src,(size_t)5);
__gen_e_acsl_exit(0);
}
else {
int process_status_13;
- __e_acsl_store_block((void *)(& process_status_13),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_13),4UL);
__gen_e_acsl_waitpid(pid_13,& process_status_13,0);
signal_eval(process_status_13,1,__gen_e_acsl_literal_string_22);
__e_acsl_delete_block((void *)(& process_status_13));
@@ -1156,13 +1155,12 @@ int main(int argc, char const **argv)
{
pid_t pid_14 = __gen_e_acsl_fork();
if (! pid_14) {
- __e_acsl_builtin_strncpy(& dest3[5],(char const *)(dest3),
- (unsigned long)5);
+ __e_acsl_builtin_strncpy(& dest3[5],(char const *)(dest3),(size_t)5);
__gen_e_acsl_exit(0);
}
else {
int process_status_14;
- __e_acsl_store_block((void *)(& process_status_14),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_14),4UL);
__gen_e_acsl_waitpid(pid_14,& process_status_14,0);
signal_eval(process_status_14,0,__gen_e_acsl_literal_string_23);
__e_acsl_delete_block((void *)(& process_status_14));
@@ -1171,13 +1169,12 @@ int main(int argc, char const **argv)
{
pid_t pid_15 = __gen_e_acsl_fork();
if (! pid_15) {
- __e_acsl_builtin_strncpy(& dest3[4],(char const *)(dest3),
- (unsigned long)5);
+ __e_acsl_builtin_strncpy(& dest3[4],(char const *)(dest3),(size_t)5);
__gen_e_acsl_exit(0);
}
else {
int process_status_15;
- __e_acsl_store_block((void *)(& process_status_15),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_15),4UL);
__gen_e_acsl_waitpid(pid_15,& process_status_15,0);
signal_eval(process_status_15,1,__gen_e_acsl_literal_string_24);
__e_acsl_delete_block((void *)(& process_status_15));
diff --git a/src/plugins/e-acsl/tests/builtin/oracle/gen_strlen.c b/src/plugins/e-acsl/tests/builtin/oracle/gen_strlen.c
index ffcc52912c6944f9696714d6642f47c95e5609fc..0c6854b4d1ccfd0a30bc8c2b55bb5fcea15973a5 100644
--- a/src/plugins/e-acsl/tests/builtin/oracle/gen_strlen.c
+++ b/src/plugins/e-acsl/tests/builtin/oracle/gen_strlen.c
@@ -129,12 +129,12 @@ char *__gen_e_acsl_strdup(char const *s)
{
__e_acsl_contract_t *__gen_e_acsl_contract;
char *__retres;
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+ __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
__retres = strdup(s);
{
int __gen_e_acsl_assumes_value;
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
if (__gen_e_acsl_assumes_value) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_4 =
{.values = (void *)0};
@@ -220,15 +220,15 @@ pid_t __gen_e_acsl_waitpid(pid_t pid, int *stat_loc, int options)
pid_t __retres;
{
int __gen_e_acsl_assumes_value;
- __e_acsl_store_block((void *)(& stat_loc),(size_t)8);
+ __e_acsl_store_block((void *)(& stat_loc),8UL);
__gen_e_acsl_at = stat_loc;
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+ __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
stat_loc == (int *)0);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
stat_loc != (int *)0);
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
if (__gen_e_acsl_assumes_value) {
int __gen_e_acsl_valid;
__e_acsl_assert_data_t __gen_e_acsl_assert_data =
@@ -447,7 +447,7 @@ int main(int argc, char const **argv)
{
int __retres;
int len;
- __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+ __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
__e_acsl_globals_init();
char *empty_str = (char *)__gen_e_acsl_literal_string_6;
char *heap_str = __gen_e_acsl_strdup(__gen_e_acsl_literal_string_7);
@@ -472,7 +472,7 @@ int main(int argc, char const **argv)
}
else {
int process_status;
- __e_acsl_store_block((void *)(& process_status),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status),4UL);
__gen_e_acsl_waitpid(pid,& process_status,0);
signal_eval(process_status,0,__gen_e_acsl_literal_string_9);
__e_acsl_delete_block((void *)(& process_status));
@@ -489,7 +489,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_0;
- __e_acsl_store_block((void *)(& process_status_0),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_0),4UL);
__gen_e_acsl_waitpid(pid_0,& process_status_0,0);
signal_eval(process_status_0,0,__gen_e_acsl_literal_string_10);
__e_acsl_delete_block((void *)(& process_status_0));
@@ -506,7 +506,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_1;
- __e_acsl_store_block((void *)(& process_status_1),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_1),4UL);
__gen_e_acsl_waitpid(pid_1,& process_status_1,0);
signal_eval(process_status_1,0,__gen_e_acsl_literal_string_11);
__e_acsl_delete_block((void *)(& process_status_1));
@@ -523,7 +523,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_2;
- __e_acsl_store_block((void *)(& process_status_2),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_2),4UL);
__gen_e_acsl_waitpid(pid_2,& process_status_2,0);
signal_eval(process_status_2,0,__gen_e_acsl_literal_string_12);
__e_acsl_delete_block((void *)(& process_status_2));
@@ -542,7 +542,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_3;
- __e_acsl_store_block((void *)(& process_status_3),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_3),4UL);
__gen_e_acsl_waitpid(pid_3,& process_status_3,0);
signal_eval(process_status_3,1,__gen_e_acsl_literal_string_13);
__e_acsl_delete_block((void *)(& process_status_3));
@@ -559,7 +559,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_4;
- __e_acsl_store_block((void *)(& process_status_4),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_4),4UL);
__gen_e_acsl_waitpid(pid_4,& process_status_4,0);
signal_eval(process_status_4,1,__gen_e_acsl_literal_string_14);
__e_acsl_delete_block((void *)(& process_status_4));
@@ -577,7 +577,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_5;
- __e_acsl_store_block((void *)(& process_status_5),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_5),4UL);
__gen_e_acsl_waitpid(pid_5,& process_status_5,0);
signal_eval(process_status_5,1,__gen_e_acsl_literal_string_15);
__e_acsl_delete_block((void *)(& process_status_5));
diff --git a/src/plugins/e-acsl/tests/concurrency/oracle/gen_parallel_threads.c b/src/plugins/e-acsl/tests/concurrency/oracle/gen_parallel_threads.c
index f3a95efc32f2c09091802446b752d3bdca67f1d2..ee89abb7fcb4c4457d8d139441afbf78d105cc07 100644
--- a/src/plugins/e-acsl/tests/concurrency/oracle/gen_parallel_threads.c
+++ b/src/plugins/e-acsl/tests/concurrency/oracle/gen_parallel_threads.c
@@ -160,11 +160,11 @@ void *write_value(void *arg)
int tmp;
int tmp_0;
int tmp_1;
- __e_acsl_store_block((void *)(& tmp_1),(size_t)4);
- __e_acsl_store_block((void *)(& tmp_0),(size_t)4);
- __e_acsl_store_block((void *)(& tmp),(size_t)4);
- __e_acsl_store_block((void *)(& __retres),(size_t)8);
- __e_acsl_store_block((void *)(& arg),(size_t)8);
+ __e_acsl_store_block((void *)(& tmp_1),4UL);
+ __e_acsl_store_block((void *)(& tmp_0),4UL);
+ __e_acsl_store_block((void *)(& tmp),4UL);
+ __e_acsl_store_block((void *)(& __retres),8UL);
+ __e_acsl_store_block((void *)(& arg),8UL);
__e_acsl_full_init((void *)(& tmp));
tmp = __gen_e_acsl_pthread_mutex_lock(& write_mutex);
if (tmp != 0) {
@@ -184,9 +184,9 @@ void *write_value(void *arg)
__gen_e_acsl_perror(__gen_e_acsl_literal_string_3);
__gen_e_acsl_exit(1);
}
- __gen_e_acsl_usleep((unsigned int)100);
+ __gen_e_acsl_usleep((useconds_t)100);
int idx = *((int *)arg);
- __e_acsl_store_block((void *)(& idx),(size_t)4);
+ __e_acsl_store_block((void *)(& idx),4UL);
__e_acsl_full_init((void *)(& idx));
__e_acsl_initialize((void *)(& values[idx]),sizeof(int *));
values[idx] = (int *)malloc(sizeof(int));
@@ -215,11 +215,11 @@ void *read_value(void *arg)
int tmp;
int tmp_0;
int tmp_1;
- __e_acsl_store_block((void *)(& tmp_1),(size_t)4);
- __e_acsl_store_block((void *)(& tmp_0),(size_t)4);
- __e_acsl_store_block((void *)(& tmp),(size_t)4);
- __e_acsl_store_block((void *)(& __retres),(size_t)8);
- __e_acsl_store_block((void *)(& arg),(size_t)8);
+ __e_acsl_store_block((void *)(& tmp_1),4UL);
+ __e_acsl_store_block((void *)(& tmp_0),4UL);
+ __e_acsl_store_block((void *)(& tmp),4UL);
+ __e_acsl_store_block((void *)(& __retres),8UL);
+ __e_acsl_store_block((void *)(& arg),8UL);
__e_acsl_full_init((void *)(& tmp));
tmp = __gen_e_acsl_pthread_mutex_lock(& read_mutex);
if (tmp != 0) {
@@ -239,7 +239,7 @@ void *read_value(void *arg)
__gen_e_acsl_perror(__gen_e_acsl_literal_string_6);
__gen_e_acsl_exit(1);
}
- __gen_e_acsl_usleep((unsigned int)100);
+ __gen_e_acsl_usleep((useconds_t)100);
{
int __gen_e_acsl_idx;
int __gen_e_acsl_initialized;
@@ -355,7 +355,7 @@ void *read_value(void *arg)
*/
{
int idx = *((int *)arg);
- __e_acsl_store_block((void *)(& idx),(size_t)4);
+ __e_acsl_store_block((void *)(& idx),4UL);
__e_acsl_full_init((void *)(& idx));
{
int __gen_e_acsl_initialized_3;
@@ -478,13 +478,13 @@ void *read_value(void *arg)
void *__gen_e_acsl_read_value(void *arg)
{
void *__retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)8);
+ __e_acsl_store_block((void *)(& __retres),8UL);
{
int __gen_e_acsl_idx;
int __gen_e_acsl_initialized;
int __gen_e_acsl_and;
int __gen_e_acsl_and_2;
- __e_acsl_store_block((void *)(& arg),(size_t)8);
+ __e_acsl_store_block((void *)(& arg),8UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_int(& __gen_e_acsl_assert_data,"*((int *)arg)",
0,*((int *)arg));
@@ -603,8 +603,8 @@ void *__gen_e_acsl_write_value(void *arg)
{
void *__gen_e_acsl_at;
void *__retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)8);
- __e_acsl_store_block((void *)(& arg),(size_t)8);
+ __e_acsl_store_block((void *)(& __retres),8UL);
+ __e_acsl_store_block((void *)(& arg),8UL);
__gen_e_acsl_at = arg;
__retres = write_value(arg);
{
@@ -731,8 +731,8 @@ void *__gen_e_acsl_write_value(void *arg)
int __gen_e_acsl_usleep(useconds_t usec)
{
int __retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
- __e_acsl_store_block((void *)(& usec),(size_t)4);
+ __e_acsl_store_block((void *)(& __retres),4UL);
+ __e_acsl_store_block((void *)(& usec),4UL);
__retres = usleep(usec);
{
int __gen_e_acsl_or;
@@ -750,7 +750,7 @@ int __gen_e_acsl_usleep(useconds_t usec)
__gen_e_acsl_assert_data.pred_txt = "\\result == 0 || \\result == -1";
__gen_e_acsl_assert_data.file = "FRAMAC_SHARE/libc/unistd.h";
__gen_e_acsl_assert_data.fct = "usleep";
- __gen_e_acsl_assert_data.line = 1119;
+ __gen_e_acsl_assert_data.line = 1133;
__gen_e_acsl_assert_data.name = "result_ok_or_error";
__e_acsl_assert(__gen_e_acsl_or,& __gen_e_acsl_assert_data);
__e_acsl_assert_clean(& __gen_e_acsl_assert_data);
@@ -767,7 +767,7 @@ int __gen_e_acsl_usleep(useconds_t usec)
*/
void __gen_e_acsl_exit(int status)
{
- __e_acsl_store_block((void *)(& status),(size_t)4);
+ __e_acsl_store_block((void *)(& status),4UL);
exit(status);
{
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
@@ -790,7 +790,7 @@ void __gen_e_acsl_exit(int status)
*/
void __gen_e_acsl_perror(char const *s)
{
- __e_acsl_store_block((void *)(& s),(size_t)8);
+ __e_acsl_store_block((void *)(& s),8UL);
perror(s);
__e_acsl_delete_block((void *)(& s));
return;
@@ -805,10 +805,10 @@ void __gen_e_acsl_perror(char const *s)
int __gen_e_acsl_pthread_mutex_unlock(pthread_mutex_t *mutex)
{
int __retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
+ __e_acsl_store_block((void *)(& __retres),4UL);
{
int __gen_e_acsl_valid;
- __e_acsl_store_block((void *)(& mutex),(size_t)8);
+ __e_acsl_store_block((void *)(& mutex),8UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"mutex",
(void *)mutex);
@@ -869,10 +869,10 @@ int __gen_e_acsl_pthread_mutex_unlock(pthread_mutex_t *mutex)
int __gen_e_acsl_pthread_mutex_lock(pthread_mutex_t *mutex)
{
int __retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
+ __e_acsl_store_block((void *)(& __retres),4UL);
{
int __gen_e_acsl_valid;
- __e_acsl_store_block((void *)(& mutex),(size_t)8);
+ __e_acsl_store_block((void *)(& mutex),8UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"mutex",
(void *)mutex);
@@ -951,12 +951,12 @@ int __gen_e_acsl_pthread_mutex_init(pthread_mutex_t * restrict mutex,
{
pthread_mutex_t *__gen_e_acsl_at;
int __retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
+ __e_acsl_store_block((void *)(& __retres),4UL);
{
int __gen_e_acsl_valid;
int __gen_e_acsl_or;
- __e_acsl_store_block((void *)(& attrs),(size_t)8);
- __e_acsl_store_block((void *)(& mutex),(size_t)8);
+ __e_acsl_store_block((void *)(& attrs),8UL);
+ __e_acsl_store_block((void *)(& mutex),8UL);
__gen_e_acsl_at = mutex;
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"mutex",
@@ -1098,13 +1098,13 @@ int __gen_e_acsl_pthread_join(pthread_t thread, void **retval)
{
__e_acsl_contract_t *__gen_e_acsl_contract;
int __retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
+ __e_acsl_store_block((void *)(& __retres),4UL);
{
int __gen_e_acsl_or;
int __gen_e_acsl_valid_2;
- __e_acsl_store_block((void *)(& retval),(size_t)8);
- __e_acsl_store_block((void *)(& thread),(size_t)4);
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+ __e_acsl_store_block((void *)(& retval),8UL);
+ __e_acsl_store_block((void *)(& thread),4UL);
+ __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"retval",
(void *)retval);
@@ -1130,11 +1130,11 @@ int __gen_e_acsl_pthread_join(pthread_t thread, void **retval)
__gen_e_acsl_assert_data.name = "valid_or_null_retval";
__e_acsl_assert(__gen_e_acsl_or,& __gen_e_acsl_assert_data);
__e_acsl_assert_clean(& __gen_e_acsl_assert_data);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
retval == (void **)0);
__gen_e_acsl_valid_2 = __e_acsl_valid((void *)retval,sizeof(void *),
(void *)retval,(void *)(& retval));
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
__gen_e_acsl_valid_2);
}
__retres = pthread_join(thread,retval);
@@ -1198,15 +1198,15 @@ int __gen_e_acsl_pthread_create(pthread_t * restrict thread,
void * restrict arg)
{
int __retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
+ __e_acsl_store_block((void *)(& __retres),4UL);
{
int __gen_e_acsl_valid;
int __gen_e_acsl_or;
int __gen_e_acsl_or_2;
- __e_acsl_store_block((void *)(& arg),(size_t)8);
- __e_acsl_store_block((void *)(& start_routine),(size_t)8);
- __e_acsl_store_block((void *)(& attr),(size_t)8);
- __e_acsl_store_block((void *)(& thread),(size_t)8);
+ __e_acsl_store_block((void *)(& arg),8UL);
+ __e_acsl_store_block((void *)(& start_routine),8UL);
+ __e_acsl_store_block((void *)(& attr),8UL);
+ __e_acsl_store_block((void *)(& thread),8UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"thread",
(void *)thread);
@@ -1336,12 +1336,12 @@ int __gen_e_acsl_pthread_cond_wait(pthread_cond_t * restrict cond,
pthread_mutex_t * restrict mutex)
{
int __retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
+ __e_acsl_store_block((void *)(& __retres),4UL);
{
int __gen_e_acsl_valid;
int __gen_e_acsl_valid_2;
- __e_acsl_store_block((void *)(& mutex),(size_t)8);
- __e_acsl_store_block((void *)(& cond),(size_t)8);
+ __e_acsl_store_block((void *)(& mutex),8UL);
+ __e_acsl_store_block((void *)(& cond),8UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"cond",
(void *)cond);
@@ -1418,12 +1418,12 @@ int __gen_e_acsl_pthread_cond_init(pthread_cond_t * restrict cond,
{
pthread_cond_t *__gen_e_acsl_at;
int __retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
+ __e_acsl_store_block((void *)(& __retres),4UL);
{
int __gen_e_acsl_valid;
int __gen_e_acsl_or;
- __e_acsl_store_block((void *)(& attr),(size_t)8);
- __e_acsl_store_block((void *)(& cond),(size_t)8);
+ __e_acsl_store_block((void *)(& attr),8UL);
+ __e_acsl_store_block((void *)(& cond),8UL);
__gen_e_acsl_at = cond;
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"cond",
@@ -1527,10 +1527,10 @@ int __gen_e_acsl_pthread_cond_init(pthread_cond_t * restrict cond,
int __gen_e_acsl_pthread_cond_broadcast(pthread_cond_t *cond)
{
int __retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
+ __e_acsl_store_block((void *)(& __retres),4UL);
{
int __gen_e_acsl_valid;
- __e_acsl_store_block((void *)(& cond),(size_t)8);
+ __e_acsl_store_block((void *)(& cond),8UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"cond",
(void *)cond);
@@ -1647,127 +1647,121 @@ void __e_acsl_globals_init(void)
sizeof("Unable to broadcast to read cond var"));
__e_acsl_full_init((void *)__gen_e_acsl_literal_string_14);
__e_acsl_mark_readonly((void *)__gen_e_acsl_literal_string_14);
- __e_acsl_store_block((void *)(& __gen_e_acsl_read_value),(size_t)1);
+ __e_acsl_store_block((void *)(& __gen_e_acsl_read_value),1UL);
__e_acsl_full_init((void *)(& __gen_e_acsl_read_value));
- __e_acsl_store_block((void *)(& __gen_e_acsl_write_value),(size_t)1);
+ __e_acsl_store_block((void *)(& __gen_e_acsl_write_value),1UL);
__e_acsl_full_init((void *)(& __gen_e_acsl_write_value));
- __e_acsl_store_block((void *)(& __gen_e_acsl_usleep),(size_t)1);
+ __e_acsl_store_block((void *)(& __gen_e_acsl_usleep),1UL);
__e_acsl_full_init((void *)(& __gen_e_acsl_usleep));
- __e_acsl_store_block((void *)(& __gen_e_acsl_exit),(size_t)1);
+ __e_acsl_store_block((void *)(& __gen_e_acsl_exit),1UL);
__e_acsl_full_init((void *)(& __gen_e_acsl_exit));
- __e_acsl_store_block((void *)(& __gen_e_acsl_perror),(size_t)1);
+ __e_acsl_store_block((void *)(& __gen_e_acsl_perror),1UL);
__e_acsl_full_init((void *)(& __gen_e_acsl_perror));
- __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_mutex_unlock),
- (size_t)1);
+ __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_mutex_unlock),1UL);
__e_acsl_full_init((void *)(& __gen_e_acsl_pthread_mutex_unlock));
- __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_mutex_lock),
- (size_t)1);
+ __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_mutex_lock),1UL);
__e_acsl_full_init((void *)(& __gen_e_acsl_pthread_mutex_lock));
- __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_mutex_init),
- (size_t)1);
+ __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_mutex_init),1UL);
__e_acsl_full_init((void *)(& __gen_e_acsl_pthread_mutex_init));
- __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_join),(size_t)1);
+ __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_join),1UL);
__e_acsl_full_init((void *)(& __gen_e_acsl_pthread_join));
- __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_create),(size_t)1);
+ __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_create),1UL);
__e_acsl_full_init((void *)(& __gen_e_acsl_pthread_create));
- __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_cond_wait),
- (size_t)1);
+ __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_cond_wait),1UL);
__e_acsl_full_init((void *)(& __gen_e_acsl_pthread_cond_wait));
- __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_cond_init),
- (size_t)1);
+ __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_cond_init),1UL);
__e_acsl_full_init((void *)(& __gen_e_acsl_pthread_cond_init));
- __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_cond_broadcast),
- (size_t)1);
+ __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_cond_broadcast),1UL);
__e_acsl_full_init((void *)(& __gen_e_acsl_pthread_cond_broadcast));
- __e_acsl_store_block((void *)(& read_value),(size_t)1);
+ __e_acsl_store_block((void *)(& read_value),1UL);
__e_acsl_full_init((void *)(& read_value));
- __e_acsl_store_block((void *)(& write_value),(size_t)1);
+ __e_acsl_store_block((void *)(& write_value),1UL);
__e_acsl_full_init((void *)(& write_value));
- __e_acsl_store_block((void *)(& read_mutex),(size_t)4);
+ __e_acsl_store_block((void *)(& read_mutex),4UL);
__e_acsl_full_init((void *)(& read_mutex));
- __e_acsl_store_block((void *)(& write_mutex),(size_t)4);
+ __e_acsl_store_block((void *)(& write_mutex),4UL);
__e_acsl_full_init((void *)(& write_mutex));
- __e_acsl_store_block((void *)(& read_cond),(size_t)4);
+ __e_acsl_store_block((void *)(& read_cond),4UL);
__e_acsl_full_init((void *)(& read_cond));
- __e_acsl_store_block((void *)(& write_cond),(size_t)4);
+ __e_acsl_store_block((void *)(& write_cond),4UL);
__e_acsl_full_init((void *)(& write_cond));
- __e_acsl_store_block((void *)(& read_count),(size_t)4);
+ __e_acsl_store_block((void *)(& read_count),4UL);
__e_acsl_full_init((void *)(& read_count));
- __e_acsl_store_block((void *)(& write_count),(size_t)4);
+ __e_acsl_store_block((void *)(& write_count),4UL);
__e_acsl_full_init((void *)(& write_count));
- __e_acsl_store_block((void *)(values),(size_t)80);
+ __e_acsl_store_block((void *)(values),80UL);
__e_acsl_full_init((void *)(& values));
- __e_acsl_store_block((void *)(& usleep),(size_t)1);
+ __e_acsl_store_block((void *)(& usleep),1UL);
__e_acsl_full_init((void *)(& usleep));
- __e_acsl_store_block((void *)(& __fc_p_ttyname),(size_t)8);
+ __e_acsl_store_block((void *)(& __fc_p_ttyname),8UL);
__e_acsl_full_init((void *)(& __fc_p_ttyname));
- __e_acsl_store_block((void *)(ttyname),(size_t)32);
+ __e_acsl_store_block((void *)(ttyname),32UL);
__e_acsl_full_init((void *)(& ttyname));
- __e_acsl_store_block((void *)(& Frama_C_entropy_source),(size_t)4);
+ __e_acsl_store_block((void *)(& Frama_C_entropy_source),4UL);
__e_acsl_full_init((void *)(& Frama_C_entropy_source));
- __e_acsl_store_block((void *)(& exit),(size_t)1);
+ __e_acsl_store_block((void *)(& exit),1UL);
__e_acsl_full_init((void *)(& exit));
- __e_acsl_store_block((void *)(& free),(size_t)1);
+ __e_acsl_store_block((void *)(& free),1UL);
__e_acsl_full_init((void *)(& free));
- __e_acsl_store_block((void *)(& malloc),(size_t)1);
+ __e_acsl_store_block((void *)(& malloc),1UL);
__e_acsl_full_init((void *)(& malloc));
- __e_acsl_store_block((void *)(& __fc_p_random48_counter),(size_t)8);
+ __e_acsl_store_block((void *)(& __fc_p_random48_counter),8UL);
__e_acsl_full_init((void *)(& __fc_p_random48_counter));
- __e_acsl_store_block((void *)(random48_counter),(size_t)6);
+ __e_acsl_store_block((void *)(random48_counter),6UL);
__e_acsl_full_init((void *)(& random48_counter));
- __e_acsl_store_block((void *)(& __fc_random48_init),(size_t)4);
+ __e_acsl_store_block((void *)(& __fc_random48_init),4UL);
__e_acsl_full_init((void *)(& __fc_random48_init));
- __e_acsl_store_block((void *)(& __fc_rand_max),(size_t)8);
+ __e_acsl_store_block((void *)(& __fc_rand_max),8UL);
__e_acsl_full_init((void *)(& __fc_rand_max));
- __e_acsl_store_block((void *)(& perror),(size_t)1);
+ __e_acsl_store_block((void *)(& perror),1UL);
__e_acsl_full_init((void *)(& perror));
- __e_acsl_store_block((void *)(& __fc_p_tmpnam),(size_t)8);
+ __e_acsl_store_block((void *)(& __fc_p_tmpnam),8UL);
__e_acsl_full_init((void *)(& __fc_p_tmpnam));
- __e_acsl_store_block((void *)(__fc_tmpnam),(size_t)2048);
+ __e_acsl_store_block((void *)(__fc_tmpnam),2048UL);
__e_acsl_full_init((void *)(& __fc_tmpnam));
- __e_acsl_store_block((void *)(& __fc_p_fopen),(size_t)8);
+ __e_acsl_store_block((void *)(& __fc_p_fopen),8UL);
__e_acsl_full_init((void *)(& __fc_p_fopen));
- __e_acsl_store_block((void *)(__fc_fopen),(size_t)128);
+ __e_acsl_store_block((void *)(__fc_fopen),128UL);
__e_acsl_full_init((void *)(& __fc_fopen));
- __e_acsl_store_block((void *)(& stdout),(size_t)8);
+ __e_acsl_store_block((void *)(& stdout),8UL);
__e_acsl_full_init((void *)(& stdout));
- __e_acsl_store_block((void *)(& stdin),(size_t)8);
+ __e_acsl_store_block((void *)(& stdin),8UL);
__e_acsl_full_init((void *)(& stdin));
- __e_acsl_store_block((void *)(& __fc_interrupted),(size_t)4);
+ __e_acsl_store_block((void *)(& __fc_interrupted),4UL);
__e_acsl_full_init((void *)(& __fc_interrupted));
- __e_acsl_store_block((void *)(& __fc_p_time_tm),(size_t)8);
+ __e_acsl_store_block((void *)(& __fc_p_time_tm),8UL);
__e_acsl_full_init((void *)(& __fc_p_time_tm));
- __e_acsl_store_block((void *)(& __fc_time_tm),(size_t)36);
+ __e_acsl_store_block((void *)(& __fc_time_tm),36UL);
__e_acsl_full_init((void *)(& __fc_time_tm));
- __e_acsl_store_block((void *)(& __fc_p_ctime),(size_t)8);
+ __e_acsl_store_block((void *)(& __fc_p_ctime),8UL);
__e_acsl_full_init((void *)(& __fc_p_ctime));
- __e_acsl_store_block((void *)(__fc_ctime),(size_t)26);
+ __e_acsl_store_block((void *)(__fc_ctime),26UL);
__e_acsl_full_init((void *)(& __fc_ctime));
- __e_acsl_store_block((void *)(& __fc_time),(size_t)4);
+ __e_acsl_store_block((void *)(& __fc_time),4UL);
__e_acsl_full_init((void *)(& __fc_time));
- __e_acsl_store_block((void *)(& __fc_p_sigaction),(size_t)8);
+ __e_acsl_store_block((void *)(& __fc_p_sigaction),8UL);
__e_acsl_full_init((void *)(& __fc_p_sigaction));
- __e_acsl_store_block((void *)(sigaction),(size_t)2080);
+ __e_acsl_store_block((void *)(sigaction),2080UL);
__e_acsl_full_init((void *)(& sigaction));
- __e_acsl_store_block((void *)(& pthread_mutex_unlock),(size_t)1);
+ __e_acsl_store_block((void *)(& pthread_mutex_unlock),1UL);
__e_acsl_full_init((void *)(& pthread_mutex_unlock));
- __e_acsl_store_block((void *)(& pthread_mutex_trylock),(size_t)1);
+ __e_acsl_store_block((void *)(& pthread_mutex_trylock),1UL);
__e_acsl_full_init((void *)(& pthread_mutex_trylock));
- __e_acsl_store_block((void *)(& pthread_mutex_lock),(size_t)1);
+ __e_acsl_store_block((void *)(& pthread_mutex_lock),1UL);
__e_acsl_full_init((void *)(& pthread_mutex_lock));
- __e_acsl_store_block((void *)(& pthread_mutex_init),(size_t)1);
+ __e_acsl_store_block((void *)(& pthread_mutex_init),1UL);
__e_acsl_full_init((void *)(& pthread_mutex_init));
- __e_acsl_store_block((void *)(& pthread_join),(size_t)1);
+ __e_acsl_store_block((void *)(& pthread_join),1UL);
__e_acsl_full_init((void *)(& pthread_join));
- __e_acsl_store_block((void *)(& pthread_create),(size_t)1);
+ __e_acsl_store_block((void *)(& pthread_create),1UL);
__e_acsl_full_init((void *)(& pthread_create));
- __e_acsl_store_block((void *)(& pthread_cond_wait),(size_t)1);
+ __e_acsl_store_block((void *)(& pthread_cond_wait),1UL);
__e_acsl_full_init((void *)(& pthread_cond_wait));
- __e_acsl_store_block((void *)(& pthread_cond_init),(size_t)1);
+ __e_acsl_store_block((void *)(& pthread_cond_init),1UL);
__e_acsl_full_init((void *)(& pthread_cond_init));
- __e_acsl_store_block((void *)(& pthread_cond_broadcast),(size_t)1);
+ __e_acsl_store_block((void *)(& pthread_cond_broadcast),1UL);
__e_acsl_full_init((void *)(& pthread_cond_broadcast));
- __e_acsl_store_block((void *)(& errno),(size_t)4);
+ __e_acsl_store_block((void *)(& errno),4UL);
__e_acsl_full_init((void *)(& errno));
}
return;
@@ -1848,18 +1842,18 @@ int main(void)
int tmp_2;
int tmp_5;
int tmp_6;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
- __e_acsl_store_block((void *)(& tmp_6),(size_t)4);
- __e_acsl_store_block((void *)(& tmp_5),(size_t)4);
- __e_acsl_store_block((void *)(& tmp_2),(size_t)4);
- __e_acsl_store_block((void *)(& tmp_1),(size_t)4);
- __e_acsl_store_block((void *)(& tmp_0),(size_t)4);
- __e_acsl_store_block((void *)(& tmp),(size_t)4);
- __e_acsl_store_block((void *)(args),(size_t)40);
- __e_acsl_store_block((void *)(readers),(size_t)40);
- __e_acsl_store_block((void *)(writers),(size_t)40);
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
+ __e_acsl_store_block((void *)(& tmp_6),4UL);
+ __e_acsl_store_block((void *)(& tmp_5),4UL);
+ __e_acsl_store_block((void *)(& tmp_2),4UL);
+ __e_acsl_store_block((void *)(& tmp_1),4UL);
+ __e_acsl_store_block((void *)(& tmp_0),4UL);
+ __e_acsl_store_block((void *)(& tmp),4UL);
+ __e_acsl_store_block((void *)(args),40UL);
+ __e_acsl_store_block((void *)(readers),40UL);
+ __e_acsl_store_block((void *)(writers),40UL);
+ __e_acsl_store_block((void *)(& __retres),4UL);
__e_acsl_full_init((void *)(& tmp));
tmp = __gen_e_acsl_pthread_mutex_init(& write_mutex,
(pthread_mutexattr_t const *)0);
@@ -1890,7 +1884,7 @@ int main(void)
}
{
int i = 0;
- __e_acsl_store_block((void *)(& i),(size_t)4);
+ __e_acsl_store_block((void *)(& i),4UL);
__e_acsl_full_init((void *)(& i));
while (i < 10) {
__e_acsl_initialize((void *)(& args[i]),sizeof(int));
@@ -1908,11 +1902,11 @@ int main(void)
}
while (1) {
int res = pthread_mutex_trylock(& write_mutex);
- __e_acsl_store_block((void *)(& res),(size_t)4);
+ __e_acsl_store_block((void *)(& res),4UL);
__e_acsl_full_init((void *)(& res));
if (res == 0) {
int done = write_count == 10;
- __e_acsl_store_block((void *)(& done),(size_t)4);
+ __e_acsl_store_block((void *)(& done),4UL);
__e_acsl_full_init((void *)(& done));
__gen_e_acsl_pthread_mutex_unlock(& write_mutex);
if (done) {
@@ -1924,16 +1918,16 @@ int main(void)
}
else
if (res != 16) __gen_e_acsl_perror(__gen_e_acsl_literal_string_11);
- __gen_e_acsl_usleep((unsigned int)100);
+ __gen_e_acsl_usleep((useconds_t)100);
__e_acsl_delete_block((void *)(& res));
}
while (1) {
int res_0 = pthread_mutex_trylock(& read_mutex);
- __e_acsl_store_block((void *)(& res_0),(size_t)4);
+ __e_acsl_store_block((void *)(& res_0),4UL);
__e_acsl_full_init((void *)(& res_0));
if (res_0 == 0) {
int done_0 = read_count == 10;
- __e_acsl_store_block((void *)(& done_0),(size_t)4);
+ __e_acsl_store_block((void *)(& done_0),4UL);
__e_acsl_full_init((void *)(& done_0));
__gen_e_acsl_pthread_mutex_unlock(& read_mutex);
if (done_0) {
@@ -1945,7 +1939,7 @@ int main(void)
}
else
if (res_0 != 16) __gen_e_acsl_perror(__gen_e_acsl_literal_string_12);
- __gen_e_acsl_usleep((unsigned int)100);
+ __gen_e_acsl_usleep((useconds_t)100);
__e_acsl_delete_block((void *)(& res_0));
}
__e_acsl_full_init((void *)(& tmp_5));
@@ -1956,7 +1950,7 @@ int main(void)
}
{
int i_0 = 0;
- __e_acsl_store_block((void *)(& i_0),(size_t)4);
+ __e_acsl_store_block((void *)(& i_0),4UL);
__e_acsl_full_init((void *)(& i_0));
while (i_0 < 10) {
__gen_e_acsl_pthread_join(writers[i_0],(void **)0);
@@ -1973,7 +1967,7 @@ int main(void)
}
{
int i_1 = 0;
- __e_acsl_store_block((void *)(& i_1),(size_t)4);
+ __e_acsl_store_block((void *)(& i_1),4UL);
__e_acsl_full_init((void *)(& i_1));
while (i_1 < 10) {
__gen_e_acsl_pthread_join(readers[i_1],(void **)0);
diff --git a/src/plugins/e-acsl/tests/concurrency/oracle/gen_sequential_threads.c b/src/plugins/e-acsl/tests/concurrency/oracle/gen_sequential_threads.c
index bd02dd0355d18779644cfa6ea9c40c16c4c1ff1d..d6bbeca06f8ff845966b080a3e1ec359a3856754 100644
--- a/src/plugins/e-acsl/tests/concurrency/oracle/gen_sequential_threads.c
+++ b/src/plugins/e-acsl/tests/concurrency/oracle/gen_sequential_threads.c
@@ -50,10 +50,10 @@ int *values[10];
void *write_value(void *arg)
{
void *__retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)8);
- __e_acsl_store_block((void *)(& arg),(size_t)8);
+ __e_acsl_store_block((void *)(& __retres),8UL);
+ __e_acsl_store_block((void *)(& arg),8UL);
int idx = *((int *)arg);
- __e_acsl_store_block((void *)(& idx),(size_t)4);
+ __e_acsl_store_block((void *)(& idx),4UL);
__e_acsl_full_init((void *)(& idx));
__e_acsl_initialize((void *)(& values[idx]),sizeof(int *));
values[idx] = (int *)malloc(sizeof(int));
@@ -70,10 +70,10 @@ void *write_value(void *arg)
void *read_value(void *arg)
{
void *__retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)8);
- __e_acsl_store_block((void *)(& arg),(size_t)8);
+ __e_acsl_store_block((void *)(& __retres),8UL);
+ __e_acsl_store_block((void *)(& arg),8UL);
int idx = *((int *)arg);
- __e_acsl_store_block((void *)(& idx),(size_t)4);
+ __e_acsl_store_block((void *)(& idx),4UL);
__e_acsl_full_init((void *)(& idx));
{
int __gen_e_acsl_initialized;
@@ -202,13 +202,13 @@ int __gen_e_acsl_pthread_join(pthread_t thread, void **retval)
{
__e_acsl_contract_t *__gen_e_acsl_contract;
int __retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
+ __e_acsl_store_block((void *)(& __retres),4UL);
{
int __gen_e_acsl_or;
int __gen_e_acsl_valid_2;
- __e_acsl_store_block((void *)(& retval),(size_t)8);
- __e_acsl_store_block((void *)(& thread),(size_t)4);
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+ __e_acsl_store_block((void *)(& retval),8UL);
+ __e_acsl_store_block((void *)(& thread),4UL);
+ __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"retval",
(void *)retval);
@@ -234,11 +234,11 @@ int __gen_e_acsl_pthread_join(pthread_t thread, void **retval)
__gen_e_acsl_assert_data.name = "valid_or_null_retval";
__e_acsl_assert(__gen_e_acsl_or,& __gen_e_acsl_assert_data);
__e_acsl_assert_clean(& __gen_e_acsl_assert_data);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
retval == (void **)0);
__gen_e_acsl_valid_2 = __e_acsl_valid((void *)retval,sizeof(void *),
(void *)retval,(void *)(& retval));
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
__gen_e_acsl_valid_2);
}
__retres = pthread_join(thread,retval);
@@ -302,15 +302,15 @@ int __gen_e_acsl_pthread_create(pthread_t * restrict thread,
void * restrict arg)
{
int __retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
+ __e_acsl_store_block((void *)(& __retres),4UL);
{
int __gen_e_acsl_valid;
int __gen_e_acsl_or;
int __gen_e_acsl_or_2;
- __e_acsl_store_block((void *)(& arg),(size_t)8);
- __e_acsl_store_block((void *)(& start_routine),(size_t)8);
- __e_acsl_store_block((void *)(& attr),(size_t)8);
- __e_acsl_store_block((void *)(& thread),(size_t)8);
+ __e_acsl_store_block((void *)(& arg),8UL);
+ __e_acsl_store_block((void *)(& start_routine),8UL);
+ __e_acsl_store_block((void *)(& attr),8UL);
+ __e_acsl_store_block((void *)(& thread),8UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"thread",
(void *)thread);
@@ -435,47 +435,47 @@ void __e_acsl_globals_init(void)
static char __e_acsl_already_run = 0;
if (! __e_acsl_already_run) {
__e_acsl_already_run = 1;
- __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_join),(size_t)1);
+ __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_join),1UL);
__e_acsl_full_init((void *)(& __gen_e_acsl_pthread_join));
- __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_create),(size_t)1);
+ __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_create),1UL);
__e_acsl_full_init((void *)(& __gen_e_acsl_pthread_create));
- __e_acsl_store_block((void *)(& read_value),(size_t)1);
+ __e_acsl_store_block((void *)(& read_value),1UL);
__e_acsl_full_init((void *)(& read_value));
- __e_acsl_store_block((void *)(& write_value),(size_t)1);
+ __e_acsl_store_block((void *)(& write_value),1UL);
__e_acsl_full_init((void *)(& write_value));
- __e_acsl_store_block((void *)(values),(size_t)80);
+ __e_acsl_store_block((void *)(values),80UL);
__e_acsl_full_init((void *)(& values));
- __e_acsl_store_block((void *)(& free),(size_t)1);
+ __e_acsl_store_block((void *)(& free),1UL);
__e_acsl_full_init((void *)(& free));
- __e_acsl_store_block((void *)(& malloc),(size_t)1);
+ __e_acsl_store_block((void *)(& malloc),1UL);
__e_acsl_full_init((void *)(& malloc));
- __e_acsl_store_block((void *)(& __fc_p_random48_counter),(size_t)8);
+ __e_acsl_store_block((void *)(& __fc_p_random48_counter),8UL);
__e_acsl_full_init((void *)(& __fc_p_random48_counter));
- __e_acsl_store_block((void *)(random48_counter),(size_t)6);
+ __e_acsl_store_block((void *)(random48_counter),6UL);
__e_acsl_full_init((void *)(& random48_counter));
- __e_acsl_store_block((void *)(& __fc_random48_init),(size_t)4);
+ __e_acsl_store_block((void *)(& __fc_random48_init),4UL);
__e_acsl_full_init((void *)(& __fc_random48_init));
- __e_acsl_store_block((void *)(& __fc_rand_max),(size_t)8);
+ __e_acsl_store_block((void *)(& __fc_rand_max),8UL);
__e_acsl_full_init((void *)(& __fc_rand_max));
- __e_acsl_store_block((void *)(& __fc_interrupted),(size_t)4);
+ __e_acsl_store_block((void *)(& __fc_interrupted),4UL);
__e_acsl_full_init((void *)(& __fc_interrupted));
- __e_acsl_store_block((void *)(& __fc_p_time_tm),(size_t)8);
+ __e_acsl_store_block((void *)(& __fc_p_time_tm),8UL);
__e_acsl_full_init((void *)(& __fc_p_time_tm));
- __e_acsl_store_block((void *)(& __fc_time_tm),(size_t)36);
+ __e_acsl_store_block((void *)(& __fc_time_tm),36UL);
__e_acsl_full_init((void *)(& __fc_time_tm));
- __e_acsl_store_block((void *)(& __fc_p_ctime),(size_t)8);
+ __e_acsl_store_block((void *)(& __fc_p_ctime),8UL);
__e_acsl_full_init((void *)(& __fc_p_ctime));
- __e_acsl_store_block((void *)(__fc_ctime),(size_t)26);
+ __e_acsl_store_block((void *)(__fc_ctime),26UL);
__e_acsl_full_init((void *)(& __fc_ctime));
- __e_acsl_store_block((void *)(& __fc_time),(size_t)4);
+ __e_acsl_store_block((void *)(& __fc_time),4UL);
__e_acsl_full_init((void *)(& __fc_time));
- __e_acsl_store_block((void *)(& __fc_p_sigaction),(size_t)8);
+ __e_acsl_store_block((void *)(& __fc_p_sigaction),8UL);
__e_acsl_full_init((void *)(& __fc_p_sigaction));
- __e_acsl_store_block((void *)(sigaction),(size_t)2080);
+ __e_acsl_store_block((void *)(sigaction),2080UL);
__e_acsl_full_init((void *)(& sigaction));
- __e_acsl_store_block((void *)(& pthread_join),(size_t)1);
+ __e_acsl_store_block((void *)(& pthread_join),1UL);
__e_acsl_full_init((void *)(& pthread_join));
- __e_acsl_store_block((void *)(& pthread_create),(size_t)1);
+ __e_acsl_store_block((void *)(& pthread_create),1UL);
__e_acsl_full_init((void *)(& pthread_create));
}
return;
@@ -512,14 +512,14 @@ int main(void)
int __retres;
pthread_t t;
int args[10];
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
- __e_acsl_store_block((void *)(args),(size_t)40);
- __e_acsl_store_block((void *)(& t),(size_t)4);
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
+ __e_acsl_store_block((void *)(args),40UL);
+ __e_acsl_store_block((void *)(& t),4UL);
+ __e_acsl_store_block((void *)(& __retres),4UL);
{
int i = 0;
- __e_acsl_store_block((void *)(& i),(size_t)4);
+ __e_acsl_store_block((void *)(& i),4UL);
__e_acsl_full_init((void *)(& i));
while (i < 10) {
__e_acsl_initialize((void *)(& args[i]),sizeof(int));
@@ -534,7 +534,7 @@ int main(void)
}
{
int i_0 = 0;
- __e_acsl_store_block((void *)(& i_0),(size_t)4);
+ __e_acsl_store_block((void *)(& i_0),4UL);
__e_acsl_full_init((void *)(& i_0));
while (i_0 < 10) {
__gen_e_acsl_pthread_create(& t,(pthread_attr_t const *)0,& read_value,
diff --git a/src/plugins/e-acsl/tests/concurrency/oracle/gen_threads_debug.c b/src/plugins/e-acsl/tests/concurrency/oracle/gen_threads_debug.c
index 36848cfe9d268407252e463c1e8dc21ff685c0d0..015865844d25becb116a1fef1bd8cfbc986dabe0 100644
--- a/src/plugins/e-acsl/tests/concurrency/oracle/gen_threads_debug.c
+++ b/src/plugins/e-acsl/tests/concurrency/oracle/gen_threads_debug.c
@@ -160,13 +160,13 @@ void *__gen_e_acsl_read_value(void *arg);
void *__gen_e_acsl_read_value(void *arg)
{
void *__retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)8);
+ __e_acsl_store_block((void *)(& __retres),8UL);
{
int __gen_e_acsl_idx;
int __gen_e_acsl_initialized;
int __gen_e_acsl_and;
int __gen_e_acsl_and_2;
- __e_acsl_store_block((void *)(& arg),(size_t)8);
+ __e_acsl_store_block((void *)(& arg),8UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_int(& __gen_e_acsl_assert_data,"*((int *)arg)",
0,*((int *)arg));
@@ -285,8 +285,8 @@ void *__gen_e_acsl_write_value(void *arg)
{
void *__gen_e_acsl_at;
void *__retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)8);
- __e_acsl_store_block((void *)(& arg),(size_t)8);
+ __e_acsl_store_block((void *)(& __retres),8UL);
+ __e_acsl_store_block((void *)(& arg),8UL);
__gen_e_acsl_at = arg;
__retres = write_value(arg);
{
@@ -413,8 +413,8 @@ void *__gen_e_acsl_write_value(void *arg)
int __gen_e_acsl_usleep(useconds_t usec)
{
int __retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
- __e_acsl_store_block((void *)(& usec),(size_t)4);
+ __e_acsl_store_block((void *)(& __retres),4UL);
+ __e_acsl_store_block((void *)(& usec),4UL);
__retres = usleep(usec);
{
int __gen_e_acsl_or;
@@ -432,7 +432,7 @@ int __gen_e_acsl_usleep(useconds_t usec)
__gen_e_acsl_assert_data.pred_txt = "\\result == 0 || \\result == -1";
__gen_e_acsl_assert_data.file = "FRAMAC_SHARE/libc/unistd.h";
__gen_e_acsl_assert_data.fct = "usleep";
- __gen_e_acsl_assert_data.line = 1119;
+ __gen_e_acsl_assert_data.line = 1133;
__gen_e_acsl_assert_data.name = "result_ok_or_error";
__e_acsl_assert(__gen_e_acsl_or,& __gen_e_acsl_assert_data);
__e_acsl_assert_clean(& __gen_e_acsl_assert_data);
@@ -449,7 +449,7 @@ int __gen_e_acsl_usleep(useconds_t usec)
*/
void __gen_e_acsl_exit(int status)
{
- __e_acsl_store_block((void *)(& status),(size_t)4);
+ __e_acsl_store_block((void *)(& status),4UL);
exit(status);
{
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
@@ -472,7 +472,7 @@ void __gen_e_acsl_exit(int status)
*/
void __gen_e_acsl_perror(char const *s)
{
- __e_acsl_store_block((void *)(& s),(size_t)8);
+ __e_acsl_store_block((void *)(& s),8UL);
perror(s);
__e_acsl_delete_block((void *)(& s));
return;
@@ -487,10 +487,10 @@ void __gen_e_acsl_perror(char const *s)
int __gen_e_acsl_pthread_mutex_unlock(pthread_mutex_t *mutex)
{
int __retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
+ __e_acsl_store_block((void *)(& __retres),4UL);
{
int __gen_e_acsl_valid;
- __e_acsl_store_block((void *)(& mutex),(size_t)8);
+ __e_acsl_store_block((void *)(& mutex),8UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"mutex",
(void *)mutex);
@@ -551,10 +551,10 @@ int __gen_e_acsl_pthread_mutex_unlock(pthread_mutex_t *mutex)
int __gen_e_acsl_pthread_mutex_lock(pthread_mutex_t *mutex)
{
int __retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
+ __e_acsl_store_block((void *)(& __retres),4UL);
{
int __gen_e_acsl_valid;
- __e_acsl_store_block((void *)(& mutex),(size_t)8);
+ __e_acsl_store_block((void *)(& mutex),8UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"mutex",
(void *)mutex);
@@ -633,12 +633,12 @@ int __gen_e_acsl_pthread_mutex_init(pthread_mutex_t * restrict mutex,
{
pthread_mutex_t *__gen_e_acsl_at;
int __retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
+ __e_acsl_store_block((void *)(& __retres),4UL);
{
int __gen_e_acsl_valid;
int __gen_e_acsl_or;
- __e_acsl_store_block((void *)(& attrs),(size_t)8);
- __e_acsl_store_block((void *)(& mutex),(size_t)8);
+ __e_acsl_store_block((void *)(& attrs),8UL);
+ __e_acsl_store_block((void *)(& mutex),8UL);
__gen_e_acsl_at = mutex;
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"mutex",
@@ -780,13 +780,13 @@ int __gen_e_acsl_pthread_join(pthread_t thread, void **retval)
{
__e_acsl_contract_t *__gen_e_acsl_contract;
int __retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
+ __e_acsl_store_block((void *)(& __retres),4UL);
{
int __gen_e_acsl_or;
int __gen_e_acsl_valid_2;
- __e_acsl_store_block((void *)(& retval),(size_t)8);
- __e_acsl_store_block((void *)(& thread),(size_t)4);
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+ __e_acsl_store_block((void *)(& retval),8UL);
+ __e_acsl_store_block((void *)(& thread),4UL);
+ __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"retval",
(void *)retval);
@@ -812,11 +812,11 @@ int __gen_e_acsl_pthread_join(pthread_t thread, void **retval)
__gen_e_acsl_assert_data.name = "valid_or_null_retval";
__e_acsl_assert(__gen_e_acsl_or,& __gen_e_acsl_assert_data);
__e_acsl_assert_clean(& __gen_e_acsl_assert_data);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
retval == (void **)0);
__gen_e_acsl_valid_2 = __e_acsl_valid((void *)retval,sizeof(void *),
(void *)retval,(void *)(& retval));
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
__gen_e_acsl_valid_2);
}
__retres = pthread_join(thread,retval);
@@ -880,15 +880,15 @@ int __gen_e_acsl_pthread_create(pthread_t * restrict thread,
void * restrict arg)
{
int __retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
+ __e_acsl_store_block((void *)(& __retres),4UL);
{
int __gen_e_acsl_valid;
int __gen_e_acsl_or;
int __gen_e_acsl_or_2;
- __e_acsl_store_block((void *)(& arg),(size_t)8);
- __e_acsl_store_block((void *)(& start_routine),(size_t)8);
- __e_acsl_store_block((void *)(& attr),(size_t)8);
- __e_acsl_store_block((void *)(& thread),(size_t)8);
+ __e_acsl_store_block((void *)(& arg),8UL);
+ __e_acsl_store_block((void *)(& start_routine),8UL);
+ __e_acsl_store_block((void *)(& attr),8UL);
+ __e_acsl_store_block((void *)(& thread),8UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"thread",
(void *)thread);
@@ -1018,12 +1018,12 @@ int __gen_e_acsl_pthread_cond_wait(pthread_cond_t * restrict cond,
pthread_mutex_t * restrict mutex)
{
int __retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
+ __e_acsl_store_block((void *)(& __retres),4UL);
{
int __gen_e_acsl_valid;
int __gen_e_acsl_valid_2;
- __e_acsl_store_block((void *)(& mutex),(size_t)8);
- __e_acsl_store_block((void *)(& cond),(size_t)8);
+ __e_acsl_store_block((void *)(& mutex),8UL);
+ __e_acsl_store_block((void *)(& cond),8UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"cond",
(void *)cond);
@@ -1100,12 +1100,12 @@ int __gen_e_acsl_pthread_cond_init(pthread_cond_t * restrict cond,
{
pthread_cond_t *__gen_e_acsl_at;
int __retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
+ __e_acsl_store_block((void *)(& __retres),4UL);
{
int __gen_e_acsl_valid;
int __gen_e_acsl_or;
- __e_acsl_store_block((void *)(& attr),(size_t)8);
- __e_acsl_store_block((void *)(& cond),(size_t)8);
+ __e_acsl_store_block((void *)(& attr),8UL);
+ __e_acsl_store_block((void *)(& cond),8UL);
__gen_e_acsl_at = cond;
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"cond",
@@ -1209,10 +1209,10 @@ int __gen_e_acsl_pthread_cond_init(pthread_cond_t * restrict cond,
int __gen_e_acsl_pthread_cond_broadcast(pthread_cond_t *cond)
{
int __retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
+ __e_acsl_store_block((void *)(& __retres),4UL);
{
int __gen_e_acsl_valid;
- __e_acsl_store_block((void *)(& cond),(size_t)8);
+ __e_acsl_store_block((void *)(& cond),8UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"cond",
(void *)cond);
@@ -1329,127 +1329,121 @@ void __e_acsl_globals_init(void)
sizeof("Unable to broadcast to read cond var"));
__e_acsl_full_init((void *)__gen_e_acsl_literal_string_14);
__e_acsl_mark_readonly((void *)__gen_e_acsl_literal_string_14);
- __e_acsl_store_block((void *)(& __gen_e_acsl_read_value),(size_t)1);
+ __e_acsl_store_block((void *)(& __gen_e_acsl_read_value),1UL);
__e_acsl_full_init((void *)(& __gen_e_acsl_read_value));
- __e_acsl_store_block((void *)(& __gen_e_acsl_write_value),(size_t)1);
+ __e_acsl_store_block((void *)(& __gen_e_acsl_write_value),1UL);
__e_acsl_full_init((void *)(& __gen_e_acsl_write_value));
- __e_acsl_store_block((void *)(& __gen_e_acsl_usleep),(size_t)1);
+ __e_acsl_store_block((void *)(& __gen_e_acsl_usleep),1UL);
__e_acsl_full_init((void *)(& __gen_e_acsl_usleep));
- __e_acsl_store_block((void *)(& __gen_e_acsl_exit),(size_t)1);
+ __e_acsl_store_block((void *)(& __gen_e_acsl_exit),1UL);
__e_acsl_full_init((void *)(& __gen_e_acsl_exit));
- __e_acsl_store_block((void *)(& __gen_e_acsl_perror),(size_t)1);
+ __e_acsl_store_block((void *)(& __gen_e_acsl_perror),1UL);
__e_acsl_full_init((void *)(& __gen_e_acsl_perror));
- __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_mutex_unlock),
- (size_t)1);
+ __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_mutex_unlock),1UL);
__e_acsl_full_init((void *)(& __gen_e_acsl_pthread_mutex_unlock));
- __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_mutex_lock),
- (size_t)1);
+ __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_mutex_lock),1UL);
__e_acsl_full_init((void *)(& __gen_e_acsl_pthread_mutex_lock));
- __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_mutex_init),
- (size_t)1);
+ __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_mutex_init),1UL);
__e_acsl_full_init((void *)(& __gen_e_acsl_pthread_mutex_init));
- __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_join),(size_t)1);
+ __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_join),1UL);
__e_acsl_full_init((void *)(& __gen_e_acsl_pthread_join));
- __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_create),(size_t)1);
+ __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_create),1UL);
__e_acsl_full_init((void *)(& __gen_e_acsl_pthread_create));
- __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_cond_wait),
- (size_t)1);
+ __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_cond_wait),1UL);
__e_acsl_full_init((void *)(& __gen_e_acsl_pthread_cond_wait));
- __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_cond_init),
- (size_t)1);
+ __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_cond_init),1UL);
__e_acsl_full_init((void *)(& __gen_e_acsl_pthread_cond_init));
- __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_cond_broadcast),
- (size_t)1);
+ __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_cond_broadcast),1UL);
__e_acsl_full_init((void *)(& __gen_e_acsl_pthread_cond_broadcast));
- __e_acsl_store_block((void *)(& read_value),(size_t)1);
+ __e_acsl_store_block((void *)(& read_value),1UL);
__e_acsl_full_init((void *)(& read_value));
- __e_acsl_store_block((void *)(& write_value),(size_t)1);
+ __e_acsl_store_block((void *)(& write_value),1UL);
__e_acsl_full_init((void *)(& write_value));
- __e_acsl_store_block((void *)(& read_mutex),(size_t)4);
+ __e_acsl_store_block((void *)(& read_mutex),4UL);
__e_acsl_full_init((void *)(& read_mutex));
- __e_acsl_store_block((void *)(& write_mutex),(size_t)4);
+ __e_acsl_store_block((void *)(& write_mutex),4UL);
__e_acsl_full_init((void *)(& write_mutex));
- __e_acsl_store_block((void *)(& read_cond),(size_t)4);
+ __e_acsl_store_block((void *)(& read_cond),4UL);
__e_acsl_full_init((void *)(& read_cond));
- __e_acsl_store_block((void *)(& write_cond),(size_t)4);
+ __e_acsl_store_block((void *)(& write_cond),4UL);
__e_acsl_full_init((void *)(& write_cond));
- __e_acsl_store_block((void *)(& read_count),(size_t)4);
+ __e_acsl_store_block((void *)(& read_count),4UL);
__e_acsl_full_init((void *)(& read_count));
- __e_acsl_store_block((void *)(& write_count),(size_t)4);
+ __e_acsl_store_block((void *)(& write_count),4UL);
__e_acsl_full_init((void *)(& write_count));
- __e_acsl_store_block((void *)(values),(size_t)80);
+ __e_acsl_store_block((void *)(values),80UL);
__e_acsl_full_init((void *)(& values));
- __e_acsl_store_block((void *)(& usleep),(size_t)1);
+ __e_acsl_store_block((void *)(& usleep),1UL);
__e_acsl_full_init((void *)(& usleep));
- __e_acsl_store_block((void *)(& __fc_p_ttyname),(size_t)8);
+ __e_acsl_store_block((void *)(& __fc_p_ttyname),8UL);
__e_acsl_full_init((void *)(& __fc_p_ttyname));
- __e_acsl_store_block((void *)(ttyname),(size_t)32);
+ __e_acsl_store_block((void *)(ttyname),32UL);
__e_acsl_full_init((void *)(& ttyname));
- __e_acsl_store_block((void *)(& Frama_C_entropy_source),(size_t)4);
+ __e_acsl_store_block((void *)(& Frama_C_entropy_source),4UL);
__e_acsl_full_init((void *)(& Frama_C_entropy_source));
- __e_acsl_store_block((void *)(& exit),(size_t)1);
+ __e_acsl_store_block((void *)(& exit),1UL);
__e_acsl_full_init((void *)(& exit));
- __e_acsl_store_block((void *)(& free),(size_t)1);
+ __e_acsl_store_block((void *)(& free),1UL);
__e_acsl_full_init((void *)(& free));
- __e_acsl_store_block((void *)(& malloc),(size_t)1);
+ __e_acsl_store_block((void *)(& malloc),1UL);
__e_acsl_full_init((void *)(& malloc));
- __e_acsl_store_block((void *)(& __fc_p_random48_counter),(size_t)8);
+ __e_acsl_store_block((void *)(& __fc_p_random48_counter),8UL);
__e_acsl_full_init((void *)(& __fc_p_random48_counter));
- __e_acsl_store_block((void *)(random48_counter),(size_t)6);
+ __e_acsl_store_block((void *)(random48_counter),6UL);
__e_acsl_full_init((void *)(& random48_counter));
- __e_acsl_store_block((void *)(& __fc_random48_init),(size_t)4);
+ __e_acsl_store_block((void *)(& __fc_random48_init),4UL);
__e_acsl_full_init((void *)(& __fc_random48_init));
- __e_acsl_store_block((void *)(& __fc_rand_max),(size_t)8);
+ __e_acsl_store_block((void *)(& __fc_rand_max),8UL);
__e_acsl_full_init((void *)(& __fc_rand_max));
- __e_acsl_store_block((void *)(& perror),(size_t)1);
+ __e_acsl_store_block((void *)(& perror),1UL);
__e_acsl_full_init((void *)(& perror));
- __e_acsl_store_block((void *)(& __fc_p_tmpnam),(size_t)8);
+ __e_acsl_store_block((void *)(& __fc_p_tmpnam),8UL);
__e_acsl_full_init((void *)(& __fc_p_tmpnam));
- __e_acsl_store_block((void *)(__fc_tmpnam),(size_t)2048);
+ __e_acsl_store_block((void *)(__fc_tmpnam),2048UL);
__e_acsl_full_init((void *)(& __fc_tmpnam));
- __e_acsl_store_block((void *)(& __fc_p_fopen),(size_t)8);
+ __e_acsl_store_block((void *)(& __fc_p_fopen),8UL);
__e_acsl_full_init((void *)(& __fc_p_fopen));
- __e_acsl_store_block((void *)(__fc_fopen),(size_t)128);
+ __e_acsl_store_block((void *)(__fc_fopen),128UL);
__e_acsl_full_init((void *)(& __fc_fopen));
- __e_acsl_store_block((void *)(& stdout),(size_t)8);
+ __e_acsl_store_block((void *)(& stdout),8UL);
__e_acsl_full_init((void *)(& stdout));
- __e_acsl_store_block((void *)(& stdin),(size_t)8);
+ __e_acsl_store_block((void *)(& stdin),8UL);
__e_acsl_full_init((void *)(& stdin));
- __e_acsl_store_block((void *)(& __fc_interrupted),(size_t)4);
+ __e_acsl_store_block((void *)(& __fc_interrupted),4UL);
__e_acsl_full_init((void *)(& __fc_interrupted));
- __e_acsl_store_block((void *)(& __fc_p_time_tm),(size_t)8);
+ __e_acsl_store_block((void *)(& __fc_p_time_tm),8UL);
__e_acsl_full_init((void *)(& __fc_p_time_tm));
- __e_acsl_store_block((void *)(& __fc_time_tm),(size_t)36);
+ __e_acsl_store_block((void *)(& __fc_time_tm),36UL);
__e_acsl_full_init((void *)(& __fc_time_tm));
- __e_acsl_store_block((void *)(& __fc_p_ctime),(size_t)8);
+ __e_acsl_store_block((void *)(& __fc_p_ctime),8UL);
__e_acsl_full_init((void *)(& __fc_p_ctime));
- __e_acsl_store_block((void *)(__fc_ctime),(size_t)26);
+ __e_acsl_store_block((void *)(__fc_ctime),26UL);
__e_acsl_full_init((void *)(& __fc_ctime));
- __e_acsl_store_block((void *)(& __fc_time),(size_t)4);
+ __e_acsl_store_block((void *)(& __fc_time),4UL);
__e_acsl_full_init((void *)(& __fc_time));
- __e_acsl_store_block((void *)(& __fc_p_sigaction),(size_t)8);
+ __e_acsl_store_block((void *)(& __fc_p_sigaction),8UL);
__e_acsl_full_init((void *)(& __fc_p_sigaction));
- __e_acsl_store_block((void *)(sigaction),(size_t)2080);
+ __e_acsl_store_block((void *)(sigaction),2080UL);
__e_acsl_full_init((void *)(& sigaction));
- __e_acsl_store_block((void *)(& pthread_mutex_unlock),(size_t)1);
+ __e_acsl_store_block((void *)(& pthread_mutex_unlock),1UL);
__e_acsl_full_init((void *)(& pthread_mutex_unlock));
- __e_acsl_store_block((void *)(& pthread_mutex_trylock),(size_t)1);
+ __e_acsl_store_block((void *)(& pthread_mutex_trylock),1UL);
__e_acsl_full_init((void *)(& pthread_mutex_trylock));
- __e_acsl_store_block((void *)(& pthread_mutex_lock),(size_t)1);
+ __e_acsl_store_block((void *)(& pthread_mutex_lock),1UL);
__e_acsl_full_init((void *)(& pthread_mutex_lock));
- __e_acsl_store_block((void *)(& pthread_mutex_init),(size_t)1);
+ __e_acsl_store_block((void *)(& pthread_mutex_init),1UL);
__e_acsl_full_init((void *)(& pthread_mutex_init));
- __e_acsl_store_block((void *)(& pthread_join),(size_t)1);
+ __e_acsl_store_block((void *)(& pthread_join),1UL);
__e_acsl_full_init((void *)(& pthread_join));
- __e_acsl_store_block((void *)(& pthread_create),(size_t)1);
+ __e_acsl_store_block((void *)(& pthread_create),1UL);
__e_acsl_full_init((void *)(& pthread_create));
- __e_acsl_store_block((void *)(& pthread_cond_wait),(size_t)1);
+ __e_acsl_store_block((void *)(& pthread_cond_wait),1UL);
__e_acsl_full_init((void *)(& pthread_cond_wait));
- __e_acsl_store_block((void *)(& pthread_cond_init),(size_t)1);
+ __e_acsl_store_block((void *)(& pthread_cond_init),1UL);
__e_acsl_full_init((void *)(& pthread_cond_init));
- __e_acsl_store_block((void *)(& pthread_cond_broadcast),(size_t)1);
+ __e_acsl_store_block((void *)(& pthread_cond_broadcast),1UL);
__e_acsl_full_init((void *)(& pthread_cond_broadcast));
- __e_acsl_store_block((void *)(& errno),(size_t)4);
+ __e_acsl_store_block((void *)(& errno),4UL);
__e_acsl_full_init((void *)(& errno));
}
return;
@@ -1530,18 +1524,18 @@ int main(void)
int tmp_2;
int tmp_5;
int tmp_6;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
- __e_acsl_store_block((void *)(& tmp_6),(size_t)4);
- __e_acsl_store_block((void *)(& tmp_5),(size_t)4);
- __e_acsl_store_block((void *)(& tmp_2),(size_t)4);
- __e_acsl_store_block((void *)(& tmp_1),(size_t)4);
- __e_acsl_store_block((void *)(& tmp_0),(size_t)4);
- __e_acsl_store_block((void *)(& tmp),(size_t)4);
- __e_acsl_store_block((void *)(args),(size_t)40);
- __e_acsl_store_block((void *)(readers),(size_t)40);
- __e_acsl_store_block((void *)(writers),(size_t)40);
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
+ __e_acsl_store_block((void *)(& tmp_6),4UL);
+ __e_acsl_store_block((void *)(& tmp_5),4UL);
+ __e_acsl_store_block((void *)(& tmp_2),4UL);
+ __e_acsl_store_block((void *)(& tmp_1),4UL);
+ __e_acsl_store_block((void *)(& tmp_0),4UL);
+ __e_acsl_store_block((void *)(& tmp),4UL);
+ __e_acsl_store_block((void *)(args),40UL);
+ __e_acsl_store_block((void *)(readers),40UL);
+ __e_acsl_store_block((void *)(writers),40UL);
+ __e_acsl_store_block((void *)(& __retres),4UL);
__e_acsl_full_init((void *)(& tmp));
tmp = __gen_e_acsl_pthread_mutex_init(& write_mutex,
(pthread_mutexattr_t const *)0);
@@ -1572,7 +1566,7 @@ int main(void)
}
{
int i = 0;
- __e_acsl_store_block((void *)(& i),(size_t)4);
+ __e_acsl_store_block((void *)(& i),4UL);
__e_acsl_full_init((void *)(& i));
while (i < 10) {
__e_acsl_initialize((void *)(& args[i]),sizeof(int));
@@ -1590,11 +1584,11 @@ int main(void)
}
while (1) {
int res = pthread_mutex_trylock(& write_mutex);
- __e_acsl_store_block((void *)(& res),(size_t)4);
+ __e_acsl_store_block((void *)(& res),4UL);
__e_acsl_full_init((void *)(& res));
if (res == 0) {
int done = write_count == 10;
- __e_acsl_store_block((void *)(& done),(size_t)4);
+ __e_acsl_store_block((void *)(& done),4UL);
__e_acsl_full_init((void *)(& done));
__gen_e_acsl_pthread_mutex_unlock(& write_mutex);
if (done) {
@@ -1606,16 +1600,16 @@ int main(void)
}
else
if (res != 16) __gen_e_acsl_perror(__gen_e_acsl_literal_string_11);
- __gen_e_acsl_usleep((unsigned int)100);
+ __gen_e_acsl_usleep((useconds_t)100);
__e_acsl_delete_block((void *)(& res));
}
while (1) {
int res_0 = pthread_mutex_trylock(& read_mutex);
- __e_acsl_store_block((void *)(& res_0),(size_t)4);
+ __e_acsl_store_block((void *)(& res_0),4UL);
__e_acsl_full_init((void *)(& res_0));
if (res_0 == 0) {
int done_0 = read_count == 10;
- __e_acsl_store_block((void *)(& done_0),(size_t)4);
+ __e_acsl_store_block((void *)(& done_0),4UL);
__e_acsl_full_init((void *)(& done_0));
__gen_e_acsl_pthread_mutex_unlock(& read_mutex);
if (done_0) {
@@ -1627,7 +1621,7 @@ int main(void)
}
else
if (res_0 != 16) __gen_e_acsl_perror(__gen_e_acsl_literal_string_12);
- __gen_e_acsl_usleep((unsigned int)100);
+ __gen_e_acsl_usleep((useconds_t)100);
__e_acsl_delete_block((void *)(& res_0));
}
__e_acsl_full_init((void *)(& tmp_5));
@@ -1638,7 +1632,7 @@ int main(void)
}
{
int i_0 = 0;
- __e_acsl_store_block((void *)(& i_0),(size_t)4);
+ __e_acsl_store_block((void *)(& i_0),4UL);
__e_acsl_full_init((void *)(& i_0));
while (i_0 < 10) {
__gen_e_acsl_pthread_join(writers[i_0],(void **)0);
@@ -1655,7 +1649,7 @@ int main(void)
}
{
int i_1 = 0;
- __e_acsl_store_block((void *)(& i_1),(size_t)4);
+ __e_acsl_store_block((void *)(& i_1),4UL);
__e_acsl_full_init((void *)(& i_1));
while (i_1 < 10) {
__gen_e_acsl_pthread_join(readers[i_1],(void **)0);
diff --git a/src/plugins/e-acsl/tests/concurrency/oracle/gen_threads_safe_locations.c b/src/plugins/e-acsl/tests/concurrency/oracle/gen_threads_safe_locations.c
index 025b3fb3ba9b21ea7af65525383814d002fc43a8..9de07836f81ad5f6886d1e8f3ef63cb1cd1888b6 100644
--- a/src/plugins/e-acsl/tests/concurrency/oracle/gen_threads_safe_locations.c
+++ b/src/plugins/e-acsl/tests/concurrency/oracle/gen_threads_safe_locations.c
@@ -49,11 +49,11 @@ int __gen_e_acsl_pthread_join(pthread_t thread, void **retval);
void *thread_start(void *arg)
{
void *__retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)8);
+ __e_acsl_store_block((void *)(& __retres),8UL);
{
int __gen_e_acsl_valid;
int __gen_e_acsl_and;
- __e_acsl_store_block((void *)(& arg),(size_t)8);
+ __e_acsl_store_block((void *)(& arg),8UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"__fc_stdout",
(void *)stdout);
@@ -164,7 +164,7 @@ void *thread_start(void *arg)
}
/*@ assert \valid(__fc_stdin) && \initialized(__fc_stdin); */ ;
int *addrof_errno = & errno;
- __e_acsl_store_block((void *)(& addrof_errno),(size_t)8);
+ __e_acsl_store_block((void *)(& addrof_errno),8UL);
__e_acsl_full_init((void *)(& addrof_errno));
{
int __gen_e_acsl_initialized_4;
@@ -251,13 +251,13 @@ int __gen_e_acsl_pthread_join(pthread_t thread, void **retval)
{
__e_acsl_contract_t *__gen_e_acsl_contract;
int __retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
+ __e_acsl_store_block((void *)(& __retres),4UL);
{
int __gen_e_acsl_or;
int __gen_e_acsl_valid_2;
- __e_acsl_store_block((void *)(& retval),(size_t)8);
- __e_acsl_store_block((void *)(& thread),(size_t)4);
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+ __e_acsl_store_block((void *)(& retval),8UL);
+ __e_acsl_store_block((void *)(& thread),4UL);
+ __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"retval",
(void *)retval);
@@ -283,11 +283,11 @@ int __gen_e_acsl_pthread_join(pthread_t thread, void **retval)
__gen_e_acsl_assert_data.name = "valid_or_null_retval";
__e_acsl_assert(__gen_e_acsl_or,& __gen_e_acsl_assert_data);
__e_acsl_assert_clean(& __gen_e_acsl_assert_data);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
retval == (void **)0);
__gen_e_acsl_valid_2 = __e_acsl_valid((void *)retval,sizeof(void *),
(void *)retval,(void *)(& retval));
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
__gen_e_acsl_valid_2);
}
__retres = pthread_join(thread,retval);
@@ -351,15 +351,15 @@ int __gen_e_acsl_pthread_create(pthread_t * restrict thread,
void * restrict arg)
{
int __retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
+ __e_acsl_store_block((void *)(& __retres),4UL);
{
int __gen_e_acsl_valid;
int __gen_e_acsl_or;
int __gen_e_acsl_or_2;
- __e_acsl_store_block((void *)(& arg),(size_t)8);
- __e_acsl_store_block((void *)(& start_routine),(size_t)8);
- __e_acsl_store_block((void *)(& attr),(size_t)8);
- __e_acsl_store_block((void *)(& thread),(size_t)8);
+ __e_acsl_store_block((void *)(& arg),8UL);
+ __e_acsl_store_block((void *)(& start_routine),8UL);
+ __e_acsl_store_block((void *)(& attr),8UL);
+ __e_acsl_store_block((void *)(& thread),8UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"thread",
(void *)thread);
@@ -484,47 +484,47 @@ void __e_acsl_globals_init(void)
static char __e_acsl_already_run = 0;
if (! __e_acsl_already_run) {
__e_acsl_already_run = 1;
- __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_join),(size_t)1);
+ __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_join),1UL);
__e_acsl_full_init((void *)(& __gen_e_acsl_pthread_join));
- __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_create),(size_t)1);
+ __e_acsl_store_block((void *)(& __gen_e_acsl_pthread_create),1UL);
__e_acsl_full_init((void *)(& __gen_e_acsl_pthread_create));
- __e_acsl_store_block((void *)(& thread_start),(size_t)1);
+ __e_acsl_store_block((void *)(& thread_start),1UL);
__e_acsl_full_init((void *)(& thread_start));
- __e_acsl_store_block((void *)(& __fc_p_tmpnam),(size_t)8);
+ __e_acsl_store_block((void *)(& __fc_p_tmpnam),8UL);
__e_acsl_full_init((void *)(& __fc_p_tmpnam));
- __e_acsl_store_block((void *)(__fc_tmpnam),(size_t)2048);
+ __e_acsl_store_block((void *)(__fc_tmpnam),2048UL);
__e_acsl_full_init((void *)(& __fc_tmpnam));
- __e_acsl_store_block((void *)(& __fc_p_fopen),(size_t)8);
+ __e_acsl_store_block((void *)(& __fc_p_fopen),8UL);
__e_acsl_full_init((void *)(& __fc_p_fopen));
- __e_acsl_store_block((void *)(__fc_fopen),(size_t)128);
+ __e_acsl_store_block((void *)(__fc_fopen),128UL);
__e_acsl_full_init((void *)(& __fc_fopen));
- __e_acsl_store_block((void *)(& stdout),(size_t)8);
+ __e_acsl_store_block((void *)(& stdout),8UL);
__e_acsl_full_init((void *)(& stdout));
- __e_acsl_store_block((void *)(& stdin),(size_t)8);
+ __e_acsl_store_block((void *)(& stdin),8UL);
__e_acsl_full_init((void *)(& stdin));
- __e_acsl_store_block((void *)(& stderr),(size_t)8);
+ __e_acsl_store_block((void *)(& stderr),8UL);
__e_acsl_full_init((void *)(& stderr));
- __e_acsl_store_block((void *)(& __fc_interrupted),(size_t)4);
+ __e_acsl_store_block((void *)(& __fc_interrupted),4UL);
__e_acsl_full_init((void *)(& __fc_interrupted));
- __e_acsl_store_block((void *)(& __fc_p_time_tm),(size_t)8);
+ __e_acsl_store_block((void *)(& __fc_p_time_tm),8UL);
__e_acsl_full_init((void *)(& __fc_p_time_tm));
- __e_acsl_store_block((void *)(& __fc_time_tm),(size_t)36);
+ __e_acsl_store_block((void *)(& __fc_time_tm),36UL);
__e_acsl_full_init((void *)(& __fc_time_tm));
- __e_acsl_store_block((void *)(& __fc_p_ctime),(size_t)8);
+ __e_acsl_store_block((void *)(& __fc_p_ctime),8UL);
__e_acsl_full_init((void *)(& __fc_p_ctime));
- __e_acsl_store_block((void *)(__fc_ctime),(size_t)26);
+ __e_acsl_store_block((void *)(__fc_ctime),26UL);
__e_acsl_full_init((void *)(& __fc_ctime));
- __e_acsl_store_block((void *)(& __fc_time),(size_t)4);
+ __e_acsl_store_block((void *)(& __fc_time),4UL);
__e_acsl_full_init((void *)(& __fc_time));
- __e_acsl_store_block((void *)(& __fc_p_sigaction),(size_t)8);
+ __e_acsl_store_block((void *)(& __fc_p_sigaction),8UL);
__e_acsl_full_init((void *)(& __fc_p_sigaction));
- __e_acsl_store_block((void *)(sigaction),(size_t)2080);
+ __e_acsl_store_block((void *)(sigaction),2080UL);
__e_acsl_full_init((void *)(& sigaction));
- __e_acsl_store_block((void *)(& pthread_join),(size_t)1);
+ __e_acsl_store_block((void *)(& pthread_join),1UL);
__e_acsl_full_init((void *)(& pthread_join));
- __e_acsl_store_block((void *)(& pthread_create),(size_t)1);
+ __e_acsl_store_block((void *)(& pthread_create),1UL);
__e_acsl_full_init((void *)(& pthread_create));
- __e_acsl_store_block((void *)(& errno),(size_t)4);
+ __e_acsl_store_block((void *)(& errno),4UL);
__e_acsl_full_init((void *)(& errno));
}
return;
@@ -560,10 +560,10 @@ int main(void)
{
int __retres;
pthread_t t;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
- __e_acsl_store_block((void *)(& t),(size_t)4);
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
+ __e_acsl_store_block((void *)(& t),4UL);
+ __e_acsl_store_block((void *)(& __retres),4UL);
__gen_e_acsl_pthread_create(& t,(pthread_attr_t const *)0,& thread_start,
(void *)0);
__gen_e_acsl_pthread_join(t,(void **)0);
diff --git a/src/plugins/e-acsl/tests/concurrency/oracle/parallel_threads.res.oracle b/src/plugins/e-acsl/tests/concurrency/oracle/parallel_threads.res.oracle
index 97e90525ac72063851e0e7eaa39c5562a9c17737..e2c36e496bfdfe3bfea42a54de5cd5d7e96cc934 100644
--- a/src/plugins/e-acsl/tests/concurrency/oracle/parallel_threads.res.oracle
+++ b/src/plugins/e-acsl/tests/concurrency/oracle/parallel_threads.res.oracle
@@ -35,7 +35,7 @@
[e-acsl] Warning: annotating undefined function `usleep':
the generated program may miss memory instrumentation
if there are memory-related annotations.
-[e-acsl] FRAMAC_SHARE/libc/unistd.h:1116: Warning:
+[e-acsl] FRAMAC_SHARE/libc/unistd.h:1130: Warning:
E-ACSL construct `assigns clause in behavior' is not yet supported.
Ignoring annotation.
[e-acsl] FRAMAC_SHARE/libc/stdlib.h:505: Warning:
@@ -166,6 +166,6 @@
[eva:alarm] FRAMAC_SHARE/libc/pthread.h:316: Warning:
function __e_acsl_assert_register_int: precondition data->values == \null ||
\valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/unistd.h:1119: Warning:
+[eva:alarm] FRAMAC_SHARE/libc/unistd.h:1133: Warning:
function __e_acsl_assert_register_int: precondition data->values == \null ||
\valid(data->values) got status unknown.
diff --git a/src/plugins/e-acsl/tests/concurrency/oracle/threads_debug.res.oracle b/src/plugins/e-acsl/tests/concurrency/oracle/threads_debug.res.oracle
index 97e90525ac72063851e0e7eaa39c5562a9c17737..e2c36e496bfdfe3bfea42a54de5cd5d7e96cc934 100644
--- a/src/plugins/e-acsl/tests/concurrency/oracle/threads_debug.res.oracle
+++ b/src/plugins/e-acsl/tests/concurrency/oracle/threads_debug.res.oracle
@@ -35,7 +35,7 @@
[e-acsl] Warning: annotating undefined function `usleep':
the generated program may miss memory instrumentation
if there are memory-related annotations.
-[e-acsl] FRAMAC_SHARE/libc/unistd.h:1116: Warning:
+[e-acsl] FRAMAC_SHARE/libc/unistd.h:1130: Warning:
E-ACSL construct `assigns clause in behavior' is not yet supported.
Ignoring annotation.
[e-acsl] FRAMAC_SHARE/libc/stdlib.h:505: Warning:
@@ -166,6 +166,6 @@
[eva:alarm] FRAMAC_SHARE/libc/pthread.h:316: Warning:
function __e_acsl_assert_register_int: precondition data->values == \null ||
\valid(data->values) got status unknown.
-[eva:alarm] FRAMAC_SHARE/libc/unistd.h:1119: Warning:
+[eva:alarm] FRAMAC_SHARE/libc/unistd.h:1133: Warning:
function __e_acsl_assert_register_int: precondition data->values == \null ||
\valid(data->values) got status unknown.
diff --git a/src/plugins/e-acsl/tests/concurrency/oracle_dev/threads_debug.e-acsl.err.log b/src/plugins/e-acsl/tests/concurrency/oracle_dev/threads_debug.e-acsl.err.log
index e338b6d403c5a5e10843cf71d93df93272621992..1f0d3a94375d8a4739ab04df8909eaec26127b7f 100644
--- a/src/plugins/e-acsl/tests/concurrency/oracle_dev/threads_debug.e-acsl.err.log
+++ b/src/plugins/e-acsl/tests/concurrency/oracle_dev/threads_debug.e-acsl.err.log
@@ -1,182 +1,182 @@
>>> HEAP ---------------------
- Application: 128 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 128 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> STACK --------------------
- Application: 16 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> GLOBAL -------------------
Application: xxxkB [0x0000-0000-0000, 0x0000-0000-0000]
Primary : xxxkB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
Secondary : xxxkB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> TLS ----------------------
- Application: 2 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> VDSO ---------------------
Application: xxxkB [0x0000-0000-0000, 0x0000-0000-0000]
Primary : xxxkB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
Secondary : xxxkB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> --------------------------
>>> Thread stack -------------
- Application: 16 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread TLS ---------------
- Application: 2 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread stack -------------
- Application: 16 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread TLS ---------------
- Application: 2 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread stack -------------
- Application: 16 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread TLS ---------------
- Application: 2 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread stack -------------
- Application: 16 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread TLS ---------------
- Application: 2 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread stack -------------
- Application: 16 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread TLS ---------------
- Application: 2 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread stack -------------
- Application: 16 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread TLS ---------------
- Application: 2 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread stack -------------
- Application: 16 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread TLS ---------------
- Application: 2 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread stack -------------
- Application: 16 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread TLS ---------------
- Application: 2 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread stack -------------
- Application: 16 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread TLS ---------------
- Application: 2 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread stack -------------
- Application: 16 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread TLS ---------------
- Application: 2 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread stack -------------
- Application: 16 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread TLS ---------------
- Application: 2 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread stack -------------
- Application: 16 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread TLS ---------------
- Application: 2 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread stack -------------
- Application: 16 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread TLS ---------------
- Application: 2 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread stack -------------
- Application: 16 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread TLS ---------------
- Application: 2 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread stack -------------
- Application: 16 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread TLS ---------------
- Application: 2 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread stack -------------
- Application: 16 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread TLS ---------------
- Application: 2 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread stack -------------
- Application: 16 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread TLS ---------------
- Application: 2 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread stack -------------
- Application: 16 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread TLS ---------------
- Application: 2 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread stack -------------
- Application: 16 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread TLS ---------------
- Application: 2 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread stack -------------
- Application: 16 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> Thread TLS ---------------
- Application: 2 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
*** WARNING: Leakedxxxbytes of heap memory in 2 blocks
diff --git a/src/plugins/e-acsl/tests/concurrency/threads_debug.c b/src/plugins/e-acsl/tests/concurrency/threads_debug.c
index 35837359d4f1de8addc0f62050b90be999d13137..75bf51d6121358b31fa55b3114b3d2b2ac5a6b12 100644
--- a/src/plugins/e-acsl/tests/concurrency/threads_debug.c
+++ b/src/plugins/e-acsl/tests/concurrency/threads_debug.c
@@ -4,7 +4,7 @@
MACRO: ROOT_EACSL_GCC_OPTS_EXT --rt-debug --rt-verbose --concurrency
COMMENT: Filter the addresses of the output so that the test is deterministic.
- MACRO: ROOT_EACSL_EXEC_FILTER sed -e s_0x[0-9a-f-]*_0x0000-0000-0000_g | sed -e s_Offset:\s[0-9-]*_Offset:xxxxx_g | sed -e s/[0-9]*\skB/xxxkB/g | sed -e s/Leaked.*bytes/Leakedxxxbytes/g
+ MACRO: ROOT_EACSL_EXEC_FILTER sed -e s_0x[0-9a-f-]*_0x0000-0000-0000_g | sed -e s_Offset:\s[0-9-]*_Offset:xxxxx_g | sed -e s/[0-9]*\skB/xxxkB/g | sed -e s/[0-9]*\sMB/xxxMB/g | sed -e s/Leaked.*bytes/Leakedxxxbytes/g
*/
// Include existing test
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_acsl_check.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_acsl_check.c
index 24b9305c4e783385a9808c33cd52ccd89b80a92f..d47109de36cc480a9349766977bf1c963867cf8a 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_acsl_check.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_acsl_check.c
@@ -22,7 +22,7 @@ void g(int a, int *b)
{
{
int __gen_e_acsl_valid_read;
- __e_acsl_store_block((void *)(& b),(size_t)8);
+ __e_acsl_store_block((void *)(& b),8UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_int(& __gen_e_acsl_assert_data,"a",0,a);
__e_acsl_assert_register_int(& __gen_e_acsl_assert_data,"*(b + 1)",0,
@@ -122,11 +122,11 @@ void __e_acsl_globals_init(void)
int main(void)
{
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
int a = 0;
int b[3] = {1, 2, 3};
- __e_acsl_store_block((void *)(b),(size_t)12);
+ __e_acsl_store_block((void *)(b),12UL);
__e_acsl_full_init((void *)(& b));
{
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_decrease.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_decrease.c
index ea2bac72e0d84d7d055f219610d4a597bbf4b0cd..0eab76f22a050c2ac71fb532dedb183f8c3af891 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_decrease.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_decrease.c
@@ -192,7 +192,7 @@ size_t fact2(size_t n)
result *= n - i;
{
int __gen_e_acsl_and_2;
- i += (size_t)1;
+ i ++;
__e_acsl_assert_data_t __gen_e_acsl_assert_data_2 =
{.values = (void *)0};
__e_acsl_assert_register_ulong(& __gen_e_acsl_assert_data_2,"i",0,i);
@@ -279,7 +279,7 @@ int odd(int n)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
int f10 = f(10);
{
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
@@ -355,7 +355,7 @@ int main(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_5);
}
/*@ assert fact7 == 5040; */ ;
- size_t fact18 = __gen_e_acsl_fact2((unsigned long)18);
+ size_t fact18 = __gen_e_acsl_fact2((size_t)18);
{
__e_acsl_assert_data_t __gen_e_acsl_assert_data_6 =
{.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_false.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_false.c
index c3a7f41246d04a2faa4da3d20d41b6a46afcdc31..14f3b4114b093d9121e71cfd8ee11415271068c7 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_false.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_false.c
@@ -11,7 +11,7 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
int x = 0;
if (x) {
{
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_function_contract.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_function_contract.c
index 501806c4f435ef09594846b2a8a7e66d2bf84847..38edcc63e05ed91d0f319cd77fc3a5ff825d864d 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_function_contract.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_function_contract.c
@@ -181,7 +181,7 @@ void o(void)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__gen_e_acsl_f();
__gen_e_acsl_g();
__gen_e_acsl_h();
@@ -234,7 +234,7 @@ void __gen_e_acsl_o(void)
int __gen_e_acsl_assumes_value;
int __gen_e_acsl_active_bhvrs;
__gen_e_acsl_at = Y;
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)4);
+ __gen_e_acsl_contract = __e_acsl_contract_init(4UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_int(& __gen_e_acsl_assert_data,"X",0,X);
__gen_e_acsl_assert_data.blocking = 1;
@@ -245,16 +245,14 @@ void __gen_e_acsl_o(void)
__gen_e_acsl_assert_data.line = 93;
__e_acsl_assert(X > -1000,& __gen_e_acsl_assert_data);
__e_acsl_assert_clean(& __gen_e_acsl_assert_data);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
- Y < 0);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
- Y >= 0);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)2,
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,Y < 0);
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,Y >= 0);
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,2UL,
Y % 2 == 1);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)3,
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,3UL,
Y % 2 == 0);
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
if (__gen_e_acsl_assumes_value) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_2 =
{.values = (void *)0};
@@ -270,7 +268,7 @@ void __gen_e_acsl_o(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_2);
}
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
if (__gen_e_acsl_assumes_value) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_3 =
{.values = (void *)0};
@@ -286,7 +284,7 @@ void __gen_e_acsl_o(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_3);
}
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)2);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,2UL);
if (__gen_e_acsl_assumes_value) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_4 =
{.values = (void *)0};
@@ -302,7 +300,7 @@ void __gen_e_acsl_o(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_4);
}
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)3);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,3UL);
if (__gen_e_acsl_assumes_value) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_5 =
{.values = (void *)0};
@@ -318,7 +316,7 @@ void __gen_e_acsl_o(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_5);
}
__gen_e_acsl_active_bhvrs = __e_acsl_contract_partial_count_behaviors
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)2,1,0);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,2UL,1,0);
__e_acsl_assert_data_t __gen_e_acsl_assert_data_6 =
{.values = (void *)0};
__e_acsl_assert_register_int(& __gen_e_acsl_assert_data_6,
@@ -350,7 +348,7 @@ void __gen_e_acsl_o(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_7);
}
__gen_e_acsl_active_bhvrs = __e_acsl_contract_partial_count_behaviors
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)2,2,3);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,2UL,2,3);
__e_acsl_assert_data_t __gen_e_acsl_assert_data_8 =
{.values = (void *)0};
__e_acsl_assert_register_int(& __gen_e_acsl_assert_data_8,
@@ -420,7 +418,7 @@ void __gen_e_acsl_o(void)
__e_acsl_assert(X == __gen_e_acsl_at,& __gen_e_acsl_assert_data_12);
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_12);
__gen_e_acsl_assumes_value_2 = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
if (__gen_e_acsl_assumes_value_2) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_13 =
{.values = (void *)0};
@@ -438,7 +436,7 @@ void __gen_e_acsl_o(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_13);
}
__gen_e_acsl_assumes_value_2 = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
if (__gen_e_acsl_assumes_value_2) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_14 =
{.values = (void *)0};
@@ -456,7 +454,7 @@ void __gen_e_acsl_o(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_14);
}
__gen_e_acsl_assumes_value_2 = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)2);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,2UL);
if (__gen_e_acsl_assumes_value_2) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_15 =
{.values = (void *)0};
@@ -474,7 +472,7 @@ void __gen_e_acsl_o(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_15);
}
__gen_e_acsl_assumes_value_2 = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)3);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,3UL);
if (__gen_e_acsl_assumes_value_2) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_16 =
{.values = (void *)0};
@@ -511,7 +509,7 @@ void __gen_e_acsl_n(void)
{
__e_acsl_contract_t *__gen_e_acsl_contract;
{
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+ __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_int(& __gen_e_acsl_assert_data,"X",0,X);
__gen_e_acsl_assert_data.blocking = 1;
@@ -533,16 +531,14 @@ void __gen_e_acsl_n(void)
__gen_e_acsl_assert_data_2.line = 80;
__e_acsl_assert(X < 10,& __gen_e_acsl_assert_data_2);
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_2);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
- X == 7);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
- X == 5);
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,X == 7);
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,X == 5);
}
n();
{
int __gen_e_acsl_assumes_value;
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
if (__gen_e_acsl_assumes_value) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_3 =
{.values = (void *)0};
@@ -558,7 +554,7 @@ void __gen_e_acsl_n(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_3);
}
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
if (__gen_e_acsl_assumes_value) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_4 =
{.values = (void *)0};
@@ -595,18 +591,17 @@ void __gen_e_acsl_m(void)
{
int __gen_e_acsl_and;
__gen_e_acsl_at = (long)X;
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
- X == 7);
+ __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,X == 7);
if (X == 5) __gen_e_acsl_and = Y == 2; else __gen_e_acsl_and = 0;
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
__gen_e_acsl_and);
}
m();
{
int __gen_e_acsl_assumes_value;
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
if (__gen_e_acsl_assumes_value) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data =
{.values = (void *)0};
@@ -622,7 +617,7 @@ void __gen_e_acsl_m(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data);
}
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
if (__gen_e_acsl_assumes_value) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_2 =
{.values = (void *)0};
@@ -694,14 +689,13 @@ void __gen_e_acsl_k(void)
{
int __gen_e_acsl_and;
int __gen_e_acsl_assumes_value;
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
- X == 1);
+ __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,X == 1);
if (X == 3) __gen_e_acsl_and = Y == 2; else __gen_e_acsl_and = 0;
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
__gen_e_acsl_and);
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
if (__gen_e_acsl_assumes_value) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data =
{.values = (void *)0};
@@ -717,7 +711,7 @@ void __gen_e_acsl_k(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data);
}
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
if (__gen_e_acsl_assumes_value) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_2 =
{.values = (void *)0};
@@ -765,11 +759,11 @@ void __gen_e_acsl_j(void)
__e_acsl_contract_t *__gen_e_acsl_contract;
{
int __gen_e_acsl_assumes_value;
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,1);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,1);
+ __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,1);
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,1);
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
if (__gen_e_acsl_assumes_value) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data =
{.values = (void *)0};
@@ -785,7 +779,7 @@ void __gen_e_acsl_j(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data);
}
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
if (__gen_e_acsl_assumes_value) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_2 =
{.values = (void *)0};
@@ -818,7 +812,7 @@ void __gen_e_acsl_j(void)
{
int __gen_e_acsl_assumes_value_2;
__gen_e_acsl_assumes_value_2 = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
if (__gen_e_acsl_assumes_value_2) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_4 =
{.values = (void *)0};
@@ -834,7 +828,7 @@ void __gen_e_acsl_j(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_4);
}
__gen_e_acsl_assumes_value_2 = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
if (__gen_e_acsl_assumes_value_2) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_5 =
{.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_ghost.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_ghost.c
index 182446f1eafb675f195411c4b2ba7962a90fbee2..6d224fa3a4b8b7e2b13bb17e08cc13295a23c252 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_ghost.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_ghost.c
@@ -15,9 +15,9 @@ void __e_acsl_globals_init(void)
static char __e_acsl_already_run = 0;
if (! __e_acsl_already_run) {
__e_acsl_already_run = 1;
- __e_acsl_store_block((void *)(& P),(size_t)8);
+ __e_acsl_store_block((void *)(& P),8UL);
__e_acsl_full_init((void *)(& P));
- __e_acsl_store_block((void *)(& G),(size_t)4);
+ __e_acsl_store_block((void *)(& G),4UL);
__e_acsl_full_init((void *)(& G));
}
return;
@@ -33,11 +33,11 @@ void __e_acsl_globals_clean(void)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
P = & G;
int *q = P;
- __e_acsl_store_block((void *)(& q),(size_t)8);
+ __e_acsl_store_block((void *)(& q),8UL);
__e_acsl_full_init((void *)(& q));
{
int __gen_e_acsl_valid_read;
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_invariant.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_invariant.c
index 651c79d96766f237a00f9ce84df229b611a0c30c..a4ec6fdcb850126fb0b1e7279d207370ad1aadba 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_invariant.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_invariant.c
@@ -11,7 +11,7 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
int x = 0;
{
int i = 0;
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_labeled_stmt.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_labeled_stmt.c
index ffe68532b72ad38037abbf923b009cd4898a7f62..0b1558a7fe8a138b7b8d1ba1b003f3c572bc2fc4 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_labeled_stmt.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_labeled_stmt.c
@@ -75,7 +75,7 @@ int __gen_e_acsl_main(void)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__retres = __gen_e_acsl_main();
{
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_lazy.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_lazy.c
index daa81b382920eadd2bfcfd1e6411b5533a0f85d1..d405c61064bca78dee4270cc5f8bf20049e45caf 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_lazy.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_lazy.c
@@ -11,7 +11,7 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
int x = 0;
int y = 1;
{
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_loop.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_loop.c
index 3277c9121c0013e0006ef1c9ab35c200fdd5532f..056654390353a4dbe2e700688ec917b9b9c0984a 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_loop.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_loop.c
@@ -403,7 +403,7 @@ void unnatural_loop(void)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
simple_loop();
nested_loops();
unnatural_loop();
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_nested_code_annot.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_nested_code_annot.c
index b8f02566ff26b92842a2a4e2e3008347b8e77727..5df7d92a197ed6a15bfa5c5e11d90ebfe78ee9d5 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_nested_code_annot.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_nested_code_annot.c
@@ -11,7 +11,7 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
int x = 0;
int y = 1;
{
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_printed_data.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_printed_data.c
index 0f25bc6887d87786a36f164663702eac90e4feb5..d0a76ef10ec6870d106e0e11c0b3cfec13882149 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_printed_data.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_printed_data.c
@@ -87,7 +87,7 @@ void __e_acsl_globals_init(void)
sizeof("EVERY ASSERTION SHOULD PRINT ITS DATA IN EXECUTION LOG\n"));
__e_acsl_full_init((void *)__gen_e_acsl_literal_string);
__e_acsl_mark_readonly((void *)__gen_e_acsl_literal_string);
- __e_acsl_store_block((void *)(& lvalue),(size_t)4);
+ __e_acsl_store_block((void *)(& lvalue),4UL);
__e_acsl_full_init((void *)(& lvalue));
}
return;
@@ -102,11 +102,11 @@ void __e_acsl_globals_clean(void)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
fprintf(stderr,__gen_e_acsl_literal_string); /* fprintf_va_1 */
_Bool int_bool = (_Bool)1;
- __e_acsl_store_block((void *)(& int_bool),(size_t)1);
+ __e_acsl_store_block((void *)(& int_bool),1UL);
__e_acsl_full_init((void *)(& int_bool));
{
int __gen_e_acsl_x;
@@ -125,7 +125,7 @@ int main(void)
}
/*@ assert \let x = int_bool; \true; */ ;
char int_char = (char)127;
- __e_acsl_store_block((void *)(& int_char),(size_t)1);
+ __e_acsl_store_block((void *)(& int_char),1UL);
__e_acsl_full_init((void *)(& int_char));
{
int __gen_e_acsl_x_2;
@@ -145,7 +145,7 @@ int main(void)
}
/*@ assert \let x = int_char; \true; */ ;
signed char int_schar = (signed char)127;
- __e_acsl_store_block((void *)(& int_schar),(size_t)1);
+ __e_acsl_store_block((void *)(& int_schar),1UL);
__e_acsl_full_init((void *)(& int_schar));
{
int __gen_e_acsl_x_3;
@@ -165,7 +165,7 @@ int main(void)
}
/*@ assert \let x = int_schar; \true; */ ;
unsigned char int_uchar = (unsigned char)255;
- __e_acsl_store_block((void *)(& int_uchar),(size_t)1);
+ __e_acsl_store_block((void *)(& int_uchar),1UL);
__e_acsl_full_init((void *)(& int_uchar));
{
int __gen_e_acsl_x_4;
@@ -185,7 +185,7 @@ int main(void)
}
/*@ assert \let x = int_uchar; \true; */ ;
int int_int = 2147483647;
- __e_acsl_store_block((void *)(& int_int),(size_t)4);
+ __e_acsl_store_block((void *)(& int_int),4UL);
__e_acsl_full_init((void *)(& int_int));
{
int __gen_e_acsl_x_5;
@@ -205,7 +205,7 @@ int main(void)
}
/*@ assert \let x = int_int; \true; */ ;
unsigned int int_uint = 4294967295U;
- __e_acsl_store_block((void *)(& int_uint),(size_t)4);
+ __e_acsl_store_block((void *)(& int_uint),4UL);
__e_acsl_full_init((void *)(& int_uint));
{
unsigned int __gen_e_acsl_x_6;
@@ -225,7 +225,7 @@ int main(void)
}
/*@ assert \let x = int_uint; \true; */ ;
short int_short = (short)32767;
- __e_acsl_store_block((void *)(& int_short),(size_t)2);
+ __e_acsl_store_block((void *)(& int_short),2UL);
__e_acsl_full_init((void *)(& int_short));
{
int __gen_e_acsl_x_7;
@@ -245,7 +245,7 @@ int main(void)
}
/*@ assert \let x = int_short; \true; */ ;
unsigned short int_ushort = (unsigned short)65535;
- __e_acsl_store_block((void *)(& int_ushort),(size_t)2);
+ __e_acsl_store_block((void *)(& int_ushort),2UL);
__e_acsl_full_init((void *)(& int_ushort));
{
int __gen_e_acsl_x_8;
@@ -265,7 +265,7 @@ int main(void)
}
/*@ assert \let x = int_ushort; \true; */ ;
long int_long = 9223372036854775807L;
- __e_acsl_store_block((void *)(& int_long),(size_t)8);
+ __e_acsl_store_block((void *)(& int_long),8UL);
__e_acsl_full_init((void *)(& int_long));
{
long __gen_e_acsl_x_9;
@@ -285,7 +285,7 @@ int main(void)
}
/*@ assert \let x = int_long; \true; */ ;
unsigned long int_ulong = 18446744073709551615UL;
- __e_acsl_store_block((void *)(& int_ulong),(size_t)8);
+ __e_acsl_store_block((void *)(& int_ulong),8UL);
__e_acsl_full_init((void *)(& int_ulong));
{
unsigned long __gen_e_acsl_x_10;
@@ -305,7 +305,7 @@ int main(void)
}
/*@ assert \let x = int_ulong; \true; */ ;
long long int_llong = 9223372036854775807LL;
- __e_acsl_store_block((void *)(& int_llong),(size_t)8);
+ __e_acsl_store_block((void *)(& int_llong),8UL);
__e_acsl_full_init((void *)(& int_llong));
{
long __gen_e_acsl_x_11;
@@ -325,7 +325,7 @@ int main(void)
}
/*@ assert \let x = int_llong; \true; */ ;
unsigned long long int_ullong = 18446744073709551615ULL;
- __e_acsl_store_block((void *)(& int_ullong),(size_t)8);
+ __e_acsl_store_block((void *)(& int_ullong),8UL);
__e_acsl_full_init((void *)(& int_ullong));
{
unsigned long __gen_e_acsl_x_12;
@@ -383,7 +383,7 @@ int main(void)
*/
;
float real_float = (float)0x1.fffffep+127;
- __e_acsl_store_block((void *)(& real_float),(size_t)4);
+ __e_acsl_store_block((void *)(& real_float),4UL);
__e_acsl_full_init((void *)(& real_float));
{
float __gen_e_acsl_x_13;
@@ -403,7 +403,7 @@ int main(void)
}
/*@ assert \let x = real_float; \true; */ ;
double real_double = 0x1.fffffffffffffp+1023;
- __e_acsl_store_block((void *)(& real_double),(size_t)8);
+ __e_acsl_store_block((void *)(& real_double),8UL);
__e_acsl_full_init((void *)(& real_double));
{
double __gen_e_acsl_x_14;
@@ -427,7 +427,7 @@ int main(void)
\is_finite((long double)0x1.fffffffffffffffep+16383L);
*/
long double real_ldouble = 0x1.fffffffffffffffep+16383L;
- __e_acsl_store_block((void *)(& real_ldouble),(size_t)16);
+ __e_acsl_store_block((void *)(& real_ldouble),16UL);
__e_acsl_full_init((void *)(& real_ldouble));
{
long double __gen_e_acsl_x_15;
@@ -480,7 +480,7 @@ int main(void)
}
/*@ assert \let real_mpq = 0.1; real_mpq != 1; */ ;
void *ptr = (void *)(& lvalue);
- __e_acsl_store_block((void *)(& ptr),(size_t)8);
+ __e_acsl_store_block((void *)(& ptr),8UL);
__e_acsl_full_init((void *)(& ptr));
{
__e_acsl_assert_data_t __gen_e_acsl_assert_data_18 =
@@ -545,7 +545,7 @@ int main(void)
}
/*@ assert &f != &g; */ ;
struct A struct1 = {.a = 1};
- __e_acsl_store_block((void *)(& struct1),(size_t)4);
+ __e_acsl_store_block((void *)(& struct1),4UL);
__e_acsl_full_init((void *)(& struct1));
{
struct A __gen_e_acsl_x_16;
@@ -564,7 +564,7 @@ int main(void)
}
/*@ assert \let x = struct1; \true; */ ;
union U union1 = {.b = (float)1.};
- __e_acsl_store_block((void *)(& union1),(size_t)4);
+ __e_acsl_store_block((void *)(& union1),4UL);
__e_acsl_full_init((void *)(& union1));
{
union U __gen_e_acsl_x_17;
@@ -583,7 +583,7 @@ int main(void)
}
/*@ assert \let x = union1; \true; */ ;
enum EBool enum_bool = (enum EBool)EBOOL_MAX;
- __e_acsl_store_block((void *)(& enum_bool),(size_t)4);
+ __e_acsl_store_block((void *)(& enum_bool),4UL);
__e_acsl_full_init((void *)(& enum_bool));
{
unsigned int __gen_e_acsl_x_18;
@@ -603,7 +603,7 @@ int main(void)
}
/*@ assert \let x = enum_bool; \true; */ ;
enum EChar enum_char = (enum EChar)ECHAR_MAX;
- __e_acsl_store_block((void *)(& enum_char),(size_t)4);
+ __e_acsl_store_block((void *)(& enum_char),4UL);
__e_acsl_full_init((void *)(& enum_char));
{
int __gen_e_acsl_x_19;
@@ -623,7 +623,7 @@ int main(void)
}
/*@ assert \let x = enum_char; \true; */ ;
enum ESChar enum_schar = (enum ESChar)ESCHAR_MAX;
- __e_acsl_store_block((void *)(& enum_schar),(size_t)4);
+ __e_acsl_store_block((void *)(& enum_schar),4UL);
__e_acsl_full_init((void *)(& enum_schar));
{
int __gen_e_acsl_x_20;
@@ -643,7 +643,7 @@ int main(void)
}
/*@ assert \let x = enum_schar; \true; */ ;
enum EUChar enum_uchar = (enum EUChar)EUCHAR_MAX;
- __e_acsl_store_block((void *)(& enum_uchar),(size_t)4);
+ __e_acsl_store_block((void *)(& enum_uchar),4UL);
__e_acsl_full_init((void *)(& enum_uchar));
{
unsigned int __gen_e_acsl_x_21;
@@ -663,7 +663,7 @@ int main(void)
}
/*@ assert \let x = enum_uchar; \true; */ ;
enum EInt enum_int = EINT_MAX;
- __e_acsl_store_block((void *)(& enum_int),(size_t)4);
+ __e_acsl_store_block((void *)(& enum_int),4UL);
__e_acsl_full_init((void *)(& enum_int));
{
int __gen_e_acsl_x_22;
@@ -683,7 +683,7 @@ int main(void)
}
/*@ assert \let x = enum_int; \true; */ ;
enum EUInt enum_uint = EUINT_MAX;
- __e_acsl_store_block((void *)(& enum_uint),(size_t)4);
+ __e_acsl_store_block((void *)(& enum_uint),4UL);
__e_acsl_full_init((void *)(& enum_uint));
{
unsigned int __gen_e_acsl_x_23;
@@ -703,7 +703,7 @@ int main(void)
}
/*@ assert \let x = enum_uint; \true; */ ;
enum EShort enum_short = (enum EShort)ESHORT_MAX;
- __e_acsl_store_block((void *)(& enum_short),(size_t)4);
+ __e_acsl_store_block((void *)(& enum_short),4UL);
__e_acsl_full_init((void *)(& enum_short));
{
int __gen_e_acsl_x_24;
@@ -723,7 +723,7 @@ int main(void)
}
/*@ assert \let x = enum_short; \true; */ ;
enum EUShort enum_ushort = (enum EUShort)EUSHORT_MAX;
- __e_acsl_store_block((void *)(& enum_ushort),(size_t)4);
+ __e_acsl_store_block((void *)(& enum_ushort),4UL);
__e_acsl_full_init((void *)(& enum_ushort));
{
unsigned int __gen_e_acsl_x_25;
@@ -743,7 +743,7 @@ int main(void)
}
/*@ assert \let x = enum_ushort; \true; */ ;
enum ELong enum_long = ELONG_MAX;
- __e_acsl_store_block((void *)(& enum_long),(size_t)8);
+ __e_acsl_store_block((void *)(& enum_long),8UL);
__e_acsl_full_init((void *)(& enum_long));
{
long __gen_e_acsl_x_26;
@@ -763,7 +763,7 @@ int main(void)
}
/*@ assert \let x = enum_long; \true; */ ;
enum EULong enum_ulong = EULONG_MAX;
- __e_acsl_store_block((void *)(& enum_ulong),(size_t)8);
+ __e_acsl_store_block((void *)(& enum_ulong),8UL);
__e_acsl_full_init((void *)(& enum_ulong));
{
unsigned long __gen_e_acsl_x_27;
@@ -783,7 +783,7 @@ int main(void)
}
/*@ assert \let x = enum_ulong; \true; */ ;
enum ELLong enum_llong = ELLONG_MAX;
- __e_acsl_store_block((void *)(& enum_llong),(size_t)8);
+ __e_acsl_store_block((void *)(& enum_llong),8UL);
__e_acsl_full_init((void *)(& enum_llong));
{
long __gen_e_acsl_x_28;
@@ -803,7 +803,7 @@ int main(void)
}
/*@ assert \let x = enum_llong; \true; */ ;
enum EULLong enum_ullong = EULLONG_MAX;
- __e_acsl_store_block((void *)(& enum_ullong),(size_t)8);
+ __e_acsl_store_block((void *)(& enum_ullong),8UL);
__e_acsl_full_init((void *)(& enum_ullong));
{
unsigned long __gen_e_acsl_x_29;
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_result.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_result.c
index c99db3bf2f45ab4efa11c47155678b6581fe419a..0fdf520c053564fee249660efb0d726f42be6925 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_result.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_result.c
@@ -40,7 +40,7 @@ int h(void)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__gen_e_acsl_f(1);
__gen_e_acsl_g(Y);
__gen_e_acsl_h();
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_rte.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_rte.c
index 20f953076433b4058d4249f0cbbe345bd0ddd782..a8875fd82f683195938bb91718eef9d652c8bc92 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_rte.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_rte.c
@@ -33,7 +33,7 @@ void test(int a, int b, int c, int d, int e, int f, int g, int h, int i,
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__gen_e_acsl_test(2,3,4,5,6,7,8,9,10,11,12,13);
__retres = 0;
__e_acsl_memory_clean();
@@ -63,7 +63,7 @@ void __gen_e_acsl_test(int a, int b, int c, int d, int e, int f, int g,
int __gen_e_acsl_assumes_value;
__gen_e_acsl_at = b;
__gen_e_acsl_at_2 = e;
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)1);
+ __gen_e_acsl_contract = __e_acsl_contract_init(1UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_int(& __gen_e_acsl_assert_data,"a",0,a);
__e_acsl_assert_data_t __gen_e_acsl_assert_data_2 =
@@ -98,10 +98,10 @@ void __gen_e_acsl_test(int a, int b, int c, int d, int e, int f, int g,
__gen_e_acsl_assert_data_3.name = "division_by_zero";
__e_acsl_assert(c != 0,& __gen_e_acsl_assert_data_3);
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_3);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
1 % c == 1);
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
if (__gen_e_acsl_assumes_value) {
int __gen_e_acsl_or;
int __gen_e_acsl_and;
@@ -355,7 +355,7 @@ void __gen_e_acsl_test(int a, int b, int c, int d, int e, int f, int g,
__e_acsl_assert(1 % __gen_e_acsl_at == 1,& __gen_e_acsl_assert_data_18);
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_18);
__gen_e_acsl_assumes_value_2 = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
if (__gen_e_acsl_assumes_value_2) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_20 =
{.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_stmt_contract.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_stmt_contract.c
index e13f6933a714b7ca16dccf5892f3cbe45b753e7a..7cf7c8c8b0b3dc582a7e62c4cdf5edd393f0ed8f 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_stmt_contract.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_stmt_contract.c
@@ -15,7 +15,7 @@ int main(void)
__e_acsl_contract_t *__gen_e_acsl_contract;
int __retres;
int z;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
int x = 0;
int y = 2;
{
@@ -123,13 +123,11 @@ int main(void)
int __gen_e_acsl_assumes_value_2;
{
int __gen_e_acsl_assumes_value;
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
- 1);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
- 1);
+ __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,1);
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,1);
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
if (__gen_e_acsl_assumes_value) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_8 =
{.values = (void *)0};
@@ -145,7 +143,7 @@ int main(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_8);
}
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
if (__gen_e_acsl_assumes_value) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_9 =
{.values = (void *)0};
@@ -185,7 +183,7 @@ int main(void)
*/
x = 3;
__gen_e_acsl_assumes_value_2 = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
if (__gen_e_acsl_assumes_value_2) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_11 =
{.values = (void *)0};
@@ -201,7 +199,7 @@ int main(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_11);
}
__gen_e_acsl_assumes_value_2 = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
if (__gen_e_acsl_assumes_value_2) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_12 =
{.values = (void *)0};
@@ -222,14 +220,14 @@ int main(void)
{
int __gen_e_acsl_and_2;
int __gen_e_acsl_assumes_value_3;
- __gen_e_acsl_contract_2 = __e_acsl_contract_init((size_t)2);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract_2,(size_t)0,
+ __gen_e_acsl_contract_2 = __e_acsl_contract_init(2UL);
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract_2,0UL,
x == 1);
if (x == 3) __gen_e_acsl_and_2 = y == 2; else __gen_e_acsl_and_2 = 0;
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract_2,(size_t)1,
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract_2,1UL,
__gen_e_acsl_and_2);
__gen_e_acsl_assumes_value_3 = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract_2,(size_t)0);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract_2,0UL);
if (__gen_e_acsl_assumes_value_3) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_13 =
{.values = (void *)0};
@@ -245,7 +243,7 @@ int main(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_13);
}
__gen_e_acsl_assumes_value_3 = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract_2,(size_t)1);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract_2,1UL);
if (__gen_e_acsl_assumes_value_3) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_14 =
{.values = (void *)0};
@@ -321,7 +319,7 @@ int main(void)
int __gen_e_acsl_assumes_value_4;
{
int __gen_e_acsl_active_bhvrs;
- __gen_e_acsl_contract_3 = __e_acsl_contract_init((size_t)2);
+ __gen_e_acsl_contract_3 = __e_acsl_contract_init(2UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data_18 =
{.values = (void *)0};
__e_acsl_assert_register_int(& __gen_e_acsl_assert_data_18,"x",0,x);
@@ -333,10 +331,10 @@ int main(void)
__gen_e_acsl_assert_data_18.line = 49;
__e_acsl_assert(x > -1000,& __gen_e_acsl_assert_data_18);
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_18);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract_3,
- (size_t)0,x >= 0);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract_3,
- (size_t)1,x < 0);
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract_3,0UL,
+ x >= 0);
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract_3,1UL,
+ x < 0);
__gen_e_acsl_active_bhvrs = __e_acsl_contract_partial_count_all_behaviors
((__e_acsl_contract_t const *)__gen_e_acsl_contract_3);
__e_acsl_assert_data_t __gen_e_acsl_assert_data_19 =
@@ -398,7 +396,7 @@ int main(void)
__e_acsl_assert(z >= 0,& __gen_e_acsl_assert_data_21);
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_21);
__gen_e_acsl_assumes_value_4 = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract_3,(size_t)0);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract_3,0UL);
if (__gen_e_acsl_assumes_value_4) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_22 =
{.values = (void *)0};
@@ -415,7 +413,7 @@ int main(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_22);
}
__gen_e_acsl_assumes_value_4 = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract_3,(size_t)1);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract_3,1UL);
if (__gen_e_acsl_assumes_value_4) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_23 =
{.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_true.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_true.c
index ccc710ca0a41352e2fa259d2c7d21e822967b397..ee983e4268f8c376653b37505260f19b3eacbf90 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_true.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_true.c
@@ -11,7 +11,7 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
int x = 0;
x ++;
{
diff --git a/src/plugins/e-acsl/tests/constructs/oracle/gen_typedef.c b/src/plugins/e-acsl/tests/constructs/oracle/gen_typedef.c
index 67731cb9825960598f246237040f949c4a9cce22..4ed5c8171efb069369c043bd772dcc6141ceefc7 100644
--- a/src/plugins/e-acsl/tests/constructs/oracle/gen_typedef.c
+++ b/src/plugins/e-acsl/tests/constructs/oracle/gen_typedef.c
@@ -12,8 +12,8 @@ typedef unsigned char uint8;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
- uint8 x = (unsigned char)0;
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+ uint8 x = (uint8)0;
{
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_uchar(& __gen_e_acsl_assert_data,"x",0,x);
diff --git a/src/plugins/e-acsl/tests/examples/oracle/gen_functions_contiki.c b/src/plugins/e-acsl/tests/examples/oracle/gen_functions_contiki.c
index 3eb7673ca1170c5eba06cc32df1648cbca7c5271..0c529b0a24a4ede16794536a1fce067e84579189 100644
--- a/src/plugins/e-acsl/tests/examples/oracle/gen_functions_contiki.c
+++ b/src/plugins/e-acsl/tests/examples/oracle/gen_functions_contiki.c
@@ -29,16 +29,16 @@ int main(void)
struct list node1;
struct list node2;
struct list node3;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
- __e_acsl_store_block((void *)(& node3),(size_t)16);
- __e_acsl_store_block((void *)(& node2),(size_t)16);
- __e_acsl_store_block((void *)(& node1),(size_t)16);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+ __e_acsl_store_block((void *)(& node3),16UL);
+ __e_acsl_store_block((void *)(& node2),16UL);
+ __e_acsl_store_block((void *)(& node1),16UL);
__e_acsl_initialize((void *)(& node1.next),sizeof(struct list *));
node1.next = & node2;
__e_acsl_initialize((void *)(& node2.next),sizeof(struct list *));
node2.next = & node3;
struct list *l = & node1;
- __e_acsl_store_block((void *)(& l),(size_t)8);
+ __e_acsl_store_block((void *)(& l),8UL);
__e_acsl_full_init((void *)(& l));
/*@ assert length(l) == 3; */ ;
__retres = 0;
diff --git a/src/plugins/e-acsl/tests/examples/oracle/gen_linear_search.c b/src/plugins/e-acsl/tests/examples/oracle/gen_linear_search.c
index dfad48ef0b898528e819ea327ebd631801fe31c8..b437db7b306acaf71702320e513c3f8728a95304 100644
--- a/src/plugins/e-acsl/tests/examples/oracle/gen_linear_search.c
+++ b/src/plugins/e-acsl/tests/examples/oracle/gen_linear_search.c
@@ -196,7 +196,7 @@ int main(void)
{
int __retres;
int found;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
{
int i = 0;
while (i < 10) {
@@ -260,7 +260,7 @@ int __gen_e_acsl_search(int elt)
int __gen_e_acsl_j;
int __gen_e_acsl_forall_2;
int __gen_e_acsl_j_2;
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+ __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__gen_e_acsl_forall = 1;
__gen_e_acsl_i = 0;
@@ -381,7 +381,7 @@ int __gen_e_acsl_search(int elt)
__gen_e_acsl_j ++;
}
e_acsl_end_loop4: ;
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
__gen_e_acsl_exists);
__gen_e_acsl_forall_2 = 1;
__gen_e_acsl_j_2 = 0;
@@ -423,14 +423,14 @@ int __gen_e_acsl_search(int elt)
__gen_e_acsl_j_2 ++;
}
e_acsl_end_loop5: ;
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
__gen_e_acsl_forall_2);
}
__retres = search(elt);
{
int __gen_e_acsl_assumes_value;
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
if (__gen_e_acsl_assumes_value) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_10 =
{.values = (void *)0};
@@ -447,7 +447,7 @@ int __gen_e_acsl_search(int elt)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_10);
}
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
if (__gen_e_acsl_assumes_value) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_11 =
{.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/format/oracle/gen_fprintf.c b/src/plugins/e-acsl/tests/format/oracle/gen_fprintf.c
index be3cdf292261bfa137895346fadf51d49db3c777..14d271ade3d3f4e24b9af3902c96cf8a9e6bd8dc 100644
--- a/src/plugins/e-acsl/tests/format/oracle/gen_fprintf.c
+++ b/src/plugins/e-acsl/tests/format/oracle/gen_fprintf.c
@@ -159,15 +159,15 @@ pid_t __gen_e_acsl_waitpid(pid_t pid, int *stat_loc, int options)
pid_t __retres;
{
int __gen_e_acsl_assumes_value;
- __e_acsl_store_block((void *)(& stat_loc),(size_t)8);
+ __e_acsl_store_block((void *)(& stat_loc),8UL);
__gen_e_acsl_at = stat_loc;
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+ __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
stat_loc == (int *)0);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
stat_loc != (int *)0);
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
if (__gen_e_acsl_assumes_value) {
int __gen_e_acsl_valid;
__e_acsl_assert_data_t __gen_e_acsl_assert_data =
@@ -287,7 +287,7 @@ int __gen_e_acsl_fclose(FILE *stream)
int __retres;
{
int __gen_e_acsl_valid;
- __e_acsl_store_block((void *)(& stream),(size_t)8);
+ __e_acsl_store_block((void *)(& stream),8UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"stream",
(void *)stream);
@@ -343,7 +343,7 @@ int __gen_e_acsl_fclose(FILE *stream)
FILE *__gen_e_acsl_tmpfile(void)
{
FILE *__retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)8);
+ __e_acsl_store_block((void *)(& __retres),8UL);
__retres = tmpfile();
__e_acsl_delete_block((void *)(& __retres));
return __retres;
@@ -516,7 +516,7 @@ int main(int argc, char const **argv)
int __retres;
char template[256];
char buf[5];
- __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+ __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
__e_acsl_globals_init();
char *pstr = (char *)__gen_e_acsl_literal_string_6;
{
@@ -527,7 +527,7 @@ int main(int argc, char const **argv)
}
else {
int process_status;
- __e_acsl_store_block((void *)(& process_status),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status),4UL);
__gen_e_acsl_waitpid(pid,& process_status,0);
signal_eval(process_status,0,__gen_e_acsl_literal_string_8);
__e_acsl_delete_block((void *)(& process_status));
@@ -541,14 +541,14 @@ int main(int argc, char const **argv)
}
else {
int process_status_0;
- __e_acsl_store_block((void *)(& process_status_0),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_0),4UL);
__gen_e_acsl_waitpid(pid_0,& process_status_0,0);
signal_eval(process_status_0,1,__gen_e_acsl_literal_string_9);
__e_acsl_delete_block((void *)(& process_status_0));
}
}
FILE *fh = __gen_e_acsl_tmpfile();
- __e_acsl_store_block((void *)(& fh),(size_t)8);
+ __e_acsl_store_block((void *)(& fh),8UL);
__e_acsl_full_init((void *)(& fh));
if (fh) {
{
@@ -560,7 +560,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_1;
- __e_acsl_store_block((void *)(& process_status_1),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_1),4UL);
__gen_e_acsl_waitpid(pid_1,& process_status_1,0);
signal_eval(process_status_1,0,__gen_e_acsl_literal_string_12);
__e_acsl_delete_block((void *)(& process_status_1));
@@ -576,7 +576,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_2;
- __e_acsl_store_block((void *)(& process_status_2),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_2),4UL);
__gen_e_acsl_waitpid(pid_2,& process_status_2,0);
signal_eval(process_status_2,1,__gen_e_acsl_literal_string_13);
__e_acsl_delete_block((void *)(& process_status_2));
@@ -592,7 +592,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_3;
- __e_acsl_store_block((void *)(& process_status_3),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_3),4UL);
__gen_e_acsl_waitpid(pid_3,& process_status_3,0);
signal_eval(process_status_3,1,__gen_e_acsl_literal_string_14);
__e_acsl_delete_block((void *)(& process_status_3));
@@ -607,7 +607,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_4;
- __e_acsl_store_block((void *)(& process_status_4),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_4),4UL);
__gen_e_acsl_waitpid(pid_4,& process_status_4,0);
signal_eval(process_status_4,0,__gen_e_acsl_literal_string_15);
__e_acsl_delete_block((void *)(& process_status_4));
@@ -621,7 +621,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_5;
- __e_acsl_store_block((void *)(& process_status_5),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_5),4UL);
__gen_e_acsl_waitpid(pid_5,& process_status_5,0);
signal_eval(process_status_5,1,__gen_e_acsl_literal_string_16);
__e_acsl_delete_block((void *)(& process_status_5));
@@ -636,7 +636,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_6;
- __e_acsl_store_block((void *)(& process_status_6),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_6),4UL);
__gen_e_acsl_waitpid(pid_6,& process_status_6,0);
signal_eval(process_status_6,0,__gen_e_acsl_literal_string_19);
__e_acsl_delete_block((void *)(& process_status_6));
@@ -651,7 +651,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_7;
- __e_acsl_store_block((void *)(& process_status_7),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_7),4UL);
__gen_e_acsl_waitpid(pid_7,& process_status_7,0);
signal_eval(process_status_7,0,__gen_e_acsl_literal_string_21);
__e_acsl_delete_block((void *)(& process_status_7));
@@ -666,7 +666,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_8;
- __e_acsl_store_block((void *)(& process_status_8),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_8),4UL);
__gen_e_acsl_waitpid(pid_8,& process_status_8,0);
signal_eval(process_status_8,1,__gen_e_acsl_literal_string_23);
__e_acsl_delete_block((void *)(& process_status_8));
@@ -681,7 +681,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_9;
- __e_acsl_store_block((void *)(& process_status_9),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_9),4UL);
__gen_e_acsl_waitpid(pid_9,& process_status_9,0);
signal_eval(process_status_9,1,__gen_e_acsl_literal_string_24);
__e_acsl_delete_block((void *)(& process_status_9));
@@ -696,7 +696,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_10;
- __e_acsl_store_block((void *)(& process_status_10),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_10),4UL);
__gen_e_acsl_waitpid(pid_10,& process_status_10,0);
signal_eval(process_status_10,1,__gen_e_acsl_literal_string_25);
__e_acsl_delete_block((void *)(& process_status_10));
@@ -705,14 +705,14 @@ int main(int argc, char const **argv)
{
pid_t pid_11 = __gen_e_acsl_fork();
if (! pid_11) {
- __e_acsl_builtin_snprintf("s",buf,(unsigned long)4,
+ __e_acsl_builtin_snprintf("s",buf,(size_t)4,
__gen_e_acsl_literal_string_18,
__gen_e_acsl_literal_string_22);
__gen_e_acsl_exit(0);
}
else {
int process_status_11;
- __e_acsl_store_block((void *)(& process_status_11),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_11),4UL);
__gen_e_acsl_waitpid(pid_11,& process_status_11,0);
signal_eval(process_status_11,0,__gen_e_acsl_literal_string_26);
__e_acsl_delete_block((void *)(& process_status_11));
@@ -721,14 +721,14 @@ int main(int argc, char const **argv)
{
pid_t pid_12 = __gen_e_acsl_fork();
if (! pid_12) {
- __e_acsl_builtin_snprintf("s",buf,(unsigned long)5,
+ __e_acsl_builtin_snprintf("s",buf,(size_t)5,
__gen_e_acsl_literal_string_18,
__gen_e_acsl_literal_string_22);
__gen_e_acsl_exit(0);
}
else {
int process_status_12;
- __e_acsl_store_block((void *)(& process_status_12),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_12),4UL);
__gen_e_acsl_waitpid(pid_12,& process_status_12,0);
signal_eval(process_status_12,0,__gen_e_acsl_literal_string_27);
__e_acsl_delete_block((void *)(& process_status_12));
@@ -737,14 +737,14 @@ int main(int argc, char const **argv)
{
pid_t pid_13 = __gen_e_acsl_fork();
if (! pid_13) {
- __e_acsl_builtin_snprintf("s",pstr,(unsigned long)6,
+ __e_acsl_builtin_snprintf("s",pstr,(size_t)6,
__gen_e_acsl_literal_string_18,
__gen_e_acsl_literal_string_22);
__gen_e_acsl_exit(0);
}
else {
int process_status_13;
- __e_acsl_store_block((void *)(& process_status_13),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_13),4UL);
__gen_e_acsl_waitpid(pid_13,& process_status_13,0);
signal_eval(process_status_13,1,__gen_e_acsl_literal_string_28);
__e_acsl_delete_block((void *)(& process_status_13));
@@ -753,14 +753,14 @@ int main(int argc, char const **argv)
{
pid_t pid_14 = __gen_e_acsl_fork();
if (! pid_14) {
- __e_acsl_builtin_snprintf("s",buf,(unsigned long)6,
+ __e_acsl_builtin_snprintf("s",buf,(size_t)6,
__gen_e_acsl_literal_string_18,
__gen_e_acsl_literal_string_22);
__gen_e_acsl_exit(0);
}
else {
int process_status_14;
- __e_acsl_store_block((void *)(& process_status_14),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_14),4UL);
__gen_e_acsl_waitpid(pid_14,& process_status_14,0);
signal_eval(process_status_14,1,__gen_e_acsl_literal_string_29);
__e_acsl_delete_block((void *)(& process_status_14));
@@ -769,14 +769,14 @@ int main(int argc, char const **argv)
{
pid_t pid_15 = __gen_e_acsl_fork();
if (! pid_15) {
- __e_acsl_builtin_snprintf("s",(char *)0,(unsigned long)6,
+ __e_acsl_builtin_snprintf("s",(char *)0,(size_t)6,
__gen_e_acsl_literal_string_18,
__gen_e_acsl_literal_string_22);
__gen_e_acsl_exit(0);
}
else {
int process_status_15;
- __e_acsl_store_block((void *)(& process_status_15),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_15),4UL);
__gen_e_acsl_waitpid(pid_15,& process_status_15,0);
signal_eval(process_status_15,1,__gen_e_acsl_literal_string_30);
__e_acsl_delete_block((void *)(& process_status_15));
@@ -785,14 +785,14 @@ int main(int argc, char const **argv)
{
pid_t pid_16 = __gen_e_acsl_fork();
if (! pid_16) {
- __e_acsl_builtin_snprintf("s",(char *)0,(unsigned long)0,
+ __e_acsl_builtin_snprintf("s",(char *)0,(size_t)0,
__gen_e_acsl_literal_string_18,
__gen_e_acsl_literal_string_22);
__gen_e_acsl_exit(0);
}
else {
int process_status_16;
- __e_acsl_store_block((void *)(& process_status_16),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_16),4UL);
__gen_e_acsl_waitpid(pid_16,& process_status_16,0);
signal_eval(process_status_16,0,__gen_e_acsl_literal_string_31);
__e_acsl_delete_block((void *)(& process_status_16));
diff --git a/src/plugins/e-acsl/tests/format/oracle/gen_printf.c b/src/plugins/e-acsl/tests/format/oracle/gen_printf.c
index 621b839cc087df9f6b2d83cb77234df78b6c18f6..5cc47f47128dfed9ed20d3092b3792a31ec2d031 100644
--- a/src/plugins/e-acsl/tests/format/oracle/gen_printf.c
+++ b/src/plugins/e-acsl/tests/format/oracle/gen_printf.c
@@ -566,8 +566,8 @@ void apply_specifier(char *format, int spec)
{
int n;
char *tmp_1;
- __e_acsl_store_block((void *)(& tmp_1),(size_t)8);
- __e_acsl_store_block((void *)(& format),(size_t)8);
+ __e_acsl_store_block((void *)(& tmp_1),8UL);
+ __e_acsl_store_block((void *)(& format),8UL);
void *p = (void *)0;
__e_acsl_full_init((void *)(& tmp_1));
tmp_1 = __gen_e_acsl_strchr(__gen_e_acsl_literal_string_6,spec);
@@ -575,14 +575,14 @@ void apply_specifier(char *format, int spec)
1.0);
else {
char *tmp_0;
- __e_acsl_store_block((void *)(& tmp_0),(size_t)8);
+ __e_acsl_store_block((void *)(& tmp_0),8UL);
__e_acsl_full_init((void *)(& tmp_0));
tmp_0 = __gen_e_acsl_strchr(__gen_e_acsl_literal_string_7,spec);
if (tmp_0 != (char *)0) __e_acsl_builtin_printf("D",(char const *)format,
1U);
else {
char *tmp;
- __e_acsl_store_block((void *)(& tmp),(size_t)8);
+ __e_acsl_store_block((void *)(& tmp),8UL);
__e_acsl_full_init((void *)(& tmp));
tmp = __gen_e_acsl_strchr(__gen_e_acsl_literal_string_8,spec);
if (tmp != (char *)0) __e_acsl_builtin_printf("d",(char const *)format,
@@ -612,8 +612,8 @@ void test_specifier_application(char const *allowed, char const *fmt,
size_t tmp;
unsigned long __lengthof_format;
int i;
- __e_acsl_store_block((void *)(& fmt),(size_t)8);
- __e_acsl_store_block((void *)(& allowed),(size_t)8);
+ __e_acsl_store_block((void *)(& fmt),8UL);
+ __e_acsl_store_block((void *)(& allowed),8UL);
tmp = __gen_e_acsl_strlen(fmt);
int len = (int)tmp;
{
@@ -656,7 +656,7 @@ void test_specifier_application(char const *allowed, char const *fmt,
__lengthof_format = (unsigned long)(len + 1);
char *format = __builtin_alloca(sizeof(char) * __lengthof_format);
__e_acsl_store_block((void *)format,sizeof(char) * __lengthof_format);
- __e_acsl_store_block((void *)(& format),(size_t)8);
+ __e_acsl_store_block((void *)(& format),8UL);
__e_acsl_full_init((void *)(& format));
__gen_e_acsl_strcpy(format,fmt);
{
@@ -668,7 +668,7 @@ void test_specifier_application(char const *allowed, char const *fmt,
if (! ((size_t)i_0 < tmp_3)) break;
{
char *tmp_2;
- __e_acsl_store_block((void *)(& tmp_2),(size_t)8);
+ __e_acsl_store_block((void *)(& tmp_2),8UL);
int c = (int)*(valid_specifiers + i_0);
__e_acsl_initialize((void *)(format + (len - 1)),sizeof(char));
*(format + (len - 1)) = (char)c;
@@ -684,7 +684,7 @@ void test_specifier_application(char const *allowed, char const *fmt,
}
else {
int process_status;
- __e_acsl_store_block((void *)(& process_status),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status),4UL);
__gen_e_acsl_waitpid(pid,& process_status,0);
signal_eval(process_status,0,(char const *)at);
__e_acsl_delete_block((void *)(& process_status));
@@ -701,7 +701,7 @@ void test_specifier_application(char const *allowed, char const *fmt,
}
else {
int process_status_0;
- __e_acsl_store_block((void *)(& process_status_0),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_0),4UL);
__gen_e_acsl_waitpid(pid_0,& process_status_0,0);
signal_eval(process_status_0,1,(char const *)at);
__e_acsl_delete_block((void *)(& process_status_0));
@@ -738,8 +738,8 @@ char *__gen_e_acsl_strcpy(char * restrict dest, char const * restrict src)
unsigned long __gen_e_acsl_strcpy_src_size;
char *__gen_e_acsl_at;
char *__retres;
- __e_acsl_store_block((void *)(& src),(size_t)8);
- __e_acsl_store_block((void *)(& dest),(size_t)8);
+ __e_acsl_store_block((void *)(& src),8UL);
+ __e_acsl_store_block((void *)(& dest),8UL);
__gen_e_acsl_at = dest;
__gen_e_acsl_strcpy_src_size = __e_acsl_builtin_strlen(src);
__retres = strcpy(dest,src);
@@ -834,17 +834,17 @@ char *__gen_e_acsl_strchr(char const *s, int c)
int __gen_e_acsl_at_2;
char const *__gen_e_acsl_at;
char *__retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)8);
- __e_acsl_store_block((void *)(& s),(size_t)8);
+ __e_acsl_store_block((void *)(& __retres),8UL);
+ __e_acsl_store_block((void *)(& s),8UL);
__gen_e_acsl_at = s;
__gen_e_acsl_at_2 = c;
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)3);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)2,1);
+ __gen_e_acsl_contract = __e_acsl_contract_init(3UL);
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,2UL,1);
__retres = strchr(s,c);
{
int __gen_e_acsl_assumes_value;
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
if (__gen_e_acsl_assumes_value) {
int __gen_e_acsl_initialized;
int __gen_e_acsl_and;
@@ -918,7 +918,7 @@ char *__gen_e_acsl_strchr(char const *s, int c)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_2);
}
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
if (__gen_e_acsl_assumes_value) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_8 =
{.values = (void *)0};
@@ -935,7 +935,7 @@ char *__gen_e_acsl_strchr(char const *s, int c)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_8);
}
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)2);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,2UL);
if (__gen_e_acsl_assumes_value) {
int __gen_e_acsl_or;
__e_acsl_assert_data_t __gen_e_acsl_assert_data_9 =
@@ -981,7 +981,7 @@ char *__gen_e_acsl_strchr(char const *s, int c)
size_t __gen_e_acsl_strlen(char const *s)
{
size_t __retres;
- __e_acsl_store_block((void *)(& s),(size_t)8);
+ __e_acsl_store_block((void *)(& s),8UL);
__retres = strlen(s);
__e_acsl_delete_block((void *)(& s));
return __retres;
@@ -1052,15 +1052,15 @@ pid_t __gen_e_acsl_waitpid(pid_t pid, int *stat_loc, int options)
pid_t __retres;
{
int __gen_e_acsl_assumes_value;
- __e_acsl_store_block((void *)(& stat_loc),(size_t)8);
+ __e_acsl_store_block((void *)(& stat_loc),8UL);
__gen_e_acsl_at = stat_loc;
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+ __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
stat_loc == (int *)0);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
stat_loc != (int *)0);
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
if (__gen_e_acsl_assumes_value) {
int __gen_e_acsl_valid;
__e_acsl_assert_data_t __gen_e_acsl_assert_data =
@@ -3470,11 +3470,11 @@ void __e_acsl_globals_init(void)
sizeof("% n"));
__e_acsl_full_init((void *)__gen_e_acsl_literal_string_441);
__e_acsl_mark_readonly((void *)__gen_e_acsl_literal_string_441);
- __e_acsl_store_block((void *)(& valid_specifiers),(size_t)8);
+ __e_acsl_store_block((void *)(& valid_specifiers),8UL);
__e_acsl_full_init((void *)(& valid_specifiers));
- __e_acsl_store_block((void *)(& __fc_p_time_tm),(size_t)8);
+ __e_acsl_store_block((void *)(& __fc_p_time_tm),8UL);
__e_acsl_full_init((void *)(& __fc_p_time_tm));
- __e_acsl_store_block((void *)(& __fc_time_tm),(size_t)36);
+ __e_acsl_store_block((void *)(& __fc_time_tm),36UL);
__e_acsl_full_init((void *)(& __fc_time_tm));
}
return;
@@ -3492,7 +3492,7 @@ int main(int argc, char const **argv)
{
int __retres;
char *s2;
- __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+ __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
__e_acsl_globals_init();
char *pstr = (char *)__gen_e_acsl_literal_string_10;
char astr[13] =
@@ -3511,7 +3511,7 @@ int main(int argc, char const **argv)
(char)'\000'};
signed char *sastr = (signed char *)(astr);
void *vptr = (void *)(& argc);
- __e_acsl_store_block((void *)(& vptr),(size_t)8);
+ __e_acsl_store_block((void *)(& vptr),8UL);
__e_acsl_full_init((void *)(& vptr));
char chr = (char)'T';
unsigned char uchr = (unsigned char)'U';
@@ -3519,7 +3519,7 @@ int main(int argc, char const **argv)
unsigned short ushrt = (unsigned short)4567;
int i = 268;
unsigned int ui = (unsigned int)516;
- wint_t wi = (unsigned int)123;
+ wint_t wi = (wint_t)123;
long li = (long)3134;
unsigned long lu = (unsigned long)7845216;
long long lli = 123LL;
@@ -3527,10 +3527,10 @@ int main(int argc, char const **argv)
float flt = (float)0.2;
double dbl = 0.3;
long double ldbl = (long double)0.3;
- intmax_t imax = (long long)10;
- uintmax_t uimax = (unsigned long long)10;
- size_t szt = (unsigned long)10;
- ptrdiff_t ptrdf = (long)147;
+ intmax_t imax = (intmax_t)10;
+ uintmax_t uimax = (uintmax_t)10;
+ size_t szt = (size_t)10;
+ ptrdiff_t ptrdf = (ptrdiff_t)147;
{
pid_t pid = __gen_e_acsl_fork();
if (! pid) {
@@ -3539,7 +3539,7 @@ int main(int argc, char const **argv)
}
else {
int process_status;
- __e_acsl_store_block((void *)(& process_status),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status),4UL);
__gen_e_acsl_waitpid(pid,& process_status,0);
signal_eval(process_status,0,__gen_e_acsl_literal_string_12);
__e_acsl_delete_block((void *)(& process_status));
@@ -3554,7 +3554,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_0;
- __e_acsl_store_block((void *)(& process_status_0),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_0),4UL);
__gen_e_acsl_waitpid(pid_0,& process_status_0,0);
signal_eval(process_status_0,0,__gen_e_acsl_literal_string_14);
__e_acsl_delete_block((void *)(& process_status_0));
@@ -3569,7 +3569,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_1;
- __e_acsl_store_block((void *)(& process_status_1),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_1),4UL);
__gen_e_acsl_waitpid(pid_1,& process_status_1,0);
signal_eval(process_status_1,1,__gen_e_acsl_literal_string_16);
__e_acsl_delete_block((void *)(& process_status_1));
@@ -3584,7 +3584,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_2;
- __e_acsl_store_block((void *)(& process_status_2),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_2),4UL);
__gen_e_acsl_waitpid(pid_2,& process_status_2,0);
signal_eval(process_status_2,0,__gen_e_acsl_literal_string_18);
__e_acsl_delete_block((void *)(& process_status_2));
@@ -3607,7 +3607,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_3;
- __e_acsl_store_block((void *)(& process_status_3),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_3),4UL);
__gen_e_acsl_waitpid(pid_3,& process_status_3,0);
signal_eval(process_status_3,1,__gen_e_acsl_literal_string_19);
__e_acsl_delete_block((void *)(& process_status_3));
@@ -3621,7 +3621,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_4;
- __e_acsl_store_block((void *)(& process_status_4),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_4),4UL);
__gen_e_acsl_waitpid(pid_4,& process_status_4,0);
signal_eval(process_status_4,0,__gen_e_acsl_literal_string_21);
__e_acsl_delete_block((void *)(& process_status_4));
@@ -3635,7 +3635,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_5;
- __e_acsl_store_block((void *)(& process_status_5),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_5),4UL);
__gen_e_acsl_waitpid(pid_5,& process_status_5,0);
signal_eval(process_status_5,1,__gen_e_acsl_literal_string_23);
__e_acsl_delete_block((void *)(& process_status_5));
@@ -3649,7 +3649,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_6;
- __e_acsl_store_block((void *)(& process_status_6),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_6),4UL);
__gen_e_acsl_waitpid(pid_6,& process_status_6,0);
signal_eval(process_status_6,1,__gen_e_acsl_literal_string_25);
__e_acsl_delete_block((void *)(& process_status_6));
@@ -3663,7 +3663,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_7;
- __e_acsl_store_block((void *)(& process_status_7),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_7),4UL);
__gen_e_acsl_waitpid(pid_7,& process_status_7,0);
signal_eval(process_status_7,1,__gen_e_acsl_literal_string_27);
__e_acsl_delete_block((void *)(& process_status_7));
@@ -3677,7 +3677,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_8;
- __e_acsl_store_block((void *)(& process_status_8),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_8),4UL);
__gen_e_acsl_waitpid(pid_8,& process_status_8,0);
signal_eval(process_status_8,0,__gen_e_acsl_literal_string_29);
__e_acsl_delete_block((void *)(& process_status_8));
@@ -3700,7 +3700,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_9;
- __e_acsl_store_block((void *)(& process_status_9),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_9),4UL);
__gen_e_acsl_waitpid(pid_9,& process_status_9,0);
signal_eval(process_status_9,0,__gen_e_acsl_literal_string_40);
__e_acsl_delete_block((void *)(& process_status_9));
@@ -3714,7 +3714,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_10;
- __e_acsl_store_block((void *)(& process_status_10),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_10),4UL);
__gen_e_acsl_waitpid(pid_10,& process_status_10,0);
signal_eval(process_status_10,0,__gen_e_acsl_literal_string_42);
__e_acsl_delete_block((void *)(& process_status_10));
@@ -3728,7 +3728,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_11;
- __e_acsl_store_block((void *)(& process_status_11),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_11),4UL);
__gen_e_acsl_waitpid(pid_11,& process_status_11,0);
signal_eval(process_status_11,1,__gen_e_acsl_literal_string_44);
__e_acsl_delete_block((void *)(& process_status_11));
@@ -3745,7 +3745,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_12;
- __e_acsl_store_block((void *)(& process_status_12),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_12),4UL);
__gen_e_acsl_waitpid(pid_12,& process_status_12,0);
signal_eval(process_status_12,0,__gen_e_acsl_literal_string_49);
__e_acsl_delete_block((void *)(& process_status_12));
@@ -3759,7 +3759,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_13;
- __e_acsl_store_block((void *)(& process_status_13),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_13),4UL);
__gen_e_acsl_waitpid(pid_13,& process_status_13,0);
signal_eval(process_status_13,0,__gen_e_acsl_literal_string_51);
__e_acsl_delete_block((void *)(& process_status_13));
@@ -3773,7 +3773,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_14;
- __e_acsl_store_block((void *)(& process_status_14),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_14),4UL);
__gen_e_acsl_waitpid(pid_14,& process_status_14,0);
signal_eval(process_status_14,0,__gen_e_acsl_literal_string_53);
__e_acsl_delete_block((void *)(& process_status_14));
@@ -3787,7 +3787,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_15;
- __e_acsl_store_block((void *)(& process_status_15),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_15),4UL);
__gen_e_acsl_waitpid(pid_15,& process_status_15,0);
signal_eval(process_status_15,0,__gen_e_acsl_literal_string_55);
__e_acsl_delete_block((void *)(& process_status_15));
@@ -3801,7 +3801,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_16;
- __e_acsl_store_block((void *)(& process_status_16),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_16),4UL);
__gen_e_acsl_waitpid(pid_16,& process_status_16,0);
signal_eval(process_status_16,0,__gen_e_acsl_literal_string_57);
__e_acsl_delete_block((void *)(& process_status_16));
@@ -3815,7 +3815,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_17;
- __e_acsl_store_block((void *)(& process_status_17),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_17),4UL);
__gen_e_acsl_waitpid(pid_17,& process_status_17,0);
signal_eval(process_status_17,0,__gen_e_acsl_literal_string_58);
__e_acsl_delete_block((void *)(& process_status_17));
@@ -3829,7 +3829,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_18;
- __e_acsl_store_block((void *)(& process_status_18),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_18),4UL);
__gen_e_acsl_waitpid(pid_18,& process_status_18,0);
signal_eval(process_status_18,0,__gen_e_acsl_literal_string_60);
__e_acsl_delete_block((void *)(& process_status_18));
@@ -3846,7 +3846,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_19;
- __e_acsl_store_block((void *)(& process_status_19),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_19),4UL);
__gen_e_acsl_waitpid(pid_19,& process_status_19,0);
signal_eval(process_status_19,0,__gen_e_acsl_literal_string_64);
__e_acsl_delete_block((void *)(& process_status_19));
@@ -3860,7 +3860,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_20;
- __e_acsl_store_block((void *)(& process_status_20),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_20),4UL);
__gen_e_acsl_waitpid(pid_20,& process_status_20,0);
signal_eval(process_status_20,0,__gen_e_acsl_literal_string_66);
__e_acsl_delete_block((void *)(& process_status_20));
@@ -3874,7 +3874,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_21;
- __e_acsl_store_block((void *)(& process_status_21),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_21),4UL);
__gen_e_acsl_waitpid(pid_21,& process_status_21,0);
signal_eval(process_status_21,0,__gen_e_acsl_literal_string_68);
__e_acsl_delete_block((void *)(& process_status_21));
@@ -3888,7 +3888,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_22;
- __e_acsl_store_block((void *)(& process_status_22),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_22),4UL);
__gen_e_acsl_waitpid(pid_22,& process_status_22,0);
signal_eval(process_status_22,0,__gen_e_acsl_literal_string_70);
__e_acsl_delete_block((void *)(& process_status_22));
@@ -3902,7 +3902,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_23;
- __e_acsl_store_block((void *)(& process_status_23),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_23),4UL);
__gen_e_acsl_waitpid(pid_23,& process_status_23,0);
signal_eval(process_status_23,0,__gen_e_acsl_literal_string_72);
__e_acsl_delete_block((void *)(& process_status_23));
@@ -3916,7 +3916,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_24;
- __e_acsl_store_block((void *)(& process_status_24),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_24),4UL);
__gen_e_acsl_waitpid(pid_24,& process_status_24,0);
signal_eval(process_status_24,0,__gen_e_acsl_literal_string_73);
__e_acsl_delete_block((void *)(& process_status_24));
@@ -3930,7 +3930,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_25;
- __e_acsl_store_block((void *)(& process_status_25),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_25),4UL);
__gen_e_acsl_waitpid(pid_25,& process_status_25,0);
signal_eval(process_status_25,0,__gen_e_acsl_literal_string_75);
__e_acsl_delete_block((void *)(& process_status_25));
@@ -3947,7 +3947,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_26;
- __e_acsl_store_block((void *)(& process_status_26),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_26),4UL);
__gen_e_acsl_waitpid(pid_26,& process_status_26,0);
signal_eval(process_status_26,0,__gen_e_acsl_literal_string_80);
__e_acsl_delete_block((void *)(& process_status_26));
@@ -3961,7 +3961,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_27;
- __e_acsl_store_block((void *)(& process_status_27),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_27),4UL);
__gen_e_acsl_waitpid(pid_27,& process_status_27,0);
signal_eval(process_status_27,0,__gen_e_acsl_literal_string_82);
__e_acsl_delete_block((void *)(& process_status_27));
@@ -3975,7 +3975,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_28;
- __e_acsl_store_block((void *)(& process_status_28),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_28),4UL);
__gen_e_acsl_waitpid(pid_28,& process_status_28,0);
signal_eval(process_status_28,0,__gen_e_acsl_literal_string_84);
__e_acsl_delete_block((void *)(& process_status_28));
@@ -3989,7 +3989,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_29;
- __e_acsl_store_block((void *)(& process_status_29),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_29),4UL);
__gen_e_acsl_waitpid(pid_29,& process_status_29,0);
signal_eval(process_status_29,0,__gen_e_acsl_literal_string_86);
__e_acsl_delete_block((void *)(& process_status_29));
@@ -4003,7 +4003,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_30;
- __e_acsl_store_block((void *)(& process_status_30),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_30),4UL);
__gen_e_acsl_waitpid(pid_30,& process_status_30,0);
signal_eval(process_status_30,0,__gen_e_acsl_literal_string_88);
__e_acsl_delete_block((void *)(& process_status_30));
@@ -4017,7 +4017,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_31;
- __e_acsl_store_block((void *)(& process_status_31),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_31),4UL);
__gen_e_acsl_waitpid(pid_31,& process_status_31,0);
signal_eval(process_status_31,0,__gen_e_acsl_literal_string_89);
__e_acsl_delete_block((void *)(& process_status_31));
@@ -4031,7 +4031,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_32;
- __e_acsl_store_block((void *)(& process_status_32),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_32),4UL);
__gen_e_acsl_waitpid(pid_32,& process_status_32,0);
signal_eval(process_status_32,0,__gen_e_acsl_literal_string_91);
__e_acsl_delete_block((void *)(& process_status_32));
@@ -4045,7 +4045,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_33;
- __e_acsl_store_block((void *)(& process_status_33),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_33),4UL);
__gen_e_acsl_waitpid(pid_33,& process_status_33,0);
signal_eval(process_status_33,0,__gen_e_acsl_literal_string_93);
__e_acsl_delete_block((void *)(& process_status_33));
@@ -4059,7 +4059,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_34;
- __e_acsl_store_block((void *)(& process_status_34),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_34),4UL);
__gen_e_acsl_waitpid(pid_34,& process_status_34,0);
signal_eval(process_status_34,0,__gen_e_acsl_literal_string_95);
__e_acsl_delete_block((void *)(& process_status_34));
@@ -4073,7 +4073,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_35;
- __e_acsl_store_block((void *)(& process_status_35),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_35),4UL);
__gen_e_acsl_waitpid(pid_35,& process_status_35,0);
signal_eval(process_status_35,0,__gen_e_acsl_literal_string_97);
__e_acsl_delete_block((void *)(& process_status_35));
@@ -4087,7 +4087,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_36;
- __e_acsl_store_block((void *)(& process_status_36),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_36),4UL);
__gen_e_acsl_waitpid(pid_36,& process_status_36,0);
signal_eval(process_status_36,0,__gen_e_acsl_literal_string_99);
__e_acsl_delete_block((void *)(& process_status_36));
@@ -4101,7 +4101,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_37;
- __e_acsl_store_block((void *)(& process_status_37),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_37),4UL);
__gen_e_acsl_waitpid(pid_37,& process_status_37,0);
signal_eval(process_status_37,0,__gen_e_acsl_literal_string_101);
__e_acsl_delete_block((void *)(& process_status_37));
@@ -4115,7 +4115,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_38;
- __e_acsl_store_block((void *)(& process_status_38),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_38),4UL);
__gen_e_acsl_waitpid(pid_38,& process_status_38,0);
signal_eval(process_status_38,0,__gen_e_acsl_literal_string_103);
__e_acsl_delete_block((void *)(& process_status_38));
@@ -4129,7 +4129,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_39;
- __e_acsl_store_block((void *)(& process_status_39),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_39),4UL);
__gen_e_acsl_waitpid(pid_39,& process_status_39,0);
signal_eval(process_status_39,0,__gen_e_acsl_literal_string_105);
__e_acsl_delete_block((void *)(& process_status_39));
@@ -4143,7 +4143,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_40;
- __e_acsl_store_block((void *)(& process_status_40),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_40),4UL);
__gen_e_acsl_waitpid(pid_40,& process_status_40,0);
signal_eval(process_status_40,0,__gen_e_acsl_literal_string_107);
__e_acsl_delete_block((void *)(& process_status_40));
@@ -4157,7 +4157,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_41;
- __e_acsl_store_block((void *)(& process_status_41),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_41),4UL);
__gen_e_acsl_waitpid(pid_41,& process_status_41,0);
signal_eval(process_status_41,0,__gen_e_acsl_literal_string_109);
__e_acsl_delete_block((void *)(& process_status_41));
@@ -4171,7 +4171,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_42;
- __e_acsl_store_block((void *)(& process_status_42),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_42),4UL);
__gen_e_acsl_waitpid(pid_42,& process_status_42,0);
signal_eval(process_status_42,0,__gen_e_acsl_literal_string_111);
__e_acsl_delete_block((void *)(& process_status_42));
@@ -4185,7 +4185,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_43;
- __e_acsl_store_block((void *)(& process_status_43),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_43),4UL);
__gen_e_acsl_waitpid(pid_43,& process_status_43,0);
signal_eval(process_status_43,0,__gen_e_acsl_literal_string_113);
__e_acsl_delete_block((void *)(& process_status_43));
@@ -4199,7 +4199,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_44;
- __e_acsl_store_block((void *)(& process_status_44),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_44),4UL);
__gen_e_acsl_waitpid(pid_44,& process_status_44,0);
signal_eval(process_status_44,0,__gen_e_acsl_literal_string_115);
__e_acsl_delete_block((void *)(& process_status_44));
@@ -4213,7 +4213,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_45;
- __e_acsl_store_block((void *)(& process_status_45),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_45),4UL);
__gen_e_acsl_waitpid(pid_45,& process_status_45,0);
signal_eval(process_status_45,0,__gen_e_acsl_literal_string_117);
__e_acsl_delete_block((void *)(& process_status_45));
@@ -4227,7 +4227,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_46;
- __e_acsl_store_block((void *)(& process_status_46),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_46),4UL);
__gen_e_acsl_waitpid(pid_46,& process_status_46,0);
signal_eval(process_status_46,0,__gen_e_acsl_literal_string_119);
__e_acsl_delete_block((void *)(& process_status_46));
@@ -4241,7 +4241,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_47;
- __e_acsl_store_block((void *)(& process_status_47),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_47),4UL);
__gen_e_acsl_waitpid(pid_47,& process_status_47,0);
signal_eval(process_status_47,0,__gen_e_acsl_literal_string_121);
__e_acsl_delete_block((void *)(& process_status_47));
@@ -4255,7 +4255,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_48;
- __e_acsl_store_block((void *)(& process_status_48),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_48),4UL);
__gen_e_acsl_waitpid(pid_48,& process_status_48,0);
signal_eval(process_status_48,0,__gen_e_acsl_literal_string_123);
__e_acsl_delete_block((void *)(& process_status_48));
@@ -4272,7 +4272,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_49;
- __e_acsl_store_block((void *)(& process_status_49),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_49),4UL);
__gen_e_acsl_waitpid(pid_49,& process_status_49,0);
signal_eval(process_status_49,0,__gen_e_acsl_literal_string_127);
__e_acsl_delete_block((void *)(& process_status_49));
@@ -4286,7 +4286,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_50;
- __e_acsl_store_block((void *)(& process_status_50),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_50),4UL);
__gen_e_acsl_waitpid(pid_50,& process_status_50,0);
signal_eval(process_status_50,0,__gen_e_acsl_literal_string_129);
__e_acsl_delete_block((void *)(& process_status_50));
@@ -4300,7 +4300,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_51;
- __e_acsl_store_block((void *)(& process_status_51),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_51),4UL);
__gen_e_acsl_waitpid(pid_51,& process_status_51,0);
signal_eval(process_status_51,0,__gen_e_acsl_literal_string_131);
__e_acsl_delete_block((void *)(& process_status_51));
@@ -4314,7 +4314,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_52;
- __e_acsl_store_block((void *)(& process_status_52),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_52),4UL);
__gen_e_acsl_waitpid(pid_52,& process_status_52,0);
signal_eval(process_status_52,0,__gen_e_acsl_literal_string_133);
__e_acsl_delete_block((void *)(& process_status_52));
@@ -4328,7 +4328,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_53;
- __e_acsl_store_block((void *)(& process_status_53),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_53),4UL);
__gen_e_acsl_waitpid(pid_53,& process_status_53,0);
signal_eval(process_status_53,0,__gen_e_acsl_literal_string_135);
__e_acsl_delete_block((void *)(& process_status_53));
@@ -4342,7 +4342,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_54;
- __e_acsl_store_block((void *)(& process_status_54),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_54),4UL);
__gen_e_acsl_waitpid(pid_54,& process_status_54,0);
signal_eval(process_status_54,0,__gen_e_acsl_literal_string_136);
__e_acsl_delete_block((void *)(& process_status_54));
@@ -4356,7 +4356,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_55;
- __e_acsl_store_block((void *)(& process_status_55),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_55),4UL);
__gen_e_acsl_waitpid(pid_55,& process_status_55,0);
signal_eval(process_status_55,0,__gen_e_acsl_literal_string_138);
__e_acsl_delete_block((void *)(& process_status_55));
@@ -4373,7 +4373,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_56;
- __e_acsl_store_block((void *)(& process_status_56),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_56),4UL);
__gen_e_acsl_waitpid(pid_56,& process_status_56,0);
signal_eval(process_status_56,0,__gen_e_acsl_literal_string_142);
__e_acsl_delete_block((void *)(& process_status_56));
@@ -4387,7 +4387,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_57;
- __e_acsl_store_block((void *)(& process_status_57),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_57),4UL);
__gen_e_acsl_waitpid(pid_57,& process_status_57,0);
signal_eval(process_status_57,0,__gen_e_acsl_literal_string_144);
__e_acsl_delete_block((void *)(& process_status_57));
@@ -4401,7 +4401,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_58;
- __e_acsl_store_block((void *)(& process_status_58),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_58),4UL);
__gen_e_acsl_waitpid(pid_58,& process_status_58,0);
signal_eval(process_status_58,0,__gen_e_acsl_literal_string_146);
__e_acsl_delete_block((void *)(& process_status_58));
@@ -4415,7 +4415,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_59;
- __e_acsl_store_block((void *)(& process_status_59),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_59),4UL);
__gen_e_acsl_waitpid(pid_59,& process_status_59,0);
signal_eval(process_status_59,0,__gen_e_acsl_literal_string_148);
__e_acsl_delete_block((void *)(& process_status_59));
@@ -4429,7 +4429,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_60;
- __e_acsl_store_block((void *)(& process_status_60),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_60),4UL);
__gen_e_acsl_waitpid(pid_60,& process_status_60,0);
signal_eval(process_status_60,0,__gen_e_acsl_literal_string_150);
__e_acsl_delete_block((void *)(& process_status_60));
@@ -4443,7 +4443,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_61;
- __e_acsl_store_block((void *)(& process_status_61),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_61),4UL);
__gen_e_acsl_waitpid(pid_61,& process_status_61,0);
signal_eval(process_status_61,0,__gen_e_acsl_literal_string_151);
__e_acsl_delete_block((void *)(& process_status_61));
@@ -4457,7 +4457,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_62;
- __e_acsl_store_block((void *)(& process_status_62),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_62),4UL);
__gen_e_acsl_waitpid(pid_62,& process_status_62,0);
signal_eval(process_status_62,0,__gen_e_acsl_literal_string_153);
__e_acsl_delete_block((void *)(& process_status_62));
@@ -4474,7 +4474,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_63;
- __e_acsl_store_block((void *)(& process_status_63),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_63),4UL);
__gen_e_acsl_waitpid(pid_63,& process_status_63,0);
signal_eval(process_status_63,0,__gen_e_acsl_literal_string_157);
__e_acsl_delete_block((void *)(& process_status_63));
@@ -4488,7 +4488,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_64;
- __e_acsl_store_block((void *)(& process_status_64),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_64),4UL);
__gen_e_acsl_waitpid(pid_64,& process_status_64,0);
signal_eval(process_status_64,0,__gen_e_acsl_literal_string_159);
__e_acsl_delete_block((void *)(& process_status_64));
@@ -4502,7 +4502,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_65;
- __e_acsl_store_block((void *)(& process_status_65),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_65),4UL);
__gen_e_acsl_waitpid(pid_65,& process_status_65,0);
signal_eval(process_status_65,0,__gen_e_acsl_literal_string_161);
__e_acsl_delete_block((void *)(& process_status_65));
@@ -4516,7 +4516,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_66;
- __e_acsl_store_block((void *)(& process_status_66),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_66),4UL);
__gen_e_acsl_waitpid(pid_66,& process_status_66,0);
signal_eval(process_status_66,0,__gen_e_acsl_literal_string_162);
__e_acsl_delete_block((void *)(& process_status_66));
@@ -4530,7 +4530,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_67;
- __e_acsl_store_block((void *)(& process_status_67),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_67),4UL);
__gen_e_acsl_waitpid(pid_67,& process_status_67,0);
signal_eval(process_status_67,0,__gen_e_acsl_literal_string_164);
__e_acsl_delete_block((void *)(& process_status_67));
@@ -4544,7 +4544,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_68;
- __e_acsl_store_block((void *)(& process_status_68),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_68),4UL);
__gen_e_acsl_waitpid(pid_68,& process_status_68,0);
signal_eval(process_status_68,0,__gen_e_acsl_literal_string_166);
__e_acsl_delete_block((void *)(& process_status_68));
@@ -4558,7 +4558,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_69;
- __e_acsl_store_block((void *)(& process_status_69),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_69),4UL);
__gen_e_acsl_waitpid(pid_69,& process_status_69,0);
signal_eval(process_status_69,0,__gen_e_acsl_literal_string_168);
__e_acsl_delete_block((void *)(& process_status_69));
@@ -4575,7 +4575,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_70;
- __e_acsl_store_block((void *)(& process_status_70),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_70),4UL);
__gen_e_acsl_waitpid(pid_70,& process_status_70,0);
signal_eval(process_status_70,0,__gen_e_acsl_literal_string_173);
__e_acsl_delete_block((void *)(& process_status_70));
@@ -4589,7 +4589,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_71;
- __e_acsl_store_block((void *)(& process_status_71),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_71),4UL);
__gen_e_acsl_waitpid(pid_71,& process_status_71,0);
signal_eval(process_status_71,0,__gen_e_acsl_literal_string_175);
__e_acsl_delete_block((void *)(& process_status_71));
@@ -4603,7 +4603,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_72;
- __e_acsl_store_block((void *)(& process_status_72),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_72),4UL);
__gen_e_acsl_waitpid(pid_72,& process_status_72,0);
signal_eval(process_status_72,0,__gen_e_acsl_literal_string_177);
__e_acsl_delete_block((void *)(& process_status_72));
@@ -4617,7 +4617,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_73;
- __e_acsl_store_block((void *)(& process_status_73),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_73),4UL);
__gen_e_acsl_waitpid(pid_73,& process_status_73,0);
signal_eval(process_status_73,0,__gen_e_acsl_literal_string_179);
__e_acsl_delete_block((void *)(& process_status_73));
@@ -4631,7 +4631,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_74;
- __e_acsl_store_block((void *)(& process_status_74),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_74),4UL);
__gen_e_acsl_waitpid(pid_74,& process_status_74,0);
signal_eval(process_status_74,0,__gen_e_acsl_literal_string_181);
__e_acsl_delete_block((void *)(& process_status_74));
@@ -4645,7 +4645,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_75;
- __e_acsl_store_block((void *)(& process_status_75),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_75),4UL);
__gen_e_acsl_waitpid(pid_75,& process_status_75,0);
signal_eval(process_status_75,0,__gen_e_acsl_literal_string_183);
__e_acsl_delete_block((void *)(& process_status_75));
@@ -4659,7 +4659,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_76;
- __e_acsl_store_block((void *)(& process_status_76),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_76),4UL);
__gen_e_acsl_waitpid(pid_76,& process_status_76,0);
signal_eval(process_status_76,0,__gen_e_acsl_literal_string_185);
__e_acsl_delete_block((void *)(& process_status_76));
@@ -4673,7 +4673,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_77;
- __e_acsl_store_block((void *)(& process_status_77),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_77),4UL);
__gen_e_acsl_waitpid(pid_77,& process_status_77,0);
signal_eval(process_status_77,0,__gen_e_acsl_literal_string_187);
__e_acsl_delete_block((void *)(& process_status_77));
@@ -4687,7 +4687,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_78;
- __e_acsl_store_block((void *)(& process_status_78),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_78),4UL);
__gen_e_acsl_waitpid(pid_78,& process_status_78,0);
signal_eval(process_status_78,1,__gen_e_acsl_literal_string_189);
__e_acsl_delete_block((void *)(& process_status_78));
@@ -4701,7 +4701,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_79;
- __e_acsl_store_block((void *)(& process_status_79),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_79),4UL);
__gen_e_acsl_waitpid(pid_79,& process_status_79,0);
signal_eval(process_status_79,1,__gen_e_acsl_literal_string_191);
__e_acsl_delete_block((void *)(& process_status_79));
@@ -4715,7 +4715,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_80;
- __e_acsl_store_block((void *)(& process_status_80),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_80),4UL);
__gen_e_acsl_waitpid(pid_80,& process_status_80,0);
signal_eval(process_status_80,1,__gen_e_acsl_literal_string_193);
__e_acsl_delete_block((void *)(& process_status_80));
@@ -4729,7 +4729,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_81;
- __e_acsl_store_block((void *)(& process_status_81),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_81),4UL);
__gen_e_acsl_waitpid(pid_81,& process_status_81,0);
signal_eval(process_status_81,0,__gen_e_acsl_literal_string_195);
__e_acsl_delete_block((void *)(& process_status_81));
@@ -4743,7 +4743,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_82;
- __e_acsl_store_block((void *)(& process_status_82),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_82),4UL);
__gen_e_acsl_waitpid(pid_82,& process_status_82,0);
signal_eval(process_status_82,0,__gen_e_acsl_literal_string_197);
__e_acsl_delete_block((void *)(& process_status_82));
@@ -4757,7 +4757,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_83;
- __e_acsl_store_block((void *)(& process_status_83),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_83),4UL);
__gen_e_acsl_waitpid(pid_83,& process_status_83,0);
signal_eval(process_status_83,0,__gen_e_acsl_literal_string_198);
__e_acsl_delete_block((void *)(& process_status_83));
@@ -4771,7 +4771,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_84;
- __e_acsl_store_block((void *)(& process_status_84),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_84),4UL);
__gen_e_acsl_waitpid(pid_84,& process_status_84,0);
signal_eval(process_status_84,0,__gen_e_acsl_literal_string_199);
__e_acsl_delete_block((void *)(& process_status_84));
@@ -4785,7 +4785,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_85;
- __e_acsl_store_block((void *)(& process_status_85),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_85),4UL);
__gen_e_acsl_waitpid(pid_85,& process_status_85,0);
signal_eval(process_status_85,0,__gen_e_acsl_literal_string_200);
__e_acsl_delete_block((void *)(& process_status_85));
@@ -4799,7 +4799,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_86;
- __e_acsl_store_block((void *)(& process_status_86),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_86),4UL);
__gen_e_acsl_waitpid(pid_86,& process_status_86,0);
signal_eval(process_status_86,0,__gen_e_acsl_literal_string_201);
__e_acsl_delete_block((void *)(& process_status_86));
@@ -4813,7 +4813,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_87;
- __e_acsl_store_block((void *)(& process_status_87),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_87),4UL);
__gen_e_acsl_waitpid(pid_87,& process_status_87,0);
signal_eval(process_status_87,1,__gen_e_acsl_literal_string_202);
__e_acsl_delete_block((void *)(& process_status_87));
@@ -4827,7 +4827,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_88;
- __e_acsl_store_block((void *)(& process_status_88),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_88),4UL);
__gen_e_acsl_waitpid(pid_88,& process_status_88,0);
signal_eval(process_status_88,1,__gen_e_acsl_literal_string_203);
__e_acsl_delete_block((void *)(& process_status_88));
@@ -4841,7 +4841,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_89;
- __e_acsl_store_block((void *)(& process_status_89),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_89),4UL);
__gen_e_acsl_waitpid(pid_89,& process_status_89,0);
signal_eval(process_status_89,1,__gen_e_acsl_literal_string_204);
__e_acsl_delete_block((void *)(& process_status_89));
@@ -4855,7 +4855,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_90;
- __e_acsl_store_block((void *)(& process_status_90),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_90),4UL);
__gen_e_acsl_waitpid(pid_90,& process_status_90,0);
signal_eval(process_status_90,1,__gen_e_acsl_literal_string_205);
__e_acsl_delete_block((void *)(& process_status_90));
@@ -4869,7 +4869,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_91;
- __e_acsl_store_block((void *)(& process_status_91),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_91),4UL);
__gen_e_acsl_waitpid(pid_91,& process_status_91,0);
signal_eval(process_status_91,1,__gen_e_acsl_literal_string_206);
__e_acsl_delete_block((void *)(& process_status_91));
@@ -4883,7 +4883,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_92;
- __e_acsl_store_block((void *)(& process_status_92),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_92),4UL);
__gen_e_acsl_waitpid(pid_92,& process_status_92,0);
signal_eval(process_status_92,1,__gen_e_acsl_literal_string_207);
__e_acsl_delete_block((void *)(& process_status_92));
@@ -4898,7 +4898,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_93;
- __e_acsl_store_block((void *)(& process_status_93),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_93),4UL);
__gen_e_acsl_waitpid(pid_93,& process_status_93,0);
signal_eval(process_status_93,1,__gen_e_acsl_literal_string_208);
__e_acsl_delete_block((void *)(& process_status_93));
@@ -4913,7 +4913,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_94;
- __e_acsl_store_block((void *)(& process_status_94),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_94),4UL);
__gen_e_acsl_waitpid(pid_94,& process_status_94,0);
signal_eval(process_status_94,1,__gen_e_acsl_literal_string_209);
__e_acsl_delete_block((void *)(& process_status_94));
@@ -4927,7 +4927,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_95;
- __e_acsl_store_block((void *)(& process_status_95),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_95),4UL);
__gen_e_acsl_waitpid(pid_95,& process_status_95,0);
signal_eval(process_status_95,0,__gen_e_acsl_literal_string_211);
__e_acsl_delete_block((void *)(& process_status_95));
@@ -4941,7 +4941,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_96;
- __e_acsl_store_block((void *)(& process_status_96),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_96),4UL);
__gen_e_acsl_waitpid(pid_96,& process_status_96,0);
signal_eval(process_status_96,0,__gen_e_acsl_literal_string_212);
__e_acsl_delete_block((void *)(& process_status_96));
@@ -4955,7 +4955,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_97;
- __e_acsl_store_block((void *)(& process_status_97),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_97),4UL);
__gen_e_acsl_waitpid(pid_97,& process_status_97,0);
signal_eval(process_status_97,0,__gen_e_acsl_literal_string_214);
__e_acsl_delete_block((void *)(& process_status_97));
@@ -4969,7 +4969,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_98;
- __e_acsl_store_block((void *)(& process_status_98),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_98),4UL);
__gen_e_acsl_waitpid(pid_98,& process_status_98,0);
signal_eval(process_status_98,0,__gen_e_acsl_literal_string_215);
__e_acsl_delete_block((void *)(& process_status_98));
@@ -4983,7 +4983,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_99;
- __e_acsl_store_block((void *)(& process_status_99),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_99),4UL);
__gen_e_acsl_waitpid(pid_99,& process_status_99,0);
signal_eval(process_status_99,0,__gen_e_acsl_literal_string_217);
__e_acsl_delete_block((void *)(& process_status_99));
@@ -4997,7 +4997,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_100;
- __e_acsl_store_block((void *)(& process_status_100),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_100),4UL);
__gen_e_acsl_waitpid(pid_100,& process_status_100,0);
signal_eval(process_status_100,0,__gen_e_acsl_literal_string_219);
__e_acsl_delete_block((void *)(& process_status_100));
@@ -5011,7 +5011,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_101;
- __e_acsl_store_block((void *)(& process_status_101),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_101),4UL);
__gen_e_acsl_waitpid(pid_101,& process_status_101,0);
signal_eval(process_status_101,0,__gen_e_acsl_literal_string_221);
__e_acsl_delete_block((void *)(& process_status_101));
@@ -5025,7 +5025,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_102;
- __e_acsl_store_block((void *)(& process_status_102),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_102),4UL);
__gen_e_acsl_waitpid(pid_102,& process_status_102,0);
signal_eval(process_status_102,0,__gen_e_acsl_literal_string_223);
__e_acsl_delete_block((void *)(& process_status_102));
@@ -5039,7 +5039,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_103;
- __e_acsl_store_block((void *)(& process_status_103),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_103),4UL);
__gen_e_acsl_waitpid(pid_103,& process_status_103,0);
signal_eval(process_status_103,0,__gen_e_acsl_literal_string_225);
__e_acsl_delete_block((void *)(& process_status_103));
@@ -5053,7 +5053,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_104;
- __e_acsl_store_block((void *)(& process_status_104),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_104),4UL);
__gen_e_acsl_waitpid(pid_104,& process_status_104,0);
signal_eval(process_status_104,0,__gen_e_acsl_literal_string_227);
__e_acsl_delete_block((void *)(& process_status_104));
@@ -5067,7 +5067,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_105;
- __e_acsl_store_block((void *)(& process_status_105),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_105),4UL);
__gen_e_acsl_waitpid(pid_105,& process_status_105,0);
signal_eval(process_status_105,0,__gen_e_acsl_literal_string_229);
__e_acsl_delete_block((void *)(& process_status_105));
@@ -5081,7 +5081,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_106;
- __e_acsl_store_block((void *)(& process_status_106),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_106),4UL);
__gen_e_acsl_waitpid(pid_106,& process_status_106,0);
signal_eval(process_status_106,0,__gen_e_acsl_literal_string_231);
__e_acsl_delete_block((void *)(& process_status_106));
@@ -5095,7 +5095,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_107;
- __e_acsl_store_block((void *)(& process_status_107),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_107),4UL);
__gen_e_acsl_waitpid(pid_107,& process_status_107,0);
signal_eval(process_status_107,0,__gen_e_acsl_literal_string_233);
__e_acsl_delete_block((void *)(& process_status_107));
@@ -5109,7 +5109,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_108;
- __e_acsl_store_block((void *)(& process_status_108),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_108),4UL);
__gen_e_acsl_waitpid(pid_108,& process_status_108,0);
signal_eval(process_status_108,0,__gen_e_acsl_literal_string_235);
__e_acsl_delete_block((void *)(& process_status_108));
@@ -5123,7 +5123,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_109;
- __e_acsl_store_block((void *)(& process_status_109),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_109),4UL);
__gen_e_acsl_waitpid(pid_109,& process_status_109,0);
signal_eval(process_status_109,0,__gen_e_acsl_literal_string_237);
__e_acsl_delete_block((void *)(& process_status_109));
@@ -5137,7 +5137,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_110;
- __e_acsl_store_block((void *)(& process_status_110),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_110),4UL);
__gen_e_acsl_waitpid(pid_110,& process_status_110,0);
signal_eval(process_status_110,0,__gen_e_acsl_literal_string_239);
__e_acsl_delete_block((void *)(& process_status_110));
@@ -5151,7 +5151,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_111;
- __e_acsl_store_block((void *)(& process_status_111),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_111),4UL);
__gen_e_acsl_waitpid(pid_111,& process_status_111,0);
signal_eval(process_status_111,1,__gen_e_acsl_literal_string_240);
__e_acsl_delete_block((void *)(& process_status_111));
@@ -5165,7 +5165,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_112;
- __e_acsl_store_block((void *)(& process_status_112),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_112),4UL);
__gen_e_acsl_waitpid(pid_112,& process_status_112,0);
signal_eval(process_status_112,1,__gen_e_acsl_literal_string_241);
__e_acsl_delete_block((void *)(& process_status_112));
@@ -5179,7 +5179,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_113;
- __e_acsl_store_block((void *)(& process_status_113),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_113),4UL);
__gen_e_acsl_waitpid(pid_113,& process_status_113,0);
signal_eval(process_status_113,1,__gen_e_acsl_literal_string_242);
__e_acsl_delete_block((void *)(& process_status_113));
@@ -5193,7 +5193,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_114;
- __e_acsl_store_block((void *)(& process_status_114),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_114),4UL);
__gen_e_acsl_waitpid(pid_114,& process_status_114,0);
signal_eval(process_status_114,1,__gen_e_acsl_literal_string_243);
__e_acsl_delete_block((void *)(& process_status_114));
@@ -5207,7 +5207,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_115;
- __e_acsl_store_block((void *)(& process_status_115),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_115),4UL);
__gen_e_acsl_waitpid(pid_115,& process_status_115,0);
signal_eval(process_status_115,1,__gen_e_acsl_literal_string_244);
__e_acsl_delete_block((void *)(& process_status_115));
@@ -5221,7 +5221,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_116;
- __e_acsl_store_block((void *)(& process_status_116),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_116),4UL);
__gen_e_acsl_waitpid(pid_116,& process_status_116,0);
signal_eval(process_status_116,1,__gen_e_acsl_literal_string_245);
__e_acsl_delete_block((void *)(& process_status_116));
@@ -5235,7 +5235,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_117;
- __e_acsl_store_block((void *)(& process_status_117),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_117),4UL);
__gen_e_acsl_waitpid(pid_117,& process_status_117,0);
signal_eval(process_status_117,1,__gen_e_acsl_literal_string_246);
__e_acsl_delete_block((void *)(& process_status_117));
@@ -5249,7 +5249,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_118;
- __e_acsl_store_block((void *)(& process_status_118),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_118),4UL);
__gen_e_acsl_waitpid(pid_118,& process_status_118,0);
signal_eval(process_status_118,1,__gen_e_acsl_literal_string_247);
__e_acsl_delete_block((void *)(& process_status_118));
@@ -5264,7 +5264,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_119;
- __e_acsl_store_block((void *)(& process_status_119),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_119),4UL);
__gen_e_acsl_waitpid(pid_119,& process_status_119,0);
signal_eval(process_status_119,1,__gen_e_acsl_literal_string_248);
__e_acsl_delete_block((void *)(& process_status_119));
@@ -5279,7 +5279,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_120;
- __e_acsl_store_block((void *)(& process_status_120),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_120),4UL);
__gen_e_acsl_waitpid(pid_120,& process_status_120,0);
signal_eval(process_status_120,1,__gen_e_acsl_literal_string_249);
__e_acsl_delete_block((void *)(& process_status_120));
@@ -5294,7 +5294,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_121;
- __e_acsl_store_block((void *)(& process_status_121),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_121),4UL);
__gen_e_acsl_waitpid(pid_121,& process_status_121,0);
signal_eval(process_status_121,1,__gen_e_acsl_literal_string_250);
__e_acsl_delete_block((void *)(& process_status_121));
@@ -5309,7 +5309,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_122;
- __e_acsl_store_block((void *)(& process_status_122),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_122),4UL);
__gen_e_acsl_waitpid(pid_122,& process_status_122,0);
signal_eval(process_status_122,1,__gen_e_acsl_literal_string_251);
__e_acsl_delete_block((void *)(& process_status_122));
@@ -5323,7 +5323,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_123;
- __e_acsl_store_block((void *)(& process_status_123),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_123),4UL);
__gen_e_acsl_waitpid(pid_123,& process_status_123,0);
signal_eval(process_status_123,1,__gen_e_acsl_literal_string_252);
__e_acsl_delete_block((void *)(& process_status_123));
@@ -5337,7 +5337,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_124;
- __e_acsl_store_block((void *)(& process_status_124),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_124),4UL);
__gen_e_acsl_waitpid(pid_124,& process_status_124,0);
signal_eval(process_status_124,1,__gen_e_acsl_literal_string_253);
__e_acsl_delete_block((void *)(& process_status_124));
@@ -5351,7 +5351,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_125;
- __e_acsl_store_block((void *)(& process_status_125),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_125),4UL);
__gen_e_acsl_waitpid(pid_125,& process_status_125,0);
signal_eval(process_status_125,1,__gen_e_acsl_literal_string_254);
__e_acsl_delete_block((void *)(& process_status_125));
@@ -5365,7 +5365,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_126;
- __e_acsl_store_block((void *)(& process_status_126),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_126),4UL);
__gen_e_acsl_waitpid(pid_126,& process_status_126,0);
signal_eval(process_status_126,1,__gen_e_acsl_literal_string_255);
__e_acsl_delete_block((void *)(& process_status_126));
@@ -5379,7 +5379,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_127;
- __e_acsl_store_block((void *)(& process_status_127),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_127),4UL);
__gen_e_acsl_waitpid(pid_127,& process_status_127,0);
signal_eval(process_status_127,1,__gen_e_acsl_literal_string_256);
__e_acsl_delete_block((void *)(& process_status_127));
@@ -5393,7 +5393,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_128;
- __e_acsl_store_block((void *)(& process_status_128),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_128),4UL);
__gen_e_acsl_waitpid(pid_128,& process_status_128,0);
signal_eval(process_status_128,1,__gen_e_acsl_literal_string_257);
__e_acsl_delete_block((void *)(& process_status_128));
@@ -5407,7 +5407,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_129;
- __e_acsl_store_block((void *)(& process_status_129),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_129),4UL);
__gen_e_acsl_waitpid(pid_129,& process_status_129,0);
signal_eval(process_status_129,1,__gen_e_acsl_literal_string_258);
__e_acsl_delete_block((void *)(& process_status_129));
@@ -5421,7 +5421,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_130;
- __e_acsl_store_block((void *)(& process_status_130),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_130),4UL);
__gen_e_acsl_waitpid(pid_130,& process_status_130,0);
signal_eval(process_status_130,1,__gen_e_acsl_literal_string_259);
__e_acsl_delete_block((void *)(& process_status_130));
@@ -5435,7 +5435,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_131;
- __e_acsl_store_block((void *)(& process_status_131),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_131),4UL);
__gen_e_acsl_waitpid(pid_131,& process_status_131,0);
signal_eval(process_status_131,0,__gen_e_acsl_literal_string_261);
__e_acsl_delete_block((void *)(& process_status_131));
@@ -5449,7 +5449,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_132;
- __e_acsl_store_block((void *)(& process_status_132),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_132),4UL);
__gen_e_acsl_waitpid(pid_132,& process_status_132,0);
signal_eval(process_status_132,0,__gen_e_acsl_literal_string_263);
__e_acsl_delete_block((void *)(& process_status_132));
@@ -5463,7 +5463,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_133;
- __e_acsl_store_block((void *)(& process_status_133),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_133),4UL);
__gen_e_acsl_waitpid(pid_133,& process_status_133,0);
signal_eval(process_status_133,0,__gen_e_acsl_literal_string_265);
__e_acsl_delete_block((void *)(& process_status_133));
@@ -5477,7 +5477,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_134;
- __e_acsl_store_block((void *)(& process_status_134),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_134),4UL);
__gen_e_acsl_waitpid(pid_134,& process_status_134,0);
signal_eval(process_status_134,0,__gen_e_acsl_literal_string_267);
__e_acsl_delete_block((void *)(& process_status_134));
@@ -5491,7 +5491,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_135;
- __e_acsl_store_block((void *)(& process_status_135),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_135),4UL);
__gen_e_acsl_waitpid(pid_135,& process_status_135,0);
signal_eval(process_status_135,0,__gen_e_acsl_literal_string_269);
__e_acsl_delete_block((void *)(& process_status_135));
@@ -5505,7 +5505,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_136;
- __e_acsl_store_block((void *)(& process_status_136),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_136),4UL);
__gen_e_acsl_waitpid(pid_136,& process_status_136,0);
signal_eval(process_status_136,0,__gen_e_acsl_literal_string_271);
__e_acsl_delete_block((void *)(& process_status_136));
@@ -5519,7 +5519,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_137;
- __e_acsl_store_block((void *)(& process_status_137),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_137),4UL);
__gen_e_acsl_waitpid(pid_137,& process_status_137,0);
signal_eval(process_status_137,0,__gen_e_acsl_literal_string_273);
__e_acsl_delete_block((void *)(& process_status_137));
@@ -5533,7 +5533,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_138;
- __e_acsl_store_block((void *)(& process_status_138),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_138),4UL);
__gen_e_acsl_waitpid(pid_138,& process_status_138,0);
signal_eval(process_status_138,0,__gen_e_acsl_literal_string_275);
__e_acsl_delete_block((void *)(& process_status_138));
@@ -5547,7 +5547,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_139;
- __e_acsl_store_block((void *)(& process_status_139),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_139),4UL);
__gen_e_acsl_waitpid(pid_139,& process_status_139,0);
signal_eval(process_status_139,0,__gen_e_acsl_literal_string_277);
__e_acsl_delete_block((void *)(& process_status_139));
@@ -5561,7 +5561,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_140;
- __e_acsl_store_block((void *)(& process_status_140),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_140),4UL);
__gen_e_acsl_waitpid(pid_140,& process_status_140,0);
signal_eval(process_status_140,0,__gen_e_acsl_literal_string_279);
__e_acsl_delete_block((void *)(& process_status_140));
@@ -5575,7 +5575,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_141;
- __e_acsl_store_block((void *)(& process_status_141),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_141),4UL);
__gen_e_acsl_waitpid(pid_141,& process_status_141,0);
signal_eval(process_status_141,0,__gen_e_acsl_literal_string_281);
__e_acsl_delete_block((void *)(& process_status_141));
@@ -5589,7 +5589,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_142;
- __e_acsl_store_block((void *)(& process_status_142),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_142),4UL);
__gen_e_acsl_waitpid(pid_142,& process_status_142,0);
signal_eval(process_status_142,0,__gen_e_acsl_literal_string_283);
__e_acsl_delete_block((void *)(& process_status_142));
@@ -5603,7 +5603,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_143;
- __e_acsl_store_block((void *)(& process_status_143),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_143),4UL);
__gen_e_acsl_waitpid(pid_143,& process_status_143,0);
signal_eval(process_status_143,0,__gen_e_acsl_literal_string_285);
__e_acsl_delete_block((void *)(& process_status_143));
@@ -5617,7 +5617,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_144;
- __e_acsl_store_block((void *)(& process_status_144),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_144),4UL);
__gen_e_acsl_waitpid(pid_144,& process_status_144,0);
signal_eval(process_status_144,0,__gen_e_acsl_literal_string_287);
__e_acsl_delete_block((void *)(& process_status_144));
@@ -5631,7 +5631,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_145;
- __e_acsl_store_block((void *)(& process_status_145),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_145),4UL);
__gen_e_acsl_waitpid(pid_145,& process_status_145,0);
signal_eval(process_status_145,0,__gen_e_acsl_literal_string_289);
__e_acsl_delete_block((void *)(& process_status_145));
@@ -5645,7 +5645,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_146;
- __e_acsl_store_block((void *)(& process_status_146),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_146),4UL);
__gen_e_acsl_waitpid(pid_146,& process_status_146,0);
signal_eval(process_status_146,0,__gen_e_acsl_literal_string_291);
__e_acsl_delete_block((void *)(& process_status_146));
@@ -5659,7 +5659,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_147;
- __e_acsl_store_block((void *)(& process_status_147),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_147),4UL);
__gen_e_acsl_waitpid(pid_147,& process_status_147,0);
signal_eval(process_status_147,0,__gen_e_acsl_literal_string_293);
__e_acsl_delete_block((void *)(& process_status_147));
@@ -5673,7 +5673,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_148;
- __e_acsl_store_block((void *)(& process_status_148),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_148),4UL);
__gen_e_acsl_waitpid(pid_148,& process_status_148,0);
signal_eval(process_status_148,0,__gen_e_acsl_literal_string_295);
__e_acsl_delete_block((void *)(& process_status_148));
@@ -5687,7 +5687,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_149;
- __e_acsl_store_block((void *)(& process_status_149),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_149),4UL);
__gen_e_acsl_waitpid(pid_149,& process_status_149,0);
signal_eval(process_status_149,0,__gen_e_acsl_literal_string_297);
__e_acsl_delete_block((void *)(& process_status_149));
@@ -5701,7 +5701,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_150;
- __e_acsl_store_block((void *)(& process_status_150),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_150),4UL);
__gen_e_acsl_waitpid(pid_150,& process_status_150,0);
signal_eval(process_status_150,0,__gen_e_acsl_literal_string_299);
__e_acsl_delete_block((void *)(& process_status_150));
@@ -5715,7 +5715,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_151;
- __e_acsl_store_block((void *)(& process_status_151),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_151),4UL);
__gen_e_acsl_waitpid(pid_151,& process_status_151,0);
signal_eval(process_status_151,0,__gen_e_acsl_literal_string_301);
__e_acsl_delete_block((void *)(& process_status_151));
@@ -5729,7 +5729,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_152;
- __e_acsl_store_block((void *)(& process_status_152),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_152),4UL);
__gen_e_acsl_waitpid(pid_152,& process_status_152,0);
signal_eval(process_status_152,0,__gen_e_acsl_literal_string_303);
__e_acsl_delete_block((void *)(& process_status_152));
@@ -5743,7 +5743,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_153;
- __e_acsl_store_block((void *)(& process_status_153),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_153),4UL);
__gen_e_acsl_waitpid(pid_153,& process_status_153,0);
signal_eval(process_status_153,0,__gen_e_acsl_literal_string_305);
__e_acsl_delete_block((void *)(& process_status_153));
@@ -5757,7 +5757,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_154;
- __e_acsl_store_block((void *)(& process_status_154),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_154),4UL);
__gen_e_acsl_waitpid(pid_154,& process_status_154,0);
signal_eval(process_status_154,0,__gen_e_acsl_literal_string_307);
__e_acsl_delete_block((void *)(& process_status_154));
@@ -5771,7 +5771,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_155;
- __e_acsl_store_block((void *)(& process_status_155),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_155),4UL);
__gen_e_acsl_waitpid(pid_155,& process_status_155,0);
signal_eval(process_status_155,0,__gen_e_acsl_literal_string_309);
__e_acsl_delete_block((void *)(& process_status_155));
@@ -5785,7 +5785,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_156;
- __e_acsl_store_block((void *)(& process_status_156),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_156),4UL);
__gen_e_acsl_waitpid(pid_156,& process_status_156,0);
signal_eval(process_status_156,0,__gen_e_acsl_literal_string_311);
__e_acsl_delete_block((void *)(& process_status_156));
@@ -5799,7 +5799,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_157;
- __e_acsl_store_block((void *)(& process_status_157),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_157),4UL);
__gen_e_acsl_waitpid(pid_157,& process_status_157,0);
signal_eval(process_status_157,0,__gen_e_acsl_literal_string_313);
__e_acsl_delete_block((void *)(& process_status_157));
@@ -5813,7 +5813,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_158;
- __e_acsl_store_block((void *)(& process_status_158),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_158),4UL);
__gen_e_acsl_waitpid(pid_158,& process_status_158,0);
signal_eval(process_status_158,0,__gen_e_acsl_literal_string_315);
__e_acsl_delete_block((void *)(& process_status_158));
@@ -5827,7 +5827,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_159;
- __e_acsl_store_block((void *)(& process_status_159),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_159),4UL);
__gen_e_acsl_waitpid(pid_159,& process_status_159,0);
signal_eval(process_status_159,0,__gen_e_acsl_literal_string_317);
__e_acsl_delete_block((void *)(& process_status_159));
@@ -5841,7 +5841,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_160;
- __e_acsl_store_block((void *)(& process_status_160),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_160),4UL);
__gen_e_acsl_waitpid(pid_160,& process_status_160,0);
signal_eval(process_status_160,0,__gen_e_acsl_literal_string_319);
__e_acsl_delete_block((void *)(& process_status_160));
@@ -5855,7 +5855,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_161;
- __e_acsl_store_block((void *)(& process_status_161),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_161),4UL);
__gen_e_acsl_waitpid(pid_161,& process_status_161,0);
signal_eval(process_status_161,1,__gen_e_acsl_literal_string_320);
__e_acsl_delete_block((void *)(& process_status_161));
@@ -5869,7 +5869,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_162;
- __e_acsl_store_block((void *)(& process_status_162),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_162),4UL);
__gen_e_acsl_waitpid(pid_162,& process_status_162,0);
signal_eval(process_status_162,1,__gen_e_acsl_literal_string_321);
__e_acsl_delete_block((void *)(& process_status_162));
@@ -5883,7 +5883,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_163;
- __e_acsl_store_block((void *)(& process_status_163),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_163),4UL);
__gen_e_acsl_waitpid(pid_163,& process_status_163,0);
signal_eval(process_status_163,1,__gen_e_acsl_literal_string_322);
__e_acsl_delete_block((void *)(& process_status_163));
@@ -5897,7 +5897,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_164;
- __e_acsl_store_block((void *)(& process_status_164),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_164),4UL);
__gen_e_acsl_waitpid(pid_164,& process_status_164,0);
signal_eval(process_status_164,1,__gen_e_acsl_literal_string_323);
__e_acsl_delete_block((void *)(& process_status_164));
@@ -5911,7 +5911,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_165;
- __e_acsl_store_block((void *)(& process_status_165),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_165),4UL);
__gen_e_acsl_waitpid(pid_165,& process_status_165,0);
signal_eval(process_status_165,1,__gen_e_acsl_literal_string_324);
__e_acsl_delete_block((void *)(& process_status_165));
@@ -5925,7 +5925,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_166;
- __e_acsl_store_block((void *)(& process_status_166),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_166),4UL);
__gen_e_acsl_waitpid(pid_166,& process_status_166,0);
signal_eval(process_status_166,1,__gen_e_acsl_literal_string_325);
__e_acsl_delete_block((void *)(& process_status_166));
@@ -5939,7 +5939,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_167;
- __e_acsl_store_block((void *)(& process_status_167),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_167),4UL);
__gen_e_acsl_waitpid(pid_167,& process_status_167,0);
signal_eval(process_status_167,0,__gen_e_acsl_literal_string_327);
__e_acsl_delete_block((void *)(& process_status_167));
@@ -5953,7 +5953,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_168;
- __e_acsl_store_block((void *)(& process_status_168),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_168),4UL);
__gen_e_acsl_waitpid(pid_168,& process_status_168,0);
signal_eval(process_status_168,0,__gen_e_acsl_literal_string_329);
__e_acsl_delete_block((void *)(& process_status_168));
@@ -5967,7 +5967,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_169;
- __e_acsl_store_block((void *)(& process_status_169),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_169),4UL);
__gen_e_acsl_waitpid(pid_169,& process_status_169,0);
signal_eval(process_status_169,1,__gen_e_acsl_literal_string_330);
__e_acsl_delete_block((void *)(& process_status_169));
@@ -5981,7 +5981,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_170;
- __e_acsl_store_block((void *)(& process_status_170),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_170),4UL);
__gen_e_acsl_waitpid(pid_170,& process_status_170,0);
signal_eval(process_status_170,1,__gen_e_acsl_literal_string_331);
__e_acsl_delete_block((void *)(& process_status_170));
@@ -5995,7 +5995,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_171;
- __e_acsl_store_block((void *)(& process_status_171),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_171),4UL);
__gen_e_acsl_waitpid(pid_171,& process_status_171,0);
signal_eval(process_status_171,1,__gen_e_acsl_literal_string_332);
__e_acsl_delete_block((void *)(& process_status_171));
@@ -6009,7 +6009,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_172;
- __e_acsl_store_block((void *)(& process_status_172),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_172),4UL);
__gen_e_acsl_waitpid(pid_172,& process_status_172,0);
signal_eval(process_status_172,1,__gen_e_acsl_literal_string_333);
__e_acsl_delete_block((void *)(& process_status_172));
@@ -6023,7 +6023,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_173;
- __e_acsl_store_block((void *)(& process_status_173),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_173),4UL);
__gen_e_acsl_waitpid(pid_173,& process_status_173,0);
signal_eval(process_status_173,1,__gen_e_acsl_literal_string_334);
__e_acsl_delete_block((void *)(& process_status_173));
@@ -6037,7 +6037,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_174;
- __e_acsl_store_block((void *)(& process_status_174),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_174),4UL);
__gen_e_acsl_waitpid(pid_174,& process_status_174,0);
signal_eval(process_status_174,1,__gen_e_acsl_literal_string_335);
__e_acsl_delete_block((void *)(& process_status_174));
@@ -6051,7 +6051,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_175;
- __e_acsl_store_block((void *)(& process_status_175),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_175),4UL);
__gen_e_acsl_waitpid(pid_175,& process_status_175,0);
signal_eval(process_status_175,0,__gen_e_acsl_literal_string_337);
__e_acsl_delete_block((void *)(& process_status_175));
@@ -6065,7 +6065,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_176;
- __e_acsl_store_block((void *)(& process_status_176),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_176),4UL);
__gen_e_acsl_waitpid(pid_176,& process_status_176,0);
signal_eval(process_status_176,0,__gen_e_acsl_literal_string_339);
__e_acsl_delete_block((void *)(& process_status_176));
@@ -6079,7 +6079,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_177;
- __e_acsl_store_block((void *)(& process_status_177),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_177),4UL);
__gen_e_acsl_waitpid(pid_177,& process_status_177,0);
signal_eval(process_status_177,1,__gen_e_acsl_literal_string_340);
__e_acsl_delete_block((void *)(& process_status_177));
@@ -6093,7 +6093,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_178;
- __e_acsl_store_block((void *)(& process_status_178),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_178),4UL);
__gen_e_acsl_waitpid(pid_178,& process_status_178,0);
signal_eval(process_status_178,1,__gen_e_acsl_literal_string_341);
__e_acsl_delete_block((void *)(& process_status_178));
@@ -6107,7 +6107,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_179;
- __e_acsl_store_block((void *)(& process_status_179),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_179),4UL);
__gen_e_acsl_waitpid(pid_179,& process_status_179,0);
signal_eval(process_status_179,1,__gen_e_acsl_literal_string_342);
__e_acsl_delete_block((void *)(& process_status_179));
@@ -6121,7 +6121,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_180;
- __e_acsl_store_block((void *)(& process_status_180),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_180),4UL);
__gen_e_acsl_waitpid(pid_180,& process_status_180,0);
signal_eval(process_status_180,1,__gen_e_acsl_literal_string_343);
__e_acsl_delete_block((void *)(& process_status_180));
@@ -6135,7 +6135,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_181;
- __e_acsl_store_block((void *)(& process_status_181),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_181),4UL);
__gen_e_acsl_waitpid(pid_181,& process_status_181,0);
signal_eval(process_status_181,1,__gen_e_acsl_literal_string_344);
__e_acsl_delete_block((void *)(& process_status_181));
@@ -6149,7 +6149,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_182;
- __e_acsl_store_block((void *)(& process_status_182),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_182),4UL);
__gen_e_acsl_waitpid(pid_182,& process_status_182,0);
signal_eval(process_status_182,1,__gen_e_acsl_literal_string_345);
__e_acsl_delete_block((void *)(& process_status_182));
@@ -6163,7 +6163,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_183;
- __e_acsl_store_block((void *)(& process_status_183),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_183),4UL);
__gen_e_acsl_waitpid(pid_183,& process_status_183,0);
signal_eval(process_status_183,0,__gen_e_acsl_literal_string_347);
__e_acsl_delete_block((void *)(& process_status_183));
@@ -6177,7 +6177,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_184;
- __e_acsl_store_block((void *)(& process_status_184),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_184),4UL);
__gen_e_acsl_waitpid(pid_184,& process_status_184,0);
signal_eval(process_status_184,0,__gen_e_acsl_literal_string_349);
__e_acsl_delete_block((void *)(& process_status_184));
@@ -6191,7 +6191,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_185;
- __e_acsl_store_block((void *)(& process_status_185),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_185),4UL);
__gen_e_acsl_waitpid(pid_185,& process_status_185,0);
signal_eval(process_status_185,1,__gen_e_acsl_literal_string_350);
__e_acsl_delete_block((void *)(& process_status_185));
@@ -6205,7 +6205,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_186;
- __e_acsl_store_block((void *)(& process_status_186),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_186),4UL);
__gen_e_acsl_waitpid(pid_186,& process_status_186,0);
signal_eval(process_status_186,1,__gen_e_acsl_literal_string_351);
__e_acsl_delete_block((void *)(& process_status_186));
@@ -6219,7 +6219,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_187;
- __e_acsl_store_block((void *)(& process_status_187),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_187),4UL);
__gen_e_acsl_waitpid(pid_187,& process_status_187,0);
signal_eval(process_status_187,1,__gen_e_acsl_literal_string_352);
__e_acsl_delete_block((void *)(& process_status_187));
@@ -6233,7 +6233,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_188;
- __e_acsl_store_block((void *)(& process_status_188),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_188),4UL);
__gen_e_acsl_waitpid(pid_188,& process_status_188,0);
signal_eval(process_status_188,1,__gen_e_acsl_literal_string_353);
__e_acsl_delete_block((void *)(& process_status_188));
@@ -6247,7 +6247,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_189;
- __e_acsl_store_block((void *)(& process_status_189),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_189),4UL);
__gen_e_acsl_waitpid(pid_189,& process_status_189,0);
signal_eval(process_status_189,1,__gen_e_acsl_literal_string_354);
__e_acsl_delete_block((void *)(& process_status_189));
@@ -6261,7 +6261,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_190;
- __e_acsl_store_block((void *)(& process_status_190),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_190),4UL);
__gen_e_acsl_waitpid(pid_190,& process_status_190,0);
signal_eval(process_status_190,1,__gen_e_acsl_literal_string_355);
__e_acsl_delete_block((void *)(& process_status_190));
@@ -6275,7 +6275,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_191;
- __e_acsl_store_block((void *)(& process_status_191),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_191),4UL);
__gen_e_acsl_waitpid(pid_191,& process_status_191,0);
signal_eval(process_status_191,1,__gen_e_acsl_literal_string_357);
__e_acsl_delete_block((void *)(& process_status_191));
@@ -6289,7 +6289,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_192;
- __e_acsl_store_block((void *)(& process_status_192),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_192),4UL);
__gen_e_acsl_waitpid(pid_192,& process_status_192,0);
signal_eval(process_status_192,1,__gen_e_acsl_literal_string_359);
__e_acsl_delete_block((void *)(& process_status_192));
@@ -6303,7 +6303,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_193;
- __e_acsl_store_block((void *)(& process_status_193),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_193),4UL);
__gen_e_acsl_waitpid(pid_193,& process_status_193,0);
signal_eval(process_status_193,0,__gen_e_acsl_literal_string_360);
__e_acsl_delete_block((void *)(& process_status_193));
@@ -6317,7 +6317,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_194;
- __e_acsl_store_block((void *)(& process_status_194),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_194),4UL);
__gen_e_acsl_waitpid(pid_194,& process_status_194,0);
signal_eval(process_status_194,0,__gen_e_acsl_literal_string_361);
__e_acsl_delete_block((void *)(& process_status_194));
@@ -6331,7 +6331,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_195;
- __e_acsl_store_block((void *)(& process_status_195),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_195),4UL);
__gen_e_acsl_waitpid(pid_195,& process_status_195,0);
signal_eval(process_status_195,1,__gen_e_acsl_literal_string_362);
__e_acsl_delete_block((void *)(& process_status_195));
@@ -6345,7 +6345,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_196;
- __e_acsl_store_block((void *)(& process_status_196),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_196),4UL);
__gen_e_acsl_waitpid(pid_196,& process_status_196,0);
signal_eval(process_status_196,1,__gen_e_acsl_literal_string_363);
__e_acsl_delete_block((void *)(& process_status_196));
@@ -6359,7 +6359,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_197;
- __e_acsl_store_block((void *)(& process_status_197),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_197),4UL);
__gen_e_acsl_waitpid(pid_197,& process_status_197,0);
signal_eval(process_status_197,1,__gen_e_acsl_literal_string_364);
__e_acsl_delete_block((void *)(& process_status_197));
@@ -6373,7 +6373,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_198;
- __e_acsl_store_block((void *)(& process_status_198),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_198),4UL);
__gen_e_acsl_waitpid(pid_198,& process_status_198,0);
signal_eval(process_status_198,1,__gen_e_acsl_literal_string_365);
__e_acsl_delete_block((void *)(& process_status_198));
@@ -6387,7 +6387,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_199;
- __e_acsl_store_block((void *)(& process_status_199),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_199),4UL);
__gen_e_acsl_waitpid(pid_199,& process_status_199,0);
signal_eval(process_status_199,1,__gen_e_acsl_literal_string_367);
__e_acsl_delete_block((void *)(& process_status_199));
@@ -6401,7 +6401,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_200;
- __e_acsl_store_block((void *)(& process_status_200),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_200),4UL);
__gen_e_acsl_waitpid(pid_200,& process_status_200,0);
signal_eval(process_status_200,1,__gen_e_acsl_literal_string_369);
__e_acsl_delete_block((void *)(& process_status_200));
@@ -6415,7 +6415,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_201;
- __e_acsl_store_block((void *)(& process_status_201),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_201),4UL);
__gen_e_acsl_waitpid(pid_201,& process_status_201,0);
signal_eval(process_status_201,0,__gen_e_acsl_literal_string_370);
__e_acsl_delete_block((void *)(& process_status_201));
@@ -6429,7 +6429,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_202;
- __e_acsl_store_block((void *)(& process_status_202),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_202),4UL);
__gen_e_acsl_waitpid(pid_202,& process_status_202,0);
signal_eval(process_status_202,0,__gen_e_acsl_literal_string_371);
__e_acsl_delete_block((void *)(& process_status_202));
@@ -6443,7 +6443,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_203;
- __e_acsl_store_block((void *)(& process_status_203),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_203),4UL);
__gen_e_acsl_waitpid(pid_203,& process_status_203,0);
signal_eval(process_status_203,1,__gen_e_acsl_literal_string_372);
__e_acsl_delete_block((void *)(& process_status_203));
@@ -6457,7 +6457,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_204;
- __e_acsl_store_block((void *)(& process_status_204),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_204),4UL);
__gen_e_acsl_waitpid(pid_204,& process_status_204,0);
signal_eval(process_status_204,1,__gen_e_acsl_literal_string_373);
__e_acsl_delete_block((void *)(& process_status_204));
@@ -6471,7 +6471,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_205;
- __e_acsl_store_block((void *)(& process_status_205),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_205),4UL);
__gen_e_acsl_waitpid(pid_205,& process_status_205,0);
signal_eval(process_status_205,1,__gen_e_acsl_literal_string_374);
__e_acsl_delete_block((void *)(& process_status_205));
@@ -6485,7 +6485,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_206;
- __e_acsl_store_block((void *)(& process_status_206),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_206),4UL);
__gen_e_acsl_waitpid(pid_206,& process_status_206,0);
signal_eval(process_status_206,1,__gen_e_acsl_literal_string_375);
__e_acsl_delete_block((void *)(& process_status_206));
@@ -6499,7 +6499,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_207;
- __e_acsl_store_block((void *)(& process_status_207),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_207),4UL);
__gen_e_acsl_waitpid(pid_207,& process_status_207,0);
signal_eval(process_status_207,1,__gen_e_acsl_literal_string_377);
__e_acsl_delete_block((void *)(& process_status_207));
@@ -6513,7 +6513,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_208;
- __e_acsl_store_block((void *)(& process_status_208),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_208),4UL);
__gen_e_acsl_waitpid(pid_208,& process_status_208,0);
signal_eval(process_status_208,1,__gen_e_acsl_literal_string_379);
__e_acsl_delete_block((void *)(& process_status_208));
@@ -6527,7 +6527,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_209;
- __e_acsl_store_block((void *)(& process_status_209),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_209),4UL);
__gen_e_acsl_waitpid(pid_209,& process_status_209,0);
signal_eval(process_status_209,0,__gen_e_acsl_literal_string_380);
__e_acsl_delete_block((void *)(& process_status_209));
@@ -6541,7 +6541,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_210;
- __e_acsl_store_block((void *)(& process_status_210),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_210),4UL);
__gen_e_acsl_waitpid(pid_210,& process_status_210,0);
signal_eval(process_status_210,0,__gen_e_acsl_literal_string_381);
__e_acsl_delete_block((void *)(& process_status_210));
@@ -6555,7 +6555,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_211;
- __e_acsl_store_block((void *)(& process_status_211),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_211),4UL);
__gen_e_acsl_waitpid(pid_211,& process_status_211,0);
signal_eval(process_status_211,1,__gen_e_acsl_literal_string_382);
__e_acsl_delete_block((void *)(& process_status_211));
@@ -6569,7 +6569,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_212;
- __e_acsl_store_block((void *)(& process_status_212),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_212),4UL);
__gen_e_acsl_waitpid(pid_212,& process_status_212,0);
signal_eval(process_status_212,1,__gen_e_acsl_literal_string_383);
__e_acsl_delete_block((void *)(& process_status_212));
@@ -6583,7 +6583,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_213;
- __e_acsl_store_block((void *)(& process_status_213),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_213),4UL);
__gen_e_acsl_waitpid(pid_213,& process_status_213,0);
signal_eval(process_status_213,1,__gen_e_acsl_literal_string_384);
__e_acsl_delete_block((void *)(& process_status_213));
@@ -6597,7 +6597,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_214;
- __e_acsl_store_block((void *)(& process_status_214),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_214),4UL);
__gen_e_acsl_waitpid(pid_214,& process_status_214,0);
signal_eval(process_status_214,1,__gen_e_acsl_literal_string_385);
__e_acsl_delete_block((void *)(& process_status_214));
@@ -6611,7 +6611,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_215;
- __e_acsl_store_block((void *)(& process_status_215),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_215),4UL);
__gen_e_acsl_waitpid(pid_215,& process_status_215,0);
signal_eval(process_status_215,1,__gen_e_acsl_literal_string_387);
__e_acsl_delete_block((void *)(& process_status_215));
@@ -6625,7 +6625,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_216;
- __e_acsl_store_block((void *)(& process_status_216),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_216),4UL);
__gen_e_acsl_waitpid(pid_216,& process_status_216,0);
signal_eval(process_status_216,1,__gen_e_acsl_literal_string_389);
__e_acsl_delete_block((void *)(& process_status_216));
@@ -6639,7 +6639,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_217;
- __e_acsl_store_block((void *)(& process_status_217),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_217),4UL);
__gen_e_acsl_waitpid(pid_217,& process_status_217,0);
signal_eval(process_status_217,0,__gen_e_acsl_literal_string_390);
__e_acsl_delete_block((void *)(& process_status_217));
@@ -6653,7 +6653,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_218;
- __e_acsl_store_block((void *)(& process_status_218),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_218),4UL);
__gen_e_acsl_waitpid(pid_218,& process_status_218,0);
signal_eval(process_status_218,0,__gen_e_acsl_literal_string_391);
__e_acsl_delete_block((void *)(& process_status_218));
@@ -6667,7 +6667,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_219;
- __e_acsl_store_block((void *)(& process_status_219),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_219),4UL);
__gen_e_acsl_waitpid(pid_219,& process_status_219,0);
signal_eval(process_status_219,1,__gen_e_acsl_literal_string_392);
__e_acsl_delete_block((void *)(& process_status_219));
@@ -6681,7 +6681,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_220;
- __e_acsl_store_block((void *)(& process_status_220),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_220),4UL);
__gen_e_acsl_waitpid(pid_220,& process_status_220,0);
signal_eval(process_status_220,1,__gen_e_acsl_literal_string_393);
__e_acsl_delete_block((void *)(& process_status_220));
@@ -6695,7 +6695,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_221;
- __e_acsl_store_block((void *)(& process_status_221),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_221),4UL);
__gen_e_acsl_waitpid(pid_221,& process_status_221,0);
signal_eval(process_status_221,1,__gen_e_acsl_literal_string_394);
__e_acsl_delete_block((void *)(& process_status_221));
@@ -6709,7 +6709,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_222;
- __e_acsl_store_block((void *)(& process_status_222),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_222),4UL);
__gen_e_acsl_waitpid(pid_222,& process_status_222,0);
signal_eval(process_status_222,1,__gen_e_acsl_literal_string_395);
__e_acsl_delete_block((void *)(& process_status_222));
@@ -6723,7 +6723,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_223;
- __e_acsl_store_block((void *)(& process_status_223),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_223),4UL);
__gen_e_acsl_waitpid(pid_223,& process_status_223,0);
signal_eval(process_status_223,0,__gen_e_acsl_literal_string_397);
__e_acsl_delete_block((void *)(& process_status_223));
@@ -6737,7 +6737,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_224;
- __e_acsl_store_block((void *)(& process_status_224),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_224),4UL);
__gen_e_acsl_waitpid(pid_224,& process_status_224,0);
signal_eval(process_status_224,0,__gen_e_acsl_literal_string_398);
__e_acsl_delete_block((void *)(& process_status_224));
@@ -6751,7 +6751,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_225;
- __e_acsl_store_block((void *)(& process_status_225),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_225),4UL);
__gen_e_acsl_waitpid(pid_225,& process_status_225,0);
signal_eval(process_status_225,0,__gen_e_acsl_literal_string_399);
__e_acsl_delete_block((void *)(& process_status_225));
@@ -6765,7 +6765,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_226;
- __e_acsl_store_block((void *)(& process_status_226),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_226),4UL);
__gen_e_acsl_waitpid(pid_226,& process_status_226,0);
signal_eval(process_status_226,1,__gen_e_acsl_literal_string_400);
__e_acsl_delete_block((void *)(& process_status_226));
@@ -6779,7 +6779,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_227;
- __e_acsl_store_block((void *)(& process_status_227),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_227),4UL);
__gen_e_acsl_waitpid(pid_227,& process_status_227,0);
signal_eval(process_status_227,1,__gen_e_acsl_literal_string_401);
__e_acsl_delete_block((void *)(& process_status_227));
@@ -6794,7 +6794,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_228;
- __e_acsl_store_block((void *)(& process_status_228),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_228),4UL);
__gen_e_acsl_waitpid(pid_228,& process_status_228,0);
signal_eval(process_status_228,1,__gen_e_acsl_literal_string_402);
__e_acsl_delete_block((void *)(& process_status_228));
@@ -6808,7 +6808,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_229;
- __e_acsl_store_block((void *)(& process_status_229),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_229),4UL);
__gen_e_acsl_waitpid(pid_229,& process_status_229,0);
signal_eval(process_status_229,1,__gen_e_acsl_literal_string_403);
__e_acsl_delete_block((void *)(& process_status_229));
@@ -6822,7 +6822,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_230;
- __e_acsl_store_block((void *)(& process_status_230),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_230),4UL);
__gen_e_acsl_waitpid(pid_230,& process_status_230,0);
signal_eval(process_status_230,0,__gen_e_acsl_literal_string_405);
__e_acsl_delete_block((void *)(& process_status_230));
@@ -6836,7 +6836,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_231;
- __e_acsl_store_block((void *)(& process_status_231),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_231),4UL);
__gen_e_acsl_waitpid(pid_231,& process_status_231,0);
signal_eval(process_status_231,1,__gen_e_acsl_literal_string_406);
__e_acsl_delete_block((void *)(& process_status_231));
@@ -6850,7 +6850,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_232;
- __e_acsl_store_block((void *)(& process_status_232),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_232),4UL);
__gen_e_acsl_waitpid(pid_232,& process_status_232,0);
signal_eval(process_status_232,0,__gen_e_acsl_literal_string_408);
__e_acsl_delete_block((void *)(& process_status_232));
@@ -6864,7 +6864,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_233;
- __e_acsl_store_block((void *)(& process_status_233),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_233),4UL);
__gen_e_acsl_waitpid(pid_233,& process_status_233,0);
signal_eval(process_status_233,0,__gen_e_acsl_literal_string_409);
__e_acsl_delete_block((void *)(& process_status_233));
@@ -6878,7 +6878,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_234;
- __e_acsl_store_block((void *)(& process_status_234),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_234),4UL);
__gen_e_acsl_waitpid(pid_234,& process_status_234,0);
signal_eval(process_status_234,1,__gen_e_acsl_literal_string_410);
__e_acsl_delete_block((void *)(& process_status_234));
@@ -6892,7 +6892,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_235;
- __e_acsl_store_block((void *)(& process_status_235),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_235),4UL);
__gen_e_acsl_waitpid(pid_235,& process_status_235,0);
signal_eval(process_status_235,1,__gen_e_acsl_literal_string_411);
__e_acsl_delete_block((void *)(& process_status_235));
@@ -6907,7 +6907,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_236;
- __e_acsl_store_block((void *)(& process_status_236),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_236),4UL);
__gen_e_acsl_waitpid(pid_236,& process_status_236,0);
signal_eval(process_status_236,1,__gen_e_acsl_literal_string_412);
__e_acsl_delete_block((void *)(& process_status_236));
@@ -6921,7 +6921,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_237;
- __e_acsl_store_block((void *)(& process_status_237),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_237),4UL);
__gen_e_acsl_waitpid(pid_237,& process_status_237,0);
signal_eval(process_status_237,1,__gen_e_acsl_literal_string_413);
__e_acsl_delete_block((void *)(& process_status_237));
@@ -6936,7 +6936,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_238;
- __e_acsl_store_block((void *)(& process_status_238),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_238),4UL);
__gen_e_acsl_waitpid(pid_238,& process_status_238,0);
signal_eval(process_status_238,0,__gen_e_acsl_literal_string_414);
__e_acsl_delete_block((void *)(& process_status_238));
@@ -6951,7 +6951,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_239;
- __e_acsl_store_block((void *)(& process_status_239),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_239),4UL);
__gen_e_acsl_waitpid(pid_239,& process_status_239,0);
signal_eval(process_status_239,1,__gen_e_acsl_literal_string_415);
__e_acsl_delete_block((void *)(& process_status_239));
@@ -6965,7 +6965,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_240;
- __e_acsl_store_block((void *)(& process_status_240),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_240),4UL);
__gen_e_acsl_waitpid(pid_240,& process_status_240,0);
signal_eval(process_status_240,0,__gen_e_acsl_literal_string_417);
__e_acsl_delete_block((void *)(& process_status_240));
@@ -6979,7 +6979,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_241;
- __e_acsl_store_block((void *)(& process_status_241),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_241),4UL);
__gen_e_acsl_waitpid(pid_241,& process_status_241,0);
signal_eval(process_status_241,0,__gen_e_acsl_literal_string_419);
__e_acsl_delete_block((void *)(& process_status_241));
@@ -6993,7 +6993,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_242;
- __e_acsl_store_block((void *)(& process_status_242),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_242),4UL);
__gen_e_acsl_waitpid(pid_242,& process_status_242,0);
signal_eval(process_status_242,0,__gen_e_acsl_literal_string_421);
__e_acsl_delete_block((void *)(& process_status_242));
@@ -7007,7 +7007,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_243;
- __e_acsl_store_block((void *)(& process_status_243),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_243),4UL);
__gen_e_acsl_waitpid(pid_243,& process_status_243,0);
signal_eval(process_status_243,0,__gen_e_acsl_literal_string_423);
__e_acsl_delete_block((void *)(& process_status_243));
@@ -7021,7 +7021,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_244;
- __e_acsl_store_block((void *)(& process_status_244),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_244),4UL);
__gen_e_acsl_waitpid(pid_244,& process_status_244,0);
signal_eval(process_status_244,1,__gen_e_acsl_literal_string_425);
__e_acsl_delete_block((void *)(& process_status_244));
@@ -7035,7 +7035,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_245;
- __e_acsl_store_block((void *)(& process_status_245),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_245),4UL);
__gen_e_acsl_waitpid(pid_245,& process_status_245,0);
signal_eval(process_status_245,0,__gen_e_acsl_literal_string_427);
__e_acsl_delete_block((void *)(& process_status_245));
@@ -7049,7 +7049,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_246;
- __e_acsl_store_block((void *)(& process_status_246),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_246),4UL);
__gen_e_acsl_waitpid(pid_246,& process_status_246,0);
signal_eval(process_status_246,1,__gen_e_acsl_literal_string_428);
__e_acsl_delete_block((void *)(& process_status_246));
@@ -7063,7 +7063,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_247;
- __e_acsl_store_block((void *)(& process_status_247),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_247),4UL);
__gen_e_acsl_waitpid(pid_247,& process_status_247,0);
signal_eval(process_status_247,1,__gen_e_acsl_literal_string_429);
__e_acsl_delete_block((void *)(& process_status_247));
@@ -7077,7 +7077,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_248;
- __e_acsl_store_block((void *)(& process_status_248),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_248),4UL);
__gen_e_acsl_waitpid(pid_248,& process_status_248,0);
signal_eval(process_status_248,0,__gen_e_acsl_literal_string_431);
__e_acsl_delete_block((void *)(& process_status_248));
@@ -7091,7 +7091,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_249;
- __e_acsl_store_block((void *)(& process_status_249),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_249),4UL);
__gen_e_acsl_waitpid(pid_249,& process_status_249,0);
signal_eval(process_status_249,1,__gen_e_acsl_literal_string_432);
__e_acsl_delete_block((void *)(& process_status_249));
@@ -7105,7 +7105,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_250;
- __e_acsl_store_block((void *)(& process_status_250),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_250),4UL);
__gen_e_acsl_waitpid(pid_250,& process_status_250,0);
signal_eval(process_status_250,1,__gen_e_acsl_literal_string_433);
__e_acsl_delete_block((void *)(& process_status_250));
@@ -7120,7 +7120,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_251;
- __e_acsl_store_block((void *)(& process_status_251),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_251),4UL);
__gen_e_acsl_waitpid(pid_251,& process_status_251,0);
signal_eval(process_status_251,1,__gen_e_acsl_literal_string_434);
__e_acsl_delete_block((void *)(& process_status_251));
@@ -7134,7 +7134,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_252;
- __e_acsl_store_block((void *)(& process_status_252),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_252),4UL);
__gen_e_acsl_waitpid(pid_252,& process_status_252,0);
signal_eval(process_status_252,1,__gen_e_acsl_literal_string_436);
__e_acsl_delete_block((void *)(& process_status_252));
@@ -7148,7 +7148,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_253;
- __e_acsl_store_block((void *)(& process_status_253),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_253),4UL);
__gen_e_acsl_waitpid(pid_253,& process_status_253,0);
signal_eval(process_status_253,1,__gen_e_acsl_literal_string_438);
__e_acsl_delete_block((void *)(& process_status_253));
@@ -7162,7 +7162,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_254;
- __e_acsl_store_block((void *)(& process_status_254),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_254),4UL);
__gen_e_acsl_waitpid(pid_254,& process_status_254,0);
signal_eval(process_status_254,1,__gen_e_acsl_literal_string_440);
__e_acsl_delete_block((void *)(& process_status_254));
@@ -7176,7 +7176,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_255;
- __e_acsl_store_block((void *)(& process_status_255),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_255),4UL);
__gen_e_acsl_waitpid(pid_255,& process_status_255,0);
signal_eval(process_status_255,1,__gen_e_acsl_literal_string_442);
__e_acsl_delete_block((void *)(& process_status_255));
@@ -7190,7 +7190,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_256;
- __e_acsl_store_block((void *)(& process_status_256),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_256),4UL);
__gen_e_acsl_waitpid(pid_256,& process_status_256,0);
signal_eval(process_status_256,1,__gen_e_acsl_literal_string_444);
__e_acsl_delete_block((void *)(& process_status_256));
@@ -7204,7 +7204,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_257;
- __e_acsl_store_block((void *)(& process_status_257),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_257),4UL);
__gen_e_acsl_waitpid(pid_257,& process_status_257,0);
signal_eval(process_status_257,1,__gen_e_acsl_literal_string_446);
__e_acsl_delete_block((void *)(& process_status_257));
@@ -7218,7 +7218,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_258;
- __e_acsl_store_block((void *)(& process_status_258),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_258),4UL);
__gen_e_acsl_waitpid(pid_258,& process_status_258,0);
signal_eval(process_status_258,1,__gen_e_acsl_literal_string_448);
__e_acsl_delete_block((void *)(& process_status_258));
@@ -7232,7 +7232,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_259;
- __e_acsl_store_block((void *)(& process_status_259),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_259),4UL);
__gen_e_acsl_waitpid(pid_259,& process_status_259,0);
signal_eval(process_status_259,1,__gen_e_acsl_literal_string_450);
__e_acsl_delete_block((void *)(& process_status_259));
@@ -7246,7 +7246,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_260;
- __e_acsl_store_block((void *)(& process_status_260),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_260),4UL);
__gen_e_acsl_waitpid(pid_260,& process_status_260,0);
signal_eval(process_status_260,1,__gen_e_acsl_literal_string_451);
__e_acsl_delete_block((void *)(& process_status_260));
@@ -7260,7 +7260,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_261;
- __e_acsl_store_block((void *)(& process_status_261),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_261),4UL);
__gen_e_acsl_waitpid(pid_261,& process_status_261,0);
signal_eval(process_status_261,1,__gen_e_acsl_literal_string_453);
__e_acsl_delete_block((void *)(& process_status_261));
@@ -7274,7 +7274,7 @@ int main(int argc, char const **argv)
}
else {
int process_status_262;
- __e_acsl_store_block((void *)(& process_status_262),(size_t)4);
+ __e_acsl_store_block((void *)(& process_status_262),4UL);
__gen_e_acsl_waitpid(pid_262,& process_status_262,0);
signal_eval(process_status_262,1,__gen_e_acsl_literal_string_455);
__e_acsl_delete_block((void *)(& process_status_262));
diff --git a/src/plugins/e-acsl/tests/format/oracle/gen_sprintf.c b/src/plugins/e-acsl/tests/format/oracle/gen_sprintf.c
index d8e75e298d384a07be57646a7a6c137d46bd2339..755f61a5d9da423d7eda00006ec570ea6de0531a 100644
--- a/src/plugins/e-acsl/tests/format/oracle/gen_sprintf.c
+++ b/src/plugins/e-acsl/tests/format/oracle/gen_sprintf.c
@@ -25,11 +25,11 @@ void __e_acsl_globals_init(void)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
{
char buf[4];
- __e_acsl_store_block((void *)(buf),(size_t)4);
+ __e_acsl_store_block((void *)(buf),4UL);
{
int __gen_e_acsl_size;
int __gen_e_acsl_if;
@@ -132,7 +132,7 @@ int main(void)
}
{
char buf_0[4];
- __e_acsl_store_block((void *)(buf_0),(size_t)4);
+ __e_acsl_store_block((void *)(buf_0),4UL);
{
int __gen_e_acsl_size_3;
int __gen_e_acsl_if_3;
@@ -171,7 +171,7 @@ int main(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_4);
}
/*@ assert !\initialized(&buf_0[0 .. 3]); */ ;
- __e_acsl_builtin_snprintf("d",buf_0,(unsigned long)2,
+ __e_acsl_builtin_snprintf("d",buf_0,(size_t)2,
__gen_e_acsl_literal_string,10);
{
int __gen_e_acsl_size_4;
@@ -263,7 +263,7 @@ int main(void)
}
{
char buf_1[4];
- __e_acsl_store_block((void *)(buf_1),(size_t)4);
+ __e_acsl_store_block((void *)(buf_1),4UL);
{
int __gen_e_acsl_size_5;
int __gen_e_acsl_if_5;
@@ -302,7 +302,7 @@ int main(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_8);
}
/*@ assert !\initialized(&buf_1[0 .. 3]); */ ;
- __e_acsl_builtin_snprintf("d",buf_1,(unsigned long)4,
+ __e_acsl_builtin_snprintf("d",buf_1,(size_t)4,
__gen_e_acsl_literal_string,10);
{
int __gen_e_acsl_size_6;
diff --git a/src/plugins/e-acsl/tests/full-mtracking/oracle/gen_addrOf.c b/src/plugins/e-acsl/tests/full-mtracking/oracle/gen_addrOf.c
index 2bfaddf7fd9fa6b254622fac26cf30c450922d08..f1d2267d9164fcf91f8a53e43ec363925b734ae1 100644
--- a/src/plugins/e-acsl/tests/full-mtracking/oracle/gen_addrOf.c
+++ b/src/plugins/e-acsl/tests/full-mtracking/oracle/gen_addrOf.c
@@ -13,9 +13,9 @@ void f(void)
int m;
int *u;
int *p;
- __e_acsl_store_block((void *)(& p),(size_t)8);
- __e_acsl_store_block((void *)(& u),(size_t)8);
- __e_acsl_store_block((void *)(& m),(size_t)4);
+ __e_acsl_store_block((void *)(& p),8UL);
+ __e_acsl_store_block((void *)(& u),8UL);
+ __e_acsl_store_block((void *)(& m),4UL);
__e_acsl_full_init((void *)(& u));
u = & m;
__e_acsl_full_init((void *)(& p));
@@ -53,7 +53,7 @@ void __e_acsl_globals_init(void)
static char __e_acsl_already_run = 0;
if (! __e_acsl_already_run) {
__e_acsl_already_run = 1;
- __e_acsl_store_block((void *)(& f),(size_t)1);
+ __e_acsl_store_block((void *)(& f),1UL);
__e_acsl_full_init((void *)(& f));
}
return;
@@ -68,11 +68,11 @@ void __e_acsl_globals_clean(void)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
+ __e_acsl_store_block((void *)(& __retres),4UL);
int x = 0;
- __e_acsl_store_block((void *)(& x),(size_t)4);
+ __e_acsl_store_block((void *)(& x),4UL);
__e_acsl_full_init((void *)(& x));
f();
{
diff --git a/src/plugins/e-acsl/tests/gmp-only/oracle/gen_arith.c b/src/plugins/e-acsl/tests/gmp-only/oracle/gen_arith.c
index 49d42dfc6c9aef366ad1d395654d9d49ef7ca65e..6bc0e28ab20ceb013e10d4e7c9dec4f4fb9939e8 100644
--- a/src/plugins/e-acsl/tests/gmp-only/oracle/gen_arith.c
+++ b/src/plugins/e-acsl/tests/gmp-only/oracle/gen_arith.c
@@ -11,7 +11,7 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
int x = -3;
int y = 2;
long z = 2L;
diff --git a/src/plugins/e-acsl/tests/gmp-only/oracle/gen_extended_quantifiers.c b/src/plugins/e-acsl/tests/gmp-only/oracle/gen_extended_quantifiers.c
index e85555c31985242aa8aba85a3b75c94a223627ae..ec76834879dab03a1c576a90297e278f190229cb 100644
--- a/src/plugins/e-acsl/tests/gmp-only/oracle/gen_extended_quantifiers.c
+++ b/src/plugins/e-acsl/tests/gmp-only/oracle/gen_extended_quantifiers.c
@@ -11,7 +11,7 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
{
__e_acsl_mpz_t __gen_e_acsl_;
__e_acsl_mpz_t __gen_e_acsl__2;
diff --git a/src/plugins/e-acsl/tests/gmp-only/oracle/gen_functions.c b/src/plugins/e-acsl/tests/gmp-only/oracle/gen_functions.c
index 9a6b723e62272b8954fd816710f7ae0440e6edbe..b646036d142e3d94257bebc414cf530aa3699338 100644
--- a/src/plugins/e-acsl/tests/gmp-only/oracle/gen_functions.c
+++ b/src/plugins/e-acsl/tests/gmp-only/oracle/gen_functions.c
@@ -88,7 +88,7 @@ int main(void)
{
int __retres;
mystruct m;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
int x = 1;
int y = 2;
{
diff --git a/src/plugins/e-acsl/tests/libc/oracle/gen_file.c b/src/plugins/e-acsl/tests/libc/oracle/gen_file.c
index f4e8c5310d990d1a47034b19a3fd5758e5a50a3b..8cbed47e6d6eca93a65082a59423d309ade3ac47 100644
--- a/src/plugins/e-acsl/tests/libc/oracle/gen_file.c
+++ b/src/plugins/e-acsl/tests/libc/oracle/gen_file.c
@@ -79,8 +79,8 @@ size_t __gen_e_acsl_fread(void * restrict ptr, size_t size, size_t nmemb,
unsigned long __gen_e_acsl_size_4;
int __gen_e_acsl_valid;
int __gen_e_acsl_valid_2;
- __e_acsl_store_block((void *)(& stream),(size_t)8);
- __e_acsl_store_block((void *)(& ptr),(size_t)8);
+ __e_acsl_store_block((void *)(& stream),8UL);
+ __e_acsl_store_block((void *)(& ptr),8UL);
__gen_e_acsl_at = ptr;
__gmpz_init_set_ui(__gen_e_acsl_size,size);
__gmpz_init_set(__gen_e_acsl_at_2,
@@ -406,7 +406,7 @@ FILE *__gen_e_acsl_fopen(char const * restrict filename,
char const * restrict mode)
{
FILE *__retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)8);
+ __e_acsl_store_block((void *)(& __retres),8UL);
__retres = fopen(filename,mode);
__e_acsl_delete_block((void *)(& __retres));
return __retres;
@@ -436,17 +436,16 @@ int main(void)
int buf[6];
size_t tmp_0;
int buf2[6];
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
- __e_acsl_store_block((void *)(buf2),(size_t)24);
- __e_acsl_store_block((void *)(buf),(size_t)24);
+ __e_acsl_store_block((void *)(buf2),24UL);
+ __e_acsl_store_block((void *)(buf),24UL);
FILE *f =
__gen_e_acsl_fopen(__gen_e_acsl_literal_string_2,
__gen_e_acsl_literal_string);
- __e_acsl_store_block((void *)(& f),(size_t)8);
+ __e_acsl_store_block((void *)(& f),8UL);
__e_acsl_full_init((void *)(& f));
- tmp_0 = __gen_e_acsl_fread((void *)(& buf[1]),sizeof(int),(unsigned long)4,
- f);
+ tmp_0 = __gen_e_acsl_fread((void *)(& buf[1]),sizeof(int),(size_t)4,f);
int res = (int)tmp_0;
{
int __gen_e_acsl_initialized;
@@ -624,7 +623,7 @@ int main(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_7);
}
/*@ assert !\initialized(&buf[5]); */ ;
- __gen_e_acsl_fread((void *)(& buf2[1]),sizeof(int),(unsigned long)4,f);
+ __gen_e_acsl_fread((void *)(& buf2[1]),sizeof(int),(size_t)4,f);
{
int __gen_e_acsl_initialized_8;
__e_acsl_assert_data_t __gen_e_acsl_assert_data_8 =
diff --git a/src/plugins/e-acsl/tests/libc/oracle/gen_mem.c b/src/plugins/e-acsl/tests/libc/oracle/gen_mem.c
index 5d9daf5e2e76e143f2c8324aba63392160a3723c..f78bba294659ffb2db1e47567a96b450b71a65e1 100644
--- a/src/plugins/e-acsl/tests/libc/oracle/gen_mem.c
+++ b/src/plugins/e-acsl/tests/libc/oracle/gen_mem.c
@@ -56,11 +56,11 @@ int main(void)
char a[2];
int b[5];
char c[4];
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
- __e_acsl_store_block((void *)(c),(size_t)4);
- __e_acsl_store_block((void *)(b),(size_t)20);
- __e_acsl_store_block((void *)(a),(size_t)2);
- __gen_e_acsl_memset((void *)(a),1,(unsigned long)1);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+ __e_acsl_store_block((void *)(c),4UL);
+ __e_acsl_store_block((void *)(b),20UL);
+ __e_acsl_store_block((void *)(a),2UL);
+ __gen_e_acsl_memset((void *)(a),1,(size_t)1);
{
int __gen_e_acsl_initialized;
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
@@ -106,7 +106,7 @@ int main(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_2);
}
/*@ assert !\initialized(&a[1]); */ ;
- __gen_e_acsl_memset((void *)(& a[1]),1,(unsigned long)1);
+ __gen_e_acsl_memset((void *)(& a[1]),1,(size_t)1);
{
int __gen_e_acsl_initialized_3;
__e_acsl_assert_data_t __gen_e_acsl_assert_data_3 =
@@ -240,7 +240,7 @@ int main(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_7);
}
/*@ assert !\initialized(&b[4]); */ ;
- __gen_e_acsl_memcpy((void *)(& c[1]),(void const *)(a),(unsigned long)2);
+ __gen_e_acsl_memcpy((void *)(& c[1]),(void const *)(a),(size_t)2);
{
int __gen_e_acsl_initialized_8;
__e_acsl_assert_data_t __gen_e_acsl_assert_data_8 =
@@ -325,7 +325,7 @@ int main(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_10);
}
/*@ assert !\initialized(&c[3]); */ ;
- __gen_e_acsl_memmove((void *)(c),(void const *)(& c[1]),(unsigned long)2);
+ __gen_e_acsl_memmove((void *)(c),(void const *)(& c[1]),(size_t)2);
{
int __gen_e_acsl_size_3;
int __gen_e_acsl_if_3;
@@ -406,7 +406,7 @@ void *__gen_e_acsl_memset(void *s, int c, size_t n)
{
void *__gen_e_acsl_at;
void *__retres;
- __e_acsl_store_block((void *)(& s),(size_t)8);
+ __e_acsl_store_block((void *)(& s),8UL);
__gen_e_acsl_at = s;
__retres = memset(s,c,n);
__e_acsl_initialize(s,n);
@@ -447,8 +447,8 @@ void *__gen_e_acsl_memmove(void *dest, void const *src, size_t n)
{
void *__gen_e_acsl_at;
void *__retres;
- __e_acsl_store_block((void *)(& src),(size_t)8);
- __e_acsl_store_block((void *)(& dest),(size_t)8);
+ __e_acsl_store_block((void *)(& src),8UL);
+ __e_acsl_store_block((void *)(& dest),8UL);
__gen_e_acsl_at = dest;
__retres = memmove(dest,src,n);
__e_acsl_initialize(dest,n);
@@ -516,8 +516,8 @@ void *__gen_e_acsl_memcpy(void * restrict dest, void const * restrict src,
unsigned long __gen_e_acsl__6;
unsigned long __gen_e_acsl_if_4;
int __gen_e_acsl_separated;
- __e_acsl_store_block((void *)(& src),(size_t)8);
- __e_acsl_store_block((void *)(& dest),(size_t)8);
+ __e_acsl_store_block((void *)(& src),8UL);
+ __e_acsl_store_block((void *)(& dest),8UL);
__gen_e_acsl_at = dest;
__e_acsl_assert_data_t __gen_e_acsl_assert_data_3 =
{.values = (void *)0};
@@ -633,8 +633,7 @@ void *__gen_e_acsl_memcpy(void * restrict dest, void const * restrict src,
__gen_e_acsl_size_4);
__gen_e_acsl_if_4 = __gen_e_acsl_size_4;
}
- __gen_e_acsl_separated = __e_acsl_separated((size_t)2,
- (char *)dest + 1 * 0,
+ __gen_e_acsl_separated = __e_acsl_separated(2UL,(char *)dest + 1 * 0,
__gen_e_acsl_if_3,
(char *)src + 1 * 0,
__gen_e_acsl_if_4);
diff --git a/src/plugins/e-acsl/tests/libc/oracle/gen_sprintf.c b/src/plugins/e-acsl/tests/libc/oracle/gen_sprintf.c
index 16a88485d71ba1ada9531b509e986dbe305cbeb8..90bc6d701d2386251fbd84799ee19877e6e3f16b 100644
--- a/src/plugins/e-acsl/tests/libc/oracle/gen_sprintf.c
+++ b/src/plugins/e-acsl/tests/libc/oracle/gen_sprintf.c
@@ -28,11 +28,11 @@ int main(void)
int __gen_e_acsl_snprintf_res;
int __gen_e_acsl_sprintf_res;
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
{
char buf[4];
- __e_acsl_store_block((void *)(buf),(size_t)4);
+ __e_acsl_store_block((void *)(buf),4UL);
{
int __gen_e_acsl_size;
int __gen_e_acsl_if;
@@ -137,7 +137,7 @@ int main(void)
}
{
char buf_0[4];
- __e_acsl_store_block((void *)(buf_0),(size_t)4);
+ __e_acsl_store_block((void *)(buf_0),4UL);
{
int __gen_e_acsl_size_3;
int __gen_e_acsl_if_3;
@@ -176,11 +176,11 @@ int main(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_4);
}
/*@ assert !\initialized(&buf_0[0 .. 3]); */ ;
- __gen_e_acsl_snprintf_res = snprintf(buf_0,(unsigned long)2,
+ __gen_e_acsl_snprintf_res = snprintf(buf_0,(size_t)2,
__gen_e_acsl_literal_string,10); /* snprintf_va_1 */
if (__gen_e_acsl_snprintf_res >= 0) {
unsigned long __gen_e_acsl_n;
- if (2UL <= (unsigned long)__gen_e_acsl_snprintf_res) __gen_e_acsl_n = (unsigned long)2;
+ if (2UL <= (size_t)__gen_e_acsl_snprintf_res) __gen_e_acsl_n = (size_t)2;
else __gen_e_acsl_n = __gen_e_acsl_snprintf_res + 1L;
__e_acsl_initialize((void *)(buf_0),__gen_e_acsl_n);
}
@@ -264,7 +264,7 @@ int main(void)
}
{
char buf_1[4];
- __e_acsl_store_block((void *)(buf_1),(size_t)4);
+ __e_acsl_store_block((void *)(buf_1),4UL);
{
int __gen_e_acsl_size_6;
int __gen_e_acsl_if_6;
@@ -303,11 +303,11 @@ int main(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_7);
}
/*@ assert !\initialized(&buf_1[0 .. 3]); */ ;
- __gen_e_acsl_snprintf_res_2 = snprintf(buf_1,(unsigned long)4,
+ __gen_e_acsl_snprintf_res_2 = snprintf(buf_1,(size_t)4,
__gen_e_acsl_literal_string,10); /* snprintf_va_2 */
if (__gen_e_acsl_snprintf_res_2 >= 0) {
unsigned long __gen_e_acsl_n_2;
- if (4UL <= (unsigned long)__gen_e_acsl_snprintf_res_2) __gen_e_acsl_n_2 = (unsigned long)4;
+ if (4UL <= (size_t)__gen_e_acsl_snprintf_res_2) __gen_e_acsl_n_2 = (size_t)4;
else __gen_e_acsl_n_2 = __gen_e_acsl_snprintf_res_2 + 1L;
__e_acsl_initialize((void *)(buf_1),__gen_e_acsl_n_2);
}
diff --git a/src/plugins/e-acsl/tests/libc/oracle/gen_str.c b/src/plugins/e-acsl/tests/libc/oracle/gen_str.c
index a920841927e7a495fe70d277d47f50922257f2c0..4099d75571071fa1f029b4126b1d90dce33cc243 100644
--- a/src/plugins/e-acsl/tests/libc/oracle/gen_str.c
+++ b/src/plugins/e-acsl/tests/libc/oracle/gen_str.c
@@ -154,9 +154,9 @@ char *__gen_e_acsl_strncat(char * restrict dest, char const * restrict src,
__e_acsl_contract_t *__gen_e_acsl_contract;
char *__gen_e_acsl_at;
char *__retres;
- __e_acsl_store_block((void *)(& dest),(size_t)8);
+ __e_acsl_store_block((void *)(& dest),8UL);
__gen_e_acsl_at = dest;
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+ __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
__gen_e_acsl_strcat_src_size = __e_acsl_builtin_strlen(src);
if (n < __gen_e_acsl_strcat_src_size) __gen_e_acsl_strcat_src_size = n;
__gen_e_acsl_strcat_dest_size = __e_acsl_builtin_strlen((char const *)dest);
@@ -260,7 +260,7 @@ char *__gen_e_acsl_strcat(char * restrict dest, char const * restrict src)
unsigned long __gen_e_acsl_strcat_src_size;
char *__gen_e_acsl_at;
char *__retres;
- __e_acsl_store_block((void *)(& dest),(size_t)8);
+ __e_acsl_store_block((void *)(& dest),8UL);
__gen_e_acsl_at = dest;
__gen_e_acsl_strcat_src_size = __e_acsl_builtin_strlen(src);
__gen_e_acsl_strcat_dest_size = __e_acsl_builtin_strlen((char const *)dest);
@@ -389,13 +389,13 @@ char *__gen_e_acsl_strncpy(char * restrict dest, char const * restrict src,
unsigned long __gen_e_acsl__7;
unsigned long __gen_e_acsl_if_5;
int __gen_e_acsl_separated;
- __e_acsl_store_block((void *)(& src),(size_t)8);
- __e_acsl_store_block((void *)(& dest),(size_t)8);
+ __e_acsl_store_block((void *)(& src),8UL);
+ __e_acsl_store_block((void *)(& dest),8UL);
__gen_e_acsl_at = dest;
__gmpz_init_set_ui(__gen_e_acsl_n,n);
__gmpz_init_set(__gen_e_acsl_at_2,
(__e_acsl_mpz_struct const *)(__gen_e_acsl_n));
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+ __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data_2 =
{.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data_2,"dest",
@@ -545,7 +545,7 @@ char *__gen_e_acsl_strncpy(char * restrict dest, char const * restrict src,
__gen_e_acsl_size_5);
__gen_e_acsl_if_5 = __gen_e_acsl_size_5;
}
- __gen_e_acsl_separated = __e_acsl_separated((size_t)2,dest + 1 * 0,
+ __gen_e_acsl_separated = __e_acsl_separated(2UL,dest + 1 * 0,
__gen_e_acsl_if_4,
src + 1 * 0,
__gen_e_acsl_if_5);
@@ -675,8 +675,8 @@ char *__gen_e_acsl_strcpy(char * restrict dest, char const * restrict src)
unsigned long __gen_e_acsl_strcpy_src_size;
char *__gen_e_acsl_at;
char *__retres;
- __e_acsl_store_block((void *)(& src),(size_t)8);
- __e_acsl_store_block((void *)(& dest),(size_t)8);
+ __e_acsl_store_block((void *)(& src),8UL);
+ __e_acsl_store_block((void *)(& dest),8UL);
__gen_e_acsl_at = dest;
__gen_e_acsl_strcpy_src_size = __e_acsl_builtin_strlen(src);
__retres = strcpy(dest,src);
@@ -756,13 +756,13 @@ void __e_acsl_globals_init(void)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
{
char dest[4];
- __e_acsl_store_block((void *)(dest),(size_t)4);
+ __e_acsl_store_block((void *)(dest),4UL);
char src[2] = {(char)'b', (char)'\000'};
- __e_acsl_store_block((void *)(src),(size_t)2);
+ __e_acsl_store_block((void *)(src),2UL);
__e_acsl_full_init((void *)(& src));
{
int __gen_e_acsl_size;
@@ -917,9 +917,9 @@ int main(void)
}
{
char dest_0[4];
- __e_acsl_store_block((void *)(dest_0),(size_t)4);
+ __e_acsl_store_block((void *)(dest_0),4UL);
char src_0[4] = {(char)'a', (char)'b', (char)'\000'};
- __e_acsl_store_block((void *)(src_0),(size_t)4);
+ __e_acsl_store_block((void *)(src_0),4UL);
__e_acsl_full_init((void *)(& src_0));
{
int __gen_e_acsl_size_5;
@@ -997,7 +997,7 @@ int main(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_6);
}
/*@ assert \initialized(&src_0[0 .. 3]); */ ;
- __gen_e_acsl_strncpy(dest_0,(char const *)(src_0),(unsigned long)1);
+ __gen_e_acsl_strncpy(dest_0,(char const *)(src_0),(size_t)1);
{
int __gen_e_acsl_initialized_7;
__e_acsl_assert_data_t __gen_e_acsl_assert_data_7 =
@@ -1065,9 +1065,9 @@ int main(void)
}
{
char dest_1[4];
- __e_acsl_store_block((void *)(dest_1),(size_t)4);
+ __e_acsl_store_block((void *)(dest_1),4UL);
char src_1[4] = {(char)'b', (char)'\000'};
- __e_acsl_store_block((void *)(src_1),(size_t)4);
+ __e_acsl_store_block((void *)(src_1),4UL);
__e_acsl_full_init((void *)(& src_1));
{
int __gen_e_acsl_size_8;
@@ -1145,7 +1145,7 @@ int main(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_10);
}
/*@ assert \initialized(&src_1[0 .. 3]); */ ;
- __gen_e_acsl_strncpy(dest_1,(char const *)(src_1),(unsigned long)3);
+ __gen_e_acsl_strncpy(dest_1,(char const *)(src_1),(size_t)3);
{
int __gen_e_acsl_size_10;
int __gen_e_acsl_if_10;
@@ -1213,10 +1213,10 @@ int main(void)
}
{
char dest_2[4];
- __e_acsl_store_block((void *)(dest_2),(size_t)4);
+ __e_acsl_store_block((void *)(dest_2),4UL);
__gen_e_acsl_strcpy(dest_2,__gen_e_acsl_literal_string);
char src_2[2] = {(char)'b', (char)'\000'};
- __e_acsl_store_block((void *)(src_2),(size_t)2);
+ __e_acsl_store_block((void *)(src_2),2UL);
__e_acsl_full_init((void *)(& src_2));
{
int __gen_e_acsl_size_11;
@@ -1400,10 +1400,10 @@ int main(void)
}
{
char dest_3[4];
- __e_acsl_store_block((void *)(dest_3),(size_t)4);
+ __e_acsl_store_block((void *)(dest_3),4UL);
__gen_e_acsl_strcpy(dest_3,__gen_e_acsl_literal_string);
char src_3[3] = {(char)'b', (char)'c', (char)'\000'};
- __e_acsl_store_block((void *)(src_3),(size_t)3);
+ __e_acsl_store_block((void *)(src_3),3UL);
__e_acsl_full_init((void *)(& src_3));
{
int __gen_e_acsl_size_15;
@@ -1519,7 +1519,7 @@ int main(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_20);
}
/*@ assert \initialized(&src_3[0 .. 2]); */ ;
- __gen_e_acsl_strncat(dest_3,(char const *)(src_3),(unsigned long)1);
+ __gen_e_acsl_strncat(dest_3,(char const *)(src_3),(size_t)1);
{
int __gen_e_acsl_size_18;
int __gen_e_acsl_if_18;
@@ -1587,10 +1587,10 @@ int main(void)
}
{
char dest_4[4];
- __e_acsl_store_block((void *)(dest_4),(size_t)4);
+ __e_acsl_store_block((void *)(dest_4),4UL);
__gen_e_acsl_strcpy(dest_4,__gen_e_acsl_literal_string);
char src_4[2] = {(char)'b', (char)'\000'};
- __e_acsl_store_block((void *)(src_4),(size_t)2);
+ __e_acsl_store_block((void *)(src_4),2UL);
__e_acsl_full_init((void *)(& src_4));
{
int __gen_e_acsl_size_19;
@@ -1706,7 +1706,7 @@ int main(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_25);
}
/*@ assert \initialized(&src_4[0 .. 1]); */ ;
- __gen_e_acsl_strncat(dest_4,(char const *)(src_4),(unsigned long)2);
+ __gen_e_acsl_strncat(dest_4,(char const *)(src_4),(size_t)2);
{
int __gen_e_acsl_size_22;
int __gen_e_acsl_if_22;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_addrOf.c b/src/plugins/e-acsl/tests/memory/oracle/gen_addrOf.c
index 5bd22c0c309332b9d6debd3ad73b000eaeec4736..355e8753d49eedf6596f852854d2d581941a3ac7 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_addrOf.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_addrOf.c
@@ -13,9 +13,9 @@ void f(void)
int m;
int *u;
int *p;
- __e_acsl_store_block((void *)(& p),(size_t)8);
- __e_acsl_store_block((void *)(& u),(size_t)8);
- __e_acsl_store_block((void *)(& m),(size_t)4);
+ __e_acsl_store_block((void *)(& p),8UL);
+ __e_acsl_store_block((void *)(& u),8UL);
+ __e_acsl_store_block((void *)(& m),4UL);
__e_acsl_full_init((void *)(& u));
u = & m;
__e_acsl_full_init((void *)(& p));
@@ -51,7 +51,7 @@ void f(void)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
int x = 0;
f();
{
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_alias.c b/src/plugins/e-acsl/tests/memory/oracle/gen_alias.c
index 22db7776b56bf72e22839f15db171652896df652..2581ae7200fe864d0d81e98bc3940267389330d4 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_alias.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_alias.c
@@ -10,9 +10,9 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
void f(int *dest, int val)
{
- __e_acsl_store_block((void *)(& dest),(size_t)8);
+ __e_acsl_store_block((void *)(& dest),8UL);
int *ptr = dest;
- __e_acsl_store_block((void *)(& ptr),(size_t)8);
+ __e_acsl_store_block((void *)(& ptr),8UL);
__e_acsl_full_init((void *)(& ptr));
__e_acsl_initialize((void *)ptr,sizeof(int));
*ptr = val;
@@ -25,8 +25,8 @@ int main(void)
{
int __retres;
int i;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
- __e_acsl_store_block((void *)(& i),(size_t)4);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+ __e_acsl_store_block((void *)(& i),4UL);
f(& i,255);
{
int __gen_e_acsl_initialized;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_array_overflow.c b/src/plugins/e-acsl/tests/memory/oracle/gen_array_overflow.c
index 00caeae3b6f385c7cd77aa7e3ef244aea40575ca..75cb5f6b3252ca0299b5061d6a5f0a80bb000208 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_array_overflow.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_array_overflow.c
@@ -28,9 +28,9 @@ void init4(int *arr, int start)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
int a[4] = {1, 2, 3, 4};
- __e_acsl_store_block((void *)(a),(size_t)16);
+ __e_acsl_store_block((void *)(a),16UL);
__e_acsl_full_init((void *)(& a));
int b[4] = {5, 6, 7, 8};
{
@@ -55,7 +55,7 @@ int main(void)
}
/*@ assert !\valid(&a[4]); */ ;
int *ap = a;
- __e_acsl_store_block((void *)(& ap),(size_t)8);
+ __e_acsl_store_block((void *)(& ap),8UL);
__e_acsl_full_init((void *)(& ap));
int *bp = b;
{
@@ -85,13 +85,13 @@ int main(void)
}
/*@ assert !\valid(&(*((int (*)[])ap))[4]); */ ;
struct dat d = {.arr = {4, 5, 6, 7}};
- __e_acsl_store_block((void *)(& d),(size_t)16);
+ __e_acsl_store_block((void *)(& d),16UL);
__e_acsl_full_init((void *)(& d));
struct dat dd = {.arr = {1, 2, 3, 9}};
- __e_acsl_store_block((void *)(& dd),(size_t)16);
+ __e_acsl_store_block((void *)(& dd),16UL);
__e_acsl_full_init((void *)(& dd));
struct dat2 d2 = {.p = {& d, & dd}};
- __e_acsl_store_block((void *)(& d2),(size_t)16);
+ __e_acsl_store_block((void *)(& d2),16UL);
__e_acsl_full_init((void *)(& d2));
{
int __gen_e_acsl_valid_3;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_base_addr.c b/src/plugins/e-acsl/tests/memory/oracle/gen_base_addr.c
index ffe642164ba07f4c73bb7a6b3f48617c0baad823..c5fc859be534c74efe40f000927549b587545c4c 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_base_addr.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_base_addr.c
@@ -16,9 +16,9 @@ void __e_acsl_globals_init(void)
static char __e_acsl_already_run = 0;
if (! __e_acsl_already_run) {
__e_acsl_already_run = 1;
- __e_acsl_store_block((void *)(& PA),(size_t)8);
+ __e_acsl_store_block((void *)(& PA),8UL);
__e_acsl_full_init((void *)(& PA));
- __e_acsl_store_block((void *)(A),(size_t)16);
+ __e_acsl_store_block((void *)(A),16UL);
__e_acsl_full_init((void *)(& A));
}
return;
@@ -35,9 +35,9 @@ int main(void)
{
int __retres;
int *pa;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
- __e_acsl_store_block((void *)(& pa),(size_t)8);
+ __e_acsl_store_block((void *)(& pa),8UL);
PA = (int *)(& A);
{
void *__gen_e_acsl_base_addr;
@@ -156,7 +156,7 @@ int main(void)
}
/*@ assert \base_addr(PA + 2) == \base_addr(&A[3]); */ ;
int a[4] = {1, 2, 3, 4};
- __e_acsl_store_block((void *)(a),(size_t)16);
+ __e_acsl_store_block((void *)(a),16UL);
__e_acsl_full_init((void *)(& a));
__e_acsl_full_init((void *)(& pa));
pa = (int *)(& a);
@@ -279,10 +279,10 @@ int main(void)
}
/*@ assert \base_addr(pa + 2) == \base_addr((int *)a); */ ;
long l = (long)4;
- __e_acsl_store_block((void *)(& l),(size_t)8);
+ __e_acsl_store_block((void *)(& l),8UL);
__e_acsl_full_init((void *)(& l));
char *pl = (char *)(& l);
- __e_acsl_store_block((void *)(& pl),(size_t)8);
+ __e_acsl_store_block((void *)(& pl),8UL);
__e_acsl_full_init((void *)(& pl));
{
void *__gen_e_acsl_base_addr_21;
@@ -330,7 +330,7 @@ int main(void)
}
/*@ assert \base_addr(pl + 2) == \base_addr(&l); */ ;
short *pi = (short *)(& l);
- __e_acsl_store_block((void *)(& pi),(size_t)8);
+ __e_acsl_store_block((void *)(& pi),8UL);
__e_acsl_full_init((void *)(& pi));
__e_acsl_full_init((void *)(& pi));
pi ++;
@@ -380,11 +380,11 @@ int main(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_14);
}
/*@ assert \base_addr(pl) == \base_addr(&l); */ ;
- char *p = malloc((unsigned long)12);
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ char *p = malloc((size_t)12);
+ __e_acsl_store_block((void *)(& p),8UL);
__e_acsl_full_init((void *)(& p));
char *pd = p;
- __e_acsl_store_block((void *)(& pd),(size_t)8);
+ __e_acsl_store_block((void *)(& pd),8UL);
__e_acsl_full_init((void *)(& pd));
{
void *__gen_e_acsl_base_addr_29;
@@ -505,10 +505,10 @@ int main(void)
}
/*@ assert \base_addr(p - 5) == \base_addr(pd); */ ;
long *q = malloc((unsigned long)30 * sizeof(long));
- __e_acsl_store_block((void *)(& q),(size_t)8);
+ __e_acsl_store_block((void *)(& q),8UL);
__e_acsl_full_init((void *)(& q));
long *qd = q;
- __e_acsl_store_block((void *)(& qd),(size_t)8);
+ __e_acsl_store_block((void *)(& qd),8UL);
__e_acsl_full_init((void *)(& qd));
{
void *__gen_e_acsl_base_addr_39;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_block_length.c b/src/plugins/e-acsl/tests/memory/oracle/gen_block_length.c
index 24938d7d3220c195d8d368abaa74cb732fffbeee..b688dcae7268b18755aa056952e57567e484682d 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_block_length.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_block_length.c
@@ -16,9 +16,9 @@ void __e_acsl_globals_init(void)
static char __e_acsl_already_run = 0;
if (! __e_acsl_already_run) {
__e_acsl_already_run = 1;
- __e_acsl_store_block((void *)(& PA),(size_t)8);
+ __e_acsl_store_block((void *)(& PA),8UL);
__e_acsl_full_init((void *)(& PA));
- __e_acsl_store_block((void *)(A),(size_t)16);
+ __e_acsl_store_block((void *)(A),16UL);
__e_acsl_full_init((void *)(& A));
}
return;
@@ -34,7 +34,7 @@ void __e_acsl_globals_clean(void)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
PA = (int *)(& A);
{
@@ -134,10 +134,10 @@ int main(void)
}
/*@ assert \block_length(PA + 1) == \block_length(&A[1]); */ ;
int a[4] = {1, 2, 3, 4};
- __e_acsl_store_block((void *)(a),(size_t)16);
+ __e_acsl_store_block((void *)(a),16UL);
__e_acsl_full_init((void *)(& a));
int *pa = (int *)(& a);
- __e_acsl_store_block((void *)(& pa),(size_t)8);
+ __e_acsl_store_block((void *)(& pa),8UL);
__e_acsl_full_init((void *)(& pa));
{
unsigned long __gen_e_acsl_block_length_6;
@@ -239,10 +239,10 @@ int main(void)
}
/*@ assert \block_length(pa + 1) == \block_length(&a[1]); */ ;
long l = (long)4;
- __e_acsl_store_block((void *)(& l),(size_t)8);
+ __e_acsl_store_block((void *)(& l),8UL);
__e_acsl_full_init((void *)(& l));
char *pl = (char *)(& l);
- __e_acsl_store_block((void *)(& pl),(size_t)8);
+ __e_acsl_store_block((void *)(& pl),8UL);
__e_acsl_full_init((void *)(& pl));
{
unsigned long __gen_e_acsl_block_length_11;
@@ -314,7 +314,7 @@ int main(void)
}
/*@ assert \block_length(pl + 7) == sizeof(long); */ ;
int *pi = (int *)(& l);
- __e_acsl_store_block((void *)(& pi),(size_t)8);
+ __e_acsl_store_block((void *)(& pi),8UL);
__e_acsl_full_init((void *)(& pi));
{
unsigned long __gen_e_acsl_block_length_14;
@@ -374,9 +374,9 @@ int main(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_13);
}
/*@ assert \block_length(pi) == \block_length(&l); */ ;
- size_t size = (unsigned long)12;
+ size_t size = (size_t)12;
char *p = malloc(size);
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
__e_acsl_full_init((void *)(& p));
{
unsigned long __gen_e_acsl_block_length_18;
@@ -452,7 +452,7 @@ int main(void)
/*@ assert \block_length(p + 5) == \block_length(p - 5); */ ;
size = (unsigned long)30 * sizeof(long);
long *q = malloc(size);
- __e_acsl_store_block((void *)(& q),(size_t)8);
+ __e_acsl_store_block((void *)(& q),8UL);
__e_acsl_full_init((void *)(& q));
{
unsigned long __gen_e_acsl_block_length_22;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_block_valid.c b/src/plugins/e-acsl/tests/memory/oracle/gen_block_valid.c
index 3007ee2ca7ea1554d243c7c7f805417f2e643d55..2b48b0a102f1cb453f3c74489dfb7b6bb3b0c580 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_block_valid.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_block_valid.c
@@ -17,7 +17,7 @@ void __e_acsl_globals_init(void)
static char __e_acsl_already_run = 0;
if (! __e_acsl_already_run) {
__e_acsl_already_run = 1;
- __e_acsl_store_block((void *)(& B),(size_t)4);
+ __e_acsl_store_block((void *)(& B),4UL);
__e_acsl_full_init((void *)(& B));
}
return;
@@ -32,15 +32,15 @@ void __e_acsl_globals_clean(void)
int main(int argc, char **argv)
{
int __retres;
- __e_acsl_memory_init(& argc,& argv,(size_t)8);
+ __e_acsl_memory_init(& argc,& argv,8UL);
__e_acsl_globals_init();
int *p = (int *)0;
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
__e_acsl_full_init((void *)(& p));
int *q = (int *)0;
int a = 1;
int b = 2;
- __e_acsl_store_block((void *)(& b),(size_t)4);
+ __e_acsl_store_block((void *)(& b),4UL);
__e_acsl_full_init((void *)(& b));
int c = 3;
__e_acsl_full_init((void *)(& p));
@@ -162,14 +162,14 @@ int main(int argc, char **argv)
}
/*@ assert !\valid(p + 1); */ ;
char *pmin = malloc(sizeof(int));
- __e_acsl_store_block((void *)(& pmin),(size_t)8);
+ __e_acsl_store_block((void *)(& pmin),8UL);
__e_acsl_full_init((void *)(& pmin));
char *pmax = malloc(sizeof(int));
- __e_acsl_store_block((void *)(& pmax),(size_t)8);
+ __e_acsl_store_block((void *)(& pmax),8UL);
__e_acsl_full_init((void *)(& pmax));
- if ((unsigned long)pmin > (unsigned long)pmax) {
+ if ((uintptr_t)pmin > (uintptr_t)pmax) {
char *t = pmin;
- __e_acsl_store_block((void *)(& t),(size_t)8);
+ __e_acsl_store_block((void *)(& t),8UL);
__e_acsl_full_init((void *)(& t));
__e_acsl_full_init((void *)(& pmin));
pmin = pmax;
@@ -181,7 +181,7 @@ int main(int argc, char **argv)
*pmin = (char)'P';
__e_acsl_initialize((void *)pmax,sizeof(char));
*pmax = (char)'L';
- int diff = (int)((unsigned long)pmax - (unsigned long)pmin);
+ int diff = (int)((uintptr_t)pmax - (uintptr_t)pmin);
{
int __gen_e_acsl_initialized_3;
int __gen_e_acsl_and_3;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_bypassed_var.c b/src/plugins/e-acsl/tests/memory/oracle/gen_bypassed_var.c
index 9db991fcd5f00ae965f4eeec8d74a666bc4a266b..44313cb895bdd45701dd9ba3b3284d8ba0a65c6a 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_bypassed_var.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_bypassed_var.c
@@ -11,13 +11,13 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
int main(int argc, char const **argv)
{
int __retres;
- __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+ __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
goto L;
{
int *p;
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
L:
- __e_acsl_store_block_duplicate((void *)(& p),(size_t)8);
+ __e_acsl_store_block_duplicate((void *)(& p),8UL);
__e_acsl_full_init((void *)(& p));
p = & argc;
{
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_call.c b/src/plugins/e-acsl/tests/memory/oracle/gen_call.c
index a8d4fb414519692996780a36c2c2ce94f9bfb88a..a7c2ef1d63be476acf9aeeba06013961b6dc7989 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_call.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_call.c
@@ -14,8 +14,8 @@ int *__gen_e_acsl_f(int *x, int *y);
int *f(int *x, int *y)
{
- __e_acsl_store_block((void *)(& y),(size_t)8);
- __e_acsl_store_block((void *)(& x),(size_t)8);
+ __e_acsl_store_block((void *)(& y),8UL);
+ __e_acsl_store_block((void *)(& x),8UL);
__e_acsl_initialize((void *)y,sizeof(int));
*y = 1;
__e_acsl_delete_block((void *)(& y));
@@ -27,13 +27,13 @@ int main(void)
{
int __retres;
int *p;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+ __e_acsl_store_block((void *)(& p),8UL);
int x = 0;
- __e_acsl_store_block((void *)(& x),(size_t)4);
+ __e_acsl_store_block((void *)(& x),4UL);
__e_acsl_full_init((void *)(& x));
int *q = malloc(sizeof(int));
- __e_acsl_store_block((void *)(& q),(size_t)8);
+ __e_acsl_store_block((void *)(& q),8UL);
__e_acsl_full_init((void *)(& q));
int *r = malloc(sizeof(int));
__e_acsl_full_init((void *)(& p));
@@ -52,9 +52,9 @@ int main(void)
int *__gen_e_acsl_f(int *x, int *y)
{
int *__retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)8);
- __e_acsl_store_block((void *)(& y),(size_t)8);
- __e_acsl_store_block((void *)(& x),(size_t)8);
+ __e_acsl_store_block((void *)(& __retres),8UL);
+ __e_acsl_store_block((void *)(& y),8UL);
+ __e_acsl_store_block((void *)(& x),8UL);
__retres = f(x,y);
{
int __gen_e_acsl_valid;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_compound_initializers.c b/src/plugins/e-acsl/tests/memory/oracle/gen_compound_initializers.c
index b2275a5f2b20a5f7a2d4be59ef97fbe75452a39b..0514c398308e1122c66b6f29fdb1b30e8ee1a26e 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_compound_initializers.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_compound_initializers.c
@@ -54,19 +54,19 @@ void __e_acsl_globals_init(void)
sizeof("First"));
__e_acsl_full_init((void *)__gen_e_acsl_literal_string_5);
__e_acsl_mark_readonly((void *)__gen_e_acsl_literal_string_5);
- __e_acsl_store_block((void *)(_G),(size_t)32);
+ __e_acsl_store_block((void *)(_G),32UL);
__e_acsl_full_init((void *)(& _G));
- __e_acsl_store_block((void *)(& _E),(size_t)4);
+ __e_acsl_store_block((void *)(& _E),4UL);
__e_acsl_full_init((void *)(& _E));
- __e_acsl_store_block((void *)(_D),(size_t)8);
+ __e_acsl_store_block((void *)(_D),8UL);
__e_acsl_full_init((void *)(& _D));
- __e_acsl_store_block((void *)(& _C),(size_t)8);
+ __e_acsl_store_block((void *)(& _C),8UL);
__e_acsl_full_init((void *)(& _C));
- __e_acsl_store_block((void *)(& _B),(size_t)8);
+ __e_acsl_store_block((void *)(& _B),8UL);
__e_acsl_full_init((void *)(& _B));
- __e_acsl_store_block((void *)(_A),(size_t)16);
+ __e_acsl_store_block((void *)(_A),16UL);
__e_acsl_full_init((void *)(& _A));
- __e_acsl_store_block((void *)(& _F),(size_t)4);
+ __e_acsl_store_block((void *)(& _F),4UL);
__e_acsl_full_init((void *)(& _F));
}
return;
@@ -87,7 +87,7 @@ void __e_acsl_globals_clean(void)
int main(int argc, char **argv)
{
int __retres;
- __e_acsl_memory_init(& argc,& argv,(size_t)8);
+ __e_acsl_memory_init(& argc,& argv,8UL);
__e_acsl_globals_init();
{
int __gen_e_acsl_valid;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_constructor.c b/src/plugins/e-acsl/tests/memory/oracle/gen_constructor.c
index 0583c398c29051a7ee2a57308b36fb2ac684898d..b4d85f2b9a5a9774962dcba6bbef1cb20ca57431 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_constructor.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_constructor.c
@@ -41,7 +41,7 @@ void __e_acsl_globals_init(void)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
printf(__gen_e_acsl_literal_string_2); /* printf_va_2 */
__retres = 0;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_ctype_macros.c b/src/plugins/e-acsl/tests/memory/oracle/gen_ctype_macros.c
index 6831a80ad797eb20547600972a33a96a3b8cd068..c1242436a5bfed1e428fb6f943247b4554a15c0d 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_ctype_macros.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_ctype_macros.c
@@ -29,13 +29,13 @@ int main(int argc, char const **argv)
{
int __retres;
int tmp;
- __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+ __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
tmp = __gen_e_acsl_isupper(argc);
char c = (char)tmp;
- __e_acsl_store_block((void *)(& c),(size_t)1);
+ __e_acsl_store_block((void *)(& c),1UL);
__e_acsl_full_init((void *)(& c));
char *d = & c;
- __e_acsl_store_block((void *)(& d),(size_t)8);
+ __e_acsl_store_block((void *)(& d),8UL);
__e_acsl_full_init((void *)(& d));
{
int __gen_e_acsl_initialized;
@@ -104,7 +104,7 @@ int __gen_e_acsl_isupper(int c)
int __gen_e_acsl_or_2;
int __gen_e_acsl_or_3;
int __gen_e_acsl_active_bhvrs;
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+ __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_int(& __gen_e_acsl_assert_data,"c",0,c);
if (0 <= c) {
@@ -127,7 +127,7 @@ int __gen_e_acsl_isupper(int c)
__e_acsl_assert(__gen_e_acsl_or,& __gen_e_acsl_assert_data);
__e_acsl_assert_clean(& __gen_e_acsl_assert_data);
if (65 <= c) __gen_e_acsl_and_2 = c <= 90; else __gen_e_acsl_and_2 = 0;
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
__gen_e_acsl_and_2);
if (c == -1) __gen_e_acsl_or_2 = 1;
else {
@@ -141,7 +141,7 @@ int __gen_e_acsl_isupper(int c)
if (90 < c) __gen_e_acsl_and_4 = c <= 127; else __gen_e_acsl_and_4 = 0;
__gen_e_acsl_or_3 = __gen_e_acsl_and_4;
}
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
__gen_e_acsl_or_3);
__gen_e_acsl_active_bhvrs = __e_acsl_contract_partial_count_all_behaviors
((__e_acsl_contract_t const *)__gen_e_acsl_contract);
@@ -169,7 +169,7 @@ int __gen_e_acsl_isupper(int c)
{
int __gen_e_acsl_assumes_value;
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
if (__gen_e_acsl_assumes_value) {
int __gen_e_acsl_or_4;
__e_acsl_assert_data_t __gen_e_acsl_assert_data_4 =
@@ -193,7 +193,7 @@ int __gen_e_acsl_isupper(int c)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_4);
}
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
if (__gen_e_acsl_assumes_value) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_5 =
{.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_decl_in_switch.c b/src/plugins/e-acsl/tests/memory/oracle/gen_decl_in_switch.c
index 0d716b69a95ffc84f9c23af258a85e38a030c8fb..1674016043dc8f083310e8e84e0bfe67000835a3 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_decl_in_switch.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_decl_in_switch.c
@@ -10,12 +10,12 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
void decl_in_switch(int value)
{
- __e_acsl_store_block((void *)(& value),(size_t)4);
+ __e_acsl_store_block((void *)(& value),4UL);
switch (value) {
int *p;
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
default:
- __e_acsl_store_block_duplicate((void *)(& p),(size_t)8);
+ __e_acsl_store_block_duplicate((void *)(& p),8UL);
__e_acsl_full_init((void *)(& p));
p = & value;
__e_acsl_delete_block((void *)(& p));
@@ -29,7 +29,7 @@ void decl_in_switch(int value)
void compound_decl_and_init(int value)
{
int a = 0;
- __e_acsl_store_block((void *)(& a),(size_t)4);
+ __e_acsl_store_block((void *)(& a),4UL);
__e_acsl_full_init((void *)(& a));
{
int __gen_e_acsl_valid;
@@ -78,7 +78,7 @@ void compound_decl_and_init(int value)
/*@ assert \valid(&b); */ ;
case 0: ;
int c = 3;
- __e_acsl_store_block((void *)(& c),(size_t)4);
+ __e_acsl_store_block((void *)(& c),4UL);
__e_acsl_full_init((void *)(& c));
{
int __gen_e_acsl_valid_3;
@@ -104,10 +104,10 @@ void compound_decl_and_init(int value)
/*@ assert \valid(&c); */ ;
__e_acsl_delete_block((void *)(& c));
break;
- case 1: __e_acsl_store_block_duplicate((void *)(& c),(size_t)4);
+ case 1: __e_acsl_store_block_duplicate((void *)(& c),4UL);
;
int d = 4;
- __e_acsl_store_block((void *)(& d),(size_t)4);
+ __e_acsl_store_block((void *)(& d),4UL);
__e_acsl_full_init((void *)(& d));
{
int __gen_e_acsl_valid_4;
@@ -144,7 +144,7 @@ void compound_decl_and_init(int value)
void separate_decl_and_init(int value)
{
int a;
- __e_acsl_store_block((void *)(& a),(size_t)4);
+ __e_acsl_store_block((void *)(& a),4UL);
__e_acsl_full_init((void *)(& a));
a = 1;
{
@@ -172,8 +172,8 @@ void separate_decl_and_init(int value)
int b;
int c;
int d;
- __e_acsl_store_block((void *)(& d),(size_t)4);
- __e_acsl_store_block((void *)(& c),(size_t)4);
+ __e_acsl_store_block((void *)(& d),4UL);
+ __e_acsl_store_block((void *)(& c),4UL);
b = 2;
{
int __gen_e_acsl_valid_2;
@@ -198,8 +198,8 @@ void separate_decl_and_init(int value)
}
/*@ assert \valid(&b); */ ;
case 0:
- __e_acsl_store_block_duplicate((void *)(& c),(size_t)4);
- __e_acsl_store_block_duplicate((void *)(& d),(size_t)4);
+ __e_acsl_store_block_duplicate((void *)(& c),4UL);
+ __e_acsl_store_block_duplicate((void *)(& d),4UL);
;
__e_acsl_full_init((void *)(& c));
c = 3;
@@ -229,8 +229,8 @@ void separate_decl_and_init(int value)
__e_acsl_delete_block((void *)(& d));
break;
case 1:
- __e_acsl_store_block_duplicate((void *)(& c),(size_t)4);
- __e_acsl_store_block_duplicate((void *)(& d),(size_t)4);
+ __e_acsl_store_block_duplicate((void *)(& c),4UL);
+ __e_acsl_store_block_duplicate((void *)(& d),4UL);
;
__e_acsl_full_init((void *)(& d));
d = 4;
@@ -272,7 +272,7 @@ void label_in_switch(int value)
switch (value) {
K: ;
int d = 0;
- __e_acsl_store_block((void *)(& d),(size_t)4);
+ __e_acsl_store_block((void *)(& d),4UL);
__e_acsl_full_init((void *)(& d));
{
int __gen_e_acsl_valid;
@@ -296,10 +296,10 @@ void label_in_switch(int value)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data);
}
/*@ assert \valid(&d); */ ;
- L: case 0: __e_acsl_store_block_duplicate((void *)(& d),(size_t)4);
+ L: case 0: __e_acsl_store_block_duplicate((void *)(& d),4UL);
;
int e = 1;
- __e_acsl_store_block((void *)(& e),(size_t)4);
+ __e_acsl_store_block((void *)(& e),4UL);
__e_acsl_full_init((void *)(& e));
{
int __gen_e_acsl_valid_2;
@@ -327,11 +327,11 @@ void label_in_switch(int value)
__e_acsl_delete_block((void *)(& e));
break;
case 1:
- __e_acsl_store_block_duplicate((void *)(& d),(size_t)4);
- __e_acsl_store_block_duplicate((void *)(& e),(size_t)4);
+ __e_acsl_store_block_duplicate((void *)(& d),4UL);
+ __e_acsl_store_block_duplicate((void *)(& e),4UL);
;
int ff = 2;
- __e_acsl_store_block((void *)(& ff),(size_t)4);
+ __e_acsl_store_block((void *)(& ff),4UL);
__e_acsl_full_init((void *)(& ff));
{
int __gen_e_acsl_valid_3;
@@ -373,7 +373,7 @@ void label_in_switch(int value)
int main(int argc, char **argv)
{
int __retres;
- __e_acsl_memory_init(& argc,& argv,(size_t)8);
+ __e_acsl_memory_init(& argc,& argv,8UL);
decl_in_switch(argc);
compound_decl_and_init(argc);
separate_decl_and_init(argc);
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_early_exit.c b/src/plugins/e-acsl/tests/memory/oracle/gen_early_exit.c
index f7356a6d34eab9c51448d0a974e4a7381b20f681..c059f62f435cd0d17cf4e2750779dfaa94c40902 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_early_exit.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_early_exit.c
@@ -12,10 +12,10 @@ int goto_bts(void)
{
int __retres;
int *p;
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
{
int a = 0;
- __e_acsl_store_block((void *)(& a),(size_t)4);
+ __e_acsl_store_block((void *)(& a),4UL);
__e_acsl_full_init((void *)(& a));
__e_acsl_full_init((void *)(& p));
p = & a;
@@ -110,25 +110,25 @@ int goto_valid(void)
int *p;
int *q;
int *r;
- __e_acsl_store_block((void *)(& r),(size_t)8);
- __e_acsl_store_block((void *)(& q),(size_t)8);
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& r),8UL);
+ __e_acsl_store_block((void *)(& q),8UL);
+ __e_acsl_store_block((void *)(& p),8UL);
int a = 9;
{
int a1 = 0;
- __e_acsl_store_block((void *)(& a1),(size_t)4);
+ __e_acsl_store_block((void *)(& a1),4UL);
__e_acsl_full_init((void *)(& a1));
__e_acsl_full_init((void *)(& p));
p = & a1;
{
int a2 = 0;
- __e_acsl_store_block((void *)(& a2),(size_t)4);
+ __e_acsl_store_block((void *)(& a2),4UL);
__e_acsl_full_init((void *)(& a2));
__e_acsl_full_init((void *)(& q));
q = & a2;
{
int a3 = 0;
- __e_acsl_store_block((void *)(& a3),(size_t)4);
+ __e_acsl_store_block((void *)(& a3),4UL);
__e_acsl_full_init((void *)(& a3));
__e_acsl_full_init((void *)(& r));
r = & a3;
@@ -392,11 +392,11 @@ int switch_valid(void)
int *p;
int *q;
int *s;
- __e_acsl_store_block((void *)(& s),(size_t)8);
- __e_acsl_store_block((void *)(& q),(size_t)8);
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& s),8UL);
+ __e_acsl_store_block((void *)(& q),8UL);
+ __e_acsl_store_block((void *)(& p),8UL);
int i = 1;
- __e_acsl_store_block((void *)(& i),(size_t)4);
+ __e_acsl_store_block((void *)(& i),4UL);
__e_acsl_full_init((void *)(& i));
__e_acsl_full_init((void *)(& s));
s = & i;
@@ -404,13 +404,13 @@ int switch_valid(void)
default:
{
int a1 = 0;
- __e_acsl_store_block((void *)(& a1),(size_t)4);
+ __e_acsl_store_block((void *)(& a1),4UL);
__e_acsl_full_init((void *)(& a1));
__e_acsl_full_init((void *)(& p));
p = & a1;
{
int a2 = 0;
- __e_acsl_store_block((void *)(& a2),(size_t)4);
+ __e_acsl_store_block((void *)(& a2),4UL);
__e_acsl_full_init((void *)(& a2));
__e_acsl_full_init((void *)(& q));
q = & a2;
@@ -664,13 +664,13 @@ int while_valid(void)
int *p;
int *q;
int *r;
- __e_acsl_store_block((void *)(& r),(size_t)8);
- __e_acsl_store_block((void *)(& q),(size_t)8);
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& r),8UL);
+ __e_acsl_store_block((void *)(& q),8UL);
+ __e_acsl_store_block((void *)(& p),8UL);
int i = 5;
{
int a0 = 0;
- __e_acsl_store_block((void *)(& a0),(size_t)4);
+ __e_acsl_store_block((void *)(& a0),4UL);
__e_acsl_full_init((void *)(& a0));
__e_acsl_full_init((void *)(& r));
r = & a0;
@@ -679,13 +679,13 @@ int while_valid(void)
if (! i) break;
{
int a1 = 0;
- __e_acsl_store_block((void *)(& a1),(size_t)4);
+ __e_acsl_store_block((void *)(& a1),4UL);
__e_acsl_full_init((void *)(& a1));
__e_acsl_full_init((void *)(& p));
p = & a1;
{
int a2 = 0;
- __e_acsl_store_block((void *)(& a2),(size_t)4);
+ __e_acsl_store_block((void *)(& a2),4UL);
__e_acsl_full_init((void *)(& a2));
__e_acsl_full_init((void *)(& q));
q = & a2;
@@ -936,8 +936,8 @@ void continue_valid(void)
{
int *p;
int *q;
- __e_acsl_store_block((void *)(& q),(size_t)8);
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& q),8UL);
+ __e_acsl_store_block((void *)(& p),8UL);
int i = 0;
while (1) {
int tmp;
@@ -1021,7 +1021,7 @@ void continue_valid(void)
}
/*@ assert !\valid(q); */ ;
int a1 = 1;
- __e_acsl_store_block((void *)(& a1),(size_t)4);
+ __e_acsl_store_block((void *)(& a1),4UL);
__e_acsl_full_init((void *)(& a1));
__e_acsl_full_init((void *)(& p));
p = & a1;
@@ -1101,7 +1101,7 @@ void continue_valid(void)
/*@ assert !\valid(q); */ ;
{
int a2 = 1;
- __e_acsl_store_block((void *)(& a2),(size_t)4);
+ __e_acsl_store_block((void *)(& a2),4UL);
__e_acsl_full_init((void *)(& a2));
__e_acsl_full_init((void *)(& q));
q = & a2;
@@ -1273,7 +1273,7 @@ void continue_valid(void)
int main(int argc, char const **argv)
{
int __retres;
- __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+ __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
goto_bts();
goto_valid();
switch_valid();
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_errno.c b/src/plugins/e-acsl/tests/memory/oracle/gen_errno.c
index 231296afc7f6a405937ada2872fbc93dba0bfca7..0e4e83cd028c36ecfc552a84b778241736f0ac9a 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_errno.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_errno.c
@@ -15,7 +15,7 @@ void __e_acsl_globals_init(void)
static char __e_acsl_already_run = 0;
if (! __e_acsl_already_run) {
__e_acsl_already_run = 1;
- __e_acsl_store_block((void *)(& errno),(size_t)4);
+ __e_acsl_store_block((void *)(& errno),4UL);
__e_acsl_full_init((void *)(& errno));
}
return;
@@ -30,10 +30,10 @@ void __e_acsl_globals_clean(void)
int main(int argc, char const **argv)
{
int __retres;
- __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+ __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
__e_acsl_globals_init();
int *p = & errno;
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
__e_acsl_full_init((void *)(& p));
{
int __gen_e_acsl_initialized;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_freeable.c b/src/plugins/e-acsl/tests/memory/oracle/gen_freeable.c
index f02b64b4c9ff2911d1625bae5e4b81f8fdd62eaa..589a213ac035fa26f16bfecb254383f063a7cc1d 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_freeable.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_freeable.c
@@ -15,7 +15,7 @@ void __e_acsl_globals_init(void)
static char __e_acsl_already_run = 0;
if (! __e_acsl_already_run) {
__e_acsl_already_run = 1;
- __e_acsl_store_block((void *)(array),(size_t)1024);
+ __e_acsl_store_block((void *)(array),1024UL);
__e_acsl_full_init((void *)(& array));
}
return;
@@ -31,9 +31,9 @@ int main(void)
{
int __retres;
int *p;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
{
int __gen_e_acsl_freeable;
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_ghost_parameters.c b/src/plugins/e-acsl/tests/memory/oracle/gen_ghost_parameters.c
index 7362996cf7c978ecf38d188911062dee8008d0cc..6c4a2cd4abb836ed194c9db74db986593ca49d0b 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_ghost_parameters.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_ghost_parameters.c
@@ -16,7 +16,7 @@ void function(int a, int b, int c, int d)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
int w = 0;
int x = 1;
int y = 2;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_goto.c b/src/plugins/e-acsl/tests/memory/oracle/gen_goto.c
index 43911e961b2f1153ff56d75ca6c4d41fdba4e940..1d3d5fc7491411544d824267470b6b70a7c8f78c 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_goto.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_goto.c
@@ -14,7 +14,7 @@ void __e_acsl_globals_init(void)
static char __e_acsl_already_run = 0;
if (! __e_acsl_already_run) {
__e_acsl_already_run = 1;
- __e_acsl_store_block((void *)(& a),(size_t)1);
+ __e_acsl_store_block((void *)(& a),1UL);
__e_acsl_full_init((void *)(& a));
}
return;
@@ -30,9 +30,9 @@ int main(void)
{
int __retres;
char *b;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
- __e_acsl_store_block((void *)(& b),(size_t)8);
+ __e_acsl_store_block((void *)(& b),8UL);
goto _LOR;
_LOR: __e_acsl_full_init((void *)(& b));
b = & a;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_hidden_malloc.c b/src/plugins/e-acsl/tests/memory/oracle/gen_hidden_malloc.c
index 35dffbd04896b7aaa6ec0dab069aa704236f387e..f264c45b5993b1915b86c7cc9ed25ecfae6243ad 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_hidden_malloc.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_hidden_malloc.c
@@ -26,7 +26,7 @@ void __e_acsl_globals_init(void)
int main(int argc, char const **argv)
{
int __retres;
- __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+ __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
__e_acsl_globals_init();
char *cwd = realpath(__gen_e_acsl_literal_string,(char *)0);
__retres = 0;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_init.c b/src/plugins/e-acsl/tests/memory/oracle/gen_init.c
index 6308414506af7e0306eb11e2d7ca5d37dba43b0c..9423eedcc88977c9737956839456b1d2b8e16f8b 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_init.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_init.c
@@ -15,9 +15,9 @@ void __e_acsl_globals_init(void)
static char __e_acsl_already_run = 0;
if (! __e_acsl_already_run) {
__e_acsl_already_run = 1;
- __e_acsl_store_block((void *)(& b),(size_t)4);
+ __e_acsl_store_block((void *)(& b),4UL);
__e_acsl_full_init((void *)(& b));
- __e_acsl_store_block((void *)(& a),(size_t)4);
+ __e_acsl_store_block((void *)(& a),4UL);
__e_acsl_full_init((void *)(& a));
}
return;
@@ -33,13 +33,13 @@ void __e_acsl_globals_clean(void)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
int *p = & a;
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
__e_acsl_full_init((void *)(& p));
int *q = & b;
- __e_acsl_store_block((void *)(& q),(size_t)8);
+ __e_acsl_store_block((void *)(& q),8UL);
__e_acsl_full_init((void *)(& q));
{
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_init_function.c b/src/plugins/e-acsl/tests/memory/oracle/gen_init_function.c
index 591da5b061cf4848f1808db0c66622383b558cca..b33191d7901a3d8c01e9ef350d515f0cbab3d728 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_init_function.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_init_function.c
@@ -14,7 +14,7 @@ extern size_t __e_acsl_heap_allocation_size;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
{
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ulong(& __gen_e_acsl_assert_data,
@@ -31,7 +31,7 @@ int main(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data);
}
/*@ assert __e_acsl_heap_allocation_size == 0; */ ;
- char *a = malloc((unsigned long)7);
+ char *a = malloc((size_t)7);
{
__e_acsl_assert_data_t __gen_e_acsl_assert_data_2 =
{.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_initialized.c b/src/plugins/e-acsl/tests/memory/oracle/gen_initialized.c
index b05d785e73123996595271f6620c38b27f60b93a..a370575bf58a098489017ad1e8952355600b8955 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_initialized.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_initialized.c
@@ -16,9 +16,9 @@ void __e_acsl_globals_init(void)
static char __e_acsl_already_run = 0;
if (! __e_acsl_already_run) {
__e_acsl_already_run = 1;
- __e_acsl_store_block((void *)(& B),(size_t)4);
+ __e_acsl_store_block((void *)(& B),4UL);
__e_acsl_full_init((void *)(& B));
- __e_acsl_store_block((void *)(& A),(size_t)4);
+ __e_acsl_store_block((void *)(& A),4UL);
__e_acsl_full_init((void *)(& A));
}
return;
@@ -38,16 +38,16 @@ int main(void)
long *r;
long d[2];
int dup[2];
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
- __e_acsl_store_block((void *)(d),(size_t)16);
- __e_acsl_store_block((void *)(& r),(size_t)8);
- __e_acsl_store_block((void *)(& b),(size_t)4);
+ __e_acsl_store_block((void *)(d),16UL);
+ __e_acsl_store_block((void *)(& r),8UL);
+ __e_acsl_store_block((void *)(& b),4UL);
int *p = & A;
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
__e_acsl_full_init((void *)(& p));
int *q = & B;
- __e_acsl_store_block((void *)(& q),(size_t)8);
+ __e_acsl_store_block((void *)(& q),8UL);
__e_acsl_full_init((void *)(& q));
{
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
@@ -115,10 +115,10 @@ int main(void)
}
/*@ assert \initialized(q); */ ;
int a = 0;
- __e_acsl_store_block((void *)(& a),(size_t)4);
+ __e_acsl_store_block((void *)(& a),4UL);
__e_acsl_full_init((void *)(& a));
long c[2] = {(long)1, (long)1};
- __e_acsl_store_block((void *)(c),(size_t)16);
+ __e_acsl_store_block((void *)(c),16UL);
__e_acsl_full_init((void *)(& c));
__e_acsl_full_init((void *)(& p));
p = & a;
@@ -693,7 +693,7 @@ int main(void)
}
/*@ assert !\initialized(p); */ ;
__e_acsl_full_init((void *)(& q));
- q = (int *)calloc((unsigned long)1,sizeof(int));
+ q = (int *)calloc((size_t)1,sizeof(int));
{
int __gen_e_acsl_initialized_27;
__e_acsl_assert_data_t __gen_e_acsl_assert_data_29 =
@@ -814,7 +814,7 @@ int main(void)
}
/*@ assert !\initialized(q); */ ;
__e_acsl_full_init((void *)(& q));
- q = (int *)calloc((unsigned long)3,sizeof(int));
+ q = (int *)calloc((size_t)3,sizeof(int));
{
int __gen_e_acsl_size;
int __gen_e_acsl_if;
@@ -962,7 +962,7 @@ int main(void)
/*@ assert !\initialized(q + 5); */ ;
free((void *)q);
__e_acsl_full_init((void *)(& q));
- q = (int *)calloc((unsigned long)7,sizeof(int));
+ q = (int *)calloc((size_t)7,sizeof(int));
{
int __gen_e_acsl_size_3;
int __gen_e_acsl_if_3;
@@ -1172,7 +1172,7 @@ int main(void)
/*@ assert !\initialized(q + 9); */ ;
free((void *)q);
__e_acsl_full_init((void *)(& q));
- q = (int *)calloc((unsigned long)2,sizeof(int));
+ q = (int *)calloc((size_t)2,sizeof(int));
{
int __gen_e_acsl_size_6;
int __gen_e_acsl_if_6;
@@ -1297,7 +1297,7 @@ int main(void)
/*@ assert !\initialized(q + 3); */ ;
free((void *)q);
__e_acsl_full_init((void *)(& q));
- q = (int *)calloc((unsigned long)6,sizeof(int));
+ q = (int *)calloc((size_t)6,sizeof(int));
{
int __gen_e_acsl_size_8;
int __gen_e_acsl_if_8;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_literal_string.c b/src/plugins/e-acsl/tests/memory/oracle/gen_literal_string.c
index f2c14f3d7a878ddcc615713bd3ae5e0c099a81b7..b96f4d881528aaa5b602c8bd83d7d09726b549e5 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_literal_string.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_literal_string.c
@@ -96,15 +96,15 @@ void __e_acsl_globals_init(void)
__e_acsl_store_block((void *)__gen_e_acsl_literal_string_2,sizeof("bar"));
__e_acsl_full_init((void *)__gen_e_acsl_literal_string_2);
__e_acsl_mark_readonly((void *)__gen_e_acsl_literal_string_2);
- __e_acsl_store_block((void *)(& l_str),(size_t)8);
+ __e_acsl_store_block((void *)(& l_str),8UL);
__e_acsl_full_init((void *)(& l_str));
- __e_acsl_store_block((void *)(& s_str),(size_t)8);
+ __e_acsl_store_block((void *)(& s_str),8UL);
__e_acsl_full_init((void *)(& s_str));
- __e_acsl_store_block((void *)(& S2),(size_t)8);
+ __e_acsl_store_block((void *)(& S2),8UL);
__e_acsl_full_init((void *)(& S2));
- __e_acsl_store_block((void *)(& S),(size_t)8);
+ __e_acsl_store_block((void *)(& S),8UL);
__e_acsl_full_init((void *)(& S));
- __e_acsl_store_block((void *)(& T),(size_t)8);
+ __e_acsl_store_block((void *)(& T),8UL);
__e_acsl_full_init((void *)(& T));
}
return;
@@ -123,10 +123,10 @@ void __e_acsl_globals_clean(void)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
char *SS = (char *)__gen_e_acsl_literal_string;
- __e_acsl_store_block((void *)(& SS),(size_t)8);
+ __e_acsl_store_block((void *)(& SS),8UL);
__e_acsl_full_init((void *)(& SS));
{
int __gen_e_acsl_valid_read;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_local_goto.c b/src/plugins/e-acsl/tests/memory/oracle/gen_local_goto.c
index a47a436f538ce97b3fb401db0baac5bcba4860ba..e4d49d91da56f58bfbb3e3cd1e6ef198a71ded5a 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_local_goto.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_local_goto.c
@@ -42,7 +42,7 @@ void __e_acsl_globals_init(void)
int main(int argc, char const **argv)
{
int __retres;
- __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+ __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
__e_acsl_globals_init();
int t = 0;
UP: ;
@@ -54,7 +54,7 @@ int main(int argc, char const **argv)
AGAIN:
{
int a;
- __e_acsl_store_block((void *)(& a),(size_t)4);
+ __e_acsl_store_block((void *)(& a),4UL);
__e_acsl_full_init((void *)(& a));
a = 1;
{
@@ -87,7 +87,7 @@ int main(int argc, char const **argv)
}
else t ++;
int b = 15;
- __e_acsl_store_block((void *)(& b),(size_t)4);
+ __e_acsl_store_block((void *)(& b),4UL);
__e_acsl_full_init((void *)(& b));
{
int __gen_e_acsl_valid_2;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_local_init.c b/src/plugins/e-acsl/tests/memory/oracle/gen_local_init.c
index e43ee1e33737e5409c7718cc8d432d9388befe09..5857c85776cd8618c21dd7eaf231706a6c95b9fd 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_local_init.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_local_init.c
@@ -21,9 +21,9 @@ void __e_acsl_globals_init(void)
static char __e_acsl_already_run = 0;
if (! __e_acsl_already_run) {
__e_acsl_already_run = 1;
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
__e_acsl_full_init((void *)(& p));
- __e_acsl_store_block((void *)(& X),(size_t)4);
+ __e_acsl_store_block((void *)(& X),4UL);
__e_acsl_full_init((void *)(& X));
}
return;
@@ -39,7 +39,7 @@ void __e_acsl_globals_clean(void)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
f();
__retres = 0;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_local_var.c b/src/plugins/e-acsl/tests/memory/oracle/gen_local_var.c
index d97bdb41c923b4646f7c343eea7cc64300320e05..3af7fbac0b8352922aa0d272fce3388c96790276 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_local_var.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_local_var.c
@@ -16,8 +16,8 @@ struct list {
struct list *add(struct list *l, int i)
{
struct list *new;
- __e_acsl_store_block((void *)(& new),(size_t)8);
- __e_acsl_store_block((void *)(& l),(size_t)8);
+ __e_acsl_store_block((void *)(& new),8UL);
+ __e_acsl_store_block((void *)(& l),8UL);
__e_acsl_full_init((void *)(& new));
new = (struct list *)malloc(sizeof(struct list));
{
@@ -70,9 +70,9 @@ struct list *add(struct list *l, int i)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
struct list *l = (struct list *)0;
- __e_acsl_store_block((void *)(& l),(size_t)8);
+ __e_acsl_store_block((void *)(& l),8UL);
__e_acsl_full_init((void *)(& l));
__e_acsl_full_init((void *)(& l));
l = add(l,4);
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_mainargs.c b/src/plugins/e-acsl/tests/memory/oracle/gen_mainargs.c
index 8f9f0b16081beb021b3c86b3cae4341506d752b0..001a897e2695734026b59b298cb031c28e1463a8 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_mainargs.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_mainargs.c
@@ -27,7 +27,7 @@ int __gen_e_acsl_main(int argc, char **argv)
{
int __gen_e_acsl_forall;
long __gen_e_acsl_k;
- __e_acsl_store_block((void *)(& argv),(size_t)8);
+ __e_acsl_store_block((void *)(& argv),8UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__gen_e_acsl_forall = 1;
__gen_e_acsl_k = 0;
@@ -339,7 +339,7 @@ int __gen_e_acsl_main(int argc, char **argv)
int main(int argc, char **argv)
{
int __retres;
- __e_acsl_memory_init(& argc,& argv,(size_t)8);
+ __e_acsl_memory_init(& argc,& argv,8UL);
{
int __gen_e_acsl_valid;
int __gen_e_acsl_valid_2;
@@ -393,7 +393,7 @@ int main(int argc, char **argv)
size_t __gen_e_acsl_strlen(char const *s)
{
size_t __retres;
- __e_acsl_store_block((void *)(& s),(size_t)8);
+ __e_acsl_store_block((void *)(& s),8UL);
__retres = strlen(s);
__e_acsl_delete_block((void *)(& s));
return __retres;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_memalign.c b/src/plugins/e-acsl/tests/memory/oracle/gen_memalign.c
index bb292590efff0c24e51bd0e031eaaa567bec3a72..fadac7c1f5d6af6e3f363e5190c5dfe4b766a52c 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_memalign.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_memalign.c
@@ -57,16 +57,15 @@ int main(int argc, char const **argv)
{
int __retres;
char *a;
- __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
- __e_acsl_store_block((void *)(& a),(size_t)8);
+ __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
+ __e_acsl_store_block((void *)(& a),8UL);
char **memptr = malloc(sizeof(void *));
- __e_acsl_store_block((void *)(& memptr),(size_t)8);
+ __e_acsl_store_block((void *)(& memptr),8UL);
__e_acsl_full_init((void *)(& memptr));
int res2 =
- __gen_e_acsl_posix_memalign((void **)memptr,(unsigned long)256,
- (unsigned long)15);
+ __gen_e_acsl_posix_memalign((void **)memptr,(size_t)256,(size_t)15);
char *p = *memptr;
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
__e_acsl_full_init((void *)(& p));
{
int __gen_e_acsl_initialized;
@@ -180,7 +179,7 @@ int main(int argc, char const **argv)
}
/*@ assert !\valid(p); */ ;
__e_acsl_full_init((void *)(& a));
- a = (char *)aligned_alloc((unsigned long)256,(unsigned long)12);
+ a = (char *)aligned_alloc((size_t)256,(size_t)12);
{
__e_acsl_assert_data_t __gen_e_acsl_assert_data_5 =
{.values = (void *)0};
@@ -196,7 +195,7 @@ int main(int argc, char const **argv)
}
/*@ assert a == \null; */ ;
__e_acsl_full_init((void *)(& a));
- a = (char *)aligned_alloc((unsigned long)255,(unsigned long)512);
+ a = (char *)aligned_alloc((size_t)255,(size_t)512);
{
__e_acsl_assert_data_t __gen_e_acsl_assert_data_6 =
{.values = (void *)0};
@@ -212,7 +211,7 @@ int main(int argc, char const **argv)
}
/*@ assert a == \null; */ ;
__e_acsl_full_init((void *)(& a));
- a = (char *)aligned_alloc((unsigned long)0,(unsigned long)512);
+ a = (char *)aligned_alloc((size_t)0,(size_t)512);
{
__e_acsl_assert_data_t __gen_e_acsl_assert_data_7 =
{.values = (void *)0};
@@ -228,7 +227,7 @@ int main(int argc, char const **argv)
}
/*@ assert a == \null; */ ;
__e_acsl_full_init((void *)(& a));
- a = (char *)aligned_alloc((unsigned long)256,(unsigned long)512);
+ a = (char *)aligned_alloc((size_t)256,(size_t)512);
{
__e_acsl_assert_data_t __gen_e_acsl_assert_data_8 =
{.values = (void *)0};
@@ -405,8 +404,8 @@ int __gen_e_acsl_posix_memalign(void **memptr, size_t alignment, size_t size)
{
int __gen_e_acsl_valid;
int __gen_e_acsl_and;
- __e_acsl_store_block((void *)(& memptr),(size_t)8);
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+ __e_acsl_store_block((void *)(& memptr),8UL);
+ __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"memptr",
(void *)memptr);
@@ -473,7 +472,7 @@ int __gen_e_acsl_posix_memalign(void **memptr, size_t alignment, size_t size)
{
int __gen_e_acsl_assumes_value;
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
if (__gen_e_acsl_assumes_value) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_4 =
{.values = (void *)0};
@@ -490,7 +489,7 @@ int __gen_e_acsl_posix_memalign(void **memptr, size_t alignment, size_t size)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_4);
}
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
if (__gen_e_acsl_assumes_value) {
int __gen_e_acsl_or;
__e_acsl_assert_data_t __gen_e_acsl_assert_data_5 =
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_memsize.c b/src/plugins/e-acsl/tests/memory/oracle/gen_memsize.c
index 2606de54e2ffcb3359ab934c37a3d4d1f91db566..e4806a7d05ff52c5d0e7be38a959b49503cad4ae 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_memsize.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_memsize.c
@@ -14,8 +14,8 @@ extern size_t __e_acsl_heap_allocation_size;
int main(int argc, char **argv)
{
int __retres;
- __e_acsl_memory_init(& argc,& argv,(size_t)8);
- char *a = malloc((unsigned long)7);
+ __e_acsl_memory_init(& argc,& argv,8UL);
+ char *a = malloc((size_t)7);
{
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ulong(& __gen_e_acsl_assert_data,
@@ -32,7 +32,7 @@ int main(int argc, char **argv)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data);
}
/*@ assert __e_acsl_heap_allocation_size == 7; */ ;
- char *b = malloc((unsigned long)14);
+ char *b = malloc((size_t)14);
{
__e_acsl_assert_data_t __gen_e_acsl_assert_data_2 =
{.values = (void *)0};
@@ -87,7 +87,7 @@ int main(int argc, char **argv)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_4);
}
/*@ assert __e_acsl_heap_allocation_size == 14; */ ;
- b = (char *)realloc((void *)b,(unsigned long)9);
+ b = (char *)realloc((void *)b,(size_t)9);
{
__e_acsl_assert_data_t __gen_e_acsl_assert_data_5 =
{.values = (void *)0};
@@ -105,7 +105,7 @@ int main(int argc, char **argv)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_5);
}
/*@ assert __e_acsl_heap_allocation_size == 9; */ ;
- b = (char *)realloc((void *)b,(unsigned long)18);
+ b = (char *)realloc((void *)b,(size_t)18);
{
__e_acsl_assert_data_t __gen_e_acsl_assert_data_6 =
{.values = (void *)0};
@@ -123,7 +123,7 @@ int main(int argc, char **argv)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_6);
}
/*@ assert __e_acsl_heap_allocation_size == 18; */ ;
- b = (char *)realloc((void *)b,(unsigned long)0);
+ b = (char *)realloc((void *)b,(size_t)0);
b = (char *)0;
{
__e_acsl_assert_data_t __gen_e_acsl_assert_data_7 =
@@ -142,7 +142,7 @@ int main(int argc, char **argv)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_7);
}
/*@ assert __e_acsl_heap_allocation_size == 0; */ ;
- b = (char *)realloc((void *)b,(unsigned long)8);
+ b = (char *)realloc((void *)b,(size_t)8);
{
__e_acsl_assert_data_t __gen_e_acsl_assert_data_8 =
{.values = (void *)0};
@@ -160,7 +160,7 @@ int main(int argc, char **argv)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_8);
}
/*@ assert __e_acsl_heap_allocation_size == 8; */ ;
- b = (char *)realloc((void *)0,(unsigned long)8);
+ b = (char *)realloc((void *)0,(size_t)8);
{
__e_acsl_assert_data_t __gen_e_acsl_assert_data_9 =
{.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_null.c b/src/plugins/e-acsl/tests/memory/oracle/gen_null.c
index 82e8b5fdfd15f1ff30898c1ff7c8edb923f7c17f..422719d5b1a38c9b26a8f97ce09bc8ac13696bbb 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_null.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_null.c
@@ -11,7 +11,7 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
{
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__gen_e_acsl_assert_data.blocking = 1;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_offset.c b/src/plugins/e-acsl/tests/memory/oracle/gen_offset.c
index e9beecbd3c95aca3ead09c0b1426f75e98689053..12164ac136e64966168742cd4703240c3fcca8be 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_offset.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_offset.c
@@ -16,9 +16,9 @@ void __e_acsl_globals_init(void)
static char __e_acsl_already_run = 0;
if (! __e_acsl_already_run) {
__e_acsl_already_run = 1;
- __e_acsl_store_block((void *)(& PA),(size_t)8);
+ __e_acsl_store_block((void *)(& PA),8UL);
__e_acsl_full_init((void *)(& PA));
- __e_acsl_store_block((void *)(A),(size_t)16);
+ __e_acsl_store_block((void *)(A),16UL);
__e_acsl_full_init((void *)(& A));
}
return;
@@ -34,7 +34,7 @@ void __e_acsl_globals_clean(void)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
PA = (int *)(& A);
{
@@ -119,7 +119,7 @@ int main(void)
}
/*@ assert \offset(PA + 1) == 8; */ ;
int a[4] = {1, 2, 3, 4};
- __e_acsl_store_block((void *)(a),(size_t)16);
+ __e_acsl_store_block((void *)(a),16UL);
__e_acsl_full_init((void *)(& a));
{
unsigned long __gen_e_acsl_offset_5;
@@ -183,10 +183,10 @@ int main(void)
}
/*@ assert \offset(&a[3]) == 12; */ ;
long l = (long)4;
- __e_acsl_store_block((void *)(& l),(size_t)8);
+ __e_acsl_store_block((void *)(& l),8UL);
__e_acsl_full_init((void *)(& l));
char *pl = (char *)(& l);
- __e_acsl_store_block((void *)(& pl),(size_t)8);
+ __e_acsl_store_block((void *)(& pl),8UL);
__e_acsl_full_init((void *)(& pl));
{
unsigned long __gen_e_acsl_offset_8;
@@ -271,7 +271,7 @@ int main(void)
}
/*@ assert \offset(pl + 7) == 7; */ ;
int *pi = (int *)(& l);
- __e_acsl_store_block((void *)(& pi),(size_t)8);
+ __e_acsl_store_block((void *)(& pi),8UL);
__e_acsl_full_init((void *)(& pi));
{
unsigned long __gen_e_acsl_offset_12;
@@ -315,8 +315,8 @@ int main(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_13);
}
/*@ assert \offset(pi) == 4; */ ;
- char *p = malloc((unsigned long)12);
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ char *p = malloc((size_t)12);
+ __e_acsl_store_block((void *)(& p),8UL);
__e_acsl_full_init((void *)(& p));
{
unsigned long __gen_e_acsl_offset_14;
@@ -420,7 +420,7 @@ int main(void)
}
/*@ assert \offset(p - 5) == 0; */ ;
long *q = malloc((unsigned long)30 * sizeof(long));
- __e_acsl_store_block((void *)(& q),(size_t)8);
+ __e_acsl_store_block((void *)(& q),8UL);
__e_acsl_full_init((void *)(& q));
{
unsigned long __gen_e_acsl_offset_19;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_other_constants.c b/src/plugins/e-acsl/tests/memory/oracle/gen_other_constants.c
index c5904316438e9ec40456ac4e8dd192718084f4ba..3fa7646a8d56012a9aa602cdfc9b4ce70c092ebb 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_other_constants.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_other_constants.c
@@ -15,7 +15,7 @@ enum bool {
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
{
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__gen_e_acsl_assert_data.blocking = 1;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_ptr.c b/src/plugins/e-acsl/tests/memory/oracle/gen_ptr.c
index ff00f4a06ecf01e67319c17d2e2890456b992aea..68e0b7f75809a95f5b9246040e24078dbf05fece 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_ptr.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_ptr.c
@@ -11,15 +11,15 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
int x = 1;
- __e_acsl_store_block((void *)(& x),(size_t)4);
+ __e_acsl_store_block((void *)(& x),4UL);
__e_acsl_full_init((void *)(& x));
int t[3] = {2, 3, 4};
- __e_acsl_store_block((void *)(t),(size_t)12);
+ __e_acsl_store_block((void *)(t),12UL);
__e_acsl_full_init((void *)(& t));
int *p = & x;
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
__e_acsl_full_init((void *)(& p));
{
int __gen_e_acsl_initialized;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_ptr_init.c b/src/plugins/e-acsl/tests/memory/oracle/gen_ptr_init.c
index 1c2481f7de89e62112967d385a344d64e791308e..a30ed671ba7f890805f5f957ab23bb86fbe11f6a 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_ptr_init.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_ptr_init.c
@@ -20,7 +20,7 @@ void f(void)
void g(int *C, int *D)
{
{
- __e_acsl_store_block((void *)(& C),(size_t)8);
+ __e_acsl_store_block((void *)(& C),8UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__gen_e_acsl_assert_data.blocking = 1;
__gen_e_acsl_assert_data.kind = "Assertion";
@@ -40,9 +40,9 @@ void __e_acsl_globals_init(void)
static char __e_acsl_already_run = 0;
if (! __e_acsl_already_run) {
__e_acsl_already_run = 1;
- __e_acsl_store_block((void *)(& B),(size_t)8);
+ __e_acsl_store_block((void *)(& B),8UL);
__e_acsl_full_init((void *)(& B));
- __e_acsl_store_block((void *)(& A),(size_t)8);
+ __e_acsl_store_block((void *)(& A),8UL);
__e_acsl_full_init((void *)(& A));
}
return;
@@ -60,10 +60,10 @@ int main(void)
int __retres;
int *x;
int *y;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
- __e_acsl_store_block((void *)(& y),(size_t)8);
- __e_acsl_store_block((void *)(& x),(size_t)8);
+ __e_acsl_store_block((void *)(& y),8UL);
+ __e_acsl_store_block((void *)(& x),8UL);
B = (int *)malloc(sizeof(int));
__e_acsl_full_init((void *)(& y));
y = (int *)malloc(sizeof(int));
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_ranges_in_builtins.c b/src/plugins/e-acsl/tests/memory/oracle/gen_ranges_in_builtins.c
index 51a87c4aa3be194352b758708cc91416a6e7d18a..b9c6e8b0ed6c1a13c88b0137cf0540f0017b1a58 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_ranges_in_builtins.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_ranges_in_builtins.c
@@ -29,7 +29,7 @@ void __gen_e_acsl_g(long *ptr, size_t size);
void g(long *ptr, size_t size)
{
- __e_acsl_store_block((void *)(& ptr),(size_t)8);
+ __e_acsl_store_block((void *)(& ptr),8UL);
__e_acsl_delete_block((void *)(& ptr));
return;
}
@@ -45,14 +45,14 @@ int main(void)
struct S s;
int **multi_dynamic;
int i;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
- __e_acsl_store_block((void *)(& multi_dynamic),(size_t)8);
- __e_acsl_store_block((void *)(& s),(size_t)24);
- __e_acsl_store_block((void *)(t4),(size_t)4000);
- __e_acsl_store_block((void *)(t3),(size_t)224);
- __e_acsl_store_block((void *)(t2),(size_t)32);
- __e_acsl_store_block((void *)(& b),(size_t)8);
- __e_acsl_store_block((void *)(& a),(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+ __e_acsl_store_block((void *)(& multi_dynamic),8UL);
+ __e_acsl_store_block((void *)(& s),24UL);
+ __e_acsl_store_block((void *)(t4),4000UL);
+ __e_acsl_store_block((void *)(t3),224UL);
+ __e_acsl_store_block((void *)(t2),32UL);
+ __e_acsl_store_block((void *)(& b),8UL);
+ __e_acsl_store_block((void *)(& a),8UL);
__e_acsl_full_init((void *)(& a));
a = (int *)malloc((unsigned long)10 * sizeof(int));
{
@@ -240,7 +240,7 @@ int main(void)
}
/*@ assert !\valid(b + (10 .. 15)); */ ;
long t[3] = {7l, 8l, 9l};
- __e_acsl_store_block((void *)(t),(size_t)24);
+ __e_acsl_store_block((void *)(t),24UL);
__e_acsl_full_init((void *)(& t));
{
int __gen_e_acsl_size_6;
@@ -316,7 +316,7 @@ int main(void)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_7);
}
/*@ assert !\valid(&t[3 .. 5]); */ ;
- __gen_e_acsl_g(t,(unsigned long)3);
+ __gen_e_acsl_g(t,(size_t)3);
__e_acsl_initialize((void *)(t2),sizeof(double));
t2[0] = 0.5;
__e_acsl_initialize((void *)(& t2[1]),sizeof(double));
@@ -768,11 +768,11 @@ int main(void)
}
free((void *)multi_dynamic);
char c = (char)'w';
- __e_acsl_store_block((void *)(& c),(size_t)1);
+ __e_acsl_store_block((void *)(& c),1UL);
__e_acsl_full_init((void *)(& c));
__gen_e_acsl_f(& c,(long)5);
char t5[4] = {(char)'a', (char)'b', (char)'c', (char)'d'};
- __e_acsl_store_block((void *)(t5),(size_t)4);
+ __e_acsl_store_block((void *)(t5),4UL);
__e_acsl_full_init((void *)(& t5));
{
int __gen_e_acsl_size_15;
@@ -850,7 +850,7 @@ void __gen_e_acsl_g(long *ptr, size_t size)
int __gen_e_acsl_le_2;
unsigned long __gen_e_acsl_size_4;
int __gen_e_acsl_valid;
- __e_acsl_store_block((void *)(& ptr),(size_t)8);
+ __e_acsl_store_block((void *)(& ptr),8UL);
__gen_e_acsl_at = ptr;
__gmpz_init_set_ui(__gen_e_acsl_size,size);
__gmpz_init_set(__gen_e_acsl_at_2,
@@ -1089,7 +1089,7 @@ void __gen_e_acsl_f(char *s, long n)
int __gen_e_acsl_le_2;
unsigned long __gen_e_acsl_size_2;
int __gen_e_acsl_valid;
- __e_acsl_store_block((void *)(& s),(size_t)8);
+ __e_acsl_store_block((void *)(& s),8UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"s",(void *)s);
__e_acsl_assert_register_int(& __gen_e_acsl_assert_data,"sizeof(char)",0,
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_separated.c b/src/plugins/e-acsl/tests/memory/oracle/gen_separated.c
index 4cd79cd0a40bd19db35e1aff255195ecdcbc3fde..937c0045936640b20d1ce024787706fb71b44f65 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_separated.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_separated.c
@@ -12,14 +12,14 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
{
int a;
int b;
int c;
- __e_acsl_store_block((void *)(& c),(size_t)4);
- __e_acsl_store_block((void *)(& b),(size_t)4);
- __e_acsl_store_block((void *)(& a),(size_t)4);
+ __e_acsl_store_block((void *)(& c),4UL);
+ __e_acsl_store_block((void *)(& b),4UL);
+ __e_acsl_store_block((void *)(& a),4UL);
__e_acsl_full_init((void *)(& c));
c = 0;
__e_acsl_full_init((void *)(& b));
@@ -27,7 +27,7 @@ int main(void)
__e_acsl_full_init((void *)(& a));
a = b;
int *d = & a;
- __e_acsl_store_block((void *)(& d),(size_t)8);
+ __e_acsl_store_block((void *)(& d),8UL);
__e_acsl_full_init((void *)(& d));
{
int __gen_e_acsl_valid_read;
@@ -104,8 +104,8 @@ int main(void)
(void *)(& c));
__e_acsl_assert_register_ulong(& __gen_e_acsl_assert_data,
"sizeof(int)",0,sizeof(int));
- __gen_e_acsl_separated = __e_acsl_separated((size_t)3,& a,sizeof(int),
- & b,sizeof(int),& c,
+ __gen_e_acsl_separated = __e_acsl_separated(3UL,& a,sizeof(int),& b,
+ sizeof(int),& c,
sizeof(int));
__e_acsl_assert_register_int(& __gen_e_acsl_assert_data,
"\\separated(&a, &b, &c)",0,
@@ -232,8 +232,7 @@ int main(void)
(void *)d);
__e_acsl_assert_register_ulong(& __gen_e_acsl_assert_data_5,
"sizeof(int)",0,sizeof(int));
- __gen_e_acsl_separated_2 = __e_acsl_separated((size_t)4,& a,
- sizeof(int),& b,
+ __gen_e_acsl_separated_2 = __e_acsl_separated(4UL,& a,sizeof(int),& b,
sizeof(int),& c,
sizeof(int),d,
sizeof(int));
@@ -258,7 +257,7 @@ int main(void)
}
{
double array[20] = {(double)0};
- __e_acsl_store_block((void *)(array),(size_t)160);
+ __e_acsl_store_block((void *)(array),160UL);
__e_acsl_full_init((void *)(& array));
{
int __gen_e_acsl_size;
@@ -368,7 +367,7 @@ int main(void)
__gen_e_acsl_size_4);
__gen_e_acsl_if_4 = __gen_e_acsl_size_4;
}
- __gen_e_acsl_separated_3 = __e_acsl_separated((size_t)2,
+ __gen_e_acsl_separated_3 = __e_acsl_separated(2UL,
(char *)(array) + 8 * 0,
__gen_e_acsl_if_3,
(char *)(array) + 8 * 10,
@@ -494,7 +493,7 @@ int main(void)
__gen_e_acsl_size_8);
__gen_e_acsl_if_8 = __gen_e_acsl_size_8;
}
- __gen_e_acsl_separated_4 = __e_acsl_separated((size_t)2,
+ __gen_e_acsl_separated_4 = __e_acsl_separated(2UL,
(char *)(array) + 8 * 0,
__gen_e_acsl_if_7,
(char *)(array) + 8 * 5,
@@ -621,7 +620,7 @@ int main(void)
__gen_e_acsl_size_12);
__gen_e_acsl_if_12 = __gen_e_acsl_size_12;
}
- __gen_e_acsl_separated_5 = __e_acsl_separated((size_t)2,
+ __gen_e_acsl_separated_5 = __e_acsl_separated(2UL,
(char *)(array) + 8 * 0,
__gen_e_acsl_if_11,
(char *)(array) + 8 * 5,
@@ -694,8 +693,7 @@ int main(void)
(void *)(& array[1]));
__e_acsl_assert_register_ulong(& __gen_e_acsl_assert_data_19,
"sizeof(double)",0,sizeof(double));
- __gen_e_acsl_separated_6 = __e_acsl_separated((size_t)2,array,
- sizeof(double),
+ __gen_e_acsl_separated_6 = __e_acsl_separated(2UL,array,sizeof(double),
& array[1],
sizeof(double));
__e_acsl_assert_register_int(& __gen_e_acsl_assert_data_19,
@@ -819,7 +817,7 @@ int main(void)
__gen_e_acsl_size_16);
__gen_e_acsl_if_16 = __gen_e_acsl_size_16;
}
- __gen_e_acsl_separated_7 = __e_acsl_separated((size_t)2,
+ __gen_e_acsl_separated_7 = __e_acsl_separated(2UL,
(char *)(array) + 8 * 0,
__gen_e_acsl_if_15,
(char *)(array) + 8 * 1,
@@ -946,7 +944,7 @@ int main(void)
__gen_e_acsl_size_20);
__gen_e_acsl_if_20 = __gen_e_acsl_size_20;
}
- __gen_e_acsl_separated_8 = __e_acsl_separated((size_t)2,
+ __gen_e_acsl_separated_8 = __e_acsl_separated(2UL,
(char *)(array) + 8 * 15,
__gen_e_acsl_if_19,
(char *)(array) + 8 * 0,
@@ -1072,7 +1070,7 @@ int main(void)
__gen_e_acsl_size_24);
__gen_e_acsl_if_24 = __gen_e_acsl_size_24;
}
- __gen_e_acsl_separated_9 = __e_acsl_separated((size_t)2,
+ __gen_e_acsl_separated_9 = __e_acsl_separated(2UL,
(char *)(array) + 8 * 0,
__gen_e_acsl_if_23,
(char *)(array) + 8 * 0,
@@ -1094,13 +1092,13 @@ int main(void)
}
{
int *a_0 = malloc(sizeof(int));
- __e_acsl_store_block((void *)(& a_0),(size_t)8);
+ __e_acsl_store_block((void *)(& a_0),8UL);
__e_acsl_full_init((void *)(& a_0));
int *b_0 = malloc(sizeof(int));
- __e_acsl_store_block((void *)(& b_0),(size_t)8);
+ __e_acsl_store_block((void *)(& b_0),8UL);
__e_acsl_full_init((void *)(& b_0));
int *c_0 = a_0;
- __e_acsl_store_block((void *)(& c_0),(size_t)8);
+ __e_acsl_store_block((void *)(& c_0),8UL);
__e_acsl_full_init((void *)(& c_0));
{
int __gen_e_acsl_initialized_2;
@@ -1178,8 +1176,7 @@ int main(void)
(void *)b_0);
__e_acsl_assert_register_ulong(& __gen_e_acsl_assert_data_31,
"sizeof(int)",0,sizeof(int));
- __gen_e_acsl_separated_10 = __e_acsl_separated((size_t)2,a_0,
- sizeof(int),b_0,
+ __gen_e_acsl_separated_10 = __e_acsl_separated(2UL,a_0,sizeof(int),b_0,
sizeof(int));
__e_acsl_assert_register_int(& __gen_e_acsl_assert_data_31,
"\\separated(a_0, b_0)",0,
@@ -1307,8 +1304,7 @@ int main(void)
(void *)c_0);
__e_acsl_assert_register_ulong(& __gen_e_acsl_assert_data_34,
"sizeof(int)",0,sizeof(int));
- __gen_e_acsl_separated_11 = __e_acsl_separated((size_t)3,a_0,
- sizeof(int),b_0,
+ __gen_e_acsl_separated_11 = __e_acsl_separated(3UL,a_0,sizeof(int),b_0,
sizeof(int),c_0,
sizeof(int));
__e_acsl_assert_register_int(& __gen_e_acsl_assert_data_34,
@@ -1333,7 +1329,7 @@ int main(void)
}
{
double *array_0 = malloc(sizeof(double [20]));
- __e_acsl_store_block((void *)(& array_0),(size_t)8);
+ __e_acsl_store_block((void *)(& array_0),8UL);
__e_acsl_full_init((void *)(& array_0));
{
int __gen_e_acsl_size_25;
@@ -1443,7 +1439,7 @@ int main(void)
__gen_e_acsl_size_28);
__gen_e_acsl_if_28 = __gen_e_acsl_size_28;
}
- __gen_e_acsl_separated_12 = __e_acsl_separated((size_t)2,
+ __gen_e_acsl_separated_12 = __e_acsl_separated(2UL,
(char *)array_0 + 8 * 0,
__gen_e_acsl_if_27,
(char *)array_0 + 8 * 10,
@@ -1570,7 +1566,7 @@ int main(void)
__gen_e_acsl_size_32);
__gen_e_acsl_if_32 = __gen_e_acsl_size_32;
}
- __gen_e_acsl_separated_13 = __e_acsl_separated((size_t)2,
+ __gen_e_acsl_separated_13 = __e_acsl_separated(2UL,
(char *)array_0 + 8 * 0,
__gen_e_acsl_if_31,
(char *)array_0 + 8 * 5,
@@ -1697,7 +1693,7 @@ int main(void)
__gen_e_acsl_size_36);
__gen_e_acsl_if_36 = __gen_e_acsl_size_36;
}
- __gen_e_acsl_separated_14 = __e_acsl_separated((size_t)2,
+ __gen_e_acsl_separated_14 = __e_acsl_separated(2UL,
(char *)array_0 + 8 * 0,
__gen_e_acsl_if_35,
(char *)array_0 + 8 * 5,
@@ -1770,7 +1766,7 @@ int main(void)
(void *)array_0);
__e_acsl_assert_register_ulong(& __gen_e_acsl_assert_data_47,
"sizeof(double)",0,sizeof(double));
- __gen_e_acsl_separated_15 = __e_acsl_separated((size_t)2,array_0 + 0,
+ __gen_e_acsl_separated_15 = __e_acsl_separated(2UL,array_0 + 0,
sizeof(double),
array_0 + 1,
sizeof(double));
@@ -1896,7 +1892,7 @@ int main(void)
__gen_e_acsl_size_40);
__gen_e_acsl_if_40 = __gen_e_acsl_size_40;
}
- __gen_e_acsl_separated_16 = __e_acsl_separated((size_t)2,
+ __gen_e_acsl_separated_16 = __e_acsl_separated(2UL,
(char *)array_0 + 8 * 0,
__gen_e_acsl_if_39,
(char *)array_0 + 8 * 1,
@@ -2023,7 +2019,7 @@ int main(void)
__gen_e_acsl_size_44);
__gen_e_acsl_if_44 = __gen_e_acsl_size_44;
}
- __gen_e_acsl_separated_17 = __e_acsl_separated((size_t)2,
+ __gen_e_acsl_separated_17 = __e_acsl_separated(2UL,
(char *)array_0 + 8 * 15,
__gen_e_acsl_if_43,
(char *)array_0 + 8 * 0,
@@ -2150,7 +2146,7 @@ int main(void)
__gen_e_acsl_size_48);
__gen_e_acsl_if_48 = __gen_e_acsl_size_48;
}
- __gen_e_acsl_separated_18 = __e_acsl_separated((size_t)2,
+ __gen_e_acsl_separated_18 = __e_acsl_separated(2UL,
(char *)array_0 + 8 * 0,
__gen_e_acsl_if_47,
(char *)array_0 + 8 * 0,
@@ -2174,7 +2170,7 @@ int main(void)
}
{
double array_1[10][10][10] = {{{(double)0}}};
- __e_acsl_store_block((void *)(array_1),(size_t)8000);
+ __e_acsl_store_block((void *)(array_1),8000UL);
__e_acsl_full_init((void *)(& array_1));
{
int __gen_e_acsl_forall;
@@ -2363,7 +2359,7 @@ int main(void)
__e_acsl_assert(__gen_e_acsl_valid_read_46,
& __gen_e_acsl_assert_data_65);
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_65);
- __gen_e_acsl_separated_19 = __e_acsl_separated((size_t)3,
+ __gen_e_acsl_separated_19 = __e_acsl_separated(3UL,
& array_1[0][__gen_e_acsl_range_6][0],
sizeof(double),
& array_1[0][__gen_e_acsl_range_5][0],
@@ -2606,7 +2602,7 @@ int main(void)
__e_acsl_assert(__gen_e_acsl_valid_read_52,
& __gen_e_acsl_assert_data_72);
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_72);
- __gen_e_acsl_separated_20 = __e_acsl_separated((size_t)3,
+ __gen_e_acsl_separated_20 = __e_acsl_separated(3UL,
& array_1[0][__gen_e_acsl_range_12][0],
sizeof(double),
& array_1[1][__gen_e_acsl_range_11][0],
@@ -2832,7 +2828,7 @@ int main(void)
__e_acsl_assert(__gen_e_acsl_valid_read_56,
& __gen_e_acsl_assert_data_77);
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_77);
- __gen_e_acsl_separated_21 = __e_acsl_separated((size_t)2,
+ __gen_e_acsl_separated_21 = __e_acsl_separated(2UL,
& array_1[__gen_e_acsl_range_19][__gen_e_acsl_range_20][0],
sizeof(double),
& array_1[__gen_e_acsl_range_17][__gen_e_acsl_range_18][0],
@@ -3062,7 +3058,7 @@ int main(void)
__e_acsl_assert(__gen_e_acsl_valid_read_60,
& __gen_e_acsl_assert_data_82);
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_82);
- __gen_e_acsl_separated_22 = __e_acsl_separated((size_t)2,
+ __gen_e_acsl_separated_22 = __e_acsl_separated(2UL,
& array_1[__gen_e_acsl_range_27][__gen_e_acsl_range_28][0],
sizeof(double),
& array_1[__gen_e_acsl_range_25][__gen_e_acsl_range_26][0],
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_sizeof.c b/src/plugins/e-acsl/tests/memory/oracle/gen_sizeof.c
index 37e4dc882f8117a1c4862da80fe14c07e3c25588..4e8812b79f93e9ac0de5c298d9dcabf5e74e2a2e 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_sizeof.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_sizeof.c
@@ -11,7 +11,7 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
int x = 0;
x ++;
{
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_stdout.c b/src/plugins/e-acsl/tests/memory/oracle/gen_stdout.c
index e29b8a1da4ea50d08fb3c8be4917cb49d8b0b785..a99ef484c82ad64d57f97385305d239a709504fb 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_stdout.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_stdout.c
@@ -13,11 +13,11 @@ void __e_acsl_globals_init(void)
static char __e_acsl_already_run = 0;
if (! __e_acsl_already_run) {
__e_acsl_already_run = 1;
- __e_acsl_store_block((void *)(& stdout),(size_t)8);
+ __e_acsl_store_block((void *)(& stdout),8UL);
__e_acsl_full_init((void *)(& stdout));
- __e_acsl_store_block((void *)(& stdin),(size_t)8);
+ __e_acsl_store_block((void *)(& stdin),8UL);
__e_acsl_full_init((void *)(& stdin));
- __e_acsl_store_block((void *)(& stderr),(size_t)8);
+ __e_acsl_store_block((void *)(& stderr),8UL);
__e_acsl_full_init((void *)(& stderr));
}
return;
@@ -34,7 +34,7 @@ void __e_acsl_globals_clean(void)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
{
int __gen_e_acsl_valid;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_struct_initialized.c b/src/plugins/e-acsl/tests/memory/oracle/gen_struct_initialized.c
index e67707de2733cd8454d2738b73b85d0d5e070762..de0ff8f65d6ab3d1e7d6c429260090fc70e1e88d 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_struct_initialized.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_struct_initialized.c
@@ -17,10 +17,10 @@ typedef struct __anonstruct_int32_pair_t_1 int32_pair_t;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
{
int32_pair_t static_pair;
- __e_acsl_store_block((void *)(& static_pair),(size_t)8);
+ __e_acsl_store_block((void *)(& static_pair),8UL);
{
int __gen_e_acsl_initialized;
__e_acsl_assert_data_t __gen_e_acsl_assert_data =
@@ -178,7 +178,7 @@ int main(void)
}
{
int32_pair_t *heap_pair = malloc(sizeof(int32_pair_t));
- __e_acsl_store_block((void *)(& heap_pair),(size_t)8);
+ __e_acsl_store_block((void *)(& heap_pair),8UL);
__e_acsl_full_init((void *)(& heap_pair));
{
int __gen_e_acsl_initialized_7;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_valid.c b/src/plugins/e-acsl/tests/memory/oracle/gen_valid.c
index e31b81cecdec52d7f0f6adcf31079b1fe00b58b1..0aeeb6ad615708875603970bbb6817471c32ed28 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_valid.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_valid.c
@@ -18,11 +18,11 @@ int *__gen_e_acsl_f(int *x);
int *f(int *x)
{
int *y;
- __e_acsl_store_block((void *)(& y),(size_t)8);
+ __e_acsl_store_block((void *)(& y),8UL);
{
int __gen_e_acsl_initialized;
int __gen_e_acsl_and;
- __e_acsl_store_block((void *)(& x),(size_t)8);
+ __e_acsl_store_block((void *)(& x),8UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"&y",
(void *)(& y));
@@ -88,9 +88,9 @@ void g(void)
int m;
int *u;
int **p;
- __e_acsl_store_block((void *)(& p),(size_t)8);
- __e_acsl_store_block((void *)(& u),(size_t)8);
- __e_acsl_store_block((void *)(& m),(size_t)4);
+ __e_acsl_store_block((void *)(& p),8UL);
+ __e_acsl_store_block((void *)(& u),8UL);
+ __e_acsl_store_block((void *)(& m),4UL);
__e_acsl_full_init((void *)(& p));
p = & u;
__e_acsl_full_init((void *)(& u));
@@ -174,10 +174,10 @@ void g(void)
int *__gen_e_acsl_f(int *x)
{
int *__retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)8);
+ __e_acsl_store_block((void *)(& __retres),8UL);
{
int __gen_e_acsl_valid;
- __e_acsl_store_block((void *)(& x),(size_t)8);
+ __e_acsl_store_block((void *)(& x),8UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"x",(void *)x);
__e_acsl_assert_register_ulong(& __gen_e_acsl_assert_data,"sizeof(int)",
@@ -228,9 +228,9 @@ void __e_acsl_globals_init(void)
static char __e_acsl_already_run = 0;
if (! __e_acsl_already_run) {
__e_acsl_already_run = 1;
- __e_acsl_store_block((void *)(& Z),(size_t)4);
+ __e_acsl_store_block((void *)(& Z),4UL);
__e_acsl_full_init((void *)(& Z));
- __e_acsl_store_block((void *)(& X),(size_t)8);
+ __e_acsl_store_block((void *)(& X),8UL);
__e_acsl_full_init((void *)(& X));
}
return;
@@ -250,14 +250,14 @@ int main(void)
int *b;
int **c;
int ***d;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
- __e_acsl_store_block((void *)(& d),(size_t)8);
- __e_acsl_store_block((void *)(& c),(size_t)8);
- __e_acsl_store_block((void *)(& b),(size_t)8);
- __e_acsl_store_block((void *)(& a),(size_t)8);
+ __e_acsl_store_block((void *)(& d),8UL);
+ __e_acsl_store_block((void *)(& c),8UL);
+ __e_acsl_store_block((void *)(& b),8UL);
+ __e_acsl_store_block((void *)(& a),8UL);
int n = 0;
- __e_acsl_store_block((void *)(& n),(size_t)4);
+ __e_acsl_store_block((void *)(& n),4UL);
__e_acsl_full_init((void *)(& n));
{
int __gen_e_acsl_initialized;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_valid_alias.c b/src/plugins/e-acsl/tests/memory/oracle/gen_valid_alias.c
index b8ce6271bbc724546205a7448ba1b89d8d298cd6..2fa0794d7d83e090ad4ce52e8694f21ef8392a88 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_valid_alias.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_valid_alias.c
@@ -14,9 +14,9 @@ int main(void)
int __retres;
int *a;
int *b;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
- __e_acsl_store_block((void *)(& b),(size_t)8);
- __e_acsl_store_block((void *)(& a),(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+ __e_acsl_store_block((void *)(& b),8UL);
+ __e_acsl_store_block((void *)(& a),8UL);
int n = 0;
{
int __gen_e_acsl_initialized;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_valid_in_contract.c b/src/plugins/e-acsl/tests/memory/oracle/gen_valid_in_contract.c
index af84a51e13bced58dbfedafa5657fa3ad9c16c42..82270e4d2c6b0efc3fc95ecda31497c1c332885a 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_valid_in_contract.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_valid_in_contract.c
@@ -26,8 +26,8 @@ struct list *__gen_e_acsl_f(struct list *l);
struct list *f(struct list *l)
{
struct list *__retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)8);
- __e_acsl_store_block((void *)(& l),(size_t)8);
+ __e_acsl_store_block((void *)(& __retres),8UL);
+ __e_acsl_store_block((void *)(& l),8UL);
if (l == (struct list *)0) {
__e_acsl_full_init((void *)(& __retres));
__retres = l;
@@ -49,7 +49,7 @@ struct list *f(struct list *l)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__gen_e_acsl_f((struct list *)0);
__retres = 0;
__e_acsl_memory_clean();
@@ -69,14 +69,14 @@ struct list *__gen_e_acsl_f(struct list *l)
__e_acsl_contract_t *__gen_e_acsl_contract;
struct list *__gen_e_acsl_at;
struct list *__retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)8);
+ __e_acsl_store_block((void *)(& __retres),8UL);
{
int __gen_e_acsl_valid;
int __gen_e_acsl_or;
- __e_acsl_store_block((void *)(& l),(size_t)8);
+ __e_acsl_store_block((void *)(& l),8UL);
__gen_e_acsl_at = l;
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+ __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
l == (struct list *)0);
__gen_e_acsl_valid = __e_acsl_valid((void *)l,sizeof(struct list),
(void *)l,(void *)(& l));
@@ -118,14 +118,14 @@ struct list *__gen_e_acsl_f(struct list *l)
else __gen_e_acsl_and = 0;
__gen_e_acsl_or = ! __gen_e_acsl_and;
}
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
__gen_e_acsl_or);
}
__retres = f(l);
{
int __gen_e_acsl_assumes_value;
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)0);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,0UL);
if (__gen_e_acsl_assumes_value) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_2 =
{.values = (void *)0};
@@ -145,7 +145,7 @@ struct list *__gen_e_acsl_f(struct list *l)
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_2);
}
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
if (__gen_e_acsl_assumes_value) {
__e_acsl_assert_data_t __gen_e_acsl_assert_data_3 =
{.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_vdso.c b/src/plugins/e-acsl/tests/memory/oracle/gen_vdso.c
index a41ca5d9a3cc3340c93dc7197414b8f54315ba35..720714a89c4e7b8d7fa409ede4edb0db881be48a 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_vdso.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_vdso.c
@@ -55,19 +55,19 @@ time_t __gen_e_acsl_time(time_t *timer)
__e_acsl_contract_t *__gen_e_acsl_contract;
time_t *__gen_e_acsl_at;
time_t __retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)8);
+ __e_acsl_store_block((void *)(& __retres),8UL);
{
int __gen_e_acsl_assumes_value;
int __gen_e_acsl_active_bhvrs;
- __e_acsl_store_block((void *)(& timer),(size_t)8);
+ __e_acsl_store_block((void *)(& timer),8UL);
__gen_e_acsl_at = timer;
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
+ __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,
timer == (time_t *)0);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,
timer != (time_t *)0);
__gen_e_acsl_assumes_value = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
if (__gen_e_acsl_assumes_value) {
int __gen_e_acsl_valid;
__e_acsl_assert_data_t __gen_e_acsl_assert_data =
@@ -127,7 +127,7 @@ time_t __gen_e_acsl_time(time_t *timer)
{
int __gen_e_acsl_assumes_value_2;
__gen_e_acsl_assumes_value_2 = __e_acsl_contract_get_behavior_assumes
- ((__e_acsl_contract_t const *)__gen_e_acsl_contract,(size_t)1);
+ ((__e_acsl_contract_t const *)__gen_e_acsl_contract,1UL);
if (__gen_e_acsl_assumes_value_2) {
int __gen_e_acsl_initialized;
__e_acsl_assert_data_t __gen_e_acsl_assert_data_4 =
@@ -163,25 +163,25 @@ void __e_acsl_globals_init(void)
static char __e_acsl_already_run = 0;
if (! __e_acsl_already_run) {
__e_acsl_already_run = 1;
- __e_acsl_store_block((void *)(& __gen_e_acsl_time),(size_t)1);
+ __e_acsl_store_block((void *)(& __gen_e_acsl_time),1UL);
__e_acsl_full_init((void *)(& __gen_e_acsl_time));
- __e_acsl_store_block((void *)(& __fc_interrupted),(size_t)4);
+ __e_acsl_store_block((void *)(& __fc_interrupted),4UL);
__e_acsl_full_init((void *)(& __fc_interrupted));
- __e_acsl_store_block((void *)(& __fc_p_time_tm),(size_t)8);
+ __e_acsl_store_block((void *)(& __fc_p_time_tm),8UL);
__e_acsl_full_init((void *)(& __fc_p_time_tm));
- __e_acsl_store_block((void *)(& __fc_time_tm),(size_t)36);
+ __e_acsl_store_block((void *)(& __fc_time_tm),36UL);
__e_acsl_full_init((void *)(& __fc_time_tm));
- __e_acsl_store_block((void *)(& __fc_p_ctime),(size_t)8);
+ __e_acsl_store_block((void *)(& __fc_p_ctime),8UL);
__e_acsl_full_init((void *)(& __fc_p_ctime));
- __e_acsl_store_block((void *)(__fc_ctime),(size_t)26);
+ __e_acsl_store_block((void *)(__fc_ctime),26UL);
__e_acsl_full_init((void *)(& __fc_ctime));
- __e_acsl_store_block((void *)(& time),(size_t)1);
+ __e_acsl_store_block((void *)(& time),1UL);
__e_acsl_full_init((void *)(& time));
- __e_acsl_store_block((void *)(& __fc_time),(size_t)4);
+ __e_acsl_store_block((void *)(& __fc_time),4UL);
__e_acsl_full_init((void *)(& __fc_time));
- __e_acsl_store_block((void *)(& __fc_p_sigaction),(size_t)8);
+ __e_acsl_store_block((void *)(& __fc_p_sigaction),8UL);
__e_acsl_full_init((void *)(& __fc_p_sigaction));
- __e_acsl_store_block((void *)(sigaction),(size_t)2080);
+ __e_acsl_store_block((void *)(sigaction),2080UL);
__e_acsl_full_init((void *)(& sigaction));
}
return;
@@ -205,11 +205,11 @@ void __e_acsl_globals_clean(void)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
+ __e_acsl_store_block((void *)(& __retres),4UL);
time_t tmp = __gen_e_acsl_time((time_t *)0);
- __e_acsl_store_block((void *)(& tmp),(size_t)8);
+ __e_acsl_store_block((void *)(& tmp),8UL);
__e_acsl_full_init((void *)(& tmp));
{
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_vector.c b/src/plugins/e-acsl/tests/memory/oracle/gen_vector.c
index 72e722866d20994d6d790e981a9d9d94a5c512b7..8916d75782cca663f15fa945f2167fe5a31372ed 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_vector.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_vector.c
@@ -14,11 +14,11 @@ int *new_inversed(int len, int *v)
{
int i;
int *p;
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
{
int __gen_e_acsl_valid;
int __gen_e_acsl_and;
- __e_acsl_store_block((void *)(& v),(size_t)8);
+ __e_acsl_store_block((void *)(& v),8UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"v",(void *)v);
__e_acsl_assert_register_ulong(& __gen_e_acsl_assert_data,"sizeof(int)",
@@ -93,11 +93,11 @@ int main(void)
{
int __retres;
int *v2;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
- __e_acsl_store_block((void *)(& v2),(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+ __e_acsl_store_block((void *)(& v2),8UL);
int x = 3;
int v1[3] = {1, 2, x};
- __e_acsl_store_block((void *)(v1),(size_t)12);
+ __e_acsl_store_block((void *)(v1),12UL);
__e_acsl_full_init((void *)(& v1));
{
int __gen_e_acsl_valid;
diff --git a/src/plugins/e-acsl/tests/memory/oracle/gen_vla.c b/src/plugins/e-acsl/tests/memory/oracle/gen_vla.c
index 7475c0099eff80cccee76ee0137b847b97b8a2c1..defd657b0372397c6480a1270ead29e4373ae673 100644
--- a/src/plugins/e-acsl/tests/memory/oracle/gen_vla.c
+++ b/src/plugins/e-acsl/tests/memory/oracle/gen_vla.c
@@ -14,7 +14,7 @@ int main(int argc, char **argv)
int __retres;
unsigned long __lengthof_arr;
int i;
- __e_acsl_memory_init(& argc,& argv,(size_t)8);
+ __e_acsl_memory_init(& argc,& argv,8UL);
{
int __gen_e_acsl_and;
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
@@ -52,7 +52,7 @@ int main(int argc, char **argv)
__lengthof_arr = (unsigned long)LEN;
int *arr = __builtin_alloca(sizeof(int) * __lengthof_arr);
__e_acsl_store_block((void *)arr,sizeof(int) * __lengthof_arr);
- __e_acsl_store_block((void *)(& arr),(size_t)8);
+ __e_acsl_store_block((void *)(& arr),8UL);
__e_acsl_full_init((void *)(& arr));
i = 0;
while (i <= LEN) {
diff --git a/src/plugins/e-acsl/tests/special/e-acsl-rt-debug.c b/src/plugins/e-acsl/tests/special/e-acsl-rt-debug.c
index ec28d64c54f39dc42bce34ca67dae6051c2a5300..3dad85476b7bc1cf6da89c7884342b9b7ba268e1 100644
--- a/src/plugins/e-acsl/tests/special/e-acsl-rt-debug.c
+++ b/src/plugins/e-acsl/tests/special/e-acsl-rt-debug.c
@@ -5,7 +5,7 @@
/* run.config_dev
MACRO: ROOT_EACSL_GCC_OPTS_EXT --rt-debug --rt-verbose --full-mtracking
COMMENT: Filter the addresses of the output so that the test is deterministic.
- MACRO: ROOT_EACSL_EXEC_FILTER sed -e s_0x[0-9a-f-]*_0x0000-0000-0000_g | sed -e s_Offset:\s[0-9-]*_Offset:xxxxx_g | sed -e s/[0-9]*\skB/xxxkB/g
+ MACRO: ROOT_EACSL_EXEC_FILTER sed -e s_0x[0-9a-f-]*_0x0000-0000-0000_g | sed -e s_Offset:\s[0-9-]*_Offset:xxxxx_g | sed -e s/[0-9]*\skB/xxxkB/g | sed -e s/[0-9]*\sMB/xxMB/g
*/
int main() {
return 0;
diff --git a/src/plugins/e-acsl/tests/special/oracle/gen_builtin.c b/src/plugins/e-acsl/tests/special/oracle/gen_builtin.c
index 776ea8b6524aa46b325a93ab9b127344c16a2d0f..ce258a254ebd9ea155b93869227f7cca93aae2e5 100644
--- a/src/plugins/e-acsl/tests/special/oracle/gen_builtin.c
+++ b/src/plugins/e-acsl/tests/special/oracle/gen_builtin.c
@@ -29,7 +29,7 @@ int incr(int x)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
int i = __gen_e_acsl_f(2);
__retres = 0;
__e_acsl_memory_clean();
diff --git a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-bittree-model.c b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-bittree-model.c
index 6b84d67b8d384b16e15ef215e382d44a201dcb38..06cd0bcdbc4006f43e79bcc854b7fe838ded5755 100644
--- a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-bittree-model.c
+++ b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-bittree-model.c
@@ -11,8 +11,8 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+ __e_acsl_store_block((void *)(& __retres),4UL);
__e_acsl_full_init((void *)(& __retres));
__retres = 0;
__e_acsl_delete_block((void *)(& __retres));
diff --git a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-compile-dlmalloc.c b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-compile-dlmalloc.c
index aa3403298643ea8c45f3147c955e6cb47397d915..08c7ef0403fefa641f7226048623ebf79e40ac4c 100644
--- a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-compile-dlmalloc.c
+++ b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-compile-dlmalloc.c
@@ -11,7 +11,7 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__retres = 0;
__e_acsl_memory_clean();
return __retres;
diff --git a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-external-print-value.c b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-external-print-value.c
index 0853a5bd2395f6de975eaddd1dd2b0caa7eae509..88ce6788cc5b916547a7340101e42b282378dcdb 100644
--- a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-external-print-value.c
+++ b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-external-print-value.c
@@ -11,9 +11,9 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
int value = 1;
- __e_acsl_store_block((void *)(& value),(size_t)4);
+ __e_acsl_store_block((void *)(& value),4UL);
__e_acsl_full_init((void *)(& value));
{
int __gen_e_acsl_x;
diff --git a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-functions.c b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-functions.c
index fae8de9073015154e66d4a745e8aef0e23f0387b..965cc1a7414f32cd93a1700ee1adb938c65dfa98 100644
--- a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-functions.c
+++ b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-functions.c
@@ -16,7 +16,7 @@ int __gen_e_acsl_f(int *p);
int f(int *p)
{
int __retres;
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
{
int i = 0;
{
@@ -83,9 +83,9 @@ int g(int *p)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
int x = 0;
- __e_acsl_store_block((void *)(& x),(size_t)4);
+ __e_acsl_store_block((void *)(& x),4UL);
__e_acsl_full_init((void *)(& x));
int y = 0;
__gen_e_acsl_f(& x);
@@ -107,7 +107,7 @@ int __gen_e_acsl_f(int *p)
int __gen_e_acsl_valid_read;
int __gen_e_acsl_initialized;
int __gen_e_acsl_valid_read_2;
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"p",(void *)p);
__e_acsl_assert_register_ulong(& __gen_e_acsl_assert_data,"sizeof(int)",
diff --git a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-instrument.c b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-instrument.c
index 7067ee1a95c1879484960ab054cd41e692106887..d9974db9f51c3f4986eebdd88d3e17156580ad4b 100644
--- a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-instrument.c
+++ b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-instrument.c
@@ -37,7 +37,7 @@ int uninstrument2(int *p)
int instrument1(int *p)
{
int __retres;
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
__e_acsl_initialize((void *)p,sizeof(int));
*p = 0;
__retres = 0;
@@ -51,10 +51,10 @@ int __gen_e_acsl_instrument2(int *p);
int instrument2(int *p)
{
int __retres;
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
{
int *q = p;
- __e_acsl_store_block((void *)(& q),(size_t)8);
+ __e_acsl_store_block((void *)(& q),8UL);
__e_acsl_full_init((void *)(& q));
__e_acsl_initialize((void *)p,sizeof(int));
*p = 0;
@@ -72,8 +72,8 @@ int vol(int n, void * const *__va_params)
int __retres;
va_list vl;
int tmp;
- __e_acsl_store_block((void *)(& vl),(size_t)8);
- __e_acsl_store_block((void *)(& __va_params),(size_t)8);
+ __e_acsl_store_block((void *)(& vl),8UL);
+ __e_acsl_store_block((void *)(& __va_params),8UL);
__e_acsl_full_init((void *)(& vl));
vl = __va_params;
tmp = *((int *)*vl);
@@ -90,10 +90,10 @@ int main(void)
{
int x;
int tmp;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
- __e_acsl_store_block((void *)(& x),(size_t)4);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+ __e_acsl_store_block((void *)(& x),4UL);
int y = 0;
- __e_acsl_store_block((void *)(& y),(size_t)4);
+ __e_acsl_store_block((void *)(& y),4UL);
__e_acsl_full_init((void *)(& y));
instrument1(& x);
__gen_e_acsl_uninstrument1(& x);
@@ -146,10 +146,10 @@ int main(void)
/*@ assert \initialized(&y); */ ;
{
int __va_arg0 = 1;
- __e_acsl_store_block((void *)(& __va_arg0),(size_t)4);
+ __e_acsl_store_block((void *)(& __va_arg0),4UL);
__e_acsl_full_init((void *)(& __va_arg0));
void *__va_args[1] = {& __va_arg0};
- __e_acsl_store_block((void *)(__va_args),(size_t)8);
+ __e_acsl_store_block((void *)(__va_args),8UL);
__e_acsl_full_init((void *)(& __va_args));
tmp = vol(6,(void * const *)(__va_args));
__e_acsl_delete_block((void *)(__va_args));
@@ -167,7 +167,7 @@ int __gen_e_acsl_instrument2(int *p)
int __retres;
{
int __gen_e_acsl_valid;
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"p",(void *)p);
__e_acsl_assert_register_ulong(& __gen_e_acsl_assert_data,"sizeof(int)",
diff --git a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-no-assert-print-data.c b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-no-assert-print-data.c
index 9c8f845614fc8b755ef89cc620bc8d1082eaca1b..e8c90779d5b320f9f0eb320eb9975ab90b3999fa 100644
--- a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-no-assert-print-data.c
+++ b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-no-assert-print-data.c
@@ -11,9 +11,9 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
int value = 2147483647;
- __e_acsl_store_block((void *)(& value),(size_t)4);
+ __e_acsl_store_block((void *)(& value),4UL);
__e_acsl_full_init((void *)(& value));
{
int __gen_e_acsl_x;
diff --git a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-rt-debug.c b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-rt-debug.c
index aa3403298643ea8c45f3147c955e6cb47397d915..08c7ef0403fefa641f7226048623ebf79e40ac4c 100644
--- a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-rt-debug.c
+++ b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-rt-debug.c
@@ -11,7 +11,7 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__retres = 0;
__e_acsl_memory_clean();
return __retres;
diff --git a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-segment-model.c b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-segment-model.c
index 6b84d67b8d384b16e15ef215e382d44a201dcb38..06cd0bcdbc4006f43e79bcc854b7fe838ded5755 100644
--- a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-segment-model.c
+++ b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-segment-model.c
@@ -11,8 +11,8 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
- __e_acsl_store_block((void *)(& __retres),(size_t)4);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+ __e_acsl_store_block((void *)(& __retres),4UL);
__e_acsl_full_init((void *)(& __retres));
__retres = 0;
__e_acsl_delete_block((void *)(& __retres));
diff --git a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-valid.c b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-valid.c
index 55c6aca7000fd2ee546ca5aceeebd65fa4c4e3c4..32150e3e1e323fb46ec52c24c0b3ccc1f0be03d5 100644
--- a/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-valid.c
+++ b/src/plugins/e-acsl/tests/special/oracle/gen_e-acsl-valid.c
@@ -35,8 +35,8 @@ void f(int *x, int *y)
{
{
int __gen_e_acsl_valid_read;
- __e_acsl_store_block((void *)(& y),(size_t)8);
- __e_acsl_store_block((void *)(& x),(size_t)8);
+ __e_acsl_store_block((void *)(& y),8UL);
+ __e_acsl_store_block((void *)(& x),8UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data =
{.values = (void *)0};
__e_acsl_assert_register_int(& __gen_e_acsl_assert_data,"*x",0,*x);
@@ -133,12 +133,12 @@ void f(int *x, int *y)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
int x = 0;
- __e_acsl_store_block((void *)(& x),(size_t)4);
+ __e_acsl_store_block((void *)(& x),4UL);
__e_acsl_full_init((void *)(& x));
int *y = malloc(sizeof(int));
- __e_acsl_store_block((void *)(& y),(size_t)8);
+ __e_acsl_store_block((void *)(& y),8UL);
__e_acsl_full_init((void *)(& y));
__gen_e_acsl_f(& x,y);
__retres = 0;
@@ -174,9 +174,9 @@ void __gen_e_acsl_f(int *x, int *y)
int __gen_e_acsl_valid_read;
int __gen_e_acsl_valid_read_2;
int __gen_e_acsl_active_bhvrs;
- __e_acsl_store_block((void *)(& y),(size_t)8);
- __e_acsl_store_block((void *)(& x),(size_t)8);
- __gen_e_acsl_contract = __e_acsl_contract_init((size_t)2);
+ __e_acsl_store_block((void *)(& y),8UL);
+ __e_acsl_store_block((void *)(& x),8UL);
+ __gen_e_acsl_contract = __e_acsl_contract_init(2UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,"y",(void *)y);
__e_acsl_assert_register_ulong(& __gen_e_acsl_assert_data,"sizeof(int)",
@@ -209,8 +209,7 @@ void __gen_e_acsl_f(int *x, int *y)
__gen_e_acsl_assert_data_2.name = "mem_access";
__e_acsl_assert(__gen_e_acsl_valid_read,& __gen_e_acsl_assert_data_2);
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_2);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)0,
- *x == 1);
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,0UL,*x == 1);
__e_acsl_assert_data_t __gen_e_acsl_assert_data_3 =
{.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data_3,"x",(void *)x);
@@ -227,8 +226,7 @@ void __gen_e_acsl_f(int *x, int *y)
__gen_e_acsl_assert_data_3.name = "mem_access";
__e_acsl_assert(__gen_e_acsl_valid_read_2,& __gen_e_acsl_assert_data_3);
__e_acsl_assert_clean(& __gen_e_acsl_assert_data_3);
- __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,(size_t)1,
- *x == 0);
+ __e_acsl_contract_set_behavior_assumes(__gen_e_acsl_contract,1UL,*x == 0);
__gen_e_acsl_active_bhvrs = __e_acsl_contract_partial_count_all_behaviors
((__e_acsl_contract_t const *)__gen_e_acsl_contract);
__e_acsl_assert_data_t __gen_e_acsl_assert_data_4 =
diff --git a/src/plugins/e-acsl/tests/special/oracle_dev/e-acsl-rt-debug.e-acsl.err.log b/src/plugins/e-acsl/tests/special/oracle_dev/e-acsl-rt-debug.e-acsl.err.log
index 4606d5468186f5a26f438b45094a0c1919c95741..ca626442b2bc4816438a84c5944c754b3d39ee97 100644
--- a/src/plugins/e-acsl/tests/special/oracle_dev/e-acsl-rt-debug.e-acsl.err.log
+++ b/src/plugins/e-acsl/tests/special/oracle_dev/e-acsl-rt-debug.e-acsl.err.log
@@ -1,19 +1,19 @@
>>> HEAP ---------------------
- Application: 128 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 128 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> STACK --------------------
- Application: 16 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 16 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> GLOBAL -------------------
Application: xxxkB [0x0000-0000-0000, 0x0000-0000-0000]
Primary : xxxkB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
Secondary : xxxkB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> TLS ----------------------
- Application: 2 MB [0x0000-0000-0000, 0x0000-0000-0000]
- Primary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
- Secondary : 2 MB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Application: xxMB [0x0000-0000-0000, 0x0000-0000-0000]
+ Primary : xxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
+ Secondary : xxMB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
>>> VDSO ---------------------
Application: xxxkB [0x0000-0000-0000, 0x0000-0000-0000]
Primary : xxxkB [0x0000-0000-0000, 0x0000-0000-0000]{ Offset:xxxxx }
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_addr-by-val.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_addr-by-val.c
index a8e259432fa3dc37ab9c9ef75ca179b0e92b3534..75070c93c98fd65703463637138627bf4170e96d 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_addr-by-val.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_addr-by-val.c
@@ -13,11 +13,11 @@ int main(int argc, char **argv)
int __retres;
char *p;
int *q;
- __e_acsl_memory_init(& argc,& argv,(size_t)8);
- __e_acsl_store_block((void *)(& q),(size_t)8);
- __e_acsl_store_block((void *)(& p),(size_t)8);
- uintptr_t addr = (unsigned long)(& argc);
- __e_acsl_store_block((void *)(& addr),(size_t)8);
+ __e_acsl_memory_init(& argc,& argv,8UL);
+ __e_acsl_store_block((void *)(& q),8UL);
+ __e_acsl_store_block((void *)(& p),8UL);
+ uintptr_t addr = (uintptr_t)(& argc);
+ __e_acsl_store_block((void *)(& addr),8UL);
__e_acsl_full_init((void *)(& addr));
__e_acsl_full_init((void *)(& q));
__e_acsl_temporal_store_nblock((void *)(& q),(void *)(& argc));
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_args.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_args.c
index 22c52cd04b65be0d1030740c8c03bcfea2508a35..0109cbcde50f6202bbf9504d48c14afa852f7edb 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_args.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_args.c
@@ -11,7 +11,7 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
int main(int argc, char const **argv)
{
int __retres;
- __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+ __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
{
int __gen_e_acsl_valid;
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_array.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_array.c
index fb56df41d34181662f58e8699f6cd3b5e7c601da..3360b8dbf463cd49b5c180477faf5acf7103d007 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_array.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_array.c
@@ -12,13 +12,13 @@ int main(void)
{
int __retres;
int *src[3];
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
- __e_acsl_store_block((void *)(src),(size_t)24);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+ __e_acsl_store_block((void *)(src),24UL);
int a = 111;
- __e_acsl_store_block((void *)(& a),(size_t)4);
+ __e_acsl_store_block((void *)(& a),4UL);
__e_acsl_full_init((void *)(& a));
int b = 222;
- __e_acsl_store_block((void *)(& b),(size_t)4);
+ __e_acsl_store_block((void *)(& b),4UL);
__e_acsl_full_init((void *)(& b));
__e_acsl_initialize((void *)(src),sizeof(int *));
__e_acsl_temporal_store_nblock((void *)(src),(void *)(& a));
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_char.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_char.c
index 9e82a6eae3dc07a86dc360b8328131d15fab5f88..b35623e18fd0696f0b2b5940097b3e07892433ca 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_char.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_char.c
@@ -11,20 +11,20 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
int main(int argc, char const **argv)
{
int __retres;
- __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+ __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
char a __attribute__((__aligned__(4))) = (char)'1';
- __e_acsl_store_block((void *)(& a),(size_t)1);
+ __e_acsl_store_block((void *)(& a),1UL);
__e_acsl_full_init((void *)(& a));
char b __attribute__((__aligned__(4))) = (char)'2';
- __e_acsl_store_block((void *)(& b),(size_t)1);
+ __e_acsl_store_block((void *)(& b),1UL);
__e_acsl_full_init((void *)(& b));
char *p = & a;
__e_acsl_temporal_store_nblock((void *)(& p),(void *)(& a));
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
__e_acsl_full_init((void *)(& p));
char *q = & b;
__e_acsl_temporal_store_nblock((void *)(& q),(void *)(& b));
- __e_acsl_store_block((void *)(& q),(size_t)8);
+ __e_acsl_store_block((void *)(& q),8UL);
__e_acsl_full_init((void *)(& q));
__e_acsl_full_init((void *)(& p));
__e_acsl_temporal_store_nreferent((void *)(& p),(void *)(& q));
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_darray.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_darray.c
index 2e9704213ce3e0be2049df9b017886e7095d2881..9f7518fecdf9e80abb7ba31044956af6b7a1022c 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_darray.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_darray.c
@@ -12,7 +12,7 @@ void area_triangle(double (*vertices)[4])
{
{
int __gen_e_acsl_valid_read;
- __e_acsl_store_block((void *)(& vertices),(size_t)8);
+ __e_acsl_store_block((void *)(& vertices),8UL);
__e_acsl_temporal_pull_parameter((void *)(& vertices),0U,8UL);
__e_acsl_assert_data_t __gen_e_acsl_assert_data = {.values = (void *)0};
__e_acsl_assert_register_ptr(& __gen_e_acsl_assert_data,
@@ -71,7 +71,7 @@ void area_triangle(double (*vertices)[4])
void abe_matrix(double (*vertices)[4])
{
- __e_acsl_store_block((void *)(& vertices),(size_t)8);
+ __e_acsl_store_block((void *)(& vertices),8UL);
__e_acsl_temporal_pull_parameter((void *)(& vertices),0U,8UL);
__e_acsl_temporal_reset_parameters();
__e_acsl_temporal_reset_return();
@@ -88,9 +88,9 @@ void __e_acsl_globals_init(void)
static char __e_acsl_already_run = 0;
if (! __e_acsl_already_run) {
__e_acsl_already_run = 1;
- __e_acsl_store_block((void *)(Vertices2),(size_t)96);
+ __e_acsl_store_block((void *)(Vertices2),96UL);
__e_acsl_full_init((void *)(& Vertices2));
- __e_acsl_store_block((void *)(Vertices),(size_t)96);
+ __e_acsl_store_block((void *)(Vertices),96UL);
__e_acsl_full_init((void *)(& Vertices));
}
return;
@@ -109,17 +109,17 @@ int main(int argc, char const **argv)
double vertices2[3][4];
double vertices3[3][4];
double triple_vertices[2][3][4];
- __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+ __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
__e_acsl_globals_init();
- __e_acsl_store_block((void *)(triple_vertices),(size_t)192);
- __e_acsl_store_block((void *)(vertices3),(size_t)96);
- __e_acsl_store_block((void *)(vertices2),(size_t)96);
+ __e_acsl_store_block((void *)(triple_vertices),192UL);
+ __e_acsl_store_block((void *)(vertices3),96UL);
+ __e_acsl_store_block((void *)(vertices2),96UL);
double vertices[3][4] =
{{1.0, 2.0, 3.0, 4.0}, {5.0, 6.0, 7.0, 8.0}, {9.0, 10.0, 11.0, 12.0}};
- __e_acsl_store_block((void *)(vertices),(size_t)96);
+ __e_acsl_store_block((void *)(vertices),96UL);
__e_acsl_full_init((void *)(& vertices));
double triple_vertices2[2][3][4] = {};
- __e_acsl_store_block((void *)(triple_vertices2),(size_t)192);
+ __e_acsl_store_block((void *)(triple_vertices2),192UL);
__e_acsl_full_init((void *)(& triple_vertices2));
__e_acsl_temporal_reset_parameters();
__e_acsl_temporal_reset_return();
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_dpointer.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_dpointer.c
index fef2d09de76094617e455b66f280ba926d51abb4..e1da6a9a2e96411db221b13f7dcb235bf94644ae 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_dpointer.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_dpointer.c
@@ -12,12 +12,12 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_temporal_reset_parameters();
__e_acsl_temporal_reset_return();
int **p = malloc(sizeof(int *) * (unsigned long)3);
__e_acsl_temporal_store_nblock((void *)(& p),(void *)*(& p));
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
__e_acsl_full_init((void *)(& p));
int i = 0;
while (i < 3) {
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fptr.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fptr.c
index bbf3854ccad1dca1e33343cd32ece060c46212e1..178d5a879b60ec40d408011823b4e26888fff6fe 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fptr.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fptr.c
@@ -19,7 +19,7 @@ void __e_acsl_globals_init(void)
static char __e_acsl_already_run = 0;
if (! __e_acsl_already_run) {
__e_acsl_already_run = 1;
- __e_acsl_store_block((void *)(& foo),(size_t)1);
+ __e_acsl_store_block((void *)(& foo),1UL);
__e_acsl_full_init((void *)(& foo));
}
return;
@@ -35,16 +35,16 @@ int main(int argc, char const **argv)
{
int __retres;
int *q;
- __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+ __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
__e_acsl_globals_init();
- __e_acsl_store_block((void *)(& q),(size_t)8);
+ __e_acsl_store_block((void *)(& q),8UL);
int *p = & argc;
__e_acsl_temporal_store_nblock((void *)(& p),(void *)(& argc));
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
__e_acsl_full_init((void *)(& p));
int *(*fp)(int *) = & foo;
__e_acsl_temporal_store_nblock((void *)(& fp),(void *)(& foo));
- __e_acsl_store_block((void *)(& fp),(size_t)8);
+ __e_acsl_store_block((void *)(& fp),8UL);
__e_acsl_full_init((void *)(& fp));
__e_acsl_full_init((void *)(& fp));
__e_acsl_temporal_store_nblock((void *)(& fp),(void *)(& foo));
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fun_lib.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fun_lib.c
index bd44e353e0ebb4f962c0bf184ed4c7c53099bb2f..df63c9f75adb9f046b55a94ff020506802391a5a 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fun_lib.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fun_lib.c
@@ -26,23 +26,23 @@ void __e_acsl_globals_init(void)
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
char *c = (char *)__gen_e_acsl_literal_string;
__e_acsl_temporal_reset_parameters();
__e_acsl_temporal_reset_return();
- char *p = malloc((unsigned long)256);
+ char *p = malloc((size_t)256);
__e_acsl_temporal_store_nblock((void *)(& p),(void *)*(& p));
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
__e_acsl_full_init((void *)(& p));
char *q = (char *)0;
__e_acsl_temporal_store_nblock((void *)(& q),(void *)0);
- __e_acsl_store_block((void *)(& q),(size_t)8);
+ __e_acsl_store_block((void *)(& q),8UL);
__e_acsl_full_init((void *)(& q));
__e_acsl_full_init((void *)(& q));
__e_acsl_temporal_reset_parameters();
__e_acsl_temporal_reset_return();
- q = (char *)malloc((unsigned long)256);
+ q = (char *)malloc((size_t)256);
__e_acsl_temporal_store_nblock((void *)(& q),(void *)*(& q));
{
int __gen_e_acsl_initialized;
@@ -113,7 +113,7 @@ int main(void)
__e_acsl_temporal_save_nreferent_parameter((void *)(& q),1U);
char *path = realpath((char const *)c,q);
__e_acsl_temporal_store_nblock((void *)(& path),(void *)*(& path));
- __e_acsl_store_block((void *)(& path),(size_t)8);
+ __e_acsl_store_block((void *)(& path),8UL);
__e_acsl_full_init((void *)(& path));
__e_acsl_full_init((void *)(& path));
__e_acsl_temporal_reset_parameters();
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fun_ptr.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fun_ptr.c
index c0c6e534d7797de3274190bd581bc25377cba148..4a71a4e72f824ae9f2dfff94933fc6d593ed2516 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fun_ptr.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_fun_ptr.c
@@ -11,11 +11,11 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
int *pfun(char c, int *p, int *p2, int *p3, int *p4, int i)
{
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
__e_acsl_temporal_pull_parameter((void *)(& p),1U,8UL);
int *q = p;
__e_acsl_temporal_store_nreferent((void *)(& q),(void *)(& p));
- __e_acsl_store_block((void *)(& q),(size_t)8);
+ __e_acsl_store_block((void *)(& q),8UL);
__e_acsl_full_init((void *)(& q));
__e_acsl_temporal_save_return((void *)(& q));
__e_acsl_delete_block((void *)(& p));
@@ -26,15 +26,15 @@ int *pfun(char c, int *p, int *p2, int *p3, int *p4, int i)
int main(int argc, char const **argv)
{
int __retres;
- __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+ __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
int a = 1;
- __e_acsl_store_block((void *)(& a),(size_t)4);
+ __e_acsl_store_block((void *)(& a),4UL);
__e_acsl_full_init((void *)(& a));
int *p = & a;
__e_acsl_temporal_store_nblock((void *)(& p),(void *)(& a));
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
__e_acsl_full_init((void *)(& p));
- uintptr_t addr = (unsigned long)(& addr);
+ uintptr_t addr = (uintptr_t)(& addr);
__e_acsl_full_init((void *)(& p));
__e_acsl_temporal_reset_parameters();
__e_acsl_temporal_reset_return();
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_getenv.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_getenv.c
index 6a3a17e2dfa098eafe12d3a3be41d3e2a787f893..fffa5c729eabd369bbb326e4930f8a7be8ad4e7d 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_getenv.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_getenv.c
@@ -26,7 +26,7 @@ char *__gen_e_acsl_getenv(char const *name);
char *__gen_e_acsl_getenv(char const *name)
{
char *__retres;
- __e_acsl_store_block((void *)(& __retres),(size_t)8);
+ __e_acsl_store_block((void *)(& __retres),8UL);
__e_acsl_temporal_reset_parameters();
__e_acsl_temporal_reset_return();
__retres = getenv(name);
@@ -87,11 +87,11 @@ void __e_acsl_globals_init(void)
int main(int argc, char const **argv)
{
int __retres;
- __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+ __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
__e_acsl_globals_init();
char *g1 = (char *)0;
__e_acsl_temporal_store_nblock((void *)(& g1),(void *)0);
- __e_acsl_store_block((void *)(& g1),(size_t)8);
+ __e_acsl_store_block((void *)(& g1),8UL);
__e_acsl_full_init((void *)(& g1));
__e_acsl_full_init((void *)(& g1));
__e_acsl_temporal_reset_parameters();
@@ -102,7 +102,7 @@ int main(int argc, char const **argv)
__e_acsl_temporal_reset_return();
char *g2 = __gen_e_acsl_getenv(__gen_e_acsl_literal_string_2);
__e_acsl_temporal_pull_return((void *)(& g2));
- __e_acsl_store_block((void *)(& g2),(size_t)8);
+ __e_acsl_store_block((void *)(& g2),8UL);
__e_acsl_full_init((void *)(& g2));
{
int __gen_e_acsl_or;
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_global_init.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_global_init.c
index 0642483398e245127f2cf3a54382d5a38647cfbe..235d548a00e4121e1c3cc33157671cfb969568d3 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_global_init.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_global_init.c
@@ -31,8 +31,8 @@ static tree_desc2 descs2[2] =
void build_tree(tree_desc *desc)
{
int *extra;
- __e_acsl_store_block((void *)(& extra),(size_t)8);
- __e_acsl_store_block((void *)(& desc),(size_t)8);
+ __e_acsl_store_block((void *)(& extra),8UL);
+ __e_acsl_store_block((void *)(& desc),8UL);
__e_acsl_temporal_pull_parameter((void *)(& desc),0U,8UL);
__e_acsl_full_init((void *)(& extra));
__e_acsl_temporal_store_nreferent((void *)(& extra),
@@ -101,17 +101,17 @@ void __e_acsl_globals_init(void)
__e_acsl_store_block((void *)__gen_e_acsl_literal_string_3,sizeof("tha"));
__e_acsl_full_init((void *)__gen_e_acsl_literal_string_3);
__e_acsl_mark_readonly((void *)__gen_e_acsl_literal_string_3);
- __e_acsl_store_block((void *)(descs2),(size_t)16);
+ __e_acsl_store_block((void *)(descs2),16UL);
__e_acsl_full_init((void *)(& descs2));
- __e_acsl_store_block((void *)(& l_desc2),(size_t)8);
+ __e_acsl_store_block((void *)(& l_desc2),8UL);
__e_acsl_full_init((void *)(& l_desc2));
- __e_acsl_store_block((void *)(descs),(size_t)16);
+ __e_acsl_store_block((void *)(descs),16UL);
__e_acsl_full_init((void *)(& descs));
- __e_acsl_store_block((void *)(& l_desc),(size_t)8);
+ __e_acsl_store_block((void *)(& l_desc),8UL);
__e_acsl_full_init((void *)(& l_desc));
- __e_acsl_store_block((void *)(extra_lbits),(size_t)4);
+ __e_acsl_store_block((void *)(extra_lbits),4UL);
__e_acsl_full_init((void *)(& extra_lbits));
- __e_acsl_store_block((void *)(strings),(size_t)32);
+ __e_acsl_store_block((void *)(strings),32UL);
__e_acsl_full_init((void *)(& strings));
__e_acsl_temporal_store_nblock((void *)(& descs2[0].desc.extra_bits),
(void *)(extra_lbits));
@@ -151,7 +151,7 @@ void __e_acsl_globals_clean(void)
int main(int argc, char const **argv)
{
int __retres;
- __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+ __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
__e_acsl_globals_init();
__e_acsl_temporal_reset_parameters();
__e_acsl_temporal_reset_return();
@@ -179,7 +179,7 @@ int main(int argc, char const **argv)
build_tree(& descs2[1].desc);
char **p = (char **)(strings);
__e_acsl_temporal_store_nblock((void *)(& p),(void *)(strings));
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
__e_acsl_full_init((void *)(& p));
{
int __gen_e_acsl_initialized;
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_labels.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_labels.c
index 75e427d2eeaff03f9470651e7a4d92d23f338a90..b8a61ad462a5b85185cc8c7fb4fda10525f6c87c 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_labels.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_labels.c
@@ -10,8 +10,8 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
void foo(int *a, int *b)
{
- __e_acsl_store_block((void *)(& b),(size_t)8);
- __e_acsl_store_block((void *)(& a),(size_t)8);
+ __e_acsl_store_block((void *)(& b),8UL);
+ __e_acsl_store_block((void *)(& a),8UL);
__e_acsl_temporal_pull_parameter((void *)(& a),0U,8UL);
__e_acsl_temporal_pull_parameter((void *)(& b),1U,8UL);
int t = *a;
@@ -34,20 +34,20 @@ int *bar(void)
int main(int argc, char const **argv)
{
int __retres;
- __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+ __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
int a = 11;
- __e_acsl_store_block((void *)(& a),(size_t)4);
+ __e_acsl_store_block((void *)(& a),4UL);
__e_acsl_full_init((void *)(& a));
int b = 12;
- __e_acsl_store_block((void *)(& b),(size_t)4);
+ __e_acsl_store_block((void *)(& b),4UL);
__e_acsl_full_init((void *)(& b));
int *p = & a;
__e_acsl_temporal_store_nblock((void *)(& p),(void *)(& a));
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
__e_acsl_full_init((void *)(& p));
int *q = & b;
__e_acsl_temporal_store_nblock((void *)(& q),(void *)(& b));
- __e_acsl_store_block((void *)(& q),(size_t)8);
+ __e_acsl_store_block((void *)(& q),8UL);
__e_acsl_full_init((void *)(& q));
LAB:
__e_acsl_temporal_reset_parameters();
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_lit_string.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_lit_string.c
index aaeea91f44d2915a408278bb88ed29039ad941f3..75c4793a0c30133ba502a8323981ccafc43b3506 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_lit_string.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_lit_string.c
@@ -32,14 +32,14 @@ int main(void)
int __retres;
char *g;
char *q;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
- __e_acsl_store_block((void *)(& q),(size_t)8);
- __e_acsl_store_block((void *)(& g),(size_t)8);
+ __e_acsl_store_block((void *)(& q),8UL);
+ __e_acsl_store_block((void *)(& g),8UL);
char *f = (char *)__gen_e_acsl_literal_string;
__e_acsl_temporal_store_nblock((void *)(& f),
(void *)__gen_e_acsl_literal_string);
- __e_acsl_store_block((void *)(& f),(size_t)8);
+ __e_acsl_store_block((void *)(& f),8UL);
__e_acsl_full_init((void *)(& f));
{
int __gen_e_acsl_initialized;
@@ -180,7 +180,7 @@ int main(void)
/*@ assert \valid_read(g) && !\valid(g); */ ;
char *p = f;
__e_acsl_temporal_store_nreferent((void *)(& p),(void *)(& f));
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
__e_acsl_full_init((void *)(& p));
{
int __gen_e_acsl_initialized_5;
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_local_init.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_local_init.c
index 59299163b135bb1a9ce8ab0f48bee898c4b6197c..db8252a59a2cf26de29233b939a00c683592c2f8 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_local_init.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_local_init.c
@@ -26,8 +26,8 @@ typedef struct tree_desc2 tree_desc2;
void build_tree(tree_desc *desc)
{
int *extra;
- __e_acsl_store_block((void *)(& extra),(size_t)8);
- __e_acsl_store_block((void *)(& desc),(size_t)8);
+ __e_acsl_store_block((void *)(& extra),8UL);
+ __e_acsl_store_block((void *)(& desc),8UL);
__e_acsl_temporal_pull_parameter((void *)(& desc),0U,8UL);
__e_acsl_full_init((void *)(& extra));
__e_acsl_temporal_store_nreferent((void *)(& extra),
@@ -110,9 +110,9 @@ void __e_acsl_globals_init(void)
__e_acsl_store_block((void *)__gen_e_acsl_literal_string_6,sizeof("bar"));
__e_acsl_full_init((void *)__gen_e_acsl_literal_string_6);
__e_acsl_mark_readonly((void *)__gen_e_acsl_literal_string_6);
- __e_acsl_store_block((void *)(Str),(size_t)32);
+ __e_acsl_store_block((void *)(Str),32UL);
__e_acsl_full_init((void *)(& Str));
- __e_acsl_store_block((void *)(Strings),(size_t)32);
+ __e_acsl_store_block((void *)(Strings),32UL);
__e_acsl_full_init((void *)(& Strings));
__e_acsl_temporal_store_nblock((void *)(Str),
(void *)__gen_e_acsl_literal_string_5);
@@ -143,7 +143,7 @@ void __e_acsl_globals_clean(void)
int main(int argc, char const **argv)
{
int __retres;
- __e_acsl_memory_init(& argc,(char ***)(& argv),(size_t)8);
+ __e_acsl_memory_init(& argc,(char ***)(& argv),8UL);
__e_acsl_globals_init();
char *strings[2][2] =
{{(char *)__gen_e_acsl_literal_string,
@@ -158,11 +158,11 @@ int main(int argc, char const **argv)
(void *)__gen_e_acsl_literal_string_2);
__e_acsl_temporal_store_nblock((void *)(& strings[0][0]),
(void *)__gen_e_acsl_literal_string);
- __e_acsl_store_block((void *)(strings),(size_t)32);
+ __e_acsl_store_block((void *)(strings),32UL);
__e_acsl_full_init((void *)(& strings));
char **p = (char **)(strings);
__e_acsl_temporal_store_nblock((void *)(& p),(void *)(strings));
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
__e_acsl_full_init((void *)(& p));
{
int __gen_e_acsl_initialized;
@@ -282,7 +282,7 @@ int main(int argc, char const **argv)
(void *)__gen_e_acsl_literal_string_6);
__e_acsl_temporal_store_nblock((void *)(str),
(void *)__gen_e_acsl_literal_string_5);
- __e_acsl_store_block((void *)(str),(size_t)32);
+ __e_acsl_store_block((void *)(str),32UL);
__e_acsl_full_init((void *)(& str));
__e_acsl_full_init((void *)(& p));
__e_acsl_temporal_store_nblock((void *)(& p),(void *)(& str));
@@ -399,7 +399,7 @@ int main(int argc, char const **argv)
/*@ assert \valid_read(*p); */ ;
char **P = (char **)(Strings);
__e_acsl_temporal_store_nblock((void *)(& P),(void *)(Strings));
- __e_acsl_store_block((void *)(& P),(size_t)8);
+ __e_acsl_store_block((void *)(& P),8UL);
__e_acsl_full_init((void *)(& P));
{
int __gen_e_acsl_initialized_7;
@@ -625,12 +625,12 @@ int main(int argc, char const **argv)
}
/*@ assert \valid_read(*P); */ ;
int extra_lbits[1] = {0};
- __e_acsl_store_block((void *)(extra_lbits),(size_t)4);
+ __e_acsl_store_block((void *)(extra_lbits),4UL);
__e_acsl_full_init((void *)(& extra_lbits));
tree_desc l_desc = {.extra_bits = extra_lbits};
__e_acsl_temporal_store_nblock((void *)(& l_desc.extra_bits),
(void *)(extra_lbits));
- __e_acsl_store_block((void *)(& l_desc),(size_t)8);
+ __e_acsl_store_block((void *)(& l_desc),8UL);
__e_acsl_full_init((void *)(& l_desc));
tree_desc descs[2] =
{{.extra_bits = extra_lbits}, {.extra_bits = extra_lbits}};
@@ -638,12 +638,12 @@ int main(int argc, char const **argv)
(void *)(extra_lbits));
__e_acsl_temporal_store_nblock((void *)(& descs[0].extra_bits),
(void *)(extra_lbits));
- __e_acsl_store_block((void *)(descs),(size_t)16);
+ __e_acsl_store_block((void *)(descs),16UL);
__e_acsl_full_init((void *)(& descs));
tree_desc2 l_desc2 = {.desc = {.extra_bits = extra_lbits}};
__e_acsl_temporal_store_nblock((void *)(& l_desc2.desc.extra_bits),
(void *)(extra_lbits));
- __e_acsl_store_block((void *)(& l_desc2),(size_t)8);
+ __e_acsl_store_block((void *)(& l_desc2),8UL);
__e_acsl_full_init((void *)(& l_desc2));
tree_desc2 descs2[2] =
{{.desc = {.extra_bits = extra_lbits}},
@@ -652,7 +652,7 @@ int main(int argc, char const **argv)
(void *)(extra_lbits));
__e_acsl_temporal_store_nblock((void *)(& descs2[0].desc.extra_bits),
(void *)(extra_lbits));
- __e_acsl_store_block((void *)(descs2),(size_t)16);
+ __e_acsl_store_block((void *)(descs2),16UL);
__e_acsl_full_init((void *)(& descs2));
__e_acsl_temporal_reset_parameters();
__e_acsl_temporal_reset_return();
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_malloc-asan.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_malloc-asan.c
index f34fde6988dfda415a3af91bc4e697164179c946..684e09d1b32e68f36e3c4538fe6a29517cd0f9a2 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_malloc-asan.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_malloc-asan.c
@@ -29,16 +29,16 @@ int main(void)
int __retres;
int *p;
int *q;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
__e_acsl_globals_init();
- __e_acsl_store_block((void *)(& q),(size_t)8);
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& q),8UL);
+ __e_acsl_store_block((void *)(& p),8UL);
int counter = 0;
- size_t limit = (unsigned long)10000;
+ size_t limit = (size_t)10000;
__e_acsl_full_init((void *)(& p));
__e_acsl_temporal_reset_parameters();
__e_acsl_temporal_reset_return();
- p = (int *)malloc((unsigned long)(1024 * 1024));
+ p = (int *)malloc((size_t)(1024 * 1024));
__e_acsl_temporal_store_nblock((void *)(& p),(void *)*(& p));
__e_acsl_full_init((void *)(& q));
__e_acsl_temporal_store_nreferent((void *)(& q),(void *)(& p));
@@ -51,7 +51,7 @@ int main(void)
__e_acsl_full_init((void *)(& p));
__e_acsl_temporal_reset_parameters();
__e_acsl_temporal_reset_return();
- p = (int *)malloc((unsigned long)(1024 * 1024));
+ p = (int *)malloc((size_t)(1024 * 1024));
__e_acsl_temporal_store_nblock((void *)(& p),(void *)*(& p));
counter ++;
/*@ assert Eva: dangling_pointer: !\dangling(&q); */
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_malloc.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_malloc.c
index ae85b5ecc53086d34d4a80a7ada3a47984cd627e..a5144cc427e6a3544a9bd6c0a219dbdbd2dfbef9 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_malloc.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_malloc.c
@@ -14,9 +14,9 @@ int main(void)
int __retres;
int *p;
int *q;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
- __e_acsl_store_block((void *)(& q),(size_t)8);
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+ __e_acsl_store_block((void *)(& q),8UL);
+ __e_acsl_store_block((void *)(& p),8UL);
{
int __gen_e_acsl_initialized;
int __gen_e_acsl_and;
@@ -336,7 +336,7 @@ int main(void)
__e_acsl_full_init((void *)(& q));
__e_acsl_temporal_reset_parameters();
__e_acsl_temporal_reset_return();
- q = (int *)calloc((unsigned long)4096,(unsigned long)1);
+ q = (int *)calloc((size_t)4096,(size_t)1);
__e_acsl_temporal_store_nblock((void *)(& q),(void *)*(& q));
{
int __gen_e_acsl_initialized_9;
@@ -379,7 +379,7 @@ int main(void)
__e_acsl_temporal_reset_parameters();
__e_acsl_temporal_reset_return();
__e_acsl_temporal_save_nreferent_parameter((void *)(& q),0U);
- q = (int *)realloc((void *)q,(unsigned long)8192);
+ q = (int *)realloc((void *)q,(size_t)8192);
__e_acsl_temporal_store_nblock((void *)(& q),(void *)*(& q));
{
int __gen_e_acsl_initialized_10;
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_memcpy.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_memcpy.c
index 9d5021eb070b12afaed8be77738575b0bb47f472..4819943379654d527e90c41db84795635f97dee4 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_memcpy.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_memcpy.c
@@ -43,15 +43,15 @@ int main(void)
int *src[2];
int *dest[2];
int *tmp_1;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
- __e_acsl_store_block((void *)(& tmp_1),(size_t)8);
- __e_acsl_store_block((void *)(dest),(size_t)16);
- __e_acsl_store_block((void *)(src),(size_t)16);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+ __e_acsl_store_block((void *)(& tmp_1),8UL);
+ __e_acsl_store_block((void *)(dest),16UL);
+ __e_acsl_store_block((void *)(src),16UL);
int a = 111;
- __e_acsl_store_block((void *)(& a),(size_t)4);
+ __e_acsl_store_block((void *)(& a),4UL);
__e_acsl_full_init((void *)(& a));
int b = 222;
- __e_acsl_store_block((void *)(& b),(size_t)4);
+ __e_acsl_store_block((void *)(& b),4UL);
__e_acsl_full_init((void *)(& b));
int size = (int)(sizeof(int *) * (unsigned long)2);
__e_acsl_initialize((void *)(src),sizeof(int *));
@@ -144,8 +144,7 @@ int main(void)
__e_acsl_temporal_reset_return();
__e_acsl_temporal_save_nblock_parameter((void *)(& dest),0U);
__e_acsl_temporal_save_nblock_parameter((void *)(& src),1U);
- __gen_e_acsl_memcpy((void *)(& dest),(void const *)(& src),
- (unsigned long)size);
+ __gen_e_acsl_memcpy((void *)(& dest),(void const *)(& src),(size_t)size);
{
int __gen_e_acsl_initialized_3;
int __gen_e_acsl_and_3;
@@ -224,7 +223,7 @@ int main(void)
__e_acsl_temporal_reset_parameters();
__e_acsl_temporal_reset_return();
__e_acsl_temporal_save_nblock_parameter((void *)(& dest),0U);
- __gen_e_acsl_memset((void *)(& dest),0,(unsigned long)size);
+ __gen_e_acsl_memset((void *)(& dest),0,(size_t)size);
{
int __gen_e_acsl_initialized_5;
int __gen_e_acsl_and_5;
@@ -302,15 +301,15 @@ int main(void)
/*@ assert !\valid(dest[1]); */ ;
__e_acsl_temporal_reset_parameters();
__e_acsl_temporal_reset_return();
- int **p = malloc((unsigned long)size);
+ int **p = malloc((size_t)size);
__e_acsl_temporal_store_nblock((void *)(& p),(void *)*(& p));
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
__e_acsl_full_init((void *)(& p));
__e_acsl_temporal_reset_parameters();
__e_acsl_temporal_reset_return();
- int **q = malloc((unsigned long)size);
+ int **q = malloc((size_t)size);
__e_acsl_temporal_store_nblock((void *)(& q),(void *)*(& q));
- __e_acsl_store_block((void *)(& q),(size_t)8);
+ __e_acsl_store_block((void *)(& q),8UL);
__e_acsl_full_init((void *)(& q));
__e_acsl_initialize((void *)p,sizeof(int *));
__e_acsl_temporal_store_nblock((void *)p,(void *)(& a));
@@ -585,7 +584,7 @@ int main(void)
__e_acsl_temporal_reset_return();
__e_acsl_temporal_save_nreferent_parameter((void *)(& q),0U);
__e_acsl_temporal_save_nreferent_parameter((void *)(& p),1U);
- __gen_e_acsl_memcpy((void *)q,(void const *)p,(unsigned long)size);
+ __gen_e_acsl_memcpy((void *)q,(void const *)p,(size_t)size);
{
int __gen_e_acsl_initialized_13;
int __gen_e_acsl_and_14;
@@ -736,7 +735,7 @@ void *__gen_e_acsl_memset(void *s, int c, size_t n)
{
void *__gen_e_acsl_at;
void *__retres;
- __e_acsl_store_block((void *)(& s),(size_t)8);
+ __e_acsl_store_block((void *)(& s),8UL);
__e_acsl_temporal_pull_parameter((void *)(& s),0U,8UL);
__gen_e_acsl_at = s;
__e_acsl_temporal_reset_parameters();
@@ -808,8 +807,8 @@ void *__gen_e_acsl_memcpy(void * restrict dest, void const * restrict src,
unsigned long __gen_e_acsl__6;
unsigned long __gen_e_acsl_if_4;
int __gen_e_acsl_separated;
- __e_acsl_store_block((void *)(& src),(size_t)8);
- __e_acsl_store_block((void *)(& dest),(size_t)8);
+ __e_acsl_store_block((void *)(& src),8UL);
+ __e_acsl_store_block((void *)(& dest),8UL);
__e_acsl_temporal_pull_parameter((void *)(& dest),0U,8UL);
__e_acsl_temporal_pull_parameter((void *)(& src),1U,8UL);
__gen_e_acsl_at = dest;
@@ -927,8 +926,7 @@ void *__gen_e_acsl_memcpy(void * restrict dest, void const * restrict src,
__gen_e_acsl_size_4);
__gen_e_acsl_if_4 = __gen_e_acsl_size_4;
}
- __gen_e_acsl_separated = __e_acsl_separated((size_t)2,
- (char *)dest + 1 * 0,
+ __gen_e_acsl_separated = __e_acsl_separated(2UL,(char *)dest + 1 * 0,
__gen_e_acsl_if_3,
(char *)src + 1 * 0,
__gen_e_acsl_if_4);
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_scope.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_scope.c
index 0579f052c644c4c526cc1288b157b7fca7e19a94..e175b3e5377fb7df61c497895f2e9ed9d60a94b7 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_scope.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_scope.c
@@ -11,18 +11,18 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
int *p = (int *)0;
__e_acsl_temporal_store_nblock((void *)(& p),(void *)0);
- __e_acsl_store_block((void *)(& p),(size_t)8);
+ __e_acsl_store_block((void *)(& p),8UL);
__e_acsl_full_init((void *)(& p));
int *q = (int *)0;
__e_acsl_temporal_store_nblock((void *)(& q),(void *)0);
- __e_acsl_store_block((void *)(& q),(size_t)8);
+ __e_acsl_store_block((void *)(& q),8UL);
__e_acsl_full_init((void *)(& q));
{
int i = 9;
- __e_acsl_store_block((void *)(& i),(size_t)4);
+ __e_acsl_store_block((void *)(& i),4UL);
__e_acsl_full_init((void *)(& i));
__e_acsl_full_init((void *)(& p));
__e_acsl_temporal_store_nblock((void *)(& p),(void *)(& i));
@@ -107,7 +107,7 @@ int main(void)
/*@ assert !\valid(q); */ ;
{
int j = 8;
- __e_acsl_store_block((void *)(& j),(size_t)4);
+ __e_acsl_store_block((void *)(& j),4UL);
__e_acsl_full_init((void *)(& j));
__e_acsl_full_init((void *)(& p));
__e_acsl_temporal_store_nblock((void *)(& p),(void *)(& j));
@@ -221,7 +221,7 @@ int main(void)
q = (int *)0;
while (len) {
int a;
- __e_acsl_store_block((void *)(& a),(size_t)4);
+ __e_acsl_store_block((void *)(& a),4UL);
{
int __gen_e_acsl_initialized_5;
int __gen_e_acsl_and_5;
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_struct.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_struct.c
index 471aeeec24288db92fd87004c6e6c9593442076a..9ae8456936cbe3ed2ae19ede20e8038c0fdb6cce 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_struct.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_struct.c
@@ -30,15 +30,15 @@ int main(void)
larger l;
larger *lp;
larger larr[2];
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
- __e_acsl_store_block((void *)(larr),(size_t)64);
- __e_acsl_store_block((void *)(& lp),(size_t)8);
- __e_acsl_store_block((void *)(& l),(size_t)32);
- __e_acsl_store_block((void *)(tarr),(size_t)32);
- __e_acsl_store_block((void *)(& t2),(size_t)16);
- __e_acsl_store_block((void *)(& t1),(size_t)16);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
+ __e_acsl_store_block((void *)(larr),64UL);
+ __e_acsl_store_block((void *)(& lp),8UL);
+ __e_acsl_store_block((void *)(& l),32UL);
+ __e_acsl_store_block((void *)(tarr),32UL);
+ __e_acsl_store_block((void *)(& t2),16UL);
+ __e_acsl_store_block((void *)(& t1),16UL);
int a = 1;
- __e_acsl_store_block((void *)(& a),(size_t)4);
+ __e_acsl_store_block((void *)(& a),4UL);
__e_acsl_full_init((void *)(& a));
int b = 2;
__e_acsl_initialize((void *)(& t1.p),sizeof(char *));
@@ -179,7 +179,7 @@ int main(void)
}
/*@ assert !\valid(t2.p) && !\valid(t2.q); */ ;
__e_acsl_full_init((void *)(& t2));
- __e_acsl_temporal_memcpy((void *)(& t2),(void *)(& t1),(size_t)16);
+ __e_acsl_temporal_memcpy((void *)(& t2),(void *)(& t1),16UL);
t2 = t1;
{
int __gen_e_acsl_initialized_5;
@@ -253,7 +253,7 @@ int main(void)
__e_acsl_initialize((void *)(& t2.q),sizeof(char *));
__e_acsl_temporal_reset_parameters();
__e_acsl_temporal_reset_return();
- t2.q = (char *)malloc((unsigned long)4);
+ t2.q = (char *)malloc((size_t)4);
__e_acsl_temporal_store_nblock((void *)(& t2.q),(void *)*(& t2.q));
{
int __gen_e_acsl_initialized_7;
@@ -322,7 +322,7 @@ int main(void)
}
/*@ assert !\valid(t2.p) && \valid(t2.q); */ ;
__e_acsl_initialize((void *)(& l.t),sizeof(struct temporal_t));
- __e_acsl_temporal_memcpy((void *)(& l.t),(void *)(& t2),(size_t)16);
+ __e_acsl_temporal_memcpy((void *)(& l.t),(void *)(& t2),16UL);
l.t = t2;
{
int __gen_e_acsl_initialized_9;
@@ -455,7 +455,7 @@ int main(void)
}
/*@ assert !\valid(lp->t.p); */ ;
__e_acsl_initialize((void *)(tarr),sizeof(temporal));
- __e_acsl_temporal_memcpy((void *)(tarr),(void *)(& t2),(size_t)16);
+ __e_acsl_temporal_memcpy((void *)(tarr),(void *)(& t2),16UL);
tarr[0] = t2;
{
int __gen_e_acsl_initialized_12;
@@ -529,7 +529,7 @@ int main(void)
}
/*@ assert !\valid(tarr[0].p) && \valid(tarr[0].q); */ ;
__e_acsl_initialize((void *)(larr),sizeof(larger));
- __e_acsl_temporal_memcpy((void *)(larr),(void *)(& l),(size_t)32);
+ __e_acsl_temporal_memcpy((void *)(larr),(void *)(& l),32UL);
larr[0] = l;
{
int __gen_e_acsl_initialized_14;
diff --git a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_while.c b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_while.c
index 5a074dd5307ff4a830c5c81122daaebb296163bc..a2fe47cbf60daeb25354443d06bd0e234525565f 100644
--- a/src/plugins/e-acsl/tests/temporal/oracle/gen_t_while.c
+++ b/src/plugins/e-acsl/tests/temporal/oracle/gen_t_while.c
@@ -11,19 +11,19 @@ extern __attribute__((__FC_BUILTIN__)) int __e_acsl_sound_verdict;
int main(void)
{
int __retres;
- __e_acsl_memory_init((int *)0,(char ***)0,(size_t)8);
+ __e_acsl_memory_init((int *)0,(char ***)0,8UL);
int i = 0;
int arr[4] = {1, 2, 3, 4};
- __e_acsl_store_block((void *)(arr),(size_t)16);
+ __e_acsl_store_block((void *)(arr),16UL);
__e_acsl_full_init((void *)(& arr));
int arr2[4] = {1, 2, 3, 4};
- if (! ((unsigned long)(& arr) + sizeof(arr) == (unsigned long)(& arr2))) {
+ if (! ((uintptr_t)(& arr) + sizeof(arr) == (uintptr_t)(& arr2))) {
__retres = 0;
goto return_label;
}
int *q = arr;
__e_acsl_temporal_store_nblock((void *)(& q),(void *)(arr));
- __e_acsl_store_block((void *)(& q),(size_t)8);
+ __e_acsl_store_block((void *)(& q),8UL);
__e_acsl_full_init((void *)(& q));
while (i < 4) {
{
@@ -109,7 +109,7 @@ int main(void)
/*@ assert !\valid(q); */ ;
__retres = 0;
return_label:
- __e_acsl_store_block_duplicate((void *)(& q),(size_t)8);
+ __e_acsl_store_block_duplicate((void *)(& q),8UL);
__e_acsl_delete_block((void *)(& q));
__e_acsl_delete_block((void *)(arr));
__e_acsl_memory_clean();
diff --git a/src/plugins/from/from_compute.ml b/src/plugins/from/from_compute.ml
index 6cb042290b0944179c00f4989636aa6c80a2a469..17afc0cb0009c8dd7452ed1ee8f6940e60b21f00 100644
--- a/src/plugins/from/from_compute.ml
+++ b/src/plugins/from/from_compute.ml
@@ -551,13 +551,13 @@ struct
(* Filter out unreachable values. *)
let transfer_stmt s d =
- if Db.Value.is_reachable (To_Use.get_value_state s) &&
+ if Eva.Results.is_reachable s &&
not (Function_Froms.Memory.is_bottom d.deps_table)
then transfer_stmt s d
else []
let doEdge s succ d =
- if Db.Value.is_reachable (To_Use.get_value_state succ)
+ if Eva.Results.is_reachable succ
then
let dt = d.deps_table in
let opened = Kernel_function.blocks_opened_by_edge s succ in
@@ -647,7 +647,7 @@ struct
let _poped = Stack.pop call_stack in
let last_from =
try
- if Db.Value.is_reachable (To_Use.get_value_state ret_id)
+ if Eva.Results.is_reachable ret_id
then
externalize
ret_id
diff --git a/src/plugins/from/from_register.ml b/src/plugins/from/from_register.ml
index e51dcf068bc415d4295ea78d753037d8585abdbb..d807740cf802b11d785e27cf7522d8cf673567f9 100644
--- a/src/plugins/from/from_register.ml
+++ b/src/plugins/from/from_register.ml
@@ -30,7 +30,7 @@ let display fmtopt =
Option.iter (fun fmt -> Format.fprintf fmt "@[<v>") fmtopt;
Callgraph.Uses.iter_in_rev_order
(fun kf ->
- if !Db.Value.is_called kf then
+ if Eva.Results.is_called kf then
let header fmt =
Format.fprintf fmt "Function %a:" Kernel_function.pretty kf
in
@@ -101,13 +101,11 @@ let print_calldeps () =
if !Db.Value.no_results (Kernel_function.get_definition caller)
then "<unknown>", funtype
else
- try
- let set = Db.Value.call_to_kernel_function s in
- let kf = Kernel_function.Hptset.choose set in
+ match Eva.Results.callee s with
+ | kf :: _ ->
Pretty_utils.to_string Kernel_function.pretty kf,
Kernel_function.get_type kf
- with
- | Not_found ->
+ | [] ->
From_parameters.fatal
~source:(fst (Cil_datatype.Stmt.loc s))
"Invalid call %a@." Printer.pp_stmt s
diff --git a/src/plugins/from/functionwise.ml b/src/plugins/from/functionwise.ml
index ecc6d928ac22807e6ba6d5430d6e41d8a68f47b8..a4f0a3e3065f582eab966749d0c87bcdb2265d98 100644
--- a/src/plugins/from/functionwise.ml
+++ b/src/plugins/from/functionwise.ml
@@ -95,7 +95,7 @@ let force_compute_all () =
Eva.Analysis.compute ();
Callgraph.Uses.iter_in_rev_order
(fun kf ->
- if Kernel_function.is_definition kf && !Db.Value.is_called kf
+ if Kernel_function.is_definition kf && Eva.Results.is_called kf
then !Db.From.compute kf)
(* Db Registration for function-wise from *)
diff --git a/src/plugins/instantiate/tests/stdlib/oracle/calloc.res.oracle b/src/plugins/instantiate/tests/stdlib/oracle/calloc.res.oracle
index c36cdd8459f12e78db1a9ac7bb8b173c298437df..b58973f347f3f02d2cc4ed7318a0cf053462a6cb 100644
--- a/src/plugins/instantiate/tests/stdlib/oracle/calloc.res.oracle
+++ b/src/plugins/instantiate/tests/stdlib/oracle/calloc.res.oracle
@@ -298,17 +298,17 @@ int *calloc_int(size_t num, size_t size)
int main(void)
{
int __retres;
- int *pi = calloc_int((unsigned long)10,sizeof(int));
- enum E *pe = calloc_e_E((unsigned long)10,sizeof(enum E));
- float *pf = calloc_float((unsigned long)10,sizeof(float));
- struct X *px = calloc_st_X((unsigned long)10,sizeof(struct X));
- char *pc = calloc_char((unsigned long)10,sizeof(char));
- int (*pa)[10] = calloc_arr10_int((unsigned long)10,sizeof(int [10]));
+ int *pi = calloc_int((size_t)10,sizeof(int));
+ enum E *pe = calloc_e_E((size_t)10,sizeof(enum E));
+ float *pf = calloc_float((size_t)10,sizeof(float));
+ struct X *px = calloc_st_X((size_t)10,sizeof(struct X));
+ char *pc = calloc_char((size_t)10,sizeof(char));
+ int (*pa)[10] = calloc_arr10_int((size_t)10,sizeof(int [10]));
struct Flex *f =
- calloc_st_Flex((unsigned long)1,
+ calloc_st_Flex((size_t)1,
sizeof(struct Flex) + (unsigned long)3 * sizeof(int));
- void *v = calloc((unsigned long)10,sizeof(char));
- struct incomplete *inc = calloc((unsigned long)10,(unsigned long)10);
+ void *v = calloc((size_t)10,sizeof(char));
+ struct incomplete *inc = calloc((size_t)10,(size_t)10);
__retres = 0;
return __retres;
}
@@ -617,17 +617,17 @@ int *calloc_int(size_t num, size_t size)
int main(void)
{
int __retres;
- int *pi = calloc_int((unsigned long)10,sizeof(int));
- enum E *pe = calloc_e_E((unsigned long)10,sizeof(enum E));
- float *pf = calloc_float((unsigned long)10,sizeof(float));
- struct X *px = calloc_st_X((unsigned long)10,sizeof(struct X));
- char *pc = calloc_char((unsigned long)10,sizeof(char));
- int (*pa)[10] = calloc_arr10_int((unsigned long)10,sizeof(int [10]));
+ int *pi = calloc_int((size_t)10,sizeof(int));
+ enum E *pe = calloc_e_E((size_t)10,sizeof(enum E));
+ float *pf = calloc_float((size_t)10,sizeof(float));
+ struct X *px = calloc_st_X((size_t)10,sizeof(struct X));
+ char *pc = calloc_char((size_t)10,sizeof(char));
+ int (*pa)[10] = calloc_arr10_int((size_t)10,sizeof(int [10]));
struct Flex *f =
- calloc_st_Flex((unsigned long)1,
+ calloc_st_Flex((size_t)1,
sizeof(struct Flex) + (unsigned long)3 * sizeof(int));
- void *v = calloc((unsigned long)10,sizeof(char));
- struct incomplete *inc = calloc((unsigned long)10,(unsigned long)10);
+ void *v = calloc((size_t)10,sizeof(char));
+ struct incomplete *inc = calloc((size_t)10,(size_t)10);
__retres = 0;
return __retres;
}
diff --git a/src/plugins/instantiate/tests/stdlib/oracle/malloc.res.oracle b/src/plugins/instantiate/tests/stdlib/oracle/malloc.res.oracle
index e0d3446072952e257e1f55da4311aeff40b10e4a..e5d86f16bdbba2458bff1b57ac6f3c99c5c34019 100644
--- a/src/plugins/instantiate/tests/stdlib/oracle/malloc.res.oracle
+++ b/src/plugins/instantiate/tests/stdlib/oracle/malloc.res.oracle
@@ -205,12 +205,12 @@ int main(void)
int *pi = malloc_int(sizeof(int) * (unsigned long)10);
float *pf = malloc_float(sizeof(float) * (unsigned long)10);
struct X *px = malloc_st_X(sizeof(struct X) * (unsigned long)10);
- char *pc = malloc_char((unsigned long)10);
+ char *pc = malloc_char((size_t)10);
int (*pa)[10] = malloc_arr10_int(sizeof(int [10]) * (unsigned long)10);
struct Flex *f =
malloc_st_Flex(sizeof(struct Flex) + (unsigned long)3 * sizeof(int));
void *v = malloc(sizeof(char) * (unsigned long)10);
- struct incomplete *inc = malloc((unsigned long)10);
+ struct incomplete *inc = malloc((size_t)10);
__retres = 0;
return __retres;
}
@@ -421,12 +421,12 @@ int main(void)
int *pi = malloc_int(sizeof(int) * (unsigned long)10);
float *pf = malloc_float(sizeof(float) * (unsigned long)10);
struct X *px = malloc_st_X(sizeof(struct X) * (unsigned long)10);
- char *pc = malloc_char((unsigned long)10);
+ char *pc = malloc_char((size_t)10);
int (*pa)[10] = malloc_arr10_int(sizeof(int [10]) * (unsigned long)10);
struct Flex *f =
malloc_st_Flex(sizeof(struct Flex) + (unsigned long)3 * sizeof(int));
void *v = malloc(sizeof(char) * (unsigned long)10);
- struct incomplete *inc = malloc((unsigned long)10);
+ struct incomplete *inc = malloc((size_t)10);
__retres = 0;
return __retres;
}
diff --git a/src/plugins/instantiate/tests/stdlib/oracle/no_fc_stdlib.res.oracle b/src/plugins/instantiate/tests/stdlib/oracle/no_fc_stdlib.res.oracle
index ca534ce25d9a34b4f8c7c197ef2b65bc04fd19d6..ab3451d1b583ae6b2b6b5c7f091f881733bf6f1d 100644
--- a/src/plugins/instantiate/tests/stdlib/oracle/no_fc_stdlib.res.oracle
+++ b/src/plugins/instantiate/tests/stdlib/oracle/no_fc_stdlib.res.oracle
@@ -117,7 +117,7 @@ int *malloc_int(size_t size)
void foo(void)
{
int *p = malloc_int(sizeof(int));
- int *q = calloc_int((unsigned long)2,sizeof(int));
+ int *q = calloc_int((size_t)2,sizeof(int));
free_int(p);
free_int(q);
return;
@@ -244,7 +244,7 @@ int *malloc_int(size_t size)
void foo(void)
{
int *p = malloc_int(sizeof(int));
- int *q = calloc_int((unsigned long)2,sizeof(int));
+ int *q = calloc_int((size_t)2,sizeof(int));
free_int(p);
free_int(q);
return;
diff --git a/src/plugins/instantiate/tests/string/oracle/memcmp.res.oracle b/src/plugins/instantiate/tests/string/oracle/memcmp.res.oracle
index cebb89d4b797824ac066a57ca27adb1c9514612b..7e10db28495e79b1cf76bed3ddad1f4355e8d21a 100644
--- a/src/plugins/instantiate/tests/string/oracle/memcmp.res.oracle
+++ b/src/plugins/instantiate/tests/string/oracle/memcmp.res.oracle
@@ -152,14 +152,14 @@ int nested(int (*s1)[10], int (*s2)[10], int n)
int with_void(void *s1, void *s2, int n)
{
int tmp;
- tmp = memcmp((void const *)s1,(void const *)s2,(unsigned long)10);
+ tmp = memcmp((void const *)s1,(void const *)s2,(size_t)10);
return tmp;
}
int with_incomplete(struct incomplete *s1, struct incomplete *s2, int n)
{
int tmp;
- tmp = memcmp((void const *)s1,(void const *)s2,(unsigned long)n);
+ tmp = memcmp((void const *)s1,(void const *)s2,(size_t)n);
return tmp;
}
@@ -332,14 +332,14 @@ int nested(int (*s1)[10], int (*s2)[10], int n)
int with_void(void *s1, void *s2, int n)
{
int tmp;
- tmp = memcmp((void const *)s1,(void const *)s2,(unsigned long)10);
+ tmp = memcmp((void const *)s1,(void const *)s2,(size_t)10);
return tmp;
}
int with_incomplete(struct incomplete *s1, struct incomplete *s2, int n)
{
int tmp;
- tmp = memcmp((void const *)s1,(void const *)s2,(unsigned long)n);
+ tmp = memcmp((void const *)s1,(void const *)s2,(size_t)n);
return tmp;
}
diff --git a/src/plugins/instantiate/tests/string/oracle/memcpy.res.oracle b/src/plugins/instantiate/tests/string/oracle/memcpy.res.oracle
index fab9ddfb4c84f03f72a25a3e7e6fc97d5fb90364..4c91d923d22982dc770c61832383cefc3e39494f 100644
--- a/src/plugins/instantiate/tests/string/oracle/memcpy.res.oracle
+++ b/src/plugins/instantiate/tests/string/oracle/memcpy.res.oracle
@@ -164,16 +164,15 @@ void nested(int (*src)[10], int (*dest)[10], int n)
void with_void(void *src, void *dest, int n)
{
- void *res = memcpy(dest,(void const *)src,(unsigned long)n);
- memcpy(src,(void const *)res,(unsigned long)n);
+ void *res = memcpy(dest,(void const *)src,(size_t)n);
+ memcpy(src,(void const *)res,(size_t)n);
return;
}
void with_incomplete(struct incomplete *src, struct incomplete *dest, int n)
{
- struct incomplete *res =
- memcpy((void *)dest,(void const *)src,(unsigned long)n);
- memcpy((void *)src,(void const *)res,(unsigned long)n);
+ struct incomplete *res = memcpy((void *)dest,(void const *)src,(size_t)n);
+ memcpy((void *)src,(void const *)res,(size_t)n);
return;
}
@@ -356,16 +355,15 @@ void nested(int (*src)[10], int (*dest)[10], int n)
void with_void(void *src, void *dest, int n)
{
- void *res = memcpy(dest,(void const *)src,(unsigned long)n);
- memcpy(src,(void const *)res,(unsigned long)n);
+ void *res = memcpy(dest,(void const *)src,(size_t)n);
+ memcpy(src,(void const *)res,(size_t)n);
return;
}
void with_incomplete(struct incomplete *src, struct incomplete *dest, int n)
{
- struct incomplete *res =
- memcpy((void *)dest,(void const *)src,(unsigned long)n);
- memcpy((void *)src,(void const *)res,(unsigned long)n);
+ struct incomplete *res = memcpy((void *)dest,(void const *)src,(size_t)n);
+ memcpy((void *)src,(void const *)res,(size_t)n);
return;
}
diff --git a/src/plugins/instantiate/tests/string/oracle/memmove.res.oracle b/src/plugins/instantiate/tests/string/oracle/memmove.res.oracle
index 6e9cf511e4b6754d5ccfd5ee52fb20282a43ad0c..9f915a3b283425bb332ac1ceabaea7cf7fe3e552 100644
--- a/src/plugins/instantiate/tests/string/oracle/memmove.res.oracle
+++ b/src/plugins/instantiate/tests/string/oracle/memmove.res.oracle
@@ -149,16 +149,15 @@ void nested(int (*src)[10], int (*dest)[10], int n)
void with_void(void *src, void *dest, int n)
{
- void *res = memmove(dest,(void const *)src,(unsigned long)n);
- memmove(src,(void const *)res,(unsigned long)n);
+ void *res = memmove(dest,(void const *)src,(size_t)n);
+ memmove(src,(void const *)res,(size_t)n);
return;
}
void with_incomplete(struct incomplete *src, struct incomplete *dest, int n)
{
- struct incomplete *res =
- memmove((void *)dest,(void const *)src,(unsigned long)n);
- memmove((void *)src,(void const *)res,(unsigned long)n);
+ struct incomplete *res = memmove((void *)dest,(void const *)src,(size_t)n);
+ memmove((void *)src,(void const *)res,(size_t)n);
return;
}
@@ -329,16 +328,15 @@ void nested(int (*src)[10], int (*dest)[10], int n)
void with_void(void *src, void *dest, int n)
{
- void *res = memmove(dest,(void const *)src,(unsigned long)n);
- memmove(src,(void const *)res,(unsigned long)n);
+ void *res = memmove(dest,(void const *)src,(size_t)n);
+ memmove(src,(void const *)res,(size_t)n);
return;
}
void with_incomplete(struct incomplete *src, struct incomplete *dest, int n)
{
- struct incomplete *res =
- memmove((void *)dest,(void const *)src,(unsigned long)n);
- memmove((void *)src,(void const *)res,(unsigned long)n);
+ struct incomplete *res = memmove((void *)dest,(void const *)src,(size_t)n);
+ memmove((void *)src,(void const *)res,(size_t)n);
return;
}
diff --git a/src/plugins/instantiate/tests/string/oracle/memset_0.res.oracle b/src/plugins/instantiate/tests/string/oracle/memset_0.res.oracle
index 47c65a2ee1c09fbfa94536c561f4494329fbb21a..dbceb063dfcb2532abcc4dd5ae3406d2f5b2d294 100644
--- a/src/plugins/instantiate/tests/string/oracle/memset_0.res.oracle
+++ b/src/plugins/instantiate/tests/string/oracle/memset_0.res.oracle
@@ -35,8 +35,8 @@ char *memset_char(char *ptr, char value, size_t len)
void chars(char dest[10])
{
- char *res = memset_char(dest,(char)0,(unsigned long)10);
- memset_char(res,(char)0,(unsigned long)10);
+ char *res = memset_char(dest,(char)0,(size_t)10);
+ memset_char(res,(char)0,(size_t)10);
return;
}
@@ -59,8 +59,8 @@ unsigned char *memset_uchar(unsigned char *ptr, unsigned char value,
void uchars(unsigned char dest[10])
{
- unsigned char *res = memset_uchar(dest,(unsigned char)0,(unsigned long)10);
- memset_uchar(res,(unsigned char)0,(unsigned long)10);
+ unsigned char *res = memset_uchar(dest,(unsigned char)0,(size_t)10);
+ memset_uchar(res,(unsigned char)0,(size_t)10);
return;
}
@@ -87,8 +87,8 @@ char (*memset_arr10_char(char (*ptr)[10], char value, size_t len))[10]
void nested_chars(char dest[10][10])
{
- char (*res)[10] = memset_arr10_char(dest,(char)0,(unsigned long)100);
- memset_arr10_char(res,(char)0,(unsigned long)100);
+ char (*res)[10] = memset_arr10_char(dest,(char)0,(size_t)100);
+ memset_arr10_char(res,(char)0,(size_t)100);
return;
}
@@ -261,15 +261,15 @@ void nested(int (*dest)[10], int n)
void with_void(void *dest)
{
- void *res = memset(dest,0,(unsigned long)10);
- memset(res,0,(unsigned long)10);
+ void *res = memset(dest,0,(size_t)10);
+ memset(res,0,(size_t)10);
return;
}
void with_null_or_int(void)
{
- memset((void *)0,0,(unsigned long)10);
- memset((void *)((int *)42),0,(unsigned long)10);
+ memset((void *)0,0,(size_t)10);
+ memset((void *)((int *)42),0,(size_t)10);
return;
}
@@ -309,8 +309,8 @@ char *memset_char(char *ptr, char value, size_t len)
void chars(char dest[10])
{
- char *res = memset_char(dest,(char)0,(unsigned long)10);
- memset_char(res,(char)0,(unsigned long)10);
+ char *res = memset_char(dest,(char)0,(size_t)10);
+ memset_char(res,(char)0,(size_t)10);
return;
}
@@ -335,8 +335,8 @@ unsigned char *memset_uchar(unsigned char *ptr, unsigned char value,
void uchars(unsigned char dest[10])
{
- unsigned char *res = memset_uchar(dest,(unsigned char)0,(unsigned long)10);
- memset_uchar(res,(unsigned char)0,(unsigned long)10);
+ unsigned char *res = memset_uchar(dest,(unsigned char)0,(size_t)10);
+ memset_uchar(res,(unsigned char)0,(size_t)10);
return;
}
@@ -364,8 +364,8 @@ char (*memset_arr10_char(char (*ptr)[10], char value, size_t len))[10]
void nested_chars(char dest[10][10])
{
- char (*res)[10] = memset_arr10_char(dest,(char)0,(unsigned long)100);
- memset_arr10_char(res,(char)0,(unsigned long)100);
+ char (*res)[10] = memset_arr10_char(dest,(char)0,(size_t)100);
+ memset_arr10_char(res,(char)0,(size_t)100);
return;
}
@@ -539,15 +539,15 @@ void nested(int (*dest)[10], int n)
void with_void(void *dest)
{
- void *res = memset(dest,0,(unsigned long)10);
- memset(res,0,(unsigned long)10);
+ void *res = memset(dest,0,(size_t)10);
+ memset(res,0,(size_t)10);
return;
}
void with_null_or_int(void)
{
- memset((void *)0,0,(unsigned long)10);
- memset((void *)((int *)42),0,(unsigned long)10);
+ memset((void *)0,0,(size_t)10);
+ memset((void *)((int *)42),0,(size_t)10);
return;
}
diff --git a/src/plugins/instantiate/tests/string/oracle/memset_FF.res.oracle b/src/plugins/instantiate/tests/string/oracle/memset_FF.res.oracle
index 1f530f3a13521173eb311ee6679a460a6f188f8d..c7b4c18e63c789a40f9676eb86f480721ddaf121 100644
--- a/src/plugins/instantiate/tests/string/oracle/memset_FF.res.oracle
+++ b/src/plugins/instantiate/tests/string/oracle/memset_FF.res.oracle
@@ -35,8 +35,8 @@ char *memset_char(char *ptr, char value, size_t len)
void chars(char dest[10])
{
- char *res = memset_char(dest,(char)0xFF,(unsigned long)10);
- memset_char(res,(char)0xFF,(unsigned long)10);
+ char *res = memset_char(dest,(char)0xFF,(size_t)10);
+ memset_char(res,(char)0xFF,(size_t)10);
return;
}
@@ -59,9 +59,8 @@ unsigned char *memset_uchar(unsigned char *ptr, unsigned char value,
void uchars(unsigned char dest[10])
{
- unsigned char *res =
- memset_uchar(dest,(unsigned char)0xFF,(unsigned long)10);
- memset_uchar(res,(unsigned char)0xFF,(unsigned long)10);
+ unsigned char *res = memset_uchar(dest,(unsigned char)0xFF,(size_t)10);
+ memset_uchar(res,(unsigned char)0xFF,(size_t)10);
return;
}
@@ -88,8 +87,8 @@ char (*memset_arr10_char(char (*ptr)[10], char value, size_t len))[10]
void nested_chars(char dest[10][10])
{
- char (*res)[10] = memset_arr10_char(dest,(char)0xFF,(unsigned long)100);
- memset_arr10_char(res,(char)0xFF,(unsigned long)100);
+ char (*res)[10] = memset_arr10_char(dest,(char)0xFF,(size_t)100);
+ memset_arr10_char(res,(char)0xFF,(size_t)100);
return;
}
@@ -399,15 +398,15 @@ void nested(int (*dest)[10], int n)
void with_void(void *dest)
{
- void *res = memset(dest,0xFF,(unsigned long)10);
- memset(res,0xFF,(unsigned long)10);
+ void *res = memset(dest,0xFF,(size_t)10);
+ memset(res,0xFF,(size_t)10);
return;
}
void with_null_or_int(void)
{
- memset((void *)0,0xFF,(unsigned long)10);
- memset((void *)((int *)42),0xFF,(unsigned long)10);
+ memset((void *)0,0xFF,(size_t)10);
+ memset((void *)((int *)42),0xFF,(size_t)10);
return;
}
@@ -447,8 +446,8 @@ char *memset_char(char *ptr, char value, size_t len)
void chars(char dest[10])
{
- char *res = memset_char(dest,(char)0xFF,(unsigned long)10);
- memset_char(res,(char)0xFF,(unsigned long)10);
+ char *res = memset_char(dest,(char)0xFF,(size_t)10);
+ memset_char(res,(char)0xFF,(size_t)10);
return;
}
@@ -473,9 +472,8 @@ unsigned char *memset_uchar(unsigned char *ptr, unsigned char value,
void uchars(unsigned char dest[10])
{
- unsigned char *res =
- memset_uchar(dest,(unsigned char)0xFF,(unsigned long)10);
- memset_uchar(res,(unsigned char)0xFF,(unsigned long)10);
+ unsigned char *res = memset_uchar(dest,(unsigned char)0xFF,(size_t)10);
+ memset_uchar(res,(unsigned char)0xFF,(size_t)10);
return;
}
@@ -503,8 +501,8 @@ char (*memset_arr10_char(char (*ptr)[10], char value, size_t len))[10]
void nested_chars(char dest[10][10])
{
- char (*res)[10] = memset_arr10_char(dest,(char)0xFF,(unsigned long)100);
- memset_arr10_char(res,(char)0xFF,(unsigned long)100);
+ char (*res)[10] = memset_arr10_char(dest,(char)0xFF,(size_t)100);
+ memset_arr10_char(res,(char)0xFF,(size_t)100);
return;
}
@@ -817,15 +815,15 @@ void nested(int (*dest)[10], int n)
void with_void(void *dest)
{
- void *res = memset(dest,0xFF,(unsigned long)10);
- memset(res,0xFF,(unsigned long)10);
+ void *res = memset(dest,0xFF,(size_t)10);
+ memset(res,0xFF,(size_t)10);
return;
}
void with_null_or_int(void)
{
- memset((void *)0,0xFF,(unsigned long)10);
- memset((void *)((int *)42),0xFF,(unsigned long)10);
+ memset((void *)0,0xFF,(size_t)10);
+ memset((void *)((int *)42),0xFF,(size_t)10);
return;
}
diff --git a/src/plugins/instantiate/tests/string/oracle/memset_value.res.oracle b/src/plugins/instantiate/tests/string/oracle/memset_value.res.oracle
index 5f5002cde26e1301d64d898ca3b5bb88cd3ecdc1..6fe7a23eb90c34eaa36b4b5f566a6e9a3aaa9ca4 100644
--- a/src/plugins/instantiate/tests/string/oracle/memset_value.res.oracle
+++ b/src/plugins/instantiate/tests/string/oracle/memset_value.res.oracle
@@ -68,8 +68,8 @@ char *memset_char(char *ptr, char value, size_t len)
void chars(char dest[10], char value)
{
- char *res = memset_char(dest,value,(unsigned long)10);
- memset_char(res,value,(unsigned long)10);
+ char *res = memset_char(dest,value,(size_t)10);
+ memset_char(res,value,(size_t)10);
return;
}
@@ -92,8 +92,8 @@ unsigned char *memset_uchar(unsigned char *ptr, unsigned char value,
void uchars(char dest[10], unsigned char value)
{
- unsigned char *res = memset_char(dest,(char)value,(unsigned long)10);
- memset_uchar(res,value,(unsigned long)10);
+ unsigned char *res = memset_char(dest,(char)value,(size_t)10);
+ memset_uchar(res,value,(size_t)10);
return;
}
@@ -120,8 +120,8 @@ char (*memset_arr10_char(char (*ptr)[10], char value, size_t len))[10]
void nested_chars(char dest[10][10], char value)
{
- char (*res)[10] = memset_arr10_char(dest,value,(unsigned long)100);
- memset_arr10_char(res,value,(unsigned long)100);
+ char (*res)[10] = memset_arr10_char(dest,value,(size_t)100);
+ memset_arr10_char(res,value,(size_t)100);
return;
}
@@ -172,22 +172,22 @@ void nested(int (*dest)[10], int n, int value)
void with_void(void *dest, int value)
{
- void *res = memset(dest,value,(unsigned long)10);
- memset(res,value,(unsigned long)10);
+ void *res = memset(dest,value,(size_t)10);
+ memset(res,value,(size_t)10);
return;
}
void with_incomplete(struct incomplete *dest, int value)
{
- struct incomplete *res = memset((void *)dest,value,(unsigned long)10);
- memset((void *)res,value,(unsigned long)10);
+ struct incomplete *res = memset((void *)dest,value,(size_t)10);
+ memset((void *)res,value,(size_t)10);
return;
}
void with_null_or_int(int value)
{
- memset((void *)0,value,(unsigned long)10);
- memset((void *)((int *)42),value,(unsigned long)10);
+ memset((void *)0,value,(size_t)10);
+ memset((void *)((int *)42),value,(size_t)10);
return;
}
@@ -228,8 +228,8 @@ char *memset_char(char *ptr, char value, size_t len)
void chars(char dest[10], char value)
{
- char *res = memset_char(dest,value,(unsigned long)10);
- memset_char(res,value,(unsigned long)10);
+ char *res = memset_char(dest,value,(size_t)10);
+ memset_char(res,value,(size_t)10);
return;
}
@@ -254,8 +254,8 @@ unsigned char *memset_uchar(unsigned char *ptr, unsigned char value,
void uchars(char dest[10], unsigned char value)
{
- unsigned char *res = memset_char(dest,(char)value,(unsigned long)10);
- memset_uchar(res,value,(unsigned long)10);
+ unsigned char *res = memset_char(dest,(char)value,(size_t)10);
+ memset_uchar(res,value,(size_t)10);
return;
}
@@ -283,8 +283,8 @@ char (*memset_arr10_char(char (*ptr)[10], char value, size_t len))[10]
void nested_chars(char dest[10][10], char value)
{
- char (*res)[10] = memset_arr10_char(dest,value,(unsigned long)100);
- memset_arr10_char(res,value,(unsigned long)100);
+ char (*res)[10] = memset_arr10_char(dest,value,(size_t)100);
+ memset_arr10_char(res,value,(size_t)100);
return;
}
@@ -335,22 +335,22 @@ void nested(int (*dest)[10], int n, int value)
void with_void(void *dest, int value)
{
- void *res = memset(dest,value,(unsigned long)10);
- memset(res,value,(unsigned long)10);
+ void *res = memset(dest,value,(size_t)10);
+ memset(res,value,(size_t)10);
return;
}
void with_incomplete(struct incomplete *dest, int value)
{
- struct incomplete *res = memset((void *)dest,value,(unsigned long)10);
- memset((void *)res,value,(unsigned long)10);
+ struct incomplete *res = memset((void *)dest,value,(size_t)10);
+ memset((void *)res,value,(size_t)10);
return;
}
void with_null_or_int(int value)
{
- memset((void *)0,value,(unsigned long)10);
- memset((void *)((int *)42),value,(unsigned long)10);
+ memset((void *)0,value,(size_t)10);
+ memset((void *)((int *)42),value,(size_t)10);
return;
}
diff --git a/src/plugins/markdown-report/sarif.ml b/src/plugins/markdown-report/sarif.ml
index 4521b2d4541333546abb3373ac5d82aaf76039fb..4461483db8dfefb821a7599f0a94a3fd284cfcec 100644
--- a/src/plugins/markdown-report/sarif.ml
+++ b/src/plugins/markdown-report/sarif.ml
@@ -464,7 +464,7 @@ module Notification = struct
threadId: (int [@default 0]);
time: (string [@default ""]);
exn: (Sarif_exception.t [@default Sarif_exception.default])
- [@key "exception"];
+ [@key "exception"];
properties: (Properties.t [@default Properties.default])
}[@@deriving yojson]
end
@@ -1379,7 +1379,7 @@ module Run = struct
columnKind: (ColumnKind.t [@default ColumnKind.unicodeCodePoints]);
externalPropertyFileReferences:
(ExternalPropertyFileReferences.t
- [@default ExternalPropertyFileReferences.default]);
+ [@default ExternalPropertyFileReferences.default]);
threadFlowLocations: (ThreadFlowLocation.t list [@default []]);
taxonomies: (ToolComponent.t list [@default []]);
addresses: (Address.t list [@default []]);
diff --git a/src/plugins/metrics/metrics_pivot.ml b/src/plugins/metrics/metrics_pivot.ml
index 2f943abca822231740f08df2e923ac6a2e532022..28ff05163be8866c904344217931cfcdcd5850e7 100644
--- a/src/plugins/metrics/metrics_pivot.ml
+++ b/src/plugins/metrics/metrics_pivot.ml
@@ -29,7 +29,7 @@ module PivotSourceState =
(Datatype.List(Datatype.String))
(struct
let name = "PivotSourceState"
- let dependencies = [ Ast.self; Db.Value.self; Property_status.self;
+ let dependencies = [ Ast.self; Eva.Analysis.self; Property_status.self;
Messages.self ]
end)
diff --git a/src/plugins/pdg/annot.ml b/src/plugins/pdg/annot.ml
index 7bfa2eb708f0c78b5f86acaab1328a9f02527c47..d76dc95c38da8546bce3569b83ddcadbb3fbfa54 100644
--- a/src/plugins/pdg/annot.ml
+++ b/src/plugins/pdg/annot.ml
@@ -106,7 +106,7 @@ let find_code_annot_nodes pdg stmt annot =
Pdg_parameters.debug "[pdg:annotation] CodeAnnot-%d stmt %d : %a @."
annot.annot_id stmt.sid
Printer.pp_code_annotation annot;
- if Db.Value.is_reachable_stmt stmt then
+ if Eva.Results.is_reachable stmt then
begin
let kf = PdgTypes.Pdg.get_kf pdg in
let (data_info, decl_label_info), pragmas =
diff --git a/src/plugins/pdg/build.ml b/src/plugins/pdg/build.ml
index 6b5be2c31fa08deedea5532993759c686f387bb7..d0df6abb5b2ed376ab6186867a5170e3ee651e0f 100644
--- a/src/plugins/pdg/build.ml
+++ b/src/plugins/pdg/build.ml
@@ -465,12 +465,20 @@ let create_fun_output_node pdg state dpds =
| Some state -> add_dpds pdg new_node Dpd.Data state dpds
| None -> (* return is unreachable *) ()
+let find_return_lval kf =
+ let stmt = Kernel_function.find_return kf in
+ match stmt with
+ | { skind = Return (Some {enode = Lval lval}, _) } -> stmt, lval
+ | _ -> assert false
+
(** add a node corresponding to the returned value. *)
let add_retres pdg state ret_stmt retres_loc_dpds retres_decls =
let key_return = Key.stmt_key ret_stmt in
let return_node = add_elem pdg key_return in
- let retres_loc = Db.Value.find_return_loc pdg.fct in
- let retres = Locations.(enumerate_valid_bits Read retres_loc) in
+ let retres =
+ let stmt, lval = find_return_lval pdg.fct in
+ Eva.Results.(before stmt |> eval_address ~for_writing:false lval |> as_zone)
+ in
add_dpds pdg return_node Dpd.Data state retres_loc_dpds;
add_decl_dpds pdg return_node Dpd.Data retres_decls;
let new_state = Pdg_state.add_loc_node state ~exact:true retres return_node in
@@ -600,11 +608,11 @@ let finalize_pdg pdg from_opt =
= location + exact + dependencies + declarations *)
let get_lval_infos lval stmt =
let decl = Cil.extract_varinfos_from_lval lval in
- let state = Db.Value.get_stmt_state stmt in
- let dpds, z_loc, exact =
- !Db.Value.lval_to_zone_with_deps_state
- state ~deps:(Some Locations.Zone.bottom) ~for_writing:true lval
- in
+ let request = Eva.Results.before stmt in
+ let address = Eva.Results.eval_address ~for_writing:true lval request in
+ let z_loc = Eva.Results.as_zone address in
+ let exact = Eva.Results.is_singleton address in
+ let dpds = Eva.Results.address_deps lval request in
(z_loc, exact, dpds, decl)
(** process assignment {v lval = exp; v}
@@ -700,15 +708,17 @@ let process_call pdg state stmt lvaloption funcexp argl _loc =
ignore (add_elem pdg (Key.call_ctrl_key stmt));
let arg_nodes = process_args pdg state_before_call stmt argl in
let state_with_args = state in
- let funcexp_dpds, called_functions =
- !Db.Value.expr_to_kernel_function
- (Kstmt stmt) ~deps:(Some Locations.Zone.bottom) funcexp
+ let called_functions = Eva.Results.callee stmt in
+ let funcexp_dpds =
+ match funcexp.enode with
+ | Lval lval -> Eva.Results.(before stmt |> address_deps lval)
+ | _ -> assert false
in
let mixed_froms =
try let froms = !Db.From.Callwise.find (Kstmt stmt) in Some froms
with Not_found -> None (* don't have callwise analysis (-calldeps option) *)
in
- let process_simple_call called_kf acc =
+ let process_simple_call acc called_kf =
let state_with_inputs =
process_call_params pdg state_with_args stmt called_kf arg_nodes
in
@@ -724,7 +734,7 @@ let process_call pdg state stmt lvaloption funcexp argl _loc =
in r :: acc
in
let state_for_each_call =
- Kernel_function.Hptset.fold process_simple_call called_functions []
+ List.fold_left process_simple_call [] called_functions
in
let new_state =
match state_for_each_call with
@@ -755,7 +765,7 @@ let process_condition ctrl_dpds_infos pdg state stmt condition =
let decls_cond = Cil.extract_varinfos_from_exp condition in
let controlled_stmts = CtrlDpds.get_if_controlled_stmts ctrl_dpds_infos stmt in
- let go_then, go_else = Db.Value.condition_truth_value stmt in
+ let go_then, go_else = Eva.Results.condition_truth_value stmt in
let real = go_then && go_else (* real dpd if we can go in both branches *) in
if not real then
debug
@@ -773,7 +783,7 @@ let process_jump_stmt pdg ctrl_dpds_infos jump =
let controlled_stmts =
CtrlDpds.get_jump_controlled_stmts ctrl_dpds_infos jump
in
- let real = Db.Value.is_reachable_stmt jump in
+ let real = Eva.Results.is_reachable jump in
if not real then
debug "[process_jump_stmt] stmt %d is not a real jump@." jump.sid;
process_jump pdg jump (real, controlled_stmts)
@@ -791,7 +801,7 @@ let process_loop_stmt pdg ctrl_dpds_infos loop =
let controlled_stmts =
CtrlDpds.get_loop_controlled_stmts ctrl_dpds_infos loop
in
- let real_loop = List.exists (Db.Value.is_reachable_stmt) back_edges in
+ let real_loop = List.exists Eva.Results.is_reachable back_edges in
if not real_loop then
debug "[process_loop_stmt] stmt %d is not a real loop@." loop.sid;
process_jump pdg loop (real_loop, controlled_stmts)
@@ -812,11 +822,11 @@ let process_return _current_function pdg state stmt ret_exp =
add_retres pdg state stmt loc_exp decls_exp
| None ->
let controlled_stmt = Cil_datatype.Stmt.Hptset.empty in
- let real = Db.Value.is_reachable_stmt stmt in
+ let real = Eva.Results.is_reachable stmt in
process_jump pdg stmt (real, controlled_stmt);
state
in
- if Db.Value.is_reachable_stmt stmt then
+ if Eva.Results.is_reachable stmt then
Pdg_state.store_last_state pdg.states last_state
module Computer
@@ -866,7 +876,7 @@ module Computer
Db.yield ();
pdg_debug "doInstr sid:%d : %a" stmt.sid Printer.pp_instr instr;
match instr with
- | _ when not (Db.Value.is_reachable_stmt stmt) ->
+ | _ when not (Eva.Results.is_reachable stmt) ->
pdg_debug "stmt sid:%d is unreachable : skip.@." stmt.sid ;
Pdg_state.bottom
| Local_init (v, AssignInit i, _) ->
@@ -977,7 +987,7 @@ let compute_pdg_for_f kf =
let ctrl_dpds_infos = ctrl_dpds_infos
end)
in
- if Db.Value.is_reachable_stmt start then
+ if Eva.Results.is_reachable start then
begin
let module Compute = Dataflows.Simple_forward(Fenv)(Computer) in
Array.iteri (fun ord value ->
diff --git a/src/plugins/pdg/dune b/src/plugins/pdg/dune
index 470ac25b6fdf04bdd9e19fa3a22ca6f1752a342e..1e9523549c5c25d56186f4100eead94946b69982 100644
--- a/src/plugins/pdg/dune
+++ b/src/plugins/pdg/dune
@@ -11,7 +11,7 @@
(name pdg)
(optional)
(public_name frama-c-pdg.core)
- (flags -open Frama_c_kernel :standard)
+ (flags -open Frama_c_kernel :standard -w -9)
(libraries frama-c.kernel frama-c-callgraph.core frama-c-from.core frama-c-eva.core)
)
diff --git a/src/plugins/pdg/marks.ml b/src/plugins/pdg/marks.ml
index 628611b95e3219ef821b9c759a298aab848d9fa3..272b5b1ad9fe0928b90ed766e1c06a0345f5afcc 100644
--- a/src/plugins/pdg/marks.ml
+++ b/src/plugins/pdg/marks.ml
@@ -63,7 +63,7 @@ let translate_in_marks pdg_called in_new_marks
let translate pdg rqs call =
in_marks_to_caller pdg call (m2m (Some call) pdg) ~rqs in_new_marks
in
- let build rqs (caller, _) =
+ let build rqs caller =
let pdg_caller = !Db.Pdg.get caller in
let caller_rqs =
try
@@ -77,8 +77,7 @@ let translate_in_marks pdg_called in_new_marks
in
(pdg_caller, caller_rqs)::rqs
in
- let res = List.fold_left build other_rqs (!Db.Value.callers kf_called) in
- res
+ List.fold_left build other_rqs (Eva.Results.callers kf_called)
let call_out_marks_to_called called_pdg m2m ?(rqs=[]) out_marks =
let build rqs (out_key, m) =
@@ -98,7 +97,7 @@ let call_out_marks_to_called called_pdg m2m ?(rqs=[]) out_marks =
List.fold_left build rqs out_marks
let translate_out_mark _pdg m2m other_rqs (call, l) =
- let add_list l_out_m called_kf rqs =
+ let add_list l_out_m rqs called_kf =
let called_pdg = !Db.Pdg.get called_kf in
let m2m = m2m (Some call) called_pdg in
try
@@ -111,8 +110,8 @@ let translate_out_mark _pdg m2m other_rqs (call, l) =
* *)
rqs
in
- let all_called = Db.Value.call_to_kernel_function call in
- Kernel_function.Hptset.fold (add_list l) all_called other_rqs
+ let all_called = Eva.Results.callee call in
+ List.fold_left (add_list l) other_rqs all_called
(** [add_new_marks_to_rqs pdg new_marks other_rqs] translates [new_marks]
* that were computed during intraprocedural propagation into requests,
diff --git a/src/plugins/pdg/register.ml b/src/plugins/pdg/register.ml
index ff00ddbddf132d7f679ae9f6080ce314e82c7160..4f707e7ffeb43572c405893f74411acb98b2b560 100644
--- a/src/plugins/pdg/register.ml
+++ b/src/plugins/pdg/register.ml
@@ -123,7 +123,7 @@ let () = Pdg_parameters.BuildAll.set_output_dependencies deps
let compute_for_kf kf =
let all = Pdg_parameters.BuildAll.get () in
- (all && !Db.Value.is_called kf) ||
+ (all && Eva.Results.is_called kf) ||
Kernel_function.Set.mem kf (Pdg_parameters.BuildFct.get ())
let compute () =
diff --git a/src/plugins/pdg/sets.ml b/src/plugins/pdg/sets.ml
index 9fff226ac9021220f29429141aad38420c15d95c..89b83596775910a2d19721723910ccdd42e323e1 100644
--- a/src/plugins/pdg/sets.ml
+++ b/src/plugins/pdg/sets.ml
@@ -215,7 +215,7 @@ let find_call_stmts kf ~caller =
match
List.filter
(fun (f, _) -> Kernel_function.equal f caller)
- (!Db.Value.callers kf)
+ (Eva.Results.callsites kf)
with
| [] -> []
| [ _, callsites ] -> assert (callsites <> []); callsites
diff --git a/src/plugins/postdominators/compute.ml b/src/plugins/postdominators/compute.ml
index d39e990b9dc6613be513aa5d2a42f825a005386f..8126dda260958b2954f0aaf4e52df515036e9c3a 100644
--- a/src/plugins/postdominators/compute.ml
+++ b/src/plugins/postdominators/compute.ml
@@ -258,8 +258,7 @@ include
let is_accessible = Eva.Results.is_reachable
let dependencies = [ Eva.Analysis.self ]
let name = "value"
- let eval_cond stmt _e =
- Db.Value.condition_truth_value stmt
+ let eval_cond stmt _e = Eva.Results.condition_truth_value stmt
end)
(Db.PostdominatorsValue)
diff --git a/src/plugins/scope/zones.ml b/src/plugins/scope/zones.ml
index 5106189940f635d0cbf75b96a254c62e11cc9d94..aa02df158d8b3d246e59e501748f8fdf5dd3ae08 100644
--- a/src/plugins/scope/zones.ml
+++ b/src/plugins/scope/zones.ml
@@ -65,11 +65,11 @@ let compute_new_data old_zone l_zone l_dpds exact r_dpds =
else (false, old_zone)
let get_lval_zones ~for_writing stmt lval =
- let state = Db.Value.get_stmt_state stmt in
- let dpds, zone, exact =
- !Db.Value.lval_to_zone_with_deps_state
- state ~deps:(Some Locations.Zone.bottom) ~for_writing lval
- in
+ let request = Eva.Results.before stmt in
+ let address = Eva.Results.eval_address ~for_writing lval request in
+ let zone = Eva.Results.as_zone address in
+ let exact = Eva.Results.is_singleton address in
+ let dpds = Eva.Results.address_deps lval request in
dpds, exact, zone
(* the call result can be processed like a normal assignment *)
diff --git a/src/plugins/server/Makefile.in b/src/plugins/server/Makefile.in
index 8c59c658adf2c3ac998fbeacad5aea2939e40caa..943f93e2fe1ddb98ce547a23397196bcbab2a5e4 100644
--- a/src/plugins/server/Makefile.in
+++ b/src/plugins/server/Makefile.in
@@ -82,9 +82,11 @@ include $(FRAMAC_SHARE)/Makefile.dynamic
SERVER_API= \
package.mli \
+ jbuffer.mli \
data.mli \
request.mli \
states.mli \
+ main.mli \
kernel_main.mli \
kernel_ast.mli \
kernel_properties.mli
diff --git a/src/plugins/server/data.ml b/src/plugins/server/data.ml
index 70416e8a3b3098c7455660b4f63d5dd0c848b47f..8b9722ba5d03810f762721c6cb26adc0f929da5b 100644
--- a/src/plugins/server/data.ml
+++ b/src/plugins/server/data.ml
@@ -243,6 +243,8 @@ struct
declare ~package ~name:"text" ~descr jdef
end
+let jpretty = Jbuffer.to_json
+
(* -------------------------------------------------------------------------- *)
(* --- Functional API --- *)
(* -------------------------------------------------------------------------- *)
diff --git a/src/plugins/server/data.mli b/src/plugins/server/data.mli
index d3e2e79bdf8285b2e600ed75f241068dac836bfd..87305705e39ce58bae376ff62110aa8b0732c062 100644
--- a/src/plugins/server/data.mli
+++ b/src/plugins/server/data.mli
@@ -87,6 +87,10 @@ module Jtext : S with type t = json
module Jmarkdown : S with type t = Markdown.text
+(** All-in-one formatter. Return the JSON encoding of formatted text. *)
+val jpretty : ?indent:int -> ?margin:int ->
+ (Format.formatter -> 'a -> unit) -> 'a -> Jtext.t
+
(* -------------------------------------------------------------------------- *)
(** {2 Constructors} *)
(* -------------------------------------------------------------------------- *)
@@ -155,11 +159,11 @@ val declare :
{[
(* ---- Exemple of Record Data --- *)
type r
- let s = Record.signature ~page ~kind ~name ~descr () in
+ let s = Record.signature () in
let fd_a = Record.field s ~name:"a" ~descr:"..." (module A) in
let fd_b = Record.field s ~name:"b" ~descr:"..." (module B) in
-
- module M = (val (Record.publish s) : Record with type r = r)
+ let r = Record.publish s ~page ~kind ~name ~descr
+ module M = (val r) : Record with type r = r)
let make a b = M.default |> M.set fd_a a |> M.set fd_b b
]}
diff --git a/src/plugins/server/jbuffer.ml b/src/plugins/server/jbuffer.ml
index 0cbac3b7d5cc087f30f2de2488ee6eba1aa2cd53..f03483fc4c1b1b323db66e6bfbce7171cd78ba3e 100644
--- a/src/plugins/server/jbuffer.ml
+++ b/src/plugins/server/jbuffer.ml
@@ -100,6 +100,7 @@ let bprintf buffer msg = Format.fprintf buffer.fmt msg
let formatter buffer = buffer.fmt
let contents buffer : json =
+ Format.pp_print_flush buffer.fmt () ;
flush buffer () ;
while buffer.stack <> [] do
pop_tag buffer ""
@@ -112,15 +113,20 @@ let contents buffer : json =
let format ?indent ?margin msg =
let buffer = create ?indent ?margin () in
Format.kfprintf
- (fun fmt -> Format.pp_print_flush fmt () ; contents buffer)
+ (fun _fmt -> contents buffer)
buffer.fmt msg
let to_json ?indent ?margin pp a =
let buffer = create ?indent ?margin () in
pp buffer.fmt a ;
- Format.pp_print_flush buffer.fmt () ;
contents buffer
+let rec is_empty (js : json) = match js with
+ | `Null -> true
+ | `List js -> List.for_all is_empty js
+ | `String "" -> true
+ | _ -> false
+
let rec fprintf fmt = function
| `Null -> ()
| `String text -> Format.pp_print_string fmt text
diff --git a/src/plugins/server/jbuffer.mli b/src/plugins/server/jbuffer.mli
index 08cc4050f3a2a35592affd977b55cacf46f5b0cd..f9e175210bd9b35522eccc4de51790f723fa6603 100644
--- a/src/plugins/server/jbuffer.mli
+++ b/src/plugins/server/jbuffer.mli
@@ -55,6 +55,9 @@ val pop_tag : buffer -> Format.stag -> unit
tags. *)
val contents : buffer -> json
+(** When [is_empty js] holds, the JSON is sure to be empty. *)
+val is_empty : json -> bool
+
(** Prints back a JSON encoding into the provided formatter.
@raise Yojson.Basic.Util.Type_error in case of ill formatted buffer. *)
val fprintf : Format.formatter -> json -> unit
diff --git a/src/plugins/server/kernel_ast.ml b/src/plugins/server/kernel_ast.ml
index d8cf92f5501b61b464731d4cc260528607f3f77b..84d21cb8a070f28a812fe2a47965b64a0191e041 100644
--- a/src/plugins/server/kernel_ast.ml
+++ b/src/plugins/server/kernel_ast.ml
@@ -260,7 +260,7 @@ struct
States.register_array
~package
~name:"markerInfo"
- ~descr:(Md.plain "Marker informations")
+ ~descr:(Md.plain "Marker information")
~key:snd ~keyType:Jstring
~iter ~add_reload_hook:ast_update_hook
model
@@ -543,74 +543,151 @@ struct
end
(* -------------------------------------------------------------------------- *)
-(* --- Information --- *)
+(* --- Marker Information --- *)
(* -------------------------------------------------------------------------- *)
-module Info = struct
- open Printer_tag
+module Information =
+struct
+
+ type info = {
+ id: string;
+ rank: int;
+ label: string;
+ title: string;
+ enable: unit -> bool;
+ pretty: Format.formatter -> Printer_tag.localizable -> unit
+ }
+
+ (* Info markers serialization *)
+
+ module S =
+ struct
+ type t = (info * Jtext.t)
+ let jtype = Package.(Jrecord[
+ "id", Jstring ;
+ "label", Jstring ;
+ "title", Jstring ;
+ "descr", Jtext.jtype ;
+ ])
+ let of_json _ = failwith "Information.Info"
+ let to_json (info,text) = `Assoc [
+ "id", `String info.id ;
+ "label", `String info.label ;
+ "title", `String info.title ;
+ "descr", text ;
+ ]
+ end
+
+ (* Info markers registry *)
+
+ let rankId = ref 0
+ let registry : (string,info) Hashtbl.t = Hashtbl.create 0
+
+ let jtext pp marker =
+ try
+ let buffer = Jbuffer.create () in
+ let fmt = Jbuffer.formatter buffer in
+ pp fmt marker;
+ Format.pp_print_flush fmt ();
+ Jbuffer.contents buffer
+ with Not_found ->
+ `Null
+
+ let rank ({rank},_) = rank
+ let by_rank a b = Stdlib.compare (rank a) (rank b)
+
+ let get_information tgt =
+ let infos = ref [] in
+ Hashtbl.iter
+ (fun _ info ->
+ if info.enable () then
+ match tgt with
+ | None -> infos := (info, `Null) :: !infos
+ | Some marker ->
+ let text = jtext info.pretty marker in
+ if not (Jbuffer.is_empty text) then
+ infos := (info, text) :: !infos
+ ) registry ;
+ List.sort by_rank !infos
+
+ let signal = Request.signal ~package
+ ~name:"getInformationUpdate"
+ ~descr:(Md.plain "Updated AST information")
+
+ let update () = Request.emit signal
+
+ let register ~id ~label ~title ?(enable = fun _ -> true) pretty =
+ let rank = incr rankId ; !rankId in
+ let info = { id ; rank ; label ; title ; enable ; pretty } in
+ if Hashtbl.mem registry id then
+ ( let msg = Format.sprintf
+ "Server.Kernel_ast.register_info: duplicate %S" id in
+ raise (Invalid_argument msg) );
+ Hashtbl.add registry id info
- let print_function fmt name =
- let stag = Format.String_tag name in
- Format.pp_open_stag fmt stag;
- Format.pp_print_string fmt name;
- Format.pp_close_stag fmt ()
-
- let print_kf fmt kf = print_function fmt (Kernel_function.get_name kf)
-
- let print_variable fmt vi =
- Format.fprintf fmt "Variable %s has type %a.@."
- vi.vname Printer.pp_typ vi.vtype;
- let kf = Kernel_function.find_defining_kf vi in
- let pp_kf fmt kf = Format.fprintf fmt " of function %a" print_kf kf in
- Format.fprintf fmt "It is a %s variable%a.@."
- (if vi.vglob then "global" else if vi.vformal then "formal" else "local")
- (Format.pp_print_option pp_kf) kf;
- if vi.vtemp then
- Format.fprintf fmt "This is a temporary variable%s.@."
- (match vi.vdescr with None -> "" | Some descr -> " for " ^ descr);
- Format.fprintf fmt "It is %sreferenced and its address is %staken."
- (if vi.vreferenced then "" else "not ")
- (if vi.vaddrof then "" else "not ")
-
- let print_varinfo fmt vi =
- if Cil.isFunctionType vi.vtype
- then
- Format.fprintf fmt "%a is a C function of type '%a'."
- print_function vi.vname Printer.pp_typ vi.vtype
- else print_variable fmt vi
-
- let print_lvalue fmt _loc = function
- | Var vi, NoOffset -> print_varinfo fmt vi
- | lval ->
- Format.fprintf fmt "This is an lvalue of type %a."
- Printer.pp_typ (Cil.typeOfLval lval)
-
- let print_localizable fmt = function
- | PExp (_, _, e) ->
- Format.fprintf fmt "This is a pure C expression of type %a."
- Printer.pp_typ (Cil.typeOf e)
- | PLval (_, _, lval) as loc -> print_lvalue fmt loc lval
- | PVDecl (_, _, vi) ->
- Format.fprintf fmt "This is the declaration of variable %a.@.@."
- Printer.pp_varinfo vi;
- print_varinfo fmt vi
- | PStmt (kf, _) | PStmtStart (kf, _) ->
- Format.fprintf fmt "This is a statement of function %a." print_kf kf
- | _ -> ()
-
- let get_marker_info loc =
- let buffer = Jbuffer.create () in
- let fmt = Jbuffer.formatter buffer in
- print_localizable fmt loc;
- Format.pp_print_flush fmt ();
- Jbuffer.contents buffer
end
let () = Request.register ~package
- ~kind:`GET ~name:"getInfo"
- ~descr:(Md.plain "Get textual information about a marker")
- ~input:(module Marker) ~output:(module Jtext)
- Info.get_marker_info
+ ~kind:`GET ~name:"getInformation"
+ ~descr:(Md.plain
+ "Get available information about markers. \
+ When no marker is given, returns all kinds \
+ of information (with empty `descr` field).")
+ ~input:(module Joption(Marker))
+ ~output:(module Jlist(Information.S))
+ ~signals:[Information.signal]
+ Information.get_information
+
+(* -------------------------------------------------------------------------- *)
+(* --- Default Kernel Information --- *)
+(* -------------------------------------------------------------------------- *)
+
+let () = Information.register
+ ~id:"kernel.ast.location"
+ ~label:"Location"
+ ~title:"Source file location"
+ begin fun fmt loc ->
+ let location = Printer_tag.loc_of_localizable loc in
+ Filepath.pp_pos fmt (fst location)
+ end
+
+let () = Information.register
+ ~id:"kernel.ast.varinfo"
+ ~label:"Var"
+ ~title:"Variable Information"
+ begin fun fmt loc ->
+ match loc with
+ | PLval (_ , _, (Var x,NoOffset)) | PVDecl(_,_,x) ->
+ if not x.vreferenced then Format.pp_print_string fmt "unused " ;
+ begin
+ match x.vstorage with
+ | NoStorage -> ()
+ | Extern -> Format.pp_print_string fmt "extern "
+ | Static -> Format.pp_print_string fmt "static "
+ | Register -> Format.pp_print_string fmt "register "
+ end ;
+ if x.vghost then Format.pp_print_string fmt "ghost " ;
+ if x.vaddrof then Format.pp_print_string fmt "aliased " ;
+ if x.vformal then Format.pp_print_string fmt "formal" else
+ if x.vglob then Format.pp_print_string fmt "global" else
+ if x.vtemp then Format.pp_print_string fmt "temporary" else
+ Format.pp_print_string fmt "local" ;
+ | _ -> raise Not_found
+ end
+
+let () = Information.register
+ ~id:"kernel.ast.typeinfo"
+ ~label:"Type"
+ ~title:"Type of C/ASCL expression"
+ begin fun fmt loc ->
+ let open Printer in
+ match loc with
+ | PExp (_, _, e) -> pp_typ fmt (Cil.typeOf e)
+ | PLval (_, _, lval) -> pp_typ fmt (Cil.typeOfLval lval)
+ | PTermLval(_,_,_,lv) -> pp_logic_type fmt (Cil.typeOfTermLval lv)
+ | PVDecl (_,_,vi) -> pp_typ fmt vi.vtype
+ | _ -> raise Not_found
+ end
(* -------------------------------------------------------------------------- *)
(* --- Marker at a position --- *)
diff --git a/src/plugins/server/kernel_ast.mli b/src/plugins/server/kernel_ast.mli
index 448d6f373dee42b1fb0d2c98e6afa7184207a340..e18092b2f9e96a5852c5a91f7789f47f33d53112 100644
--- a/src/plugins/server/kernel_ast.mli
+++ b/src/plugins/server/kernel_ast.mli
@@ -62,6 +62,33 @@ module KfMarker : Data.S with type t = kernel_function * Printer_tag.localizable
module Printer : Printer_tag.S_pp
+(* -------------------------------------------------------------------------- *)
+(** Ast Information *)
+(* -------------------------------------------------------------------------- *)
+
+module Information :
+sig
+ (**
+ Registers a marker information printer.
+ Identifier [id] shall be unique.
+ Label [label] shall be very short.
+ Description shall succinctly describe the kind of information.
+ If the optional [enable] function is provided, the information printer is
+ only used when [enable ()] returns true.
+ The printer is allowed to raise [Not_found] exception when there is no
+ information for the localizable.
+ *)
+ val register :
+ id:string -> label:string -> title:string -> ?enable:(unit -> bool) ->
+ (Format.formatter -> Printer_tag.localizable -> unit) -> unit
+
+ (** Updated information signal *)
+ val signal : Request.signal
+
+ (** Emits a signal to server clients to reload AST marker information. *)
+ val update : unit -> unit
+end
+
(* -------------------------------------------------------------------------- *)
(** Globals *)
(* -------------------------------------------------------------------------- *)
diff --git a/src/plugins/server/main.ml b/src/plugins/server/main.ml
index 996268e4f4ee37941a96a6f9ca240550879caeac..006d4b9d15221f5cc3013df7bbb3e0edc4d647a3 100644
--- a/src/plugins/server/main.ml
+++ b/src/plugins/server/main.ml
@@ -25,6 +25,7 @@
(* -------------------------------------------------------------------------- *)
module Senv = Server_parameters
+module Signals = Set.Make(String)
(* -------------------------------------------------------------------------- *)
(* --- Registry --- *)
@@ -69,6 +70,8 @@ type 'a response = [
| `Killed of 'a
| `Signal of string
| `Rejected of 'a
+ | `CmdLineOn
+ | `CmdLineOff
]
type 'a message = {
@@ -87,7 +90,10 @@ type 'a process = {
mutable killed : bool ;
}
-module Sigs = Set.Make(String)
+type 'a running =
+ | Idle (* Server is waiting for requests *)
+ | CmdLine (* Frama-C command line is running *)
+ | ExecRequest of 'a process (* Running EXEC process *)
(* Server with request identifier (RqId) of type ['a] *)
type 'a server = {
@@ -95,13 +101,14 @@ type 'a server = {
equal : 'a -> 'a -> bool ; (* RqId equality *)
polling : int ; (* server polling, in milliseconds *)
fetch : unit -> 'a message option ; (* fetch some client message *)
- q_in : 'a process Queue.t ; (* queue of pending jobs *)
+ q_in : 'a process Queue.t ; (* queue of pending `EXEC and `GET jobs *)
q_out : 'a response Queue.t ; (* queue of pending responses *)
mutable daemon : Db.daemon option ; (* Db.yield daemon *)
- mutable s_active : Sigs.t ; (* signals the client is listening to *)
- mutable s_signal : Sigs.t ; (* emitted signals since last synchro *)
+ mutable s_active : Signals.t ; (* signals the client is listening to *)
+ mutable s_signal : Signals.t ; (* emitted signals since last synchro *)
mutable shutdown : bool ; (* server has been asked to shut down *)
- mutable running : 'a process option ; (* currently running EXEC request *)
+ mutable running : 'a running ; (* server running state *)
+ mutable cmdline : bool option ; (* cmdline signal management *)
}
exception Killed
@@ -133,8 +140,18 @@ let pp_response pp fmt (r : _ response) =
| `Rejected id -> Format.fprintf fmt "Rejected %a" pp id
| `Killed id -> Format.fprintf fmt "Killed %a" pp id
| `Signal sg -> Format.fprintf fmt "Signal %S" sg
+ | `CmdLineOn -> Format.pp_print_string fmt "CmdLine On"
+ | `CmdLineOff -> Format.pp_print_string fmt "CmdLine Off"
| `Data(id,data) ->
- Format.fprintf fmt "@[<hov 2>Replies [%a]@ %a@]" pp id Data.pretty data
+ if Senv.debug_atleast 3 then
+ Format.fprintf fmt "@[<hov 2>Response %a:@ %a@]" pp id Data.pretty data
+ else
+ Format.fprintf fmt "Replied %a" pp id
+
+let pp_running pp fmt = function
+ | Idle -> Format.pp_print_string fmt "Idle"
+ | CmdLine -> Format.pp_print_string fmt "CmdLine"
+ | ExecRequest { id } -> Format.fprintf fmt "ExectRequest [%a]" pp id
(* -------------------------------------------------------------------------- *)
(* --- Request Handling --- *)
@@ -167,9 +184,7 @@ let execute server ?yield proc =
?on_delayed:(delayed proc.request)
yield run proc
| _ -> run proc
- in
- Senv.debug ~level:2 "%a" (pp_response server.pretty) resp ;
- Queue.push resp server.q_out
+ in Queue.push resp server.q_out
(* -------------------------------------------------------------------------- *)
(* --- Signals --- *)
@@ -203,37 +218,49 @@ let emit s = !emitter s
(* --- Processing Requests --- *)
(* -------------------------------------------------------------------------- *)
-let raise_if_killed = function { killed } -> if killed then raise Killed
-let kill_exec e = e.killed <- true
-let kill_request eq id e = if eq id e.id then e.killed <- true
+let raise_if_killed = function
+ | Idle -> ()
+ | CmdLine -> ()
+ | ExecRequest { killed } -> if killed then raise Killed
+
+let kill_running ?id s =
+ match s.running with
+ | Idle -> ()
+ | CmdLine -> if id = None then Db.cancel ()
+ | ExecRequest p ->
+ match id with
+ | None -> p.killed <- true
+ | Some id -> if s.equal id p.id then p.killed <- true
+
+let kill_request eq id p = if eq id p.id then p.killed <- true
let process_request (server : 'a server) (request : 'a request) : unit =
- if Senv.debug_atleast 1 && (Senv.debug_atleast 3 || request <> `Poll) then
+ if Senv.debug_atleast 1 && (Senv.debug_atleast 2 || request <> `Poll) then
Senv.debug "%a" (pp_request server.pretty) request ;
match request with
| `Poll -> ()
| `Shutdown ->
begin
- Option.iter kill_exec server.running ;
+ kill_running server ;
Queue.clear server.q_in ;
Queue.clear server.q_out ;
server.shutdown <- true ;
end
| `SigOn sg ->
begin
- server.s_active <- Sigs.add sg server.s_active ;
+ server.s_active <- Signals.add sg server.s_active ;
notify sg true ;
end
| `SigOff sg ->
begin
- server.s_active <- Sigs.remove sg server.s_active ;
+ server.s_active <- Signals.remove sg server.s_active ;
notify sg false ;
end
| `Kill id ->
begin
+ kill_running ~id server ;
let set_killed = kill_request server.equal id in
Queue.iter set_killed server.q_in ;
- Option.iter set_killed server.running ;
end
| `Request(id,request,data) ->
begin
@@ -260,31 +287,43 @@ let process_request (server : 'a server) (request : 'a request) : unit =
(* -------------------------------------------------------------------------- *)
let communicate server =
+ Senv.debug ~level:3 "fetch" ;
match server.fetch () with
| None -> false
| Some message ->
+ Senv.debug ~level:2 "message(s) received" ;
let error =
try List.iter (process_request server) message.requests ; None
with exn -> Some exn in (* re-raised after message reply *)
let pool = ref [] in
Queue.iter (fun r -> pool := r :: !pool) server.q_out ;
+ Option.iter
+ (fun cmd ->
+ pool := (if cmd then `CmdLineOn else `CmdLineOff) :: !pool ;
+ ) server.cmdline ;
+ pool := List.rev !pool ;
Queue.clear server.q_out ;
- server.s_signal <- Sigs.empty ;
+ server.cmdline <- None ;
+ server.s_signal <- Signals.empty ;
+ Senv.debug ~level:2 "response(s) callback" ;
+ if Senv.debug_atleast 2 then
+ List.iter (Senv.debug "%a" (pp_response server.pretty)) !pool ;
message.callback !pool ;
- Option.iter raise error ; true
+ Option.iter raise error ;
+ true
(* -------------------------------------------------------------------------- *)
(* --- Yielding & Signaling --- *)
(* -------------------------------------------------------------------------- *)
let do_yield server () =
- Option.iter raise_if_killed server.running ;
+ raise_if_killed server.running ;
ignore ( communicate server )
let do_signal server s =
- if Sigs.mem s server.s_active && not (Sigs.mem s server.s_signal) then
+ if Signals.mem s server.s_active && not (Signals.mem s server.s_signal) then
begin
- server.s_signal <- Sigs.add s server.s_signal ;
+ server.s_signal <- Signals.add s server.s_signal ;
Queue.push (`Signal s) server.q_out ;
end
@@ -301,14 +340,14 @@ let rec fetch_exec q =
let process server =
match fetch_exec server.q_in with
| None -> communicate server
- | Some proc ->
- server.running <- Some proc ;
+ | Some exec ->
+ server.running <- ExecRequest exec ;
try
- execute server ~yield:(do_yield server) proc ;
- server.running <- None ;
+ execute server ~yield:(do_yield server) exec ;
+ server.running <- Idle ;
true
with exn ->
- server.running <- None ;
+ server.running <- Idle ;
raise exn
(* -------------------------------------------------------------------------- *)
@@ -330,10 +369,11 @@ let create ~pretty ?(equal=(=)) ~fetch () =
fetch ; polling ; equal ; pretty ;
q_in = Queue.create () ;
q_out = Queue.create () ;
- s_active = Sigs.empty ;
- s_signal = Sigs.empty ;
+ s_active = Signals.empty ;
+ s_signal = Signals.empty ;
daemon = None ;
- running = None ;
+ running = Idle ;
+ cmdline = None ;
shutdown = false ;
}
@@ -341,49 +381,72 @@ let create ~pretty ?(equal=(=)) ~fetch () =
(* --- Start / Stop --- *)
(* -------------------------------------------------------------------------- *)
+(* public API ; shall be scheduled at command line main stage *)
let start server =
- emitter := do_signal server ;
- match server.daemon with
- | Some _ -> ()
- | None ->
- begin
- Senv.feedback "Server enabled." ;
- let daemon =
- Db.on_progress
- ~debounced:server.polling
- ?on_delayed:(delayed "command line")
- (do_yield server)
- in
- server.daemon <- Some daemon ;
- set_active true ;
- end
-
+ begin
+ Senv.debug ~level:2 "Server started (was %a)"
+ (pp_running server.pretty) server.running ;
+ server.running <- CmdLine ;
+ server.cmdline <- Some true ;
+ emitter := do_signal server ;
+ match server.daemon with
+ | Some _ -> ()
+ | None ->
+ begin
+ Senv.feedback "Server enabled." ;
+ let daemon =
+ Db.on_progress
+ ~debounced:server.polling
+ ?on_delayed:(delayed "command line")
+ (do_yield server)
+ in
+ server.daemon <- Some daemon ;
+ set_active true ;
+ end
+ end
+
+(* public API ; can be invoked to force server shutdown *)
let stop server =
- emitter := nop ;
- match server.daemon with
- | None -> ()
- | Some daemon ->
- begin
- Senv.feedback "Server disabled." ;
- server.daemon <- None ;
- Db.off_progress daemon ;
- set_active false ;
- end
-
+ begin
+ Senv.debug ~level:2 "Server stopped (was %a)"
+ (pp_running server.pretty) server.running ;
+ kill_running server ;
+ emitter := nop ;
+ match server.daemon with
+ | None -> ()
+ | Some daemon ->
+ begin
+ Senv.feedback "Server disabled." ;
+ server.daemon <- None ;
+ server.running <- Idle ;
+ server.cmdline <- None ;
+ Db.off_progress daemon ;
+ set_active false ;
+ end
+ end
+
+(* internal only ; invoked by run when command line is finished *)
let foreground server =
- emitter := do_signal server ;
- match server.daemon with
- | None -> ()
- | Some daemon ->
- begin
- server.daemon <- None ;
- Db.off_progress daemon ;
- end
+ begin
+ Senv.debug ~level:2 "Server foreground (was %a)"
+ (pp_running server.pretty) server.running ;
+ server.running <- Idle ;
+ server.cmdline <- Some false ;
+ emitter := do_signal server ;
+ match server.daemon with
+ | None -> ()
+ | Some daemon ->
+ begin
+ server.daemon <- None ;
+ Db.off_progress daemon ;
+ end
+ end
(* -------------------------------------------------------------------------- *)
(* --- Main Loop --- *)
(* -------------------------------------------------------------------------- *)
+(* public API ; shall be invoked at command line normal exit *)
let run server =
try
( (* TODO: catch-break to be removed once Why3 signal handler is fixed *)
diff --git a/src/plugins/server/main.mli b/src/plugins/server/main.mli
index 167692bbafdef2279b32f3594f1091de5771d413..9b649da2166f9c06ffd33a6bec2a75261f80c7f0 100644
--- a/src/plugins/server/main.mli
+++ b/src/plugins/server/main.mli
@@ -68,6 +68,8 @@ type 'a response = [
| `Killed of 'a
| `Rejected of 'a
| `Signal of string
+ | `CmdLineOn
+ | `CmdLineOff
]
(** A paired request-response message.
@@ -89,19 +91,38 @@ val create :
fetch:(unit -> 'a message option) ->
unit -> 'a server
-(** Run the server forever.
- The function will {i not} return until the server is actually shut down. *)
-val run : 'a server -> unit
-
(** Start the server in background.
- The function returns immediately after installing a daemon that accepts GET
- requests received by the server on calls to [Db.yield()]. *)
+ The function returns immediately after installing a daemon that (only)
+ accepts GET requests received by the server on calls to [Db.yield()].
+
+ Shall be scheduled at command line main stage {i via}
+ [Db.Main.extend] extension point.
+*)
val start : 'a server -> unit
-(** Stop the server if it is running in background. *)
+(** Stop the server if it is running in background.
+
+ Can be invoked to force server shutdown at any time.
+
+ It shall be typically scheduled {i via} [Extlib.safe_at_exit] along with
+ other system cleanup operations to make sure the server is property
+ shutdown before Frama-C main process exits.
+*)
val stop : 'a server -> unit
+(** Run the server forever.
+ The server would now accept any kind of requests and start handling them.
+ While executing an [`EXEC] request, the server would
+ continue to handle (only) [`GET] pending requests on [Db.yield()]
+ at every [server.polling] time interval.
+
+ The function will {i not} return until the server is actually shutdown.
+
+ Shall be scheduled at normal command line termination {i via}
+ [Cmdline.at_normal_exit] extension point. *)
+val run : 'a server -> unit
+
(** Kill the currently running request by raising an exception. *)
val kill : unit -> 'a
diff --git a/src/plugins/server/request.mli b/src/plugins/server/request.mli
index 3fe2933425cba1e63980bcc07b4adc98b5d3f442..58cfd275a8cd0b598f4d65c8cd37cbe0d1a48549 100644
--- a/src/plugins/server/request.mli
+++ b/src/plugins/server/request.mli
@@ -114,12 +114,12 @@ val register :
{[
(* ---- Exemple of Request Registration --- *)
let () =
- let s = Request.signature ~page ~kind ~name ~descr () in
+ let s = Request.signature () in
let get_a = Request.param s ~name:"a" ~descr:"..." (module A) in
let get_b = Request.param s ~name:"b" ~descr:"..." (module B) in
let set_c = Request.result s ~name:"c" ~descr:"..." (module C) in
let set_d = Request.result s ~name:"d" ~descr:"..." (module D) in
- Request.register_sig s
+ Request.register_sig s ~package ~kind ~name ~descr
(fun rq () ->
let (c,d) = some_job (get_a rq) (get_b rq) in
set_c rq c ; set_d rq d)
diff --git a/src/plugins/server/server_doc.ml b/src/plugins/server/server_doc.ml
index 007c88ce26169424d17a82635bb786fc9f086449..a1c14afd4fd0a02cc7ee8357fc5fcfb4d15cf24e 100644
--- a/src/plugins/server/server_doc.ml
+++ b/src/plugins/server/server_doc.ml
@@ -157,6 +157,12 @@ let md_named ~kind pp = function
let title = String.capitalize_ascii kind in
Md.table (Package.md_fields ~title pp prms)
+let md_signals signals =
+ if signals = [] then []
+ else
+ Md.quote (Md.emph "signals") @
+ Md.block Md.(list (List.map (fun x -> text (code x)) signals))
+
let descr_of_decl names decl =
match decl.d_kind with
| D_safe _ | D_loose _ | D_order _ -> assert false
@@ -181,9 +187,7 @@ let descr_of_decl names decl =
Md.quote (md_param ~kind:"output" pp rq.rq_output) @
md_named ~kind:"input" pp rq.rq_input @
md_named ~kind:"output" pp rq.rq_output @
- Md.quote (Md.emph "signals") @
- Md.block Md.(list (List.map (fun x -> text (code x))
- rq.rq_signals))
+ md_signals rq.rq_signals
let declaration page names decl =
match decl.d_kind with
diff --git a/src/plugins/server/server_socket.ml b/src/plugins/server/server_socket.ml
index 30bb6221c4e15f73df778d90da451ad78c13bba0..b0f2e5b03fa47ea1dbd7bad43e8a5b960e564a90 100644
--- a/src/plugins/server/server_socket.ml
+++ b/src/plugins/server/server_socket.ml
@@ -41,52 +41,94 @@ module Socket = Senv.String
Finally, the server is executed until shutdown."
end)
+let () = Parameter_customize.set_group socket_group
+module SocketSize = Senv.Int
+ (struct
+ let option_name = "-server-socket-size"
+ let arg_name = "n"
+ let default = 256
+ let help = "Control the size of socket buffers (in ko, default 256)."
+ end)
+
let _ = Server_doc.protocole
~title:"Unix Socket Protocol"
~readme:"server_socket.md"
(* -------------------------------------------------------------------------- *)
-(* --- Low-level Messages --- *)
+(* --- Socket Bytes Read & Write --- *)
(* -------------------------------------------------------------------------- *)
-let buffer_size = 65536
-
type channel = {
- mutable eof : bool ;
- inc : in_channel ;
- out : out_channel ;
- tmp : bytes ;
- buffer : Buffer.t ;
+ sock : Unix.file_descr ; (* Socket *)
+ snd : bytes ; (* SND bytes buffer, re-used for transport *)
+ rcv : bytes ; (* RCV bytes buffer, re-used for transport *)
+ brcv : Buffer.t ; (* RCV data buffer, accumulated *)
+ bsnd : Buffer.t ; (* SND data buffer, accumulated *)
}
-let feed_bytes ch =
- if not ch.eof then
- try
- let n = input ch.inc ch.tmp 0 buffer_size in
- Buffer.add_subbytes ch.buffer ch.tmp 0 n ;
- with
- | Sys_blocked_io -> ()
- | End_of_file -> ch.eof <- true
+let read_bytes { sock ; rcv ; brcv } =
+ (* rcv buffer is only used locally *)
+ let s = Bytes.length rcv in
+ let rec scan p =
+ (* try to fill RCV buffer *)
+ let n =
+ try Unix.read sock rcv p (s-p)
+ with Unix.Unix_error((EAGAIN|EWOULDBLOCK),_,_) -> 0
+ in
+ let p = p + n in
+ if n > 0 && p < s then scan p else p
+ in
+ let n = scan 0 in
+ if n > 0 then Buffer.add_subbytes brcv rcv 0 n
+
+let send_bytes { sock ; snd ; bsnd } =
+ (* snd buffer is only used locally *)
+ let n = Buffer.length bsnd in
+ if n > 0 then
+ let s = Bytes.length snd in
+ let rec send p =
+ (* try to flush BSND buffer *)
+ let w = min (n-p) s in
+ Buffer.blit bsnd p snd 0 w ;
+ let r =
+ try Unix.single_write sock snd 0 w
+ with Unix.Unix_error((EAGAIN|EWOULDBLOCK),_,_) -> 0
+ in
+ let p = p + r in
+ if r > 0 && p < n then send p else p
+ in
+ let p = send 0 in
+ if p > 0 then
+ let tail = Buffer.sub bsnd p (n-p) in
+ Buffer.reset bsnd ;
+ Buffer.add_string bsnd tail
+
+(* -------------------------------------------------------------------------- *)
+(* --- Data Chunks Encoding --- *)
+(* -------------------------------------------------------------------------- *)
let read_data ch =
try
- let h = match Buffer.nth ch.buffer 0 with
+ (* Try to read all the data.
+ In case there is not enough bytes in the buffer,
+ calls to Buffer.sub would raise Invalid_argument. *)
+ let h = match Buffer.nth ch.brcv 0 with
| 'S' -> 3
| 'L' -> 7
| 'W' -> 15
| _ -> raise (Invalid_argument "Server_socket.read")
in
- let hex = Buffer.sub ch.buffer 1 h in
+ let hex = Buffer.sub ch.brcv 1 h in
let len = int_of_string ("0x" ^ hex) in
- let data = Buffer.sub ch.buffer (1+h) len in
+ let data = Buffer.sub ch.brcv (1+h) len in
let p = 1 + h + len in
- let n = Buffer.length ch.buffer - p in
- let rest = Buffer.sub ch.buffer p n in
- Buffer.reset ch.buffer ;
- Buffer.add_string ch.buffer rest ;
+ let n = Buffer.length ch.brcv - p in
+ (* TODO[LC]: inefficient move. Requires a ring-buffer. *)
+ let rest = Buffer.sub ch.brcv p n in
+ Buffer.reset ch.brcv ;
+ Buffer.add_string ch.brcv rest ;
Some data
- with Invalid_argument _ ->
- None
+ with Invalid_argument _ -> None
let write_data ch data =
begin
@@ -96,9 +138,8 @@ let write_data ch data =
if len < 0xFFFFFFF then Printf.sprintf "L%07x" len else
Printf.sprintf "W%015x" len
in
- output_string ch.out hex ;
- output_string ch.out data ;
- flush ch.out ;
+ Buffer.add_string ch.bsnd hex ;
+ Buffer.add_string ch.bsnd data ;
end
(* -------------------------------------------------------------------------- *)
@@ -147,6 +188,8 @@ let encode (resp : string Main.response) : string =
| `Signal id -> `Assoc [
"res", `String "SIGNAL" ;
"id", `String id ]
+ | `CmdLineOn -> `String "CMDLINEON"
+ | `CmdLineOff -> `String "CMDLINEOFF"
in Yojson.Basic.to_string ~std:false js
let parse ch =
@@ -168,17 +211,18 @@ let callback ch rs =
(fun r ->
match encode r with
| data -> write_data ch data
- | exception _ -> ()
- ) rs
+ | exception err ->
+ Senv.debug "Socket: encoding error %S@." (Printexc.to_string err)
+ ) rs ;
+ send_bytes ch
let commands ch =
- if ch.eof then None else
- begin
- feed_bytes ch ;
- match parse ch with
- | [] -> None
- | requests -> Some Main.{ requests ; callback = callback ch }
- end
+ begin
+ read_bytes ch ;
+ match parse ch with
+ | [] -> send_bytes ch ; None
+ | requests -> Some Main.{ requests ; callback = callback ch }
+ end
(* -------------------------------------------------------------------------- *)
(* --- Establish the Server --- *)
@@ -191,49 +235,72 @@ type socket = {
let close (s: socket) =
match s.channel with None -> () | Some ch ->
- begin
- s.channel <- None ;
- close_in ch.inc ;
- close_out ch.out ;
- end
+ s.channel <- None ;
+ Unix.close ch.sock
+
+let set_socket_size sock opt s =
+ begin
+ let nbytes = s * 1024 in
+ (try Unix.setsockopt_int sock opt nbytes
+ with Unix.Unix_error(err,_,_) ->
+ let msg = Unix.error_message err in
+ Senv.warning ~once:true
+ "Invalid socket size (%d: %s)" nbytes msg) ;
+ Unix.getsockopt_int sock opt
+ end
+
+let channel (s: socket) =
+ match s.channel with
+ | Some _ as chan -> chan
+ | None ->
+ try
+ let sock,_ = Unix.accept ~cloexec:true s.socket in
+ Unix.set_nonblock sock ;
+ let size = SocketSize.get () in
+ let rcv = set_socket_size sock SO_RCVBUF size in
+ let snd = set_socket_size sock SO_SNDBUF size in
+ Senv.debug ~level:2 "Socket size in:%d out:%d@." rcv snd ;
+ Senv.debug "Client connected" ;
+ let ch = Some {
+ sock ;
+ snd = Bytes.create snd ;
+ rcv = Bytes.create rcv ;
+ bsnd = Buffer.create snd ;
+ brcv = Buffer.create rcv ;
+ } in
+ s.channel <- ch ; ch
+ with Unix.Unix_error(EAGAIN,_,_) -> None
let fetch (s:socket) () =
- try
- match s.channel with
+ try match channel s with
+ | None -> None
| Some ch -> commands ch
- | None ->
- let fd,_ = Unix.accept ~cloexec:true s.socket in
- let inc = Unix.in_channel_of_descr fd in
- let out = Unix.out_channel_of_descr fd in
- Senv.debug "Client connected" ;
- let ch = {
- eof = false ; inc ; out ;
- tmp = Bytes.create buffer_size ;
- buffer = Buffer.create buffer_size ;
- } in
- s.channel <- Some ch ;
- commands ch
with
- | Unix.Unix_error _ -> close s ; None
+ | Unix.Unix_error(EPIPE,_,_) ->
+ Senv.debug "Client disconnected" ;
+ close s ; None
| exn ->
Senv.warning "Socket: exn %s" (Printexc.to_string exn) ;
close s ; None
-let bind fd =
+let establish_server fd =
let socket = { socket = fd ; channel = None } in
try
- Unix.set_nonblock fd ;
Unix.listen fd 1 ;
- Unix.set_nonblock fd ;
ignore (Sys.signal Sys.sigpipe Signal_ignore) ;
let pretty = Format.pp_print_string in
let server = Main.create ~pretty ~fetch:(fetch socket) () in
- Extlib.safe_at_exit begin fun () ->
- Main.stop server ;
- close socket ;
- end ;
+ Extlib.safe_at_exit
+ begin fun () ->
+ Main.stop server ;
+ close socket ;
+ end ;
Main.start server ;
- Cmdline.at_normal_exit (fun () -> Main.run server) ;
+ Cmdline.at_normal_exit
+ begin fun () ->
+ Main.run server ;
+ close socket ;
+ end;
with exn ->
close socket ;
raise exn
@@ -245,17 +312,16 @@ let bind fd =
let server = ref None
let cmdline () =
- let addr = Socket.get () in
- match !server with
- | Some addr0 ->
- if Senv.debug_atleast 1 && addr <> addr0 then
+ let option = match Socket.get () with "" -> None | a -> Some a in
+ match !server, option with
+ | _ , None -> ()
+ | Some addr0, Some addr ->
+ if addr0 <> addr then
Senv.warning "Socket server already running on [%s]." addr0
- else
- Senv.feedback "Socket server already running."
- | None ->
- if addr <> "" then
+ | None, Some addr ->
+ begin
try
- server := Some addr ;
+ server := option ;
if Sys.file_exists addr then Unix.unlink addr ;
let fd = Unix.socket PF_UNIX SOCK_STREAM 0 in
Unix.bind fd (ADDR_UNIX addr) ;
@@ -263,10 +329,11 @@ let cmdline () =
Senv.feedback "Socket server running on [%s]." addr
else
Senv.feedback "Socket server running." ;
- bind fd
+ establish_server fd ;
with exn ->
Senv.fatal "Server socket failed.@\nError: %s@"
(Printexc.to_string exn)
+ end
let () = Db.Main.extend cmdline
diff --git a/src/plugins/server/server_zmq.ok.ml b/src/plugins/server/server_zmq.ok.ml
index d6c4ad728f20218cd05d1f26f2cd802ac3fcfc02..d19dd35c8d7ee38d02a3eda1147331b929221ae3 100644
--- a/src/plugins/server/server_zmq.ok.ml
+++ b/src/plugins/server/server_zmq.ok.ml
@@ -111,6 +111,8 @@ let rec encode = function
| `Killed id :: w -> "KILLED" :: id :: encode w
| `Rejected id :: w -> "REJECTED" :: id :: encode w
| `Signal sg :: w -> "SIGNAL" :: sg :: encode w
+ | `CmdLineOn :: w -> "CMDLINEON" :: encode w
+ | `CmdLineOff :: w -> "CMDLINEOFF" :: encode w
| [] -> []
(* -------------------------------------------------------------------------- *)
diff --git a/src/plugins/server/share/server.md b/src/plugins/server/share/server.md
index 8d308a85a4d36f59e3c33607d981eec88fc2bd41..92163ccf852d3e68516ba74f438640d50f84416e 100644
--- a/src/plugins/server/share/server.md
+++ b/src/plugins/server/share/server.md
@@ -38,7 +38,7 @@ asynchronous entry points, requests are classified into three kinds:
- `EXEC` to starts a resource intensive analysis in Frama-C
During an `EXEC` requests, the implementation of the all resource demanding
-computations shall repeatedly call the yielding routine `!Db.progress()` of the
+computations shall repeatedly call the yielding routine `Db.yield()` of the
Frama-C kernel to ensures a smooth asynchronous behavior of the Server. During a
_yield_ call, the Server would be allowed to handle few `GET` pending requests,
since they shall be fast without any modification. When the server is idled, any
@@ -59,19 +59,25 @@ to the client. However, since a lot of signals might be emitted, the server
must be aware of which signals the client is listening to.
Signal are identified by unique strings.
-The server and client can exchange two special commands to manage signals:
+The server and client can exchange other special commands to manage signals:
| Command | Issued by | Effect |
|:--------|:---------:|:----------------------------|
| `SIGON s` | client | start listening to signal `<s>` |
| `SIGOFF s` | client | stop listening to signal `<s>` |
| `SIGNAL s` | server | signal `<s>` has been emitted |
+| `CMDLINEON` | server | execution of the Frama-C command line |
+| `CMDLINEOFF` | server | termination of the Frama-C command line |
When one or many requests emit some signal `<s>` several times,
the client would be notified only once per cycle of data exchange.
Signals will be notified in addition to responses or logical requests
or server polling.
+During the execution of the Frama-C command line, the server behaves just like
+during an `EXEC` request: only `GET` requests are processed at `Db.yield()` calls
+until the (normal) termination of the command line.
+
## Transport Messages
From the entry points layer, the asynchronous behavior of the Server makes
@@ -89,7 +95,7 @@ paired _intput messages_ and _output messages_. Each single input message consis
a list of _commands_:
| Commands | Parameters | Description |
-|:--------:|:----------:|:------------|
+|:---------|:-----------|:------------|
| `POLL` | - | Ask for pending responses and signals, if any |
| `GET` | `id,request,data` | En-queue the given GET request |
| `SET` | `id,request,data` | En-queue the given SET request |
@@ -103,12 +109,14 @@ Similarly, a single output message consists of a list
of _replies_, listed in table below:
| Replies | Parameters | Description |
-|:--------:|:----------:|:------------|
+|:---------|:-----------|:------------|
| `DATA` | `id,data` | Response data from the identified request |
| `ERROR` | `id,message` | Error message from the identified request |
| `SIGNAL` | `id` | The identified signal has been emitted since last exchange |
| `KILLED` | `id` | The identified request has been killed or interrupted |
| `REJECTED` | `id` | The identified request was not registered on the Server |
+| `CMDLINEON` | - | The command line has started |
+| `CMDLINEOFF` | - | The command line is terminated |
The logic layer makes no usage of _identifiers_ and simply pass them unchanged into
output messages in response to received requests.
@@ -131,9 +139,21 @@ function that possibly returns a list of commands, associated with a
callback for emitting the paired list of replies. The Server main
loop is guaranteed to invoke the callback exactly once.
-The Server plug-in implements two entry-points, however, other Frama-C plugins might
-implement their own entry-points and call the `Server.Main.run ~fetch ()` function
-to make the server starting and exchanging messages with the external world.
+To integrate your own server into the Frama-C command-line framework, you need to
+provide an implementation of the non-blocking `fetch` function and create a server
+with `Server.create`. Then, you shall:
+
+- Schedule `Server.start myServer` during the main plug-in extension phase _via_
+ `Db.Main.extend`;
+
+- Schedule `Server.run myServer` at normal command line termination phase _via_
+ `Cmdline.at_normal_exit`;
+
+- Schedule `Server.stop myServer` with other cleaning operations at exit phase
+ _via_ `Extlib.at_exit_safe`.
+
+This way, your server will integrate well with the command line execution of
+Frama-C and the other plug-ins.
## Request Implementations
diff --git a/src/plugins/server/share/server_socket.md b/src/plugins/server/share/server_socket.md
index c43990c8cea51c2ee65bfd10ad0227af1038b038..04b580e658790f58fc0483928db8ad91dd1182e6 100644
--- a/src/plugins/server/share/server_socket.md
+++ b/src/plugins/server/share/server_socket.md
@@ -54,6 +54,8 @@ An output message chunk consists of a single response encoded as follows:
| `KILLED(id)` | `{ res = 'KILLED', id }` |
| `REJECTED(id)` | `{ res = 'REJECTED', id }` |
| `SIGNAL(id)` | `{ res = 'SIGNAL', id }` |
+| `CMDLINEON` | `"CMDLINEON"` |
+| `CMDLINEOFF` | `"CMDLINEOFF"` |
The special last case is used when the server is busy or died or some low-level
error occurs.
diff --git a/src/plugins/server/share/server_zmq.md b/src/plugins/server/share/server_zmq.md
index 67999c67a5900e251f1340f539d1c447dad6b0a7..63e1d7e830a658a2653b3871efacccebf73a3703 100644
--- a/src/plugins/server/share/server_zmq.md
+++ b/src/plugins/server/share/server_zmq.md
@@ -45,6 +45,8 @@ of each reply is a finel string identifying the reply:
| `KILLED(id)` | 2 | `"KILLED"` | id | |
| `REJECTED(id)` | 2 | `"REJECTED"` | id | |
| `SIGNAL(id)` | 2 | `"SIGNAL"` | id | |
+| `CMDLINEON` | 1 | `"CMDLINEON"` | | |
+| `CMDLINEOFF` | 1 | `"CMDLINEOFF"` | | |
| (special) | 2 | `"WRONG"` | message | |
| (special) | 1 | `"NONE"` | | |
diff --git a/src/plugins/slicing/slicingTransform.ml b/src/plugins/slicing/slicingTransform.ml
index 8fe9a26d5b60bd0222ce0d623b4ac0c87bd01c35..da5c14f22b2a58f2bb6a5d3a09e37611a204211b 100644
--- a/src/plugins/slicing/slicingTransform.ml
+++ b/src/plugins/slicing/slicingTransform.ml
@@ -449,7 +449,7 @@ module Visibility (SliceName : sig
info
let cond_edge_visible _ff_opt s =
- Db.Value.condition_truth_value s
+ Eva.Results.condition_truth_value s
end
diff --git a/src/plugins/sparecode/transform.ml b/src/plugins/sparecode/transform.ml
index dd67f76849324e533f84ca8f79ec551b87078fb0..e2280ec81b2c4ad240ddcd1902c29356572e55d9 100644
--- a/src/plugins/sparecode/transform.ml
+++ b/src/plugins/sparecode/transform.ml
@@ -155,7 +155,7 @@ module BoolInfo = struct
with Kernel_function.No_Statement -> true
let cond_edge_visible _ s =
- Db.Value.condition_truth_value s
+ Eva.Results.condition_truth_value s
end
module Info = Filter.F (BoolInfo)
diff --git a/src/plugins/value/Eva.mli b/src/plugins/value/Eva.mli
index cb625550cc5e0d7881b2b9afbde5c45aede164dc..bcb8c30652c495fafeb795b0b8d57ee80321f23d 100644
--- a/src/plugins/value/Eva.mli
+++ b/src/plugins/value/Eva.mli
@@ -293,6 +293,10 @@ module Results: sig
(** Converts the value into a Cvalue abstraction. *)
val as_cvalue_result : value evaluation -> Cvalue.V.t result
+ (** Converts the value into a Cvalue abstraction with 'undefined' and 'escaping
+ addresses' flags. *)
+ val as_cvalue_or_uninitialized : value evaluation -> Cvalue.V_Or_Uninitialized.t
+
(** Converts into a C location abstraction. *)
val as_location : address evaluation -> Locations.location result
@@ -307,6 +311,11 @@ module Results: sig
(** Evaluation properties *)
+
+ (** Does the evaluated abstraction represents only one possible C value or
+ memory location? *)
+ val is_singleton : 'a evaluation -> bool
+
(** Returns whether the evaluated value is initialized or not. If the value have
been evaluated from a Cil expression, it is always initialized. *)
val is_initialized : value evaluation -> bool
@@ -334,6 +343,10 @@ module Results: sig
the main function has been analyzed for [Kglobal]. *)
val is_reachable_kinstr : Cil_types.kinstr -> bool
+ val condition_truth_value: Cil_types.stmt -> bool * bool
+ (** Provided [stmt] is an 'if' construct, [fst (condition_truth_value stmt)]
+ (resp. snd) is true if and only if the condition of the 'if' has been
+ evaluated to true (resp. false) at least once during the analysis. *)
(*** Callers / Callees / Callsites *)
diff --git a/src/plugins/value/api/general_requests.ml b/src/plugins/value/api/general_requests.ml
index 2bf817aee3508b8c651d514c62a42298c14800d8..4cbfd6f0af85695976d06833b4e2871f6110b76b 100644
--- a/src/plugins/value/api/general_requests.ml
+++ b/src/plugins/value/api/general_requests.ml
@@ -76,6 +76,12 @@ let () = Request.register ~package
~input:(module Kernel_ast.Kf) ~output:(module Data.Jlist (CallSite))
callers
+(* ----- Functions ---------------------------------------------------------- *)
+
+let () =
+ Analysis.register_computation_hook
+ (fun _ -> States.reload Kernel_ast.Functions.array)
+
(* ----- Dead code: unreachable and non-terminating statements -------------- *)
@@ -139,10 +145,41 @@ let () = Request.register ~package
~output:(module DeadCode)
dead_code
+(* ----- Register Eva information ------------------------------------------- *)
+
+let print_value fmt loc =
+ let stmt, eval =
+ match loc with
+ | Printer_tag.PLval (_kf, Kstmt stmt, lval)
+ when Cil.isScalarType (Cil.typeOfLval lval) ->
+ stmt, Results.eval_lval lval
+ | Printer_tag.PExp (_kf, Kstmt stmt, expr)
+ when Cil.isScalarType (Cil.typeOf expr) ->
+ stmt, Results.eval_exp expr
+ | _ -> raise Not_found
+ in
+ let eval_cvalue at = Results.(at stmt |> eval |> as_cvalue_or_uninitialized) in
+ let before = eval_cvalue Results.before in
+ let after = eval_cvalue Results.after in
+ let pretty = Cvalue.V_Or_Uninitialized.pretty in
+ if Cvalue.V_Or_Uninitialized.equal before after
+ then pretty fmt before
+ else Format.fprintf fmt "Before: %a@\nAfter: %a" pretty before pretty after
+
+let () =
+ Server.Kernel_ast.Information.register
+ ~id:"eva.value"
+ ~label:"Value"
+ ~title:"Possible values inferred by Eva"
+ ~enable:Analysis.is_computed
+ print_value
+
+let () =
+ Analysis.register_computation_hook
+ (fun _ -> Server.Kernel_ast.Information.update ())
(* ----- Red and tainted alarms --------------------------------------------- *)
-
module Taint = struct
open Server.Data
open Taint_domain
diff --git a/src/plugins/value/api/values_request.ml b/src/plugins/value/api/values_request.ml
index a85d9720d60264fb8450f83a879f43216583e4b0..8714daa8f222455631017568fc60ce4afdd39618 100644
--- a/src/plugins/value/api/values_request.ml
+++ b/src/plugins/value/api/values_request.ml
@@ -85,10 +85,10 @@ let () = Analysis.register_computation_hook ~on:Computed
let next_steps s =
match s.skind with
| If (cond, _, _, _) -> [ `Then cond ; `Else cond ]
- | Instr (Set _ | Call _ | Local_init _ | Asm _ | Code_annot _)
+ | Instr (Set _ | Call _ | Local_init _) -> [ `After ]
+ | Instr (Asm _ | Code_annot _)
| Switch _ | Loop _ | Block _ | UnspecifiedSequence _
| TryCatch _ | TryFinally _ | TryExcept _
- -> [ `After ]
| Instr (Skip _) | Return _ | Break _ | Continue _ | Goto _ | Throw _ -> []
let probe_stmt s =
@@ -102,6 +102,7 @@ let probe_stmt s =
let probe marker =
let open Printer_tag in
match marker with
+ | PLval (_, _, (Var vi, NoOffset)) when Cil.isFunctionType vi.vtype -> None
| PLval(_,Kstmt s,l) -> Some (Plval (l,s))
| PExp(_,Kstmt s,e) -> Some (Pexpr (e,s))
| PStmt(_,s) | PStmtStart(_,s) -> probe_stmt s
@@ -336,7 +337,7 @@ end
module Proxy(A : Analysis.S) : EvaProxy = struct
open Eval
- type dstate = A.Dom.state or_top_or_bottom
+ type dstate = A.Dom.state or_top_bottom
let get_precise_loc =
let default = fun _ -> Precise_locs.loc_top in
@@ -354,7 +355,7 @@ module Proxy(A : Analysis.S) : EvaProxy = struct
let dstate ~after stmt = function
| None -> (A.get_stmt_state ~after stmt :> dstate)
| Some cs ->
- match A.get_stmt_state_by_callstack ~after stmt with
+ match A.get_stmt_state_by_callstack ~selection:[cs] ~after stmt with
| (`Top | `Bottom) as res -> res
| `Value cmap ->
try `Value (CSmap.find cmap cs)
@@ -530,7 +531,10 @@ let () =
let () =
let getProbeInfo = Request.signature ~input:(module Jmarker) () in
- let set_code = Request.result_opt getProbeInfo
+ let set_evaluable = Request.result getProbeInfo
+ ~name:"evaluable" ~descr:(Md.plain "Can the probe be evaluated?")
+ (module Jbool)
+ and set_code = Request.result_opt getProbeInfo
~name:"code" ~descr:(Md.plain "Probe source code")
(module Jstring)
and set_stmt = Request.result_opt getProbeInfo
@@ -547,6 +551,9 @@ let () =
~default:false (module Jbool)
in
let set_probe rq pp p s =
+ let computed = Analysis.is_computed () in
+ let reachable = Results.is_reachable s in
+ set_evaluable rq (computed && reachable);
set_code rq (Some (Pretty_utils.to_string pp p)) ;
set_stmt rq (Some s) ;
set_rank rq (Ranking.stmt s) ;
@@ -563,7 +570,7 @@ let () =
match probe marker with
| Some (Plval (l, s)) -> set_probe rq Printer.pp_lval l s
| Some (Pexpr (e, s)) -> set_probe rq Printer.pp_exp e s
- | None -> ()
+ | None -> set_evaluable rq false
end
(* -------------------------------------------------------------------------- *)
diff --git a/src/plugins/value/domains/cvalue/builtins_malloc.ml b/src/plugins/value/domains/cvalue/builtins_malloc.ml
index a6145775c9145c21dbb1136ee66ab61136a8e44d..c29b62c4e48ea5ddbec3b8c669f8021cee8b0e97 100644
--- a/src/plugins/value/domains/cvalue/builtins_malloc.ml
+++ b/src/plugins/value/domains/cvalue/builtins_malloc.ml
@@ -24,6 +24,7 @@ open Cil_types
open Abstract_interp
open Locations
open Cvalue
+open Lattice_bounds
let dkey = Self.register_category "malloc"
diff --git a/src/plugins/value/domains/domain_builder.ml b/src/plugins/value/domains/domain_builder.ml
index 3c434d03e0633706083da76f9238596280e8f101..141c643cc703d84b082afa5a7af9e5b6355a0b92 100644
--- a/src/plugins/value/domains/domain_builder.ml
+++ b/src/plugins/value/domains/domain_builder.ml
@@ -52,7 +52,7 @@ module type LeafDomain = sig
current_input:t -> previous_output:t -> t
val show_expr: 'a -> t -> Format.formatter -> exp -> unit
- val post_analysis: t Bottom.or_bottom -> unit
+ val post_analysis: t Lattice_bounds.or_bottom -> unit
module Store: Domain_store.S with type t := t
diff --git a/src/plugins/value/domains/domain_builder.mli b/src/plugins/value/domains/domain_builder.mli
index 9be07c5c74e3d39836cbcf98dc05317445ebe381..bf3c05b8f0cc79efed1e2e4ec30131f737bd49df 100644
--- a/src/plugins/value/domains/domain_builder.mli
+++ b/src/plugins/value/domains/domain_builder.mli
@@ -58,7 +58,7 @@ module type LeafDomain = sig
current_input:t -> previous_output:t -> t
val show_expr: 'a -> t -> Format.formatter -> exp -> unit
- val post_analysis: t Bottom.or_bottom -> unit
+ val post_analysis: t Lattice_bounds.or_bottom -> unit
module Store: Domain_store.S with type t := t
diff --git a/src/plugins/value/domains/domain_store.ml b/src/plugins/value/domains/domain_store.ml
index 426f36a687d6e3b13010d9ca067d8b2f7b1e7c58..5692678cb22ce05a3e3932e157d225b667c02ed4 100644
--- a/src/plugins/value/domains/domain_store.ml
+++ b/src/plugins/value/domains/domain_store.ml
@@ -42,12 +42,12 @@ module type S = sig
val get_initial_state: kernel_function -> t or_bottom
val get_initial_state_by_callstack:
?selection:callstack list ->
- kernel_function -> t Value_types.Callstack.Hashtbl.t or_top_or_bottom
+ kernel_function -> t Value_types.Callstack.Hashtbl.t or_top_bottom
val get_stmt_state: after:bool -> stmt -> t or_bottom
val get_stmt_state_by_callstack:
?selection:callstack list ->
- after:bool -> stmt -> t Value_types.Callstack.Hashtbl.t or_top_or_bottom
+ after:bool -> stmt -> t Value_types.Callstack.Hashtbl.t or_top_bottom
val mark_as_computed: unit -> unit
val is_computed: unit -> bool
diff --git a/src/plugins/value/domains/domain_store.mli b/src/plugins/value/domains/domain_store.mli
index 97260867803e6f922f12c44d2bf2853dff4d67f4..e4d70dce5e61b1fbaf5cbb3e98f006153d557bc2 100644
--- a/src/plugins/value/domains/domain_store.mli
+++ b/src/plugins/value/domains/domain_store.mli
@@ -49,12 +49,12 @@ module type S = sig
val get_initial_state: kernel_function -> t or_bottom
val get_initial_state_by_callstack:
?selection:callstack list ->
- kernel_function -> t Value_types.Callstack.Hashtbl.t or_top_or_bottom
+ kernel_function -> t Value_types.Callstack.Hashtbl.t or_top_bottom
val get_stmt_state: after:bool -> stmt -> t or_bottom
val get_stmt_state_by_callstack:
?selection:callstack list ->
- after:bool -> stmt -> t Value_types.Callstack.Hashtbl.t or_top_or_bottom
+ after:bool -> stmt -> t Value_types.Callstack.Hashtbl.t or_top_bottom
val mark_as_computed: unit -> unit
val is_computed: unit -> bool
diff --git a/src/plugins/value/domains/gauges/gauges_domain.ml b/src/plugins/value/domains/gauges/gauges_domain.ml
index 27188a34302751add35377747f6ad6027edb0f48..7a91a6af3f8e2dc22c04e88287d12316f2853dd0 100644
--- a/src/plugins/value/domains/gauges/gauges_domain.ml
+++ b/src/plugins/value/domains/gauges/gauges_domain.ml
@@ -108,7 +108,7 @@ module G = struct
let join = lift Integer.min Integer.max
let add = lift Integer.add Integer.add
- let narrow (min1, max1: t) (min2, max2: t) : t Bottom.or_bottom =
+ let narrow (min1, max1: t) (min2, max2: t) : t or_bottom =
let minb = match min1, min2 with
| Some i1, Some i2 -> Some (Integer.max i1 i2)
| None, i | i, None -> i
diff --git a/src/plugins/value/domains/traces_domain.ml b/src/plugins/value/domains/traces_domain.ml
index 6341124d00598a7fec90ff64b3811920abe18d20..52e14219be6b7f3d87404deb6e778f55890cc0a2 100644
--- a/src/plugins/value/domains/traces_domain.ml
+++ b/src/plugins/value/domains/traces_domain.ml
@@ -30,6 +30,7 @@ module OCamlGraph = Graph
module Frama_c_File = File
open Cil_types
open Cil_datatype
+open Lattice_bounds
module Node : sig
include Datatype.S_with_collections
diff --git a/src/plugins/value/engine/analysis.ml b/src/plugins/value/engine/analysis.ml
index 25fabab93298489eec675318ab166eaca0afa0dd..ca4771584258e22ee4118a368c3cbd5e4366acf8 100644
--- a/src/plugins/value/engine/analysis.ml
+++ b/src/plugins/value/engine/analysis.ml
@@ -38,12 +38,12 @@ module type Results = sig
val get_stmt_state : after:bool -> stmt -> state or_bottom
val get_stmt_state_by_callstack:
?selection:callstack list ->
- after:bool -> stmt -> state Value_types.Callstack.Hashtbl.t or_top_or_bottom
+ after:bool -> stmt -> state Value_types.Callstack.Hashtbl.t or_top_bottom
val get_initial_state:
kernel_function -> state or_bottom
val get_initial_state_by_callstack:
?selection:callstack list ->
- kernel_function -> state Value_types.Callstack.Hashtbl.t or_top_or_bottom
+ kernel_function -> state Value_types.Callstack.Hashtbl.t or_top_bottom
val eval_expr : state -> exp -> value evaluated
val copy_lvalue: state -> lval -> value flagged_value evaluated
diff --git a/src/plugins/value/engine/analysis.mli b/src/plugins/value/engine/analysis.mli
index 92dfdb74955a4ac80169393ca2738ec52269ad2e..510972db9184b41e85601f6ef1c11cb2f390482c 100644
--- a/src/plugins/value/engine/analysis.mli
+++ b/src/plugins/value/engine/analysis.mli
@@ -32,12 +32,12 @@ module type Results = sig
val get_stmt_state : after:bool -> stmt -> state or_bottom
val get_stmt_state_by_callstack:
?selection:callstack list ->
- after:bool -> stmt -> state Value_types.Callstack.Hashtbl.t or_top_or_bottom
+ after:bool -> stmt -> state Value_types.Callstack.Hashtbl.t or_top_bottom
val get_initial_state:
kernel_function -> state or_bottom
val get_initial_state_by_callstack:
?selection:callstack list ->
- kernel_function -> state Value_types.Callstack.Hashtbl.t or_top_or_bottom
+ kernel_function -> state Value_types.Callstack.Hashtbl.t or_top_bottom
val eval_expr : state -> exp -> value evaluated
val copy_lvalue: state -> lval -> value flagged_value evaluated
diff --git a/src/plugins/value/engine/initialization.mli b/src/plugins/value/engine/initialization.mli
index 3aa3687606e2a9d575bbd24bc00832f97dbdb3ce..cef8e46011c16f8e0bc83ebe4f0f6ccda44a999f 100644
--- a/src/plugins/value/engine/initialization.mli
+++ b/src/plugins/value/engine/initialization.mli
@@ -23,7 +23,7 @@
(** Creation of the initial state of abstract domain. *)
open Cil_types
-open Bottom.Type
+open Lattice_bounds
module type S = sig
type state
diff --git a/src/plugins/value/engine/iterator.ml b/src/plugins/value/engine/iterator.ml
index e728a44c4444f1673af2e72bda889435fdf25643..d9d50612ebb06d92a81cf5218fdffdb626428c9e 100644
--- a/src/plugins/value/engine/iterator.ml
+++ b/src/plugins/value/engine/iterator.ml
@@ -22,7 +22,8 @@
open Cil_types
open Interpreted_automata
-open Bottom.Type
+open Lattice_bounds
+open Bottom.Operators
let check_signals, signal_abort =
let signal_emitted = ref false in
diff --git a/src/plugins/value/engine/transfer_stmt.ml b/src/plugins/value/engine/transfer_stmt.ml
index dcc295fcd5bb4ef154823a35e86800bd23a7eb0d..8e3c04f6d31f20deb9bbaf4aa09966db3482974d 100644
--- a/src/plugins/value/engine/transfer_stmt.ml
+++ b/src/plugins/value/engine/transfer_stmt.ml
@@ -272,7 +272,7 @@ module Make (Abstract: Abstractions.Eva) = struct
in
if is_ret then assert (Alarmset.is_empty alarms);
Alarmset.emit kinstr alarms;
- eval >>- fun (assigned, valuation) ->
+ let* assigned, valuation = eval in
let domain_valuation = Eval.to_domain_valuation valuation in
let lvalue = { lval; ltyp; lloc } in
Domain.assign kinstr lvalue expr assigned domain_valuation state
@@ -289,7 +289,7 @@ module Make (Abstract: Abstractions.Eva) = struct
let eval, alarms = Eval.reduce state expr positive in
(* TODO: check not comparable. *)
Alarmset.emit (Kstmt stmt) alarms;
- eval >>- fun valuation ->
+ let* valuation = eval in
Domain.assume stmt expr positive (Eval.to_domain_valuation valuation) state
@@ -394,7 +394,7 @@ module Make (Abstract: Abstractions.Eva) = struct
let safe_arguments = filter_safe_arguments valuation call in
let empty = Eval.Valuation.empty in
let reduce_one_argument acc argument =
- acc >>- fun acc ->
+ let* acc = acc in
let pre_value = match argument.avalue with
| Assign pre_value -> `Value pre_value
| Copy (_lv, pre_value) -> pre_value.v
@@ -407,8 +407,8 @@ module Make (Abstract: Abstractions.Eva) = struct
If the call has copied the argument, it may be uninitialized. Thus,
we also avoid the backward propagation if the formal is uninitialized
here. This should not happen in the Assign case above. *)
- fst (Eval.copy_lvalue ~valuation:empty ~subdivnb:0 state lval)
- >>- fun (_valuation, post_value) ->
+ let* _valuation, post_value =
+ fst (Eval.copy_lvalue ~valuation:empty ~subdivnb:0 state lval) in
if
Bottom.is_included Value.is_included pre_value post_value.v
|| post_value.escaping || not post_value.initialized
@@ -423,10 +423,10 @@ module Make (Abstract: Abstractions.Eva) = struct
let reduce_arguments reductions state =
let valuation = `Value Eval.Valuation.empty in
let reduce_one_argument valuation (argument, post_value) =
- valuation >>- fun valuation ->
+ let* valuation = valuation in
Eval.assume ~valuation state argument.concrete post_value
in
- List.fold_left reduce_one_argument valuation reductions >>- fun valuation ->
+ let* valuation = List.fold_left reduce_one_argument valuation reductions in
Domain.update (Eval.to_domain_valuation valuation) state
(* -------------------- Treat the results of a call ----------------------- *)
@@ -441,8 +441,8 @@ module Make (Abstract: Abstractions.Eva) = struct
| Some _, None -> assert false
| Some lval, Some vi_ret ->
let exp_ret_caller = Eva_utils.lval_to_exp (Var vi_ret, NoOffset) in
- assign_ret state (Kstmt stmt) lval exp_ret_caller
- >>-: fun state -> Domain.leave_scope kf_callee [vi_ret] state
+ let+ state = assign_ret state (Kstmt stmt) lval exp_ret_caller in
+ Domain.leave_scope kf_callee [vi_ret] state
(* ---------------------- Make a one function call ------------------------ *)
@@ -475,16 +475,15 @@ module Make (Abstract: Abstractions.Eva) = struct
(* Gathers the possible reductions on the value of the concrete arguments
at the call site, according to the value of the formals at the post
state of the called function. *)
- gather_reduced_arguments call valuation state
- >>- fun reductions ->
+ let* reductions = gather_reduced_arguments call valuation state in
(* The formals (and the locals) of the called function leave scope. *)
let post = Domain.leave_scope kf_callee leaving_vars state in
let recursion = Option.map Recursion.revert recursion in
(* Computes the state after the call, from the post state at the end of
the called function, and the pre state at the call site. *)
- Domain.finalize_call stmt call recursion ~pre ~post >>- fun state ->
+ let* state = Domain.finalize_call stmt call recursion ~pre ~post in
(* Backward propagates the [reductions] on the concrete arguments. *)
- reduce_arguments reductions state >>- fun state ->
+ let* state = reduce_arguments reductions state in
treat_return ~kf_callee lv call.return stmt state
in
let states =
@@ -640,8 +639,8 @@ module Make (Abstract: Abstractions.Eva) = struct
fun fmt subdivnb lval state ->
try
let offsm =
- fst (Eval.lvaluate ~for_writing:false ~subdivnb state lval)
- >>- fun (_, loc, _) ->
+ let* (_, loc, _) =
+ fst (Eval.lvaluate ~for_writing:false ~subdivnb state lval) in
Eval_op.offsetmap_of_loc (get_ploc loc) (get_cvalue state)
in
let typ = Cil.typeOfLval lval in
@@ -748,7 +747,7 @@ module Make (Abstract: Abstractions.Eva) = struct
Alarmset.emit ki_call alarms;
let cacheable = ref Cacheable in
let eval =
- functions >>-: fun functions ->
+ let+ functions = functions in
let current_kf = Eva_utils.current_kf () in
let process_one_function kf valuation =
(* The special Frama_C_ functions to print states are handled here. *)
@@ -761,7 +760,7 @@ module Make (Abstract: Abstractions.Eva) = struct
let eval, alarms = make_call ~subdivnb kf args valuation state in
Alarmset.emit ki_call alarms;
let states =
- eval >>-: fun (call, recursion, valuation) ->
+ let+ call, recursion, valuation = eval in
(* Register the call. *)
Eva_results.add_kf_caller call.kf ~caller:(current_kf, stmt);
(* Do the call. *)
diff --git a/src/plugins/value/eval.ml b/src/plugins/value/eval.ml
index 24ec7fe01dffd408fcba0df899feca82fe44891b..c59224b89441c60ae40a58ebccd11d2990879a3d 100644
--- a/src/plugins/value/eval.ml
+++ b/src/plugins/value/eval.ml
@@ -28,10 +28,9 @@ open Cil_types
(** {2 Lattice structure } *)
(* -------------------------------------------------------------------------- *)
-include Bottom.Type
+include Lattice_bounds
+include Bottom.Operators
-type 'a or_top = [ `Value of 'a | `Top ]
-type 'a or_top_or_bottom = [ `Value of 'a | `Top | `Bottom ]
(* -------------------------------------------------------------------------- *)
(** {2 Types for the evaluations } *)
diff --git a/src/plugins/value/eval.mli b/src/plugins/value/eval.mli
index f1220412daae8394c2042f5b4dbc1353220f8a89..76f96cf20bc10c0f141cb2ac03e1448bd620c1b8 100644
--- a/src/plugins/value/eval.mli
+++ b/src/plugins/value/eval.mli
@@ -31,13 +31,8 @@ open Cil_types
(** {2 Lattice structure } *)
(* -------------------------------------------------------------------------- *)
-include module type of Bottom.Type
-
-(** For some functions, the special value top (denoting no information)
- is managed separately. *)
-type 'a or_top = [ `Value of 'a | `Top ]
-
-type 'a or_top_or_bottom = [ `Value of 'a | `Top | `Bottom ]
+include module type of Lattice_bounds
+include module type of Bottom.Operators
(* -------------------------------------------------------------------------- *)
diff --git a/src/plugins/value/gui_files/gui_eval.ml b/src/plugins/value/gui_files/gui_eval.ml
index f38c4b41faf6a4a28bf99158385acb8e633dabb8..c212bc4d9166d46a1361a6a74e135940f113c5f6 100644
--- a/src/plugins/value/gui_files/gui_eval.ml
+++ b/src/plugins/value/gui_files/gui_eval.ml
@@ -22,6 +22,7 @@
open Cil_types
open Gui_types
+open Lattice_bounds
let results_kf_computed kf =
Eva.Analysis.is_computed () &&
@@ -107,7 +108,7 @@ module type S = sig
val lval_as_offsm_ev: (Analysis.Dom.t, lval, gui_offsetmap_res) evaluation_functions
val lval_zone_ev: (Analysis.Dom.t, lval, Locations.Zone.t) evaluation_functions
val null_ev: (Analysis.Dom.t, unit, gui_offsetmap_res) evaluation_functions
- val exp_ev: (Analysis.Dom.t, exp, Analysis.Val.t Bottom.or_bottom) evaluation_functions
+ val exp_ev: (Analysis.Dom.t, exp, Analysis.Val.t or_bottom) evaluation_functions
val lval_ev: (Analysis.Dom.t, lval, Analysis.Val.t Eval.flagged_value) evaluation_functions
val tlval_ev:
@@ -116,20 +117,20 @@ module type S = sig
gui_loc -> (Eval_terms.eval_env, term, Locations.Zone.t) evaluation_functions
val term_ev:
gui_loc ->
- (Eval_terms.eval_env, term, Analysis.Val.t Bottom.or_bottom) evaluation_functions
+ (Eval_terms.eval_env, term, Analysis.Val.t or_bottom) evaluation_functions
val predicate_ev:
gui_loc ->
(Eval_terms.eval_env,
predicate,
- Eval_terms.predicate_status Bottom.or_bottom
+ Eval_terms.predicate_status or_bottom
) evaluation_functions
val predicate_with_red:
gui_loc ->
(Eval_terms.eval_env * (kinstr * Value_types.callstack),
Red_statuses.alarm_or_property * predicate,
- Eval_terms.predicate_status Bottom.or_bottom
+ Eval_terms.predicate_status or_bottom
) evaluation_functions
@@ -357,8 +358,8 @@ module Make (X: Analysis.S) = struct
(* Maps from callstacks to Value states before and after a GUI location.
The 'after' map is not always available. *)
type states_by_callstack = {
- states_before: X.Dom.t Value_types.Callstack.Hashtbl.t Eval.or_top_or_bottom;
- states_after: X.Dom.t Value_types.Callstack.Hashtbl.t Eval.or_top_or_bottom;
+ states_before: X.Dom.t Value_types.Callstack.Hashtbl.t or_top_bottom;
+ states_after: X.Dom.t Value_types.Callstack.Hashtbl.t or_top_bottom;
}
let top_states_by_callstacks = { states_before = `Top; states_after = `Top }
diff --git a/src/plugins/value/gui_files/gui_eval.mli b/src/plugins/value/gui_files/gui_eval.mli
index 9b2686313a76f88cc70636ac761f18c253b299fd..8ee4a20c0c50d5a36d3a2f032aa980a39e5d8cf7 100644
--- a/src/plugins/value/gui_files/gui_eval.mli
+++ b/src/plugins/value/gui_files/gui_eval.mli
@@ -79,7 +79,7 @@ module type S = sig
(Analysis.Dom.t, unit, gui_offsetmap_res) evaluation_functions
val exp_ev:
- (Analysis.Dom.t, exp, Analysis.Val.t Bottom.or_bottom) evaluation_functions
+ (Analysis.Dom.t, exp, Analysis.Val.t Lattice_bounds.or_bottom) evaluation_functions
val lval_ev:
(Analysis.Dom.t, lval, Analysis.Val.t Eval.flagged_value) evaluation_functions
@@ -97,20 +97,20 @@ module type S = sig
val term_ev:
gui_loc ->
- (Eval_terms.eval_env, term, Analysis.Val.t Bottom.or_bottom) evaluation_functions
+ (Eval_terms.eval_env, term, Analysis.Val.t Lattice_bounds.or_bottom) evaluation_functions
val predicate_ev:
gui_loc ->
(Eval_terms.eval_env,
predicate,
- Eval_terms.predicate_status Bottom.or_bottom
+ Eval_terms.predicate_status Lattice_bounds.or_bottom
) evaluation_functions
val predicate_with_red:
gui_loc ->
(Eval_terms.eval_env * (kinstr * Value_types.callstack),
Red_statuses.alarm_or_property * predicate,
- Eval_terms.predicate_status Bottom.or_bottom
+ Eval_terms.predicate_status Lattice_bounds.or_bottom
) evaluation_functions
val make_data_all_callstacks:
diff --git a/src/plugins/value/legacy/eval_annots.ml b/src/plugins/value/legacy/eval_annots.ml
index dc71060c5f2182ada0acb15ebdbb0cbd789654c0..8c83557fd2a766d1dde996152ae20a256e009ece 100644
--- a/src/plugins/value/legacy/eval_annots.ml
+++ b/src/plugins/value/legacy/eval_annots.ml
@@ -22,6 +22,7 @@
open Cil_types
open Eval_terms
+open Lattice_bounds
let has_requires spec =
let behav_has_requires b = b.b_requires <> [] in
diff --git a/src/plugins/value/legacy/eval_op.ml b/src/plugins/value/legacy/eval_op.ml
index 439c086ede5ca6e4061fc8e24cd76528efb0d559..8168a495b7df1f845cbfc59216cdd068bb68ea99 100644
--- a/src/plugins/value/legacy/eval_op.ml
+++ b/src/plugins/value/legacy/eval_op.ml
@@ -24,6 +24,7 @@ open Cvalue
open Cil_types
open Abstract_interp
+open Lattice_bounds
let offsetmap_of_v ~typ v =
let size = Int.of_int (Cil.bitsSizeOf typ) in
diff --git a/src/plugins/value/legacy/function_args.ml b/src/plugins/value/legacy/function_args.ml
index 30b612bb2d4de720e67d7f65ae1c750aa65b239b..876450c09b1f91f7154d6289cde1a2bc51ca0988 100644
--- a/src/plugins/value/legacy/function_args.ml
+++ b/src/plugins/value/legacy/function_args.ml
@@ -21,6 +21,7 @@
(**************************************************************************)
open Cil_types
+open Lattice_bounds
exception Actual_is_bottom
exception WrongFunctionType (* at a call through a pointer *)
diff --git a/src/plugins/value/partitioning/partition.ml b/src/plugins/value/partitioning/partition.ml
index f06b5022fa1ba45f47947b5aa225f2424fb8441b..b1c1c6f7e2444d0c53b2ea3cd6f2f3b7e1c0d8b3 100644
--- a/src/plugins/value/partitioning/partition.ml
+++ b/src/plugins/value/partitioning/partition.ml
@@ -20,7 +20,8 @@
(* *)
(**************************************************************************)
-open Bottom.Type
+open Lattice_bounds
+open Bottom.Operators
(* --- Split monitors --- *)
@@ -411,7 +412,7 @@ struct
let build i acc =
let value = Abstract.Val.inject_int (Cil.typeOf exp) i in
let state =
- Abstract.Eval.assume ~valuation state exp value >>- fun valuation ->
+ let* valuation = Abstract.Eval.assume ~valuation state exp value in
(* Check the reduction *)
Abstract.Dom.update (Abstract.Eval.to_domain_valuation valuation) state
in
@@ -471,8 +472,8 @@ struct
in
let source = fst (predicate.Cil_types.pred_loc) in
let aux positive =
- Abstract.Dom.reduce_by_predicate env state predicate positive
- >>-: fun state' ->
+ let+ state' =
+ Abstract.Dom.reduce_by_predicate env state predicate positive in
let x = Abstract.Dom.evaluate_predicate env state' predicate in
if x == Unknown
then
@@ -482,7 +483,7 @@ struct
let value = if positive then Integer.one else Integer.zero in
value, state'
in
- Bottom.all [ aux true; aux false ]
+ Bottom.list_values [ aux true; aux false ]
(* --- Applying partitioning actions onto flows --------------------------- *)
diff --git a/src/plugins/value/partitioning/trace_partitioning.ml b/src/plugins/value/partitioning/trace_partitioning.ml
index e1cc4261b38c25a272a04e2733484fc60dc67d2d..14df177983377e98e48733c679bbab5c6ea77a07 100644
--- a/src/plugins/value/partitioning/trace_partitioning.ml
+++ b/src/plugins/value/partitioning/trace_partitioning.ml
@@ -21,7 +21,6 @@
(**************************************************************************)
open Cil_types
-open Bottom.Type
open Partition
module Make
@@ -115,7 +114,7 @@ struct
let expanded (s : store) : (key * state) list =
Partition.to_list s.store_partition
- let smashed (s : store) : state or_bottom =
+ let smashed (s : store) : state Lattice_bounds.or_bottom =
match expanded s with
| [] -> `Bottom
| (_k, v1) :: l -> `Value (List.fold_left Domain.join v1 (List.map snd l))
diff --git a/src/plugins/value/partitioning/trace_partitioning.mli b/src/plugins/value/partitioning/trace_partitioning.mli
index c4d4d76cd11713c881842c50b387094a43874314..a21dc1af6723be80131a88ac289a7c8dbf00c3c9 100644
--- a/src/plugins/value/partitioning/trace_partitioning.mli
+++ b/src/plugins/value/partitioning/trace_partitioning.mli
@@ -20,8 +20,6 @@
(* *)
(**************************************************************************)
-open Bottom.Type
-
module Make
(Abstract : Abstractions.Eva)
(Kf : sig val kf: Cil_types.kernel_function end) :
@@ -59,7 +57,7 @@ sig
(* --- Accessors --- *)
val expanded : store -> (Partition.key * state) list
- val smashed : store -> state or_bottom
+ val smashed : store -> state Lattice_bounds.or_bottom
val contents : flow -> state list
val is_empty_store : store -> bool
val is_empty_flow : flow -> bool
diff --git a/src/plugins/value/utils/abstract.ml b/src/plugins/value/utils/abstract.ml
index 4fe15353218c9fdb8c59b69eb3dd9c2474c61dad..1b5be7c02b3367f62d1077fdaf654a2e5ce0cff3 100644
--- a/src/plugins/value/utils/abstract.ml
+++ b/src/plugins/value/utils/abstract.ml
@@ -89,6 +89,6 @@ module Domain = struct
val get_cvalue: (t -> Cvalue.Model.t) option
val get_cvalue_or_top: t -> Cvalue.Model.t
- val get_cvalue_or_bottom: t Bottom.or_bottom -> Cvalue.Model.t
+ val get_cvalue_or_bottom: t Lattice_bounds.or_bottom -> Cvalue.Model.t
end
end
diff --git a/src/plugins/value/utils/abstract.mli b/src/plugins/value/utils/abstract.mli
index 6ef4a4e9132c93783c5756dffb51acef1b6b8b46..087cae69ffcb7aed9c473009cd4b25e244b5a41c 100644
--- a/src/plugins/value/utils/abstract.mli
+++ b/src/plugins/value/utils/abstract.mli
@@ -113,6 +113,6 @@ module Domain : sig
(** Special accessors for the main cvalue domain. *)
val get_cvalue: (t -> Cvalue.Model.t) option
val get_cvalue_or_top: t -> Cvalue.Model.t
- val get_cvalue_or_bottom: t Bottom.or_bottom -> Cvalue.Model.t
+ val get_cvalue_or_bottom: t Lattice_bounds.or_bottom -> Cvalue.Model.t
end
end
diff --git a/src/plugins/value/utils/results.ml b/src/plugins/value/utils/results.ml
index 97c44c88b3e5cf9a7886f58b366796af3888d618..6e92b4373d7234f4919ff260b91e34f67b68df90 100644
--- a/src/plugins/value/utils/results.ml
+++ b/src/plugins/value/utils/results.ml
@@ -20,14 +20,7 @@
(* *)
(**************************************************************************)
-open Bottom.Type
-
-type 'a or_top_bottom = 'a Bottom.Top.or_top_bottom
-
-let (>>>-:) t f = match t with
- | `Top -> `Top
- | `Bottom -> `Bottom
- | `Value t -> `Value (f t)
+open Lattice_bounds
module Callstack = Value_types.Callstack
@@ -174,13 +167,15 @@ struct
let map_join : type c.
('a -> 'b) -> ('b -> 'b -> 'b) -> ('a, c) t -> 'b or_top_bottom =
fun map join ->
- let map' x = `Value (map x) in
- map_reduce default map' (Bottom.Top.join join)
+ let map' x = `Value (map x)
+ and join' = TopBottom.join (fun x y -> `Value (join x y)) in
+ map_reduce default map' join'
- let map_join' : type c. ('a -> 'b or_top_bottom) -> ('b -> 'b -> 'b) ->
+ let map_join' : type c. ('a -> [< 'b or_top_bottom]) -> ('b -> 'b -> 'b) ->
('a, c) t -> 'b or_top_bottom =
fun map join ->
- map_reduce default map (Bottom.Top.join join)
+ let join' = TopBottom.join (fun x y -> `Value (join x y)) in
+ map_reduce default map join'
end
@@ -191,6 +186,8 @@ type address
module Make () =
struct
+ open TopBottom.Operators
+
module A = (val Analysis.current_analyzer ())
module EvalTypes =
@@ -307,7 +304,7 @@ struct
let join = (@)
and extract state =
let r,_alarms = A.Eval.eval_function_exp exp state in
- r >>>-: List.map fst
+ r >>-: List.map fst
in
get req |> Response.map_join' extract join |> convert |>
Result.map (List.sort_uniq Kernel_function.compare)
@@ -315,8 +312,32 @@ struct
(* Conversion *)
+ let as_cvalue_or_uninitialized res =
+ match A.Val.get Main_values.CVal.key with
+ | None -> `Top
+ | Some get ->
+ let make_expr (x, _alarms) =
+ x >>-: fun (_valuation, v) ->
+ Cvalue.V_Or_Uninitialized.make ~initialized:true ~escaping:false (get v)
+ in
+ let make_lval (x, _alarms) =
+ let+ _valuation, v = x in
+ let Eval.{ v; initialized; escaping } = v in
+ let v =
+ match v with
+ | `Bottom -> Cvalue.V.bottom
+ | `Value v -> get v
+ in
+ Cvalue.V_Or_Uninitialized.make ~initialized ~escaping v
+ in
+ let join = Cvalue.V_Or_Uninitialized.join in
+ match res with
+ | LValue r -> Response.map_join' make_lval join r
+ | Value r -> Response.map_join' make_expr join r
+
let extract_value :
type c. (value, c) evaluation -> (A.Val.t or_bottom, c) Response.t =
+ let open Bottom.Operators in
function
| LValue r ->
let extract (x, _alarms) = x >>- (fun (_valuation,fv) -> fv.Eval.v) in
@@ -332,7 +353,7 @@ struct
| Some get ->
let join = Main_values.CVal.join in
let extract value =
- value >>>-: get
+ value >>-: get
in
extract_value res |> Response.map_join' extract join |> convert
@@ -341,7 +362,10 @@ struct
(A.Loc.location or_bottom, c) Response.t * Locations.access =
function
| Address (r, access) ->
- let extract (x, _alarms) = x >>-: (fun (_valuation,loc,_typ) -> loc) in
+ let extract (x, _alarms) =
+ let open Bottom.Operators in
+ let+ _valuation,loc,_typ = x in loc
+ in
Response.map extract r, access
let as_location res =
@@ -356,7 +380,7 @@ struct
assert (Int_Base.equal loc2.size size);
make_loc loc size
and extract loc =
- loc >>>-: get >>>-: Precise_locs.imprecise_location
+ loc >>-: get >>-: Precise_locs.imprecise_location
in
extract_loc res |> fst |> Response.map_join' extract join |> convert
@@ -368,7 +392,8 @@ struct
let response_loc, access = extract_loc res in
let join = Locations.Zone.join
and extract loc =
- loc >>>-: get >>>-: Precise_locs.enumerate_valid_bits access
+ loc >>-: get >>-:
+ Precise_locs.enumerate_valid_bits access
in
response_loc |> Response.map_join' extract join |> convert
@@ -377,7 +402,7 @@ struct
| LValue r ->
let join = (&&)
and extract (x, _alarms) =
- x >>>-: (fun (_valuation,fv) -> fv.Eval.initialized)
+ x >>-: (fun (_valuation,fv) -> fv.Eval.initialized)
in
begin match Response.map_join' extract join r with
| `Bottom | `Top -> false
@@ -539,6 +564,13 @@ let callee stmt =
(* Value conversion *)
+let as_cvalue_or_uninitialized (Value evaluation) =
+ let module E = (val evaluation : Evaluation) in
+ match E.as_cvalue_or_uninitialized E.v with
+ | `Value v -> v
+ | `Bottom -> Cvalue.V_Or_Uninitialized.bottom
+ | `Top -> Cvalue.V_Or_Uninitialized.top
+
let as_cvalue_result (Value evaluation) =
let module E = (val evaluation : Evaluation) in
E.as_cvalue E.v
@@ -650,6 +682,7 @@ let is_reachable_kinstr kinstr =
let module M = Make () in
M.is_reachable (before_kinstr kinstr)
+let condition_truth_value = Db.Value.condition_truth_value
(* Callers / callsites *)
diff --git a/src/plugins/value/utils/results.mli b/src/plugins/value/utils/results.mli
index 074e09d049bdafac88b1ddb0f40400a4b743865f..a35f29f8d30cc08b81ea9531ead9184e34b242df 100644
--- a/src/plugins/value/utils/results.mli
+++ b/src/plugins/value/utils/results.mli
@@ -225,6 +225,10 @@ val as_cvalue : value evaluation -> Cvalue.V.t
(** Converts the value into a Cvalue abstraction. *)
val as_cvalue_result : value evaluation -> Cvalue.V.t result
+(** Converts the value into a Cvalue abstraction with 'undefined' and 'escaping
+ addresses' flags. *)
+val as_cvalue_or_uninitialized : value evaluation -> Cvalue.V_Or_Uninitialized.t
+
(** Converts into a C location abstraction. *)
val as_location : address evaluation -> Locations.location result
@@ -271,6 +275,10 @@ val is_reachable : Cil_types.stmt -> bool
the main function has been analyzed for [Kglobal]. *)
val is_reachable_kinstr : Cil_types.kinstr -> bool
+val condition_truth_value: Cil_types.stmt -> bool * bool
+(** Provided [stmt] is an 'if' construct, [fst (condition_truth_value stmt)]
+ (resp. snd) is true if and only if the condition of the 'if' has been
+ evaluated to true (resp. false) at least once during the analysis. *)
(*** Callers / Callees / Callsites *)
diff --git a/src/plugins/value/utils/unit_tests.ml b/src/plugins/value/utils/unit_tests.ml
index 78f38064bd355e254d02e8a9b39fe6a24173fdac..bfa09e7c518d259f23e17d5da0c5b3a5a057356c 100644
--- a/src/plugins/value/utils/unit_tests.ml
+++ b/src/plugins/value/utils/unit_tests.ml
@@ -21,6 +21,7 @@
(**************************************************************************)
open Cil_types
+open Lattice_bounds
(* If true, prints each operation performed for the tests. Otherwise, only
prints wrong operations. *)
diff --git a/src/plugins/value/values/cvalue_forward.ml b/src/plugins/value/values/cvalue_forward.ml
index b1a91b8758b3ce1425776f7ae3cec963bcca1c49..550be0376e2a9b0f0a7ad39175b9e3de699d1ad9 100644
--- a/src/plugins/value/values/cvalue_forward.ml
+++ b/src/plugins/value/values/cvalue_forward.ml
@@ -23,6 +23,7 @@
open Cvalue
open Cil_types
open Abstract_value
+open Lattice_bounds
(* --------------------------------------------------------------------------
Comparison
diff --git a/src/plugins/value/values/numerors/numerors_float.ml b/src/plugins/value/values/numerors/numerors_float.ml
index 040286912586bba80c7f3311c6146c5ff00e75f0..ae8c540a2880f5df43bde964c58ba5089e245a44 100644
--- a/src/plugins/value/values/numerors/numerors_float.ml
+++ b/src/plugins/value/values/numerors/numerors_float.ml
@@ -75,8 +75,8 @@ let change_prec ?(rnd = Mpfr.Near) prec (p, x) =
calling the unary function f on an input of type t *)
let unary_mpfrf f =
fun ?(rnd = Rounding.Near) ?(prec = P.Real) x ->
- prec >>- fun () ->
- f (change_prec prec x) (rounding rnd)
+ prec >>- fun () ->
+ f (change_prec prec x) (rounding rnd)
(* Returns a function which apply the rounding of its optionnal parameter rnd
and change the precision according to its optionnal parameter prec before
diff --git a/src/plugins/value/values/numerors/numerors_interval.ml b/src/plugins/value/values/numerors/numerors_interval.ml
index ded1e62a5ae622753371d86bda765221ad9f8ca4..9858daa14af736aab130686424b9fd01bd78bf9e 100644
--- a/src/plugins/value/values/numerors/numerors_interval.ml
+++ b/src/plugins/value/values/numerors/numerors_interval.ml
@@ -462,7 +462,7 @@ let backward_op (op : operator) fnan ?(prec = Precisions.Real) value result () =
let x = op ~rnd:Rounding.Near ~prec xres yval in
let y = op ~rnd:Rounding.Near ~prec yres xval in
`Value (make ~nan:false x y)
- in Bottom.join join reduced_for_nan reduced_for_finite
+ in Lattice_bounds.Bottom.join join reduced_for_nan reduced_for_finite
[@@inline]
let synthetize left right =
diff --git a/src/plugins/value/values/numerors/numerors_interval.mli b/src/plugins/value/values/numerors/numerors_interval.mli
index 8ec3edb9281a04cb0b8df6dbb2ae70e42841fb75..395d5c54fe829e2e1a59cd8b32a2690ac61113fe 100644
--- a/src/plugins/value/values/numerors/numerors_interval.mli
+++ b/src/plugins/value/values/numerors/numerors_interval.mli
@@ -175,17 +175,17 @@ val exp : ?prec:Precisions.t -> t -> t
(** These functions perform backward propagation on intervals using the
precision <prec> *)
-val backward_le : ?prec:Precisions.t -> t -> t -> t Bottom.or_bottom
-val backward_lt : ?prec:Precisions.t -> t -> t -> t Bottom.or_bottom
-val backward_ge : ?prec:Precisions.t -> t -> t -> t Bottom.or_bottom
-val backward_gt : ?prec:Precisions.t -> t -> t -> t Bottom.or_bottom
+val backward_le : ?prec:Precisions.t -> t -> t -> t Lattice_bounds.or_bottom
+val backward_lt : ?prec:Precisions.t -> t -> t -> t Lattice_bounds.or_bottom
+val backward_ge : ?prec:Precisions.t -> t -> t -> t Lattice_bounds.or_bottom
+val backward_gt : ?prec:Precisions.t -> t -> t -> t Lattice_bounds.or_bottom
(** These functions perform backward propagation for arithmetic *)
val backward_add : ?prec:Precisions.t -> left:t -> right:t ->
- result:t -> unit -> (t * t) Bottom.or_bottom
+ result:t -> unit -> (t * t) Lattice_bounds.or_bottom
val backward_sub : ?prec:Precisions.t -> left:t -> right:t ->
- result:t -> unit -> (t * t) Bottom.or_bottom
+ result:t -> unit -> (t * t) Lattice_bounds.or_bottom
val backward_mul : ?prec:Precisions.t -> left:t -> right:t ->
- result:t -> unit -> (t * t) Bottom.or_bottom
+ result:t -> unit -> (t * t) Lattice_bounds.or_bottom
val backward_div : ?prec:Precisions.t -> left:t -> right:t ->
- result:t -> unit -> (t * t) Bottom.or_bottom
+ result:t -> unit -> (t * t) Lattice_bounds.or_bottom
diff --git a/src/plugins/value_types/cvalue.ml b/src/plugins/value_types/cvalue.ml
index 6a236513097a604c4fe7822cde08b948cc6370c5..61fc238db742832bc5ad2a2a42e13f2acd0cfbb8 100644
--- a/src/plugins/value_types/cvalue.ml
+++ b/src/plugins/value_types/cvalue.ml
@@ -259,7 +259,7 @@ module V = struct
(** Comparisons *)
- open Bottom.Type
+ open Lattice_bounds.Bottom.Operators
let backward_mult_int_left ~right ~result =
try
diff --git a/src/plugins/value_types/cvalue.mli b/src/plugins/value_types/cvalue.mli
index af06a2c7ceddc71b8fd41eaa14bb635f8f799209..304c4f9c5222302a45ab44e335eddbc83216aeff 100644
--- a/src/plugins/value_types/cvalue.mli
+++ b/src/plugins/value_types/cvalue.mli
@@ -81,7 +81,7 @@ module V : sig
val of_char : char -> t
val of_int64: int64 -> t
- val backward_mult_int_left: right:t -> result:t -> t option Bottom.or_bottom
+ val backward_mult_int_left: right:t -> result:t -> t option Lattice_bounds.or_bottom
val backward_comp_int_left: Comp.t -> t -> t -> t
val backward_comp_float_left_true: Comp.t -> Fval.kind -> t -> t -> t
@@ -241,15 +241,15 @@ module V_Offsetmap: sig
with type v = V_Or_Uninitialized.t
and type widen_hint = V_Or_Uninitialized.numerical_widen_hint
- val narrow: t -> t -> t Bottom.Type.or_bottom
- val narrow_reinterpret: t -> t -> t Bottom.Type.or_bottom
+ val narrow: t -> t -> t Lattice_bounds.or_bottom
+ val narrow_reinterpret: t -> t -> t Lattice_bounds.or_bottom
(** See the corresponding functions in {!Offsetmap_sig}. *)
end
(** Values bound by default to a variable. *)
module Default_offsetmap: sig
- val default_offsetmap : Base.t -> V_Offsetmap.t Bottom.or_bottom
+ val default_offsetmap : Base.t -> V_Offsetmap.t Lattice_bounds.or_bottom
end
(** Memories. They are maps from bases to memory slices *)
diff --git a/src/plugins/variadic/tests/defined/oracle/simple.res.oracle b/src/plugins/variadic/tests/defined/oracle/simple.0.res.oracle
similarity index 88%
rename from src/plugins/variadic/tests/defined/oracle/simple.res.oracle
rename to src/plugins/variadic/tests/defined/oracle/simple.0.res.oracle
index 66ca05b979890b76bcd32c42a58475e1d5c7a2d1..d682b185f8e6766bf5acd7d25d211ac7cc35ba8d 100644
--- a/src/plugins/variadic/tests/defined/oracle/simple.res.oracle
+++ b/src/plugins/variadic/tests/defined/oracle/simple.0.res.oracle
@@ -1,5 +1,5 @@
-[variadic] simple.c:4: Declaration of variadic function sum.
-[variadic] simple.c:19: Generic translation of call to variadic function.
+[variadic] simple.c:9: Declaration of variadic function sum.
+[variadic] simple.c:24: Generic translation of call to variadic function.
[eva] Analyzing a complete application starting at main
[eva] Computing initial state
[eva] Initial state computed
diff --git a/src/plugins/variadic/tests/defined/oracle/simple.1.res.oracle b/src/plugins/variadic/tests/defined/oracle/simple.1.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..7b5221cf83de9df7862c7d97e175b5b68ddb6eba
--- /dev/null
+++ b/src/plugins/variadic/tests/defined/oracle/simple.1.res.oracle
@@ -0,0 +1,52 @@
+[variadic] simple.c:9: Declaration of variadic function sum.
+[variadic] simple.c:24: Generic translation of call to variadic function.
+[eva] Analyzing a complete application starting at main
+[eva] Computing initial state
+[eva] Initial state computed
+[eva] done for function main
+[eva] ====== VALUES COMPUTED ======
+[eva:final-states] Values at end of function sum:
+ ret ∈ {42}
+ i ∈ {5}
+ list ∈ {{ &__va_args[5] }}
+[eva:final-states] Values at end of function main:
+
+/* Generated by Frama-C */
+typedef void * const *__gnuc_va_list;
+typedef __gnuc_va_list va_list;
+/*@ requires n ≥ 0; */
+int sum(int n, void * const *__va_params)
+{
+ va_list list;
+ int ret = 0;
+ int i = 0;
+ list = __va_params;
+ while (i < n) {
+ {
+ int tmp;
+ tmp = *((int *)*list);
+ list ++;
+ ret += tmp;
+ }
+ i ++;
+ }
+ return ret;
+}
+
+int main(void)
+{
+ int tmp;
+ {
+ int __va_arg0 = 6;
+ int __va_arg1 = 9;
+ int __va_arg2 = 14;
+ int __va_arg3 = 12;
+ int __va_arg4 = 1;
+ void *__va_args[5] =
+ {& __va_arg0, & __va_arg1, & __va_arg2, & __va_arg3, & __va_arg4};
+ tmp = sum(5,(void * const *)(__va_args));
+ }
+ return tmp;
+}
+
+
diff --git a/src/plugins/variadic/tests/defined/simple.c b/src/plugins/variadic/tests/defined/simple.c
index 132f956fcb98f2b1bbbccd6aa1e1a06c1994d390..b2346a3f09cadb78412a84f82bd1deca74232c59 100644
--- a/src/plugins/variadic/tests/defined/simple.c
+++ b/src/plugins/variadic/tests/defined/simple.c
@@ -1,3 +1,8 @@
+/* run.config
+STDOPT:
+STDOPT: #"-no-frama-c-stdlib -no-pp-annot"
+*/
+
#include <stdarg.h>
/*@ requires n>= 0; */
diff --git a/src/plugins/variadic/tests/known/oracle/openat.res.oracle b/src/plugins/variadic/tests/known/oracle/openat.res.oracle
index 8773e0e6c29669613ecb4e1374358be7111482a7..30a3448710c4d06aee7faf364f4c40d6b0b32137 100644
--- a/src/plugins/variadic/tests/known/oracle/openat.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/openat.res.oracle
@@ -45,7 +45,7 @@ int main(void)
{
int __retres;
int flag = 0;
- mode_t mode1 = (unsigned int)0;
+ mode_t mode1 = (mode_t)0;
int mode2 = 0;
char *file = (char *)"file";
openat(0,(char const *)file,flag,mode1); /* __va_openat_mode_t */
diff --git a/src/plugins/variadic/tests/known/oracle/printf.res.oracle b/src/plugins/variadic/tests/known/oracle/printf.res.oracle
index 84e3d2e39121ae24598a648e7503f255a9f832f9..1dbb2458c3ded4562958a33ca52c675718794048 100644
--- a/src/plugins/variadic/tests/known/oracle/printf.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/printf.res.oracle
@@ -617,20 +617,20 @@ int main(void)
size_t z;
ptrdiff_t t;
char *string = (char *)"Hello world !\n";
- wchar_t *wstring = (wchar_t *)L"H" "e" "l" "l" "o" " " "w" "o" "r" "l" "d"
- " " "!" "\\n" ;
+ wchar_t *wstring = L"H" "e" "l" "l" "o" " " "w" "o" "r" "l" "d" " " "!"
+ "\\n" ;
char c = (char)'4';
unsigned char uhh = (unsigned char)42;
unsigned short uh = (unsigned short)42;
unsigned int ui = (unsigned int)42;
unsigned long ul = (unsigned long)42;
unsigned long long ull = (unsigned long long)42;
- uintmax_t uj = (unsigned long long)42;
+ uintmax_t uj = (uintmax_t)42;
double f = (double)42.0f;
long double L = 42.0l;
uint64_t u64 = 42ul;
- int8_t i8 = (signed char)42;
- uint_least64_t uleast64 = (unsigned long)42u;
+ int8_t i8 = (int8_t)42;
+ uint_least64_t uleast64 = (uint_least64_t)42u;
int_fast32_t ifast32 = 42;
printf("Hello world !\n"); /* printf_va_1 */
printf("%s%n",string,& i); /* printf_va_2 */
diff --git a/src/plugins/variadic/tests/known/oracle/printf_garbled_mix.res.oracle b/src/plugins/variadic/tests/known/oracle/printf_garbled_mix.res.oracle
index 50337ea49e60c39f2f3944e67383e15c78075bf5..bea7ff5f3c9a6b7d349387951d468a7bdde94cd7 100644
--- a/src/plugins/variadic/tests/known/oracle/printf_garbled_mix.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/printf_garbled_mix.res.oracle
@@ -45,6 +45,7 @@
#include "errno.h"
#include "stdarg.h"
#include "stddef.h"
+#include "stdint.h"
#include "stdio.h"
/*@ assigns \result;
assigns \result \from \nothing; */
@@ -66,7 +67,7 @@ int printf_va_1(char const * restrict format, int param0);
void main(void)
{
int a[2] = {1, 2};
- int *b = (int *)((unsigned long)(a) * (unsigned long)2);
+ int *b = (int *)((uintptr_t)(a) * (uintptr_t)2);
/*@ assert Eva: pointer_downcast: (unsigned long)b ≤ 2147483647; */
int nb_printed = printf_va_1("%d",(int)b);
Frama_C_show_each_nb_printed(nb_printed);
diff --git a/src/plugins/variadic/tests/known/oracle/printf_wrong_pointers.res.oracle b/src/plugins/variadic/tests/known/oracle/printf_wrong_pointers.res.oracle
index 4a0a2456aba900a0ad64b189a0c91f26419f64bc..71e13f3012fb292ad49009070d7409db1037a452 100644
--- a/src/plugins/variadic/tests/known/oracle/printf_wrong_pointers.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/printf_wrong_pointers.res.oracle
@@ -139,7 +139,7 @@ int main(void)
short tt;
unsigned int ui = (unsigned int)42;
char *string = (char *)"foo";
- wchar_t *wstring = (wchar_t *)L"b" "a" "r" ;
+ wchar_t *wstring = L"b" "a" "r" ;
int volatile nondet = 0;
switch (nondet) {
case 0: printf("%n",(int *)(& tt)); /* printf_va_1 */
diff --git a/src/plugins/variadic/tests/known/oracle/snprintf.res.oracle b/src/plugins/variadic/tests/known/oracle/snprintf.res.oracle
index 6944f603f384205f5924bc38d699ad13c6ac5905..4e8e4cf6cbcbe1ba07bfbe7c83d84bf3e4bc27ff 100644
--- a/src/plugins/variadic/tests/known/oracle/snprintf.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/snprintf.res.oracle
@@ -86,7 +86,7 @@ int main(void)
int __retres;
char data[100];
size_t tmp_0;
- memset((void *)(data),'A',(unsigned long)99);
+ memset((void *)(data),'A',(size_t)99);
data[99] = (char)0;
char dest[50] = {(char)'\000'};
if (nondet) {
diff --git a/src/plugins/variadic/tests/known/oracle/swprintf.res.oracle b/src/plugins/variadic/tests/known/oracle/swprintf.res.oracle
index 4dac7cf95a4578226fc699c143d03aa2112aa2a0..4976f7d14946dfc6267dd2bf9e232e6baf329d19 100644
--- a/src/plugins/variadic/tests/known/oracle/swprintf.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/swprintf.res.oracle
@@ -99,7 +99,7 @@ int main(void)
int __retres;
wchar_t data[100];
size_t tmp_0;
- wmemset(data,65,(unsigned long)99);
+ wmemset(data,65,(size_t)99);
data[99] = 0;
wchar_t dest[50] = {0};
if (nondet) {
diff --git a/src/plugins/variadic/tests/known/oracle/wchar.res.oracle b/src/plugins/variadic/tests/known/oracle/wchar.res.oracle
index fa8afa9045de0669cb5266e78fc502c210d0993e..64c5c7034588d61edc26dc55f786fe160552a208 100644
--- a/src/plugins/variadic/tests/known/oracle/wchar.res.oracle
+++ b/src/plugins/variadic/tests/known/oracle/wchar.res.oracle
@@ -264,9 +264,9 @@ int main(void)
wprintf((wchar_t const *)L"%" "2" "." "1" "f" " " "%" "+" "." "0" "e" " "
"%" "E" "\\n" ,42.0,42.0,42.0); /* wprintf_va_4 */
wprintf((wchar_t const *)L"%" "*" "d" " " "\\n" ,4,2); /* wprintf_va_5 */
- wprintf((wchar_t const *)L"%" "l" "s" " " "\\n" ,(wchar_t *)L"4" "2" ); /* wprintf_va_6 */
- swprintf(wstring,(unsigned long)0x100,(wchar_t const *)L"%" "s" " " "=" " "
- "%" "d" ,(char *)L"4" "2" " " "+" " " "4" "2" ,42 + 42); /* swprintf_va_1 */
+ wprintf((wchar_t const *)L"%" "l" "s" " " "\\n" ,L"4" "2" ); /* wprintf_va_6 */
+ swprintf(wstring,(size_t)0x100,(wchar_t const *)L"%" "s" " " "=" " " "%"
+ "d" ,(char *)L"4" "2" " " "+" " " "4" "2" ,42 + 42); /* swprintf_va_1 */
wscanf((wchar_t const *)L"%" "l" "s" ,wstring); /* wscanf_va_1 */
wscanf((wchar_t const *)L"%" "d" " " "%" "d" ,& i,& j); /* wscanf_va_2 */
swscanf((wchar_t const *)(input),(wchar_t const *)L"%" "l" "s" " " "%" "*"
diff --git a/tests/builtins/oracle/allocated.0.res.oracle b/tests/builtins/oracle/allocated.0.res.oracle
index 78bb3d8a95aaf2d0c061cd1d62396def409a63f0..25fe2055044456adf9034cd035c16e7f9f692ce9 100644
--- a/tests/builtins/oracle/allocated.0.res.oracle
+++ b/tests/builtins/oracle/allocated.0.res.oracle
@@ -16,7 +16,7 @@
[eva] allocated.c:31: Call to builtin free
[eva] allocated.c:31: function free: precondition 'freeable' got status valid.
[eva:malloc] allocated.c:31: strong free on bases: {__malloc_main_l25}
-[eva] allocated.c:32: Frama_C_show_each_p_after_free: Bottom
+[eva] allocated.c:32: Frama_C_show_each_p_after_free: ⊥
[eva] allocated.c:36: Call to builtin malloc
[eva] allocated.c:36: allocating variable __malloc_main_l36
[eva] allocated.c:36: assertion got status valid.
@@ -149,7 +149,7 @@
[eva] allocated.c:120: Call to builtin malloc
[eva] allocated.c:120: allocating variable __malloc_main_l120
[eva] allocated.c:120: Frama_C_show_each: {{ &__malloc_main_l120 }}
-[eva] allocated.c:123: Frama_C_show_each: Bottom
+[eva] allocated.c:123: Frama_C_show_each: ⊥
[eva] allocated.c:125: Call to builtin free
[eva] allocated.c:125: function free: precondition 'freeable' got status valid.
[eva:malloc] allocated.c:125: strong free on bases: {__malloc_main_l120}
diff --git a/tests/builtins/oracle/allocated.1.res.oracle b/tests/builtins/oracle/allocated.1.res.oracle
index ebfce7b0022a825db7b9d5c25a7faa4881e77c96..a944c57c4e6c64a80c7f9f266b7ee9c6ba157289 100644
--- a/tests/builtins/oracle/allocated.1.res.oracle
+++ b/tests/builtins/oracle/allocated.1.res.oracle
@@ -16,7 +16,7 @@
[eva] allocated.c:31: Call to builtin free
[eva] allocated.c:31: function free: precondition 'freeable' got status valid.
[eva:malloc] allocated.c:31: strong free on bases: {__malloc_main_l25}
-[eva] allocated.c:32: Frama_C_show_each_p_after_free: Bottom
+[eva] allocated.c:32: Frama_C_show_each_p_after_free: ⊥
[eva] allocated.c:36: Call to builtin malloc
[eva] allocated.c:36: allocating variable __malloc_main_l36
[eva] allocated.c:36: assertion got status valid.
@@ -636,7 +636,7 @@
[eva] allocated.c:120: Call to builtin malloc
[eva] allocated.c:120: allocating variable __malloc_main_l120
[eva] allocated.c:120: Frama_C_show_each: {{ &__malloc_main_l120 }}
-[eva] allocated.c:123: Frama_C_show_each: Bottom
+[eva] allocated.c:123: Frama_C_show_each: ⊥
[eva] allocated.c:125: Call to builtin free
[eva] allocated.c:125: function free: precondition 'freeable' got status valid.
[eva:malloc] allocated.c:125: strong free on bases: {__malloc_main_l120}
diff --git a/tests/builtins/oracle/memcpy.res.oracle b/tests/builtins/oracle/memcpy.res.oracle
index 9d9436836ec6a35e0df4dc837eae0c634d9def9f..7b86d44704aec8a4d451079e449bfd9320966bd0 100644
--- a/tests/builtins/oracle/memcpy.res.oracle
+++ b/tests/builtins/oracle/memcpy.res.oracle
@@ -364,7 +364,6 @@
[eva] Done for function copy_0
[eva] Recording results for main_all
[from] Computing for function main_all
-[from] Non-terminating function main_all (no dependencies)
[from] Done for function main_all
[eva] done for function main_all
[scope:rm_asserts] removing 1 assertion(s)
diff --git a/tests/builtins/oracle/memset.res.oracle b/tests/builtins/oracle/memset.res.oracle
index 8f47613e495b74239590e6ef660d7a6b57623633..0270d4fc6dacf7c575dd0f15f931aa593bb40b62 100644
--- a/tests/builtins/oracle/memset.res.oracle
+++ b/tests/builtins/oracle/memset.res.oracle
@@ -39,8 +39,7 @@
[eva:alarm] memset.c:35: Warning:
function memset: precondition 'valid_s' got status unknown.
[eva:imprecision] memset.c:35:
- Call to builtin precise_memset(({{ (void *)&t3[10] }},{17},
- {{ (unsigned int)&t1 }})) failed; size is imprecise
+ Call to builtin precise_memset(({{ (void *)&t3[10] }},{17},{{ (size_t)&t1 }})) failed; size is imprecise
[eva] memset.c:38: Call to builtin memset
[eva:alarm] memset.c:38: Warning:
function memset: precondition 'valid_s' got status invalid.
diff --git a/tests/cil/oracle/cpu_a.res.oracle b/tests/cil/oracle/cpu_a.res.oracle
index 8733181a2a93e559db52dabfeb270240dafdc5ed..6623ed53971969354ea97602ac3e635ed9f2e213 100644
--- a/tests/cil/oracle/cpu_a.res.oracle
+++ b/tests/cil/oracle/cpu_a.res.oracle
@@ -5,7 +5,7 @@ typedef unsigned short DWORD;
DWORD f(void)
{
DWORD __retres;
- __retres = (unsigned short)0;
+ __retres = (DWORD)0;
return __retres;
}
diff --git a/tests/cil/oracle/cpu_b.res.oracle b/tests/cil/oracle/cpu_b.res.oracle
index cbc3f3049ce04b475caa86268a79758561145e9a..1567947463f1244480390e2cb5947ab91adeda15 100644
--- a/tests/cil/oracle/cpu_b.res.oracle
+++ b/tests/cil/oracle/cpu_b.res.oracle
@@ -14,7 +14,7 @@ DWORD g(void)
DWORD f(void)
{
DWORD __retres;
- __retres = (unsigned short)0;
+ __retres = (DWORD)0;
return __retres;
}
diff --git a/tests/float/oracle/conv.res.oracle b/tests/float/oracle/conv.res.oracle
index daa38ec7a842f43d823967175d5234eb55af4312..dea66da8e28d30a16b7a97441834f0ffc96b50ff 100644
--- a/tests/float/oracle/conv.res.oracle
+++ b/tests/float/oracle/conv.res.oracle
@@ -38,16 +38,16 @@
[eva] conv.i:69: Frama_C_show_each: [4.94065645841e-322 .. 9.22442153475e+159]
[eva] conv.i:73: Frama_C_show_each: {1.79769313486e+308}
[eva] conv.i:74: assertion got status valid.
-[eva] conv.i:77: Frama_C_show_each: Bottom
-[eva] conv.i:80: Frama_C_show_each: Bottom
+[eva] conv.i:77: Frama_C_show_each: ⊥
+[eva] conv.i:80: Frama_C_show_each: ⊥
[eva] conv.i:84: Frama_C_show_each: {-1.79769313486e+308}
[eva] conv.i:85: assertion got status valid.
-[eva] conv.i:88: Frama_C_show_each: Bottom
+[eva] conv.i:88: Frama_C_show_each: ⊥
[eva] conv.i:91: Frama_C_show_each: [0. .. 4.94065645841e-324]
[eva:alarm] conv.i:94: Warning: assertion got status unknown.
-[eva] conv.i:95: Frama_C_show_each: Bottom
+[eva] conv.i:95: Frama_C_show_each: ⊥
[eva] conv.i:98: Frama_C_show_each: {0}
-[eva] conv.i:101: Frama_C_show_each: Bottom
+[eva] conv.i:101: Frama_C_show_each: ⊥
[eva] Recording results for main2
[eva] Done for function main2
[eva] Recording results for main
diff --git a/tests/libc/oracle/argz_c.res.oracle b/tests/libc/oracle/argz_c.res.oracle
index b3215f8143a0b0eef5e8187b778046f4449036f8..24cc544eb9131c56c2d2c6ad5cc6bdb61ac14e73 100644
--- a/tests/libc/oracle/argz_c.res.oracle
+++ b/tests/libc/oracle/argz_c.res.oracle
@@ -276,6 +276,7 @@
[eva] Done for function strstr
[eva] computing for function strndup <- argz_replace <- main.
Called from FRAMAC_SHARE/libc/argz.c:79.
+[eva:loop-unroll:auto] FRAMAC_SHARE/libc/string.c:333: Automatic loop unrolling.
[eva] FRAMAC_SHARE/libc/string.c:336: Call to builtin malloc
[eva] FRAMAC_SHARE/libc/string.c:336: allocating variable __malloc_strndup_l336
[eva] FRAMAC_SHARE/libc/string.c:341: Call to builtin memcpy
@@ -295,6 +296,7 @@
[eva] FRAMAC_SHARE/libc/argz.c:49: allocating variable __realloc_str_append_l49
[eva] computing for function mempcpy <- str_append <- argz_replace <- main.
Called from FRAMAC_SHARE/libc/argz.c:52.
+[eva:loop-unroll:auto] FRAMAC_SHARE/libc/string.c:54: Automatic loop unrolling.
[eva] Recording results for mempcpy
[eva] Done for function mempcpy
[eva] FRAMAC_SHARE/libc/argz.c:56: Call to builtin free
diff --git a/tests/libc/oracle/fc_libc.0.res.oracle b/tests/libc/oracle/fc_libc.0.res.oracle
index 4cc020e5cf67e2cd14bf36a7352becb045d90275..64302fc49a200a36a4598d1a0179f3b0f3eda298 100644
--- a/tests/libc/oracle/fc_libc.0.res.oracle
+++ b/tests/libc/oracle/fc_libc.0.res.oracle
@@ -14,8 +14,6 @@
[eva] ====== VALUES COMPUTED ======
[eva:final-states] Values at end of function main:
-[kernel] FRAMAC_SHARE/libc/sys/socket.h:451: Warning:
- clause with '\initialized' must contain name 'initialization'
/* Generated by Frama-C */
#include "__fc_builtin.c"
#include "__fc_builtin.h"
diff --git a/tests/libc/oracle/fc_libc.1.res.oracle b/tests/libc/oracle/fc_libc.1.res.oracle
index db63ecd0f20e9ca69918bc45f98ea12f4726c857..6ba53d2036b480268f8f925ee06e00879500715d 100644
--- a/tests/libc/oracle/fc_libc.1.res.oracle
+++ b/tests/libc/oracle/fc_libc.1.res.oracle
@@ -534,10 +534,10 @@ void Frama_C_make_unknown(char *p, size_t l)
{
Frama_C_update_entropy();
{
- size_t i = (unsigned int)0;
+ size_t i = (size_t)0;
while (i < l) {
*(p + i) = (char)Frama_C_entropy_source;
- i += (size_t)1;
+ i ++;
}
}
return;
@@ -995,7 +995,7 @@ axiomatic WcsChr {
∀ wchar_t *wcs;
∀ ℤ wc;
wcschr(wcs, wc) ≡ \true ⇔
- (∃ ℤ i; 0 ≤ i ≤ wcslen(wcs) ∧ *(wcs + i) ≡ (int)wc);
+ (∃ ℤ i; 0 ≤ i ≤ wcslen(wcs) ∧ *(wcs + i) ≡ (wchar_t)wc);
}
*/
@@ -2096,7 +2096,7 @@ void argz_stringify(char *argz, size_t len, int sep)
argz += part_len;
len -= part_len;
tmp_0 = len;
- len -= (size_t)1;
+ len --;
;
if (tmp_0 <= (size_t)1) break;
tmp_1 = argz;
@@ -2136,7 +2136,7 @@ error_t argz_replace(char **argz, size_t *argz_len, char const *str,
char *src = *argz;
size_t src_len = *argz_len;
char *dst = (char *)0;
- size_t dst_len = (unsigned int)0;
+ size_t dst_len = (size_t)0;
int delayed_copy = 1;
size_t str_len = strlen(str);
size_t with_len = strlen(with);
@@ -2150,7 +2150,7 @@ error_t argz_replace(char **argz, size_t *argz_len, char const *str,
char *match = strstr((char const *)arg,str);
if (match) {
char *from = match + str_len;
- size_t to_len = (unsigned int)(match - arg);
+ size_t to_len = (size_t)(match - arg);
char *to = strndup((char const *)arg,to_len);
while (1) {
if (to) {
@@ -2162,7 +2162,7 @@ error_t argz_replace(char **argz, size_t *argz_len, char const *str,
match = strstr((char const *)from,str);
if (match) {
str_append(& to,& to_len,(char const *)from,
- (unsigned int)(match - from));
+ (size_t)(match - from));
from = match + str_len;
}
else {
@@ -2178,7 +2178,7 @@ error_t argz_replace(char **argz, size_t *argz_len, char const *str,
if (delayed_copy) {
if (arg > src) er = argz_append(& dst,& dst_len,
(char const *)src,
- (unsigned int)(arg - src));
+ (size_t)(arg - src));
delayed_copy = 0;
}
if (! er) er = argz_add(& dst,& dst_len,(char const *)to);
@@ -2341,8 +2341,8 @@ error_t argz_create_sep(char const *string, int delim, char **argz,
wp ++;
*tmp_1 = (char)'\000';
}
- else nlen -= (size_t)1;
- else nlen -= (size_t)1;
+ else nlen --;
+ else nlen --;
else {
char *tmp_2;
tmp_2 = wp;
@@ -2357,13 +2357,13 @@ error_t argz_create_sep(char const *string, int delim, char **argz,
if (nlen == (size_t)0) {
free((void *)*argz);
*argz = (char *)0;
- *len = (unsigned int)0;
+ *len = (size_t)0;
}
*len = nlen;
}
else {
*argz = (char *)0;
- *len = (unsigned int)0;
+ *len = (size_t)0;
}
__retres = 0;
return_label: return __retres;
@@ -2375,7 +2375,7 @@ error_t argz_create(char * const *argv, char **argz, size_t *len)
int argc;
char * const *ap;
char *p;
- size_t tlen = (unsigned int)0;
+ size_t tlen = (size_t)0;
argc = 0;
while (*(argv + argc) != (char *)0) {
size_t tmp;
@@ -2405,12 +2405,12 @@ error_t argz_create(char * const *argv, char **argz, size_t *len)
size_t argz_count(char const *argz, size_t len)
{
- size_t count = (unsigned int)0;
+ size_t count = (size_t)0;
while (len > (size_t)0) {
size_t part_len = strlen(argz);
argz += part_len + (size_t)1;
len -= part_len + (size_t)1;
- count += (size_t)1;
+ count ++;
}
return count;
}
@@ -2474,8 +2474,8 @@ error_t argz_add_sep(char **argz, size_t *argz_len, char const *string,
wp ++;
*tmp_1 = (char)'\000';
}
- else nlen -= (size_t)1;
- else nlen -= (size_t)1;
+ else nlen --;
+ else nlen --;
else {
char *tmp_2;
tmp_2 = wp;
@@ -3180,6 +3180,16 @@ extern uid_t getuid(void);
*/
extern int isatty(int fd);
+/*@ requires valid_path: valid_read_string(path1);
+ requires valid_path: valid_read_string(path2);
+ ensures result_ok_or_error: \result ≡ 0 ∨ \result ≡ -1;
+ assigns \result;
+ assigns \result
+ \from (indirect: *(path1 + (0 .. strlen{Old}(path1)))),
+ (indirect: *(path2 + (0 .. strlen{Old}(path2))));
+ */
+extern int link(char const *path1, char const *path2);
+
/*@ requires valid_fd: 0 ≤ fd < 1024;
requires valid_whence: whence ≡ 0 ∨ whence ≡ 1 ∨ whence ≡ 2;
ensures result_error_or_offset: \result ≡ -1 ∨ 0 ≤ \result;
@@ -3300,7 +3310,7 @@ extern char *ttyname(int fildes);
/*@ requires valid_string_path: valid_read_string(path);
ensures result_ok_or_error: \result ≡ 0 ∨ \result ≡ -1;
assigns \result;
- assigns \result \from *(path + (0 ..));
+ assigns \result \from (indirect: *(path + (0 .. strlen{Old}(path))));
*/
extern int unlink(char const *path);
@@ -3462,9 +3472,9 @@ int glob(char const *pattern, int flags,
pglob->gl_pathc = (unsigned int)tmp;
if (flags & (1 << 3)) tmp_0 = pglob->gl_offs; else tmp_0 = (unsigned int)0;
size_t reserve_offs = tmp_0;
- size_t prev_len = (unsigned int)0;
+ size_t prev_len = (size_t)0;
if (flags & (1 << 5))
- while (*(pglob->gl_pathv + (reserve_offs + prev_len))) prev_len += (size_t)1;
+ while (*(pglob->gl_pathv + (reserve_offs + prev_len))) prev_len ++;
if (flags & (1 << 5)) tmp_1 = pglob->gl_pathv; else tmp_1 = (char **)0;
char **path = tmp_1;
if (pglob->gl_pathc == (unsigned int)0)
@@ -3476,10 +3486,10 @@ int glob(char const *pattern, int flags,
goto return_label;
}
{
- size_t i = (unsigned int)0;
+ size_t i = (size_t)0;
while (i < reserve_offs) {
*(pglob->gl_pathv + i) = (char *)0;
- i += (size_t)1;
+ i ++;
}
}
*(pglob->gl_pathv + (reserve_offs + prev_len)) = (char *)pattern;
@@ -3498,17 +3508,17 @@ int glob(char const *pattern, int flags,
goto return_label;
}
{
- size_t i_0 = (unsigned int)0;
+ size_t i_0 = (size_t)0;
while (i_0 < reserve_offs) {
*(pglob->gl_pathv + i_0) = (char *)0;
- i_0 += (size_t)1;
+ i_0 ++;
}
}
{
- size_t i_1 = (unsigned int)0;
+ size_t i_1 = (size_t)0;
while (i_1 < pglob->gl_pathc) {
*(pglob->gl_pathv + ((reserve_offs + prev_len) + i_1)) = (char *)"glob result";
- i_1 += (size_t)1;
+ i_1 ++;
}
}
*(pglob->gl_pathv + ((prev_len + reserve_offs) + pglob->gl_pathc)) = (char *)0;
@@ -3581,7 +3591,7 @@ intmax_t imaxabs(intmax_t c)
}
/*@ requires no_div_by_zero: denom ≢ 0;
- requires no_overflow: denom ≢ -1 ∨ (long long)(-numer) ≢ numer;
+ requires no_overflow: denom ≢ -1 ∨ (intmax_t)(-numer) ≢ numer;
ensures correct_div: \result.quot ≡ \old(numer) / \old(denom);
ensures correct_mod: \result.rem ≡ \old(numer) % \old(denom);
assigns \result;
@@ -4854,7 +4864,7 @@ extern ssize_t recv(int sockfd, void *buf, size_t len, int flags);
/*@ requires valid_sockfd: 0 ≤ sockfd < 1024;
requires valid_buffer_length: \valid((char *)buf + (0 .. len - 1));
requires
- valid_addrbuf_or_null:
+ valid_addrbuf_or_null: initialization:
(\valid(addrbuf_len) ∧ \initialized(addrbuf_len) ∧
\valid((char *)addrbuf + (0 .. *addrbuf_len - 1))) ∨
(addrbuf ≡ \null ∧ addrbuf_len ≡ \null);
@@ -4936,6 +4946,24 @@ extern ssize_t recvmsg(int sockfd, struct msghdr *hdr, int flags);
*/
extern ssize_t send(int sockfd, void const *buf, size_t len, int flags);
+/*@ requires available_sockfd: 0 ≤ sockfd < 1024;
+ requires valid_message: \valid_read(message);
+ requires
+ valid_msg_iov:
+ \valid_read(message->msg_iov + (0 .. message->msg_iovlen - 1));
+ ensures error_or_chars_sent: \result ≡ -1 ∨ 0 ≤ \result;
+ assigns __fc_sockfds[sockfd], \result;
+ assigns __fc_sockfds[sockfd]
+ \from __fc_sockfds[sockfd], (indirect: *message),
+ (indirect: *(message->msg_iov + (0 .. message->msg_iovlen - 1))),
+ (indirect: flags);
+ assigns \result
+ \from (indirect: sockfd), (indirect: __fc_sockfds[sockfd]),
+ (indirect: *message),
+ (indirect: *(message->msg_iov + (0 .. message->msg_iovlen - 1)));
+ */
+extern ssize_t sendmsg(int sockfd, struct msghdr const *message, int flags);
+
/*@ requires available_sockfd: 0 ≤ sockfd < 1024;
requires buf_len_ok: \valid_read((char *)buf + (0 .. len - 1));
ensures
@@ -5157,7 +5185,7 @@ int getaddrinfo(char const * restrict nodename,
goto return_label;
}
tmp_3 = Frama_C_interval(0,43);
- sa->sa_family = (unsigned short)tmp_3;
+ sa->sa_family = (sa_family_t)tmp_3;
/*@ slevel 15; */
{
int i = 0;
@@ -5177,7 +5205,7 @@ int getaddrinfo(char const * restrict nodename,
ai->ai_protocol = Frama_C_interval(0,IPPROTO_MAX);
ai->ai_addrlen = sizeof(*sa);
ai->ai_addr = sa;
- ai->ai_canonname = (char *)malloc((unsigned int)6);
+ ai->ai_canonname = (char *)malloc((size_t)6);
if (! ai->ai_canonname) {
__retres = -10;
goto return_label;
@@ -5233,8 +5261,8 @@ struct hostent *gethostbyname(char const *name)
goto return_label;
}
memcpy((void *)(__fc_ghbn.host_addr),(void const *)(& addr),
- (unsigned int)__fc_ghbn.host.h_length);
- strncpy(__fc_ghbn.hostbuf,name,(unsigned int)(128 - 1));
+ (size_t)__fc_ghbn.host.h_length);
+ strncpy(__fc_ghbn.hostbuf,name,(size_t)(128 - 1));
__fc_ghbn.hostbuf[128 - 1] = (char)'\000';
__fc_ghbn.host.h_name = __fc_ghbn.hostbuf;
__fc_ghbn.host.h_aliases = __fc_ghbn.host_aliases;
@@ -5267,8 +5295,8 @@ struct hostent *gethostbyname(char const *name)
struct in_addr addr_0;
addr_0.s_addr = inet_addr(name);
memcpy((void *)(__fc_ghbn.host_addr),(void const *)(& addr_0),
- (unsigned int)__fc_ghbn.host.h_length);
- strncpy(__fc_ghbn.hostbuf,name,(unsigned int)(128 - 1));
+ (size_t)__fc_ghbn.host.h_length);
+ strncpy(__fc_ghbn.hostbuf,name,(size_t)(128 - 1));
__fc_ghbn.hostbuf[128 - 1] = (char)'\000';
__fc_ghbn.host.h_name = __fc_ghbn.hostbuf;
__fc_ghbn.host.h_aliases = __fc_ghbn.host_aliases;
@@ -5282,24 +5310,24 @@ struct hostent *gethostbyname(char const *name)
return_label: return __retres;
}
-struct in6_addr const in6addr_any = {.s6_addr = {(unsigned char)0}};
+struct in6_addr const in6addr_any = {.s6_addr = {(uint8_t)0}};
struct in6_addr const in6addr_loopback =
- {.s6_addr = {(unsigned char)0,
- (unsigned char)0,
- (unsigned char)0,
- (unsigned char)0,
- (unsigned char)0,
- (unsigned char)0,
- (unsigned char)0,
- (unsigned char)0,
- (unsigned char)0,
- (unsigned char)0,
- (unsigned char)0,
- (unsigned char)0,
- (unsigned char)0,
- (unsigned char)0,
- (unsigned char)0,
- (unsigned char)1}};
+ {.s6_addr = {(uint8_t)0,
+ (uint8_t)0,
+ (uint8_t)0,
+ (uint8_t)0,
+ (uint8_t)0,
+ (uint8_t)0,
+ (uint8_t)0,
+ (uint8_t)0,
+ (uint8_t)0,
+ (uint8_t)0,
+ (uint8_t)0,
+ (uint8_t)0,
+ (uint8_t)0,
+ (uint8_t)0,
+ (uint8_t)0,
+ (uint8_t)1}};
char __fc_getpw_pw_name[64];
char __fc_getpw_pw_passwd[64];
char __fc_getpw_pw_gecos[64];
@@ -5347,15 +5375,15 @@ static int __fc_getpw_r(struct passwd *pwd, char *buf, size_t buflen,
int tmp_2;
if (! __fc_getpw_init) {
__fc_getpw_init = 1;
- Frama_C_make_unknown(__fc_getpw_pw_name,(unsigned int)63);
+ Frama_C_make_unknown(__fc_getpw_pw_name,(size_t)63);
__fc_getpw_pw_name[63] = (char)0;
- Frama_C_make_unknown(__fc_getpw_pw_passwd,(unsigned int)63);
+ Frama_C_make_unknown(__fc_getpw_pw_passwd,(size_t)63);
__fc_getpw_pw_passwd[63] = (char)0;
- Frama_C_make_unknown(__fc_getpw_pw_gecos,(unsigned int)63);
+ Frama_C_make_unknown(__fc_getpw_pw_gecos,(size_t)63);
__fc_getpw_pw_gecos[63] = (char)0;
- Frama_C_make_unknown(__fc_getpw_pw_dir,(unsigned int)63);
+ Frama_C_make_unknown(__fc_getpw_pw_dir,(size_t)63);
__fc_getpw_pw_dir[63] = (char)0;
- Frama_C_make_unknown(__fc_getpw_pw_shell,(unsigned int)63);
+ Frama_C_make_unknown(__fc_getpw_pw_shell,(size_t)63);
__fc_getpw_pw_shell[63] = (char)0;
}
tmp_2 = Frama_C_interval(0,1);
@@ -5789,7 +5817,7 @@ extern void tzset(void);
/*@ requires
valid:
- valid_read_or_empty((void *)s, (unsigned int)(sizeof(wchar_t) * n)) ∨
+ valid_read_or_empty((void *)s, (size_t)(sizeof(wchar_t) * n)) ∨
\valid_read((unsigned char *)s + (0 .. wmemchr_off(s, c, n)));
requires
initialization:
@@ -5797,10 +5825,9 @@ extern void tzset(void);
\initialized(s + (0 .. wmemchr_off(s, c, n)));
requires
danglingness:
- non_escaping((void *)s, (unsigned int)(sizeof(wchar_t) * n)) ∨
+ non_escaping((void *)s, (size_t)(sizeof(wchar_t) * n)) ∨
non_escaping((void *)s,
- (unsigned int)(sizeof(wchar_t) *
- (wmemchr_off(s, c, n) + 1)));
+ (size_t)(sizeof(wchar_t) * (wmemchr_off(s, c, n) + 1)));
ensures
result_null_or_inside_s:
\result ≡ \null ∨ \subset(\result, \old(s) + (0 .. \old(n) - 1));
@@ -5812,18 +5839,18 @@ extern wchar_t *wmemchr(wchar_t const *s, wchar_t c, size_t n);
/*@ requires
valid_s1:
- valid_read_or_empty((void *)s1, (unsigned int)(sizeof(wchar_t) * n));
+ valid_read_or_empty((void *)s1, (size_t)(sizeof(wchar_t) * n));
requires
valid_s2:
- valid_read_or_empty((void *)s2, (unsigned int)(sizeof(wchar_t) * n));
+ valid_read_or_empty((void *)s2, (size_t)(sizeof(wchar_t) * n));
requires initialization: s1: \initialized(s1 + (0 .. n - 1));
requires initialization: s2: \initialized(s2 + (0 .. n - 1));
requires
danglingness: s1:
- non_escaping((void *)s1, (unsigned int)(sizeof(wchar_t) * n));
+ non_escaping((void *)s1, (size_t)(sizeof(wchar_t) * n));
requires
danglingness: s2:
- non_escaping((void *)s2, (unsigned int)(sizeof(wchar_t) * n));
+ non_escaping((void *)s2, (size_t)(sizeof(wchar_t) * n));
assigns \result;
assigns \result
\from (indirect: *(s1 + (0 .. n - 1))),
@@ -6180,22 +6207,22 @@ unsigned long long __fc_atomic_exchange(void *obj,
unsigned long long r = (unsigned long long)0;
if (obj_size == sizeof(char)) {
r = (unsigned long long)*((atomic_uchar volatile *)obj);
- *((atomic_uchar volatile *)obj) = (unsigned char)desired;
+ *((atomic_uchar volatile *)obj) = (atomic_uchar)desired;
}
else
if (obj_size == sizeof(short)) {
r = (unsigned long long)*((atomic_ushort volatile *)obj);
- *((atomic_ushort volatile *)obj) = (unsigned short)desired;
+ *((atomic_ushort volatile *)obj) = (atomic_ushort)desired;
}
else
if (obj_size == sizeof(int)) {
r = (unsigned long long)*((atomic_uint volatile *)obj);
- *((atomic_uint volatile *)obj) = (unsigned int)desired;
+ *((atomic_uint volatile *)obj) = (atomic_uint)desired;
}
else
if (obj_size == sizeof(long)) {
r = (unsigned long long)*((atomic_ulong volatile *)obj);
- *((atomic_ulong volatile *)obj) = (unsigned long)desired;
+ *((atomic_ulong volatile *)obj) = (atomic_ulong)desired;
}
else
if (obj_size == sizeof(long long)) {
@@ -6268,22 +6295,22 @@ unsigned long long __fc_atomic_fetch_add(void *obj,
unsigned long long r = (unsigned long long)0;
if (obj_size == sizeof(char)) {
r = (unsigned long long)*((atomic_uchar volatile *)obj);
- *((atomic_uchar volatile *)obj) = (unsigned char)((unsigned long long)*((atomic_uchar volatile *)obj) + operand);
+ *((atomic_uchar volatile *)obj) = (atomic_uchar)((unsigned long long)*((atomic_uchar volatile *)obj) + operand);
}
else
if (obj_size == sizeof(short)) {
r = (unsigned long long)*((atomic_ushort volatile *)obj);
- *((atomic_ushort volatile *)obj) = (unsigned short)((unsigned long long)*((atomic_ushort volatile *)obj) + operand);
+ *((atomic_ushort volatile *)obj) = (atomic_ushort)((unsigned long long)*((atomic_ushort volatile *)obj) + operand);
}
else
if (obj_size == sizeof(int)) {
r = (unsigned long long)*((atomic_uint volatile *)obj);
- *((atomic_uint volatile *)obj) = (unsigned int)((unsigned long long)*((atomic_uint volatile *)obj) + operand);
+ *((atomic_uint volatile *)obj) = (atomic_uint)((unsigned long long)*((atomic_uint volatile *)obj) + operand);
}
else
if (obj_size == sizeof(long)) {
r = (unsigned long long)*((atomic_ulong volatile *)obj);
- *((atomic_ulong volatile *)obj) = (unsigned long)((unsigned long long)*((atomic_ulong volatile *)obj) + operand);
+ *((atomic_ulong volatile *)obj) = (atomic_ulong)((unsigned long long)*((atomic_ulong volatile *)obj) + operand);
}
else
if (obj_size == sizeof(long long)) {
@@ -6311,22 +6338,22 @@ unsigned long long __fc_atomic_fetch_sub(void *obj,
unsigned long long r = (unsigned long long)0;
if (obj_size == sizeof(char)) {
r = (unsigned long long)*((atomic_uchar volatile *)obj);
- *((atomic_uchar volatile *)obj) = (unsigned char)((unsigned long long)*((atomic_uchar volatile *)obj) - operand);
+ *((atomic_uchar volatile *)obj) = (atomic_uchar)((unsigned long long)*((atomic_uchar volatile *)obj) - operand);
}
else
if (obj_size == sizeof(short)) {
r = (unsigned long long)*((atomic_ushort volatile *)obj);
- *((atomic_ushort volatile *)obj) = (unsigned short)((unsigned long long)*((atomic_ushort volatile *)obj) - operand);
+ *((atomic_ushort volatile *)obj) = (atomic_ushort)((unsigned long long)*((atomic_ushort volatile *)obj) - operand);
}
else
if (obj_size == sizeof(int)) {
r = (unsigned long long)*((atomic_uint volatile *)obj);
- *((atomic_uint volatile *)obj) = (unsigned int)((unsigned long long)*((atomic_uint volatile *)obj) - operand);
+ *((atomic_uint volatile *)obj) = (atomic_uint)((unsigned long long)*((atomic_uint volatile *)obj) - operand);
}
else
if (obj_size == sizeof(long)) {
r = (unsigned long long)*((atomic_ulong volatile *)obj);
- *((atomic_ulong volatile *)obj) = (unsigned long)((unsigned long long)*((atomic_ulong volatile *)obj) - operand);
+ *((atomic_ulong volatile *)obj) = (atomic_ulong)((unsigned long long)*((atomic_ulong volatile *)obj) - operand);
}
else
if (obj_size == sizeof(long long)) {
@@ -6354,22 +6381,22 @@ unsigned long long __fc_atomic_fetch_or(void *obj,
unsigned long long r = (unsigned long long)0;
if (obj_size == sizeof(char)) {
r = (unsigned long long)*((atomic_uchar volatile *)obj);
- *((atomic_uchar volatile *)obj) = (unsigned char)((unsigned long long)*((atomic_uchar volatile *)obj) | operand);
+ *((atomic_uchar volatile *)obj) = (atomic_uchar)((unsigned long long)*((atomic_uchar volatile *)obj) | operand);
}
else
if (obj_size == sizeof(short)) {
r = (unsigned long long)*((atomic_ushort volatile *)obj);
- *((atomic_ushort volatile *)obj) = (unsigned short)((unsigned long long)*((atomic_ushort volatile *)obj) | operand);
+ *((atomic_ushort volatile *)obj) = (atomic_ushort)((unsigned long long)*((atomic_ushort volatile *)obj) | operand);
}
else
if (obj_size == sizeof(int)) {
r = (unsigned long long)*((atomic_uint volatile *)obj);
- *((atomic_uint volatile *)obj) = (unsigned int)((unsigned long long)*((atomic_uint volatile *)obj) | operand);
+ *((atomic_uint volatile *)obj) = (atomic_uint)((unsigned long long)*((atomic_uint volatile *)obj) | operand);
}
else
if (obj_size == sizeof(long)) {
r = (unsigned long long)*((atomic_ulong volatile *)obj);
- *((atomic_ulong volatile *)obj) = (unsigned long)((unsigned long long)*((atomic_ulong volatile *)obj) | operand);
+ *((atomic_ulong volatile *)obj) = (atomic_ulong)((unsigned long long)*((atomic_ulong volatile *)obj) | operand);
}
else
if (obj_size == sizeof(long long)) {
@@ -6397,22 +6424,22 @@ unsigned long long __fc_atomic_fetch_xor(void *obj,
unsigned long long r = (unsigned long long)0;
if (obj_size == sizeof(char)) {
r = (unsigned long long)*((atomic_uchar volatile *)obj);
- *((atomic_uchar volatile *)obj) = (unsigned char)((unsigned long long)*((atomic_uchar volatile *)obj) ^ operand);
+ *((atomic_uchar volatile *)obj) = (atomic_uchar)((unsigned long long)*((atomic_uchar volatile *)obj) ^ operand);
}
else
if (obj_size == sizeof(short)) {
r = (unsigned long long)*((atomic_ushort volatile *)obj);
- *((atomic_ushort volatile *)obj) = (unsigned short)((unsigned long long)*((atomic_ushort volatile *)obj) ^ operand);
+ *((atomic_ushort volatile *)obj) = (atomic_ushort)((unsigned long long)*((atomic_ushort volatile *)obj) ^ operand);
}
else
if (obj_size == sizeof(int)) {
r = (unsigned long long)*((atomic_uint volatile *)obj);
- *((atomic_uint volatile *)obj) = (unsigned int)((unsigned long long)*((atomic_uint volatile *)obj) ^ operand);
+ *((atomic_uint volatile *)obj) = (atomic_uint)((unsigned long long)*((atomic_uint volatile *)obj) ^ operand);
}
else
if (obj_size == sizeof(long)) {
r = (unsigned long long)*((atomic_ulong volatile *)obj);
- *((atomic_ulong volatile *)obj) = (unsigned long)((unsigned long long)*((atomic_ulong volatile *)obj) ^ operand);
+ *((atomic_ulong volatile *)obj) = (atomic_ulong)((unsigned long long)*((atomic_ulong volatile *)obj) ^ operand);
}
else
if (obj_size == sizeof(long long)) {
@@ -6440,22 +6467,22 @@ unsigned long long __fc_atomic_fetch_and(void *obj,
unsigned long long r = (unsigned long long)0;
if (obj_size == sizeof(char)) {
r = (unsigned long long)*((atomic_uchar volatile *)obj);
- *((atomic_uchar volatile *)obj) = (unsigned char)((unsigned long long)*((atomic_uchar volatile *)obj) & operand);
+ *((atomic_uchar volatile *)obj) = (atomic_uchar)((unsigned long long)*((atomic_uchar volatile *)obj) & operand);
}
else
if (obj_size == sizeof(short)) {
r = (unsigned long long)*((atomic_ushort volatile *)obj);
- *((atomic_ushort volatile *)obj) = (unsigned short)((unsigned long long)*((atomic_ushort volatile *)obj) & operand);
+ *((atomic_ushort volatile *)obj) = (atomic_ushort)((unsigned long long)*((atomic_ushort volatile *)obj) & operand);
}
else
if (obj_size == sizeof(int)) {
r = (unsigned long long)*((atomic_uint volatile *)obj);
- *((atomic_uint volatile *)obj) = (unsigned int)((unsigned long long)*((atomic_uint volatile *)obj) & operand);
+ *((atomic_uint volatile *)obj) = (atomic_uint)((unsigned long long)*((atomic_uint volatile *)obj) & operand);
}
else
if (obj_size == sizeof(long)) {
r = (unsigned long long)*((atomic_ulong volatile *)obj);
- *((atomic_ulong volatile *)obj) = (unsigned long)((unsigned long long)*((atomic_ulong volatile *)obj) & operand);
+ *((atomic_ulong volatile *)obj) = (atomic_ulong)((unsigned long long)*((atomic_ulong volatile *)obj) & operand);
}
else
if (obj_size == sizeof(long long)) {
@@ -7090,16 +7117,16 @@ ssize_t getline(char **lineptr, size_t *n, FILE *stream)
if (*n == (size_t)0) {
_LOR_1:
{
- *lineptr = (char *)malloc((unsigned int)2);
+ *lineptr = (char *)malloc((size_t)2);
if (! lineptr) {
__fc_errno = 12;
__retres = -1;
goto return_label;
}
- *n = (unsigned int)2;
+ *n = (size_t)2;
}
}
- size_t cur = (unsigned int)0;
+ size_t cur = (size_t)0;
while (1) {
int tmp_3;
tmp_3 = ferror(stream);
@@ -7122,7 +7149,7 @@ ssize_t getline(char **lineptr, size_t *n, FILE *stream)
if ((int)c != -1) {
size_t tmp_2;
tmp_2 = cur;
- cur += (size_t)1;
+ cur ++;
*(*lineptr + tmp_2) = c;
}
if ((int)c == '\n') goto _LOR_2;
@@ -7131,7 +7158,7 @@ ssize_t getline(char **lineptr, size_t *n, FILE *stream)
_LOR_2:
{
*(*lineptr + cur) = (char)'\000';
- __retres = (int)cur;
+ __retres = (ssize_t)cur;
goto return_label;
}
}
@@ -7173,7 +7200,7 @@ int asprintf(char **strp, char const *fmt, void * const *__va_params)
int tmp;
args = __va_params;
tmp = Frama_C_interval(1,256);
- size_t len = (unsigned int)tmp;
+ size_t len = (size_t)tmp;
*strp = (char *)malloc(len);
if (! *strp) {
__retres = -1;
@@ -7378,7 +7405,7 @@ static char __fc_initenv_init;
static void __fc_initenv(void)
{
if (! __fc_initenv_init) {
- Frama_C_make_unknown(__fc_env_strings,(unsigned int)(64 - 1));
+ Frama_C_make_unknown(__fc_env_strings,(size_t)(64 - 1));
{
int i = 0;
while (i < 4096) {
@@ -7492,7 +7519,7 @@ int setenv(char const *name, char const *value, int overwrite)
int tmp_2;
int tmp_3;
tmp_1 = Frama_C_nondet(0,1);
- if (tmp_1) Frama_C_make_unknown(__fc_env_strings,(unsigned int)(64 - 1));
+ if (tmp_1) Frama_C_make_unknown(__fc_env_strings,(size_t)(64 - 1));
tmp_2 = Frama_C_interval(0,4096 - 1);
tmp_3 = Frama_C_interval(0,64 - 1);
__fc_env[tmp_2] = & __fc_env_strings[tmp_3];
@@ -7622,14 +7649,14 @@ char *realpath(char const * restrict file_name, char * restrict resolved_name)
}
int realpath_len = Frama_C_interval(1,256);
if (! resolved_name) {
- resolved_name = (char *)malloc((unsigned int)256);
+ resolved_name = (char *)malloc((size_t)256);
if (! resolved_name) {
__fc_errno = 12;
__retres = (char *)0;
goto return_label;
}
}
- Frama_C_make_unknown(resolved_name,(unsigned int)realpath_len);
+ Frama_C_make_unknown(resolved_name,(size_t)realpath_len);
*(resolved_name + (realpath_len - 1)) = (char)'\000';
__retres = resolved_name;
return_label: return __retres;
@@ -7660,7 +7687,7 @@ char *canonicalize_file_name(char const *path)
void *memcpy(void * restrict dest, void const * restrict src, size_t n)
{
{
- size_t i = (unsigned int)0;
+ size_t i = (size_t)0;
/*@ loop invariant no_eva: 0 ≤ i ≤ n;
loop invariant
no_eva:
@@ -7671,7 +7698,7 @@ void *memcpy(void * restrict dest, void const * restrict src, size_t n)
*/
while (i < n) {
*((char *)dest + i) = *((char *)src + i);
- i += (size_t)1;
+ i ++;
}
}
return dest;
@@ -7696,7 +7723,7 @@ void *mempcpy(void * restrict dest, void const * restrict src, size_t n)
{
void *__retres;
size_t i;
- i = (unsigned int)0;
+ i = (size_t)0;
/*@ loop invariant no_eva: 0 ≤ i ≤ n;
loop invariant
no_eva:
@@ -7707,7 +7734,7 @@ void *mempcpy(void * restrict dest, void const * restrict src, size_t n)
*/
while (i < n) {
*((char *)dest + i) = *((char *)src + i);
- i += (size_t)1;
+ i ++;
}
__retres = (void *)((char *)dest + i);
return __retres;
@@ -7740,10 +7767,10 @@ void *mempcpy(void * restrict dest, void const * restrict src, size_t n)
static int memoverlap(char const *p, char const *q, size_t n)
{
int __retres;
- uintptr_t p1 = (unsigned int)p;
- uintptr_t p2 = (unsigned int)(p + n);
- uintptr_t q1 = (unsigned int)q;
- uintptr_t q2 = (unsigned int)(q + n);
+ uintptr_t p1 = (uintptr_t)p;
+ uintptr_t p2 = (uintptr_t)(p + n);
+ uintptr_t q1 = (uintptr_t)q;
+ uintptr_t q2 = (uintptr_t)(q + n);
if (p1 <= q1) {
if (p2 > q1) {
__retres = -1;
@@ -7794,7 +7821,7 @@ void *memmove(void *dest, void const *src, size_t n)
char *d = (char *)dest;
tmp = memoverlap((char const *)dest,(char const *)src,n);
if (tmp <= 0) {
- size_t i = (unsigned int)0;
+ size_t i = (size_t)0;
/*@ loop invariant no_eva: 0 ≤ i ≤ n;
loop invariant
no_eva:
@@ -7811,7 +7838,7 @@ void *memmove(void *dest, void const *src, size_t n)
*/
while (i < n) {
*(d + i) = *(s + i);
- i += (size_t)1;
+ i ++;
}
}
else {
@@ -7833,7 +7860,7 @@ void *memmove(void *dest, void const *src, size_t n)
*/
while (i_0 > (size_t)0) {
*(d + i_0) = *(s + i_0);
- i_0 -= (size_t)1;
+ i_0 --;
}
}
*(d + 0) = *(s + 0);
@@ -7850,8 +7877,8 @@ void *memmove(void *dest, void const *src, size_t n)
size_t strlen(char const *s)
{
size_t i;
- i = (unsigned int)0;
- while ((int)*(s + i) != 0) i += (size_t)1;
+ i = (size_t)0;
+ while ((int)*(s + i) != 0) i ++;
return i;
}
@@ -7866,13 +7893,13 @@ size_t strlen(char const *s)
size_t strnlen(char const *s, size_t maxlen)
{
size_t i;
- i = (unsigned int)0;
+ i = (size_t)0;
while (1) {
if (i < maxlen) {
if (! ((int)*(s + i) != 0)) break;
}
else break;
- i += (size_t)1;
+ i ++;
}
return i;
}
@@ -7889,10 +7916,10 @@ void *memset(void *s, int c, size_t n)
{
unsigned char *p = (unsigned char *)s;
{
- size_t i = (unsigned int)0;
+ size_t i = (size_t)0;
while (i < n) {
*(p + i) = (unsigned char)c;
- i += (size_t)1;
+ i ++;
}
}
return s;
@@ -7909,13 +7936,13 @@ int strcmp(char const *s1, char const *s2)
{
int __retres;
size_t i;
- i = (unsigned int)0;
+ i = (size_t)0;
while ((int)*(s1 + i) == (int)*(s2 + i)) {
if ((int)*(s1 + i) == 0) {
__retres = 0;
goto return_label;
}
- i += (size_t)1;
+ i ++;
}
__retres = (int)*((unsigned char *)s1 + i) - (int)*((unsigned char *)s2 + i);
return_label: return __retres;
@@ -7933,7 +7960,7 @@ int strncmp(char const *s1, char const *s2, size_t n)
{
int __retres;
{
- size_t i = (unsigned int)0;
+ size_t i = (size_t)0;
while (i < n) {
if ((int)*(s1 + i) != (int)*(s2 + i)) {
__retres = (int)*((unsigned char *)s1 + i) - (int)*((unsigned char *)s2 + i);
@@ -7943,7 +7970,7 @@ int strncmp(char const *s1, char const *s2, size_t n)
__retres = 0;
goto return_label;
}
- i += (size_t)1;
+ i ++;
}
}
__retres = 0;
@@ -7973,13 +8000,13 @@ int memcmp(void const *s1, void const *s2, size_t n)
p1 = (unsigned char const *)s1;
p2 = (unsigned char const *)s2;
{
- size_t i = (unsigned int)0;
+ size_t i = (size_t)0;
while (i < n) {
if ((int)*(p1 + i) != (int)*(p2 + i)) {
__retres = (int)*(p1 + i) - (int)*(p2 + i);
goto return_label;
}
- i += (size_t)1;
+ i ++;
}
}
__retres = 0;
@@ -8014,7 +8041,7 @@ int strcasecmp(char const *s1, char const *s2)
{
int __retres;
size_t i;
- i = (unsigned int)0;
+ i = (size_t)0;
while (1) {
if ((int)*(s1 + i) != 0) {
if (! ((int)*(s2 + i) != 0)) break;
@@ -8027,7 +8054,7 @@ int strcasecmp(char const *s1, char const *s2)
goto return_label;
}
}
- i += (size_t)1;
+ i ++;
}
if ((int)*(s1 + i) == 0) {
if ((int)*(s2 + i) == 0) {
@@ -8074,10 +8101,10 @@ char *strcat(char *dest, char const *src)
{
size_t i;
size_t n = strlen((char const *)dest);
- i = (unsigned int)0;
+ i = (size_t)0;
while ((int)*(src + i) != 0) {
*(dest + (n + i)) = *(src + i);
- i += (size_t)1;
+ i ++;
}
*(dest + (n + i)) = (char)0;
return dest;
@@ -8125,11 +8152,11 @@ char *strncat(char *dest, char const *src, size_t n)
{
size_t i;
size_t dest_len = strlen((char const *)dest);
- i = (unsigned int)0;
+ i = (size_t)0;
while (i < n) {
if ((int)*(src + i) == 0) break;
*(dest + (dest_len + i)) = *(src + i);
- i += (size_t)1;
+ i ++;
}
*(dest + (dest_len + i)) = (char)0;
return dest;
@@ -8150,10 +8177,10 @@ char *strncat(char *dest, char const *src, size_t n)
char *strcpy(char *dest, char const *src)
{
size_t i;
- i = (unsigned int)0;
+ i = (size_t)0;
while ((int)*(src + i) != 0) {
*(dest + i) = *(src + i);
- i += (size_t)1;
+ i ++;
}
*(dest + i) = (char)0;
return dest;
@@ -8175,10 +8202,10 @@ char *stpcpy(char *dest, char const *src)
{
char *__retres;
size_t i;
- i = (unsigned int)0;
+ i = (size_t)0;
while ((int)*(src + i) != 0) {
*(dest + i) = *(src + i);
- i += (size_t)1;
+ i ++;
}
*(dest + i) = (char)0;
__retres = dest + i;
@@ -8207,15 +8234,15 @@ char *stpcpy(char *dest, char const *src)
char *strncpy(char *dest, char const *src, size_t n)
{
size_t i;
- i = (unsigned int)0;
+ i = (size_t)0;
while (i < n) {
*(dest + i) = *(src + i);
if ((int)*(src + i) == 0) break;
- i += (size_t)1;
+ i ++;
}
while (i < n) {
*(dest + i) = (char)0;
- i += (size_t)1;
+ i ++;
}
return dest;
}
@@ -8250,13 +8277,13 @@ char *strchr(char const *s, int c)
char *__retres;
size_t i;
char const ch = (char)c;
- i = (unsigned int)0;
+ i = (size_t)0;
while ((int)*(s + i) != (int)ch) {
if ((int)*(s + i) == 0) {
__retres = (char *)0;
goto return_label;
}
- i += (size_t)1;
+ i ++;
}
__retres = (char *)(s + i);
return_label: return __retres;
@@ -8294,7 +8321,7 @@ char *strrchr(char const *s, int c)
__retres = (char *)(s + (i - (size_t)1));
goto return_label;
}
- i -= (size_t)1;
+ i --;
}
}
__retres = (char *)0;
@@ -8312,7 +8339,7 @@ char *strrchr(char const *s, int c)
requires
danglingness:
non_escaping(s, n) ∨
- non_escaping(s, (unsigned int)(memchr_off((char *)s, c, n) + 1));
+ non_escaping(s, (size_t)(memchr_off((char *)s, c, n) + 1));
assigns \result;
assigns \result \from s, c, *((unsigned char *)s + (0 .. n - 1));
@@ -8337,13 +8364,13 @@ void *memchr(void const *s, int c, size_t n)
unsigned char const ch = (unsigned char)c;
unsigned char const *ss = (unsigned char const *)s;
{
- size_t i = (unsigned int)0;
+ size_t i = (size_t)0;
while (i < n) {
if ((int)*(ss + i) == (int)ch) {
__retres = (void *)(ss + i);
goto return_label;
}
- i += (size_t)1;
+ i ++;
}
}
__retres = (void *)0;
@@ -8362,7 +8389,7 @@ void *memrchr(void const *s, int c, size_t n)
__retres = (void *)(ss + (i - (size_t)1));
goto return_label;
}
- i -= (size_t)1;
+ i --;
}
}
__retres = (void *)0;
@@ -8390,21 +8417,21 @@ char *strstr(char const *haystack, char const *needle)
goto return_label;
}
{
- size_t i = (unsigned int)0;
+ size_t i = (size_t)0;
while ((int)*(haystack + i) != 0) {
{
size_t j;
- j = (unsigned int)0;
+ j = (size_t)0;
while ((int)*(haystack + (i + j)) != 0) {
if ((int)*(haystack + (i + j)) != (int)*(needle + j)) break;
- j += (size_t)1;
+ j ++;
}
if ((int)*(needle + j) == 0) {
__retres = (char *)(haystack + i);
goto return_label;
}
}
- i += (size_t)1;
+ i ++;
}
}
__retres = (char *)0;
@@ -8422,7 +8449,7 @@ char *strerror(int errnum)
{
char *__retres;
if (! strerror___fc_strerror_init) {
- Frama_C_make_unknown(__fc_strerror,(unsigned int)63);
+ Frama_C_make_unknown(__fc_strerror,(size_t)63);
__fc_strerror[63] = (char)0;
strerror___fc_strerror_init = 1;
}
@@ -8508,10 +8535,10 @@ char *strndup(char const *s, size_t n)
{
char *__retres;
size_t l;
- l = (unsigned int)0;
+ l = (size_t)0;
while (l < n) {
if ((int)*(s + l) == 0) break;
- l += (size_t)1;
+ l ++;
}
char *p = malloc(l + (size_t)1);
if (! p) {
@@ -8536,7 +8563,7 @@ char *strsignal(int signum)
{
char *__retres;
if (! strsignal___fc_strsignal_init) {
- Frama_C_make_unknown(__fc_strsignal,(unsigned int)63);
+ Frama_C_make_unknown(__fc_strsignal,(size_t)63);
__fc_strsignal[63] = (char)0;
strsignal___fc_strsignal_init = 1;
}
@@ -8545,11 +8572,10 @@ char *strsignal(int signum)
}
/*@ requires
- valid_dest:
- valid_or_empty((void *)dest, (unsigned int)(sizeof(wchar_t) * n));
+ valid_dest: valid_or_empty((void *)dest, (size_t)(sizeof(wchar_t) * n));
requires
valid_src:
- valid_read_or_empty((void *)src, (unsigned int)(sizeof(wchar_t) * n));
+ valid_read_or_empty((void *)src, (size_t)(sizeof(wchar_t) * n));
requires
separation: dest: src:
\separated(dest + (0 .. n - 1), src + (0 .. n - 1));
@@ -8562,10 +8588,10 @@ char *strsignal(int signum)
wchar_t *wmemcpy(wchar_t *dest, wchar_t const *src, size_t n)
{
{
- size_t i = (unsigned int)0;
+ size_t i = (size_t)0;
while (i < n) {
*(dest + i) = *(src + i);
- i += (size_t)1;
+ i ++;
}
}
return dest;
@@ -8585,10 +8611,10 @@ wchar_t *wmemcpy(wchar_t *dest, wchar_t const *src, size_t n)
wchar_t *wmemset(wchar_t *dest, wchar_t val, size_t len)
{
{
- size_t i = (unsigned int)0;
+ size_t i = (size_t)0;
while (i < len) {
*(dest + i) = val;
- i += (size_t)1;
+ i ++;
}
}
return dest;
@@ -8608,10 +8634,10 @@ wchar_t *wmemset(wchar_t *dest, wchar_t val, size_t len)
wchar_t *wcscpy(wchar_t *dest, wchar_t const *src)
{
size_t i;
- i = (unsigned int)0;
+ i = (size_t)0;
while (*(src + i) != 0) {
*(dest + i) = *(src + i);
- i += (size_t)1;
+ i ++;
}
*(dest + i) = 0;
return dest;
@@ -8625,8 +8651,8 @@ wchar_t *wcscpy(wchar_t *dest, wchar_t const *src)
size_t wcslen(wchar_t const *str)
{
size_t i;
- i = (unsigned int)0;
- while (*(str + i) != 0) i += (size_t)1;
+ i = (size_t)0;
+ while (*(str + i) != 0) i ++;
return i;
}
@@ -8645,15 +8671,15 @@ size_t wcslen(wchar_t const *str)
wchar_t *wcsncpy(wchar_t *dest, wchar_t const *src, size_t n)
{
size_t i;
- i = (unsigned int)0;
+ i = (size_t)0;
while (i < n) {
*(dest + i) = *(src + i);
if (*(src + i) == 0) break;
- i += (size_t)1;
+ i ++;
}
while (i < n) {
*(dest + i) = 0;
- i += (size_t)1;
+ i ++;
}
return dest;
}
@@ -8679,10 +8705,10 @@ wchar_t *wcscat(wchar_t *dest, wchar_t const *src)
{
size_t i;
size_t n = wcslen((wchar_t const *)dest);
- i = (unsigned int)0;
+ i = (size_t)0;
while (*(src + i) != 0) {
*(dest + (n + i)) = *(src + i);
- i += (size_t)1;
+ i ++;
}
*(dest + (n + i)) = 0;
return dest;
@@ -8709,14 +8735,14 @@ wchar_t *wcsncat(wchar_t *dest, wchar_t const *src, size_t n)
{
size_t i;
size_t dest_len = wcslen((wchar_t const *)dest);
- i = (unsigned int)0;
+ i = (size_t)0;
while (1) {
if (i < n) {
if (! (*(src + i) != 0)) break;
}
else break;
*(dest + (dest_len + i)) = *(src + i);
- i += (size_t)1;
+ i ++;
}
*(dest + (dest_len + i)) = 0;
return dest;
diff --git a/tests/libc/oracle/glob_c.res.oracle b/tests/libc/oracle/glob_c.res.oracle
index 6cebcdd93d5d4ca4fcb48f72065beda0e5a4f7e2..7b0f8fbed93b48ae5e5803702c27d54696c7f42a 100644
--- a/tests/libc/oracle/glob_c.res.oracle
+++ b/tests/libc/oracle/glob_c.res.oracle
@@ -21,14 +21,12 @@
[eva:alarm] FRAMAC_SHARE/libc/glob.c:74: Warning:
out of bounds write.
assert
- \valid(pglob->gl_pathv +
- (unsigned int)((unsigned int)(reserve_offs + prev_len) + i_1));
+ \valid(pglob->gl_pathv + (size_t)((size_t)(reserve_offs + prev_len) + i_1));
[eva:alarm] FRAMAC_SHARE/libc/glob.c:76: Warning:
out of bounds write.
assert
\valid(pglob->gl_pathv +
- (unsigned int)((unsigned int)(prev_len + reserve_offs) +
- pglob->gl_pathc));
+ (size_t)((size_t)(prev_len + reserve_offs) + pglob->gl_pathc));
[eva] computing for function Frama_C_nondet <- glob <- main.
Called from FRAMAC_SHARE/libc/glob.c:77.
[eva] using specification for function Frama_C_nondet
diff --git a/tests/libc/oracle/inttypes_h.0.res.oracle b/tests/libc/oracle/inttypes_h.0.res.oracle
index aaac74691f5c7c89d39025891f6b0596d6376935..256d275c25b295dbf09dff30931381e3bd9bd4ae 100644
--- a/tests/libc/oracle/inttypes_h.0.res.oracle
+++ b/tests/libc/oracle/inttypes_h.0.res.oracle
@@ -2531,254 +2531,254 @@ int main(void)
int __retres;
{
int8_t x;
- scanf("%hhd",(signed char *)(& x)); /* scanf_va_1 */
+ scanf("%hhd",& x); /* scanf_va_1 */
printf("%hhd",(int)x); /* printf_va_1 */
- scanf("%hhi",(signed char *)(& x)); /* scanf_va_2 */
+ scanf("%hhi",& x); /* scanf_va_2 */
printf("%hhi",(int)x); /* printf_va_2 */
}
{
uint8_t x_0;
- scanf("%hho",(unsigned char *)(& x_0)); /* scanf_va_3 */
+ scanf("%hho",& x_0); /* scanf_va_3 */
printf("%hho",(int)x_0); /* printf_va_3 */
- scanf("%hhu",(unsigned char *)(& x_0)); /* scanf_va_4 */
+ scanf("%hhu",& x_0); /* scanf_va_4 */
printf("%hhu",(int)x_0); /* printf_va_4 */
- scanf("%hhx",(unsigned char *)(& x_0)); /* scanf_va_5 */
+ scanf("%hhx",& x_0); /* scanf_va_5 */
printf("%hhx",(int)x_0); /* printf_va_5 */
- scanf("%hhx",(unsigned char *)(& x_0)); /* scanf_va_6 */
+ scanf("%hhx",& x_0); /* scanf_va_6 */
printf("%hhX",(int)x_0); /* printf_va_6 */
}
{
int16_t x_1;
- scanf("%hd",(short *)(& x_1)); /* scanf_va_7 */
+ scanf("%hd",& x_1); /* scanf_va_7 */
printf("%hd",(int)x_1); /* printf_va_7 */
- scanf("%hi",(short *)(& x_1)); /* scanf_va_8 */
+ scanf("%hi",& x_1); /* scanf_va_8 */
printf("%hi",(int)x_1); /* printf_va_8 */
}
{
uint16_t x_2;
- scanf("%ho",(unsigned short *)(& x_2)); /* scanf_va_9 */
+ scanf("%ho",& x_2); /* scanf_va_9 */
printf("%ho",(unsigned int)x_2); /* printf_va_9 */
- scanf("%hu",(unsigned short *)(& x_2)); /* scanf_va_10 */
+ scanf("%hu",& x_2); /* scanf_va_10 */
printf("%hu",(unsigned int)x_2); /* printf_va_10 */
- scanf("%hx",(unsigned short *)(& x_2)); /* scanf_va_11 */
+ scanf("%hx",& x_2); /* scanf_va_11 */
printf("%hx",(unsigned int)x_2); /* printf_va_11 */
- scanf("%hx",(unsigned short *)(& x_2)); /* scanf_va_12 */
+ scanf("%hx",& x_2); /* scanf_va_12 */
printf("%hX",(unsigned int)x_2); /* printf_va_12 */
}
{
int32_t x_3;
- scanf("%ld",(long *)(& x_3)); /* scanf_va_13 */
+ scanf("%ld",& x_3); /* scanf_va_13 */
printf("%ld",x_3); /* printf_va_13 */
- scanf("%li",(long *)(& x_3)); /* scanf_va_14 */
+ scanf("%li",& x_3); /* scanf_va_14 */
printf("%li",x_3); /* printf_va_14 */
}
{
uint32_t x_4;
- scanf("%lo",(unsigned long *)(& x_4)); /* scanf_va_15 */
+ scanf("%lo",& x_4); /* scanf_va_15 */
printf("%lo",x_4); /* printf_va_15 */
- scanf("%lu",(unsigned long *)(& x_4)); /* scanf_va_16 */
+ scanf("%lu",& x_4); /* scanf_va_16 */
printf("%lu",x_4); /* printf_va_16 */
- scanf("%lx",(unsigned long *)(& x_4)); /* scanf_va_17 */
+ scanf("%lx",& x_4); /* scanf_va_17 */
printf("%lx",x_4); /* printf_va_17 */
- scanf("%lx",(unsigned long *)(& x_4)); /* scanf_va_18 */
+ scanf("%lx",& x_4); /* scanf_va_18 */
printf("%lX",x_4); /* printf_va_18 */
}
{
int64_t x_5;
- scanf("%lld",(long long *)(& x_5)); /* scanf_va_19 */
+ scanf("%lld",& x_5); /* scanf_va_19 */
printf("%lld",x_5); /* printf_va_19 */
- scanf("%lli",(long long *)(& x_5)); /* scanf_va_20 */
+ scanf("%lli",& x_5); /* scanf_va_20 */
printf("%lli",x_5); /* printf_va_20 */
}
{
uint64_t x_6;
- scanf("%llo",(unsigned long long *)(& x_6)); /* scanf_va_21 */
+ scanf("%llo",& x_6); /* scanf_va_21 */
printf("%llo",x_6); /* printf_va_21 */
- scanf("%llu",(unsigned long long *)(& x_6)); /* scanf_va_22 */
+ scanf("%llu",& x_6); /* scanf_va_22 */
printf("%llu",x_6); /* printf_va_22 */
- scanf("%llx",(unsigned long long *)(& x_6)); /* scanf_va_23 */
+ scanf("%llx",& x_6); /* scanf_va_23 */
printf("%llx",x_6); /* printf_va_23 */
- scanf("%llx",(unsigned long long *)(& x_6)); /* scanf_va_24 */
+ scanf("%llx",& x_6); /* scanf_va_24 */
printf("%llX",x_6); /* printf_va_24 */
}
{
int_least8_t x_7;
- scanf("%hhd",(signed char *)(& x_7)); /* scanf_va_25 */
+ scanf("%hhd",& x_7); /* scanf_va_25 */
printf("%hhd",(int)x_7); /* printf_va_25 */
- scanf("%hhi",(signed char *)(& x_7)); /* scanf_va_26 */
+ scanf("%hhi",& x_7); /* scanf_va_26 */
printf("%hhi",(int)x_7); /* printf_va_26 */
}
{
uint_least8_t x_8;
- scanf("%hho",(unsigned char *)(& x_8)); /* scanf_va_27 */
+ scanf("%hho",& x_8); /* scanf_va_27 */
printf("%hho",(int)x_8); /* printf_va_27 */
- scanf("%hhu",(unsigned char *)(& x_8)); /* scanf_va_28 */
+ scanf("%hhu",& x_8); /* scanf_va_28 */
printf("%hhu",(int)x_8); /* printf_va_28 */
- scanf("%hhx",(unsigned char *)(& x_8)); /* scanf_va_29 */
+ scanf("%hhx",& x_8); /* scanf_va_29 */
printf("%hhx",(int)x_8); /* printf_va_29 */
- scanf("%hhx",(unsigned char *)(& x_8)); /* scanf_va_30 */
+ scanf("%hhx",& x_8); /* scanf_va_30 */
printf("%hhX",(int)x_8); /* printf_va_30 */
}
{
int_least16_t x_9;
- scanf("%hd",(short *)(& x_9)); /* scanf_va_31 */
+ scanf("%hd",& x_9); /* scanf_va_31 */
printf("%hd",(int)x_9); /* printf_va_31 */
- scanf("%hi",(short *)(& x_9)); /* scanf_va_32 */
+ scanf("%hi",& x_9); /* scanf_va_32 */
printf("%hi",(int)x_9); /* printf_va_32 */
}
{
uint_least16_t x_10;
- scanf("%ho",(unsigned short *)(& x_10)); /* scanf_va_33 */
+ scanf("%ho",& x_10); /* scanf_va_33 */
printf("%ho",(unsigned int)x_10); /* printf_va_33 */
- scanf("%hu",(unsigned short *)(& x_10)); /* scanf_va_34 */
+ scanf("%hu",& x_10); /* scanf_va_34 */
printf("%hu",(unsigned int)x_10); /* printf_va_34 */
- scanf("%hx",(unsigned short *)(& x_10)); /* scanf_va_35 */
+ scanf("%hx",& x_10); /* scanf_va_35 */
printf("%hx",(unsigned int)x_10); /* printf_va_35 */
- scanf("%hx",(unsigned short *)(& x_10)); /* scanf_va_36 */
+ scanf("%hx",& x_10); /* scanf_va_36 */
printf("%hX",(unsigned int)x_10); /* printf_va_36 */
}
{
int_least32_t x_11;
- scanf("%ld",(long *)(& x_11)); /* scanf_va_37 */
+ scanf("%ld",& x_11); /* scanf_va_37 */
printf("%ld",x_11); /* printf_va_37 */
- scanf("%li",(long *)(& x_11)); /* scanf_va_38 */
+ scanf("%li",& x_11); /* scanf_va_38 */
printf("%li",x_11); /* printf_va_38 */
}
{
uint_least32_t x_12;
- scanf("%lo",(unsigned long *)(& x_12)); /* scanf_va_39 */
+ scanf("%lo",& x_12); /* scanf_va_39 */
printf("%lo",x_12); /* printf_va_39 */
- scanf("%lu",(unsigned long *)(& x_12)); /* scanf_va_40 */
+ scanf("%lu",& x_12); /* scanf_va_40 */
printf("%lu",x_12); /* printf_va_40 */
- scanf("%lx",(unsigned long *)(& x_12)); /* scanf_va_41 */
+ scanf("%lx",& x_12); /* scanf_va_41 */
printf("%lx",x_12); /* printf_va_41 */
- scanf("%lx",(unsigned long *)(& x_12)); /* scanf_va_42 */
+ scanf("%lx",& x_12); /* scanf_va_42 */
printf("%lX",x_12); /* printf_va_42 */
}
{
int_least64_t x_13;
- scanf("%lld",(long long *)(& x_13)); /* scanf_va_43 */
+ scanf("%lld",& x_13); /* scanf_va_43 */
printf("%lld",x_13); /* printf_va_43 */
- scanf("%lli",(long long *)(& x_13)); /* scanf_va_44 */
+ scanf("%lli",& x_13); /* scanf_va_44 */
printf("%lli",x_13); /* printf_va_44 */
}
{
uint_least64_t x_14;
- scanf("%llo",(unsigned long long *)(& x_14)); /* scanf_va_45 */
+ scanf("%llo",& x_14); /* scanf_va_45 */
printf("%llo",x_14); /* printf_va_45 */
- scanf("%llu",(unsigned long long *)(& x_14)); /* scanf_va_46 */
+ scanf("%llu",& x_14); /* scanf_va_46 */
printf("%llu",x_14); /* printf_va_46 */
- scanf("%llx",(unsigned long long *)(& x_14)); /* scanf_va_47 */
+ scanf("%llx",& x_14); /* scanf_va_47 */
printf("%llx",x_14); /* printf_va_47 */
- scanf("%llx",(unsigned long long *)(& x_14)); /* scanf_va_48 */
+ scanf("%llx",& x_14); /* scanf_va_48 */
printf("%llX",x_14); /* printf_va_48 */
}
{
int_fast8_t x_15;
- scanf("%hhd",(signed char *)(& x_15)); /* scanf_va_49 */
+ scanf("%hhd",& x_15); /* scanf_va_49 */
printf("%hhd",(int)x_15); /* printf_va_49 */
- scanf("%hhi",(signed char *)(& x_15)); /* scanf_va_50 */
+ scanf("%hhi",& x_15); /* scanf_va_50 */
printf("%hhi",(int)x_15); /* printf_va_50 */
}
{
uint_fast8_t x_16;
- scanf("%hho",(unsigned char *)(& x_16)); /* scanf_va_51 */
+ scanf("%hho",& x_16); /* scanf_va_51 */
printf("%hho",(int)x_16); /* printf_va_51 */
- scanf("%hhu",(unsigned char *)(& x_16)); /* scanf_va_52 */
+ scanf("%hhu",& x_16); /* scanf_va_52 */
printf("%hhu",(int)x_16); /* printf_va_52 */
- scanf("%hhx",(unsigned char *)(& x_16)); /* scanf_va_53 */
+ scanf("%hhx",& x_16); /* scanf_va_53 */
printf("%hhx",(int)x_16); /* printf_va_53 */
- scanf("%hhx",(unsigned char *)(& x_16)); /* scanf_va_54 */
+ scanf("%hhx",& x_16); /* scanf_va_54 */
printf("%hhX",(int)x_16); /* printf_va_54 */
}
{
int_fast16_t x_17;
- scanf("%d",(int *)(& x_17)); /* scanf_va_55 */
+ scanf("%d",& x_17); /* scanf_va_55 */
printf("%d",x_17); /* printf_va_55 */
- scanf("%i",(int *)(& x_17)); /* scanf_va_56 */
+ scanf("%i",& x_17); /* scanf_va_56 */
printf("%i",x_17); /* printf_va_56 */
}
{
uint_fast16_t x_18;
- scanf("%o",(unsigned int *)(& x_18)); /* scanf_va_57 */
+ scanf("%o",& x_18); /* scanf_va_57 */
printf("%o",x_18); /* printf_va_57 */
- scanf("%u",(unsigned int *)(& x_18)); /* scanf_va_58 */
+ scanf("%u",& x_18); /* scanf_va_58 */
printf("%u",x_18); /* printf_va_58 */
- scanf("%x",(unsigned int *)(& x_18)); /* scanf_va_59 */
+ scanf("%x",& x_18); /* scanf_va_59 */
printf("%x",x_18); /* printf_va_59 */
- scanf("%x",(unsigned int *)(& x_18)); /* scanf_va_60 */
+ scanf("%x",& x_18); /* scanf_va_60 */
printf("%X",x_18); /* printf_va_60 */
}
{
int_fast32_t x_19;
- scanf("%ld",(long *)(& x_19)); /* scanf_va_61 */
+ scanf("%ld",& x_19); /* scanf_va_61 */
printf("%ld",x_19); /* printf_va_61 */
- scanf("%li",(long *)(& x_19)); /* scanf_va_62 */
+ scanf("%li",& x_19); /* scanf_va_62 */
printf("%li",x_19); /* printf_va_62 */
}
{
uint_fast32_t x_20;
- scanf("%lo",(unsigned long *)(& x_20)); /* scanf_va_63 */
+ scanf("%lo",& x_20); /* scanf_va_63 */
printf("%lo",x_20); /* printf_va_63 */
- scanf("%lu",(unsigned long *)(& x_20)); /* scanf_va_64 */
+ scanf("%lu",& x_20); /* scanf_va_64 */
printf("%lu",x_20); /* printf_va_64 */
- scanf("%lx",(unsigned long *)(& x_20)); /* scanf_va_65 */
+ scanf("%lx",& x_20); /* scanf_va_65 */
printf("%lx",x_20); /* printf_va_65 */
- scanf("%lx",(unsigned long *)(& x_20)); /* scanf_va_66 */
+ scanf("%lx",& x_20); /* scanf_va_66 */
printf("%lX",x_20); /* printf_va_66 */
}
{
int_fast64_t x_21;
- scanf("%lld",(long long *)(& x_21)); /* scanf_va_67 */
+ scanf("%lld",& x_21); /* scanf_va_67 */
printf("%lld",x_21); /* printf_va_67 */
- scanf("%lli",(long long *)(& x_21)); /* scanf_va_68 */
+ scanf("%lli",& x_21); /* scanf_va_68 */
printf("%lli",x_21); /* printf_va_68 */
}
{
uint_fast64_t x_22;
- scanf("%llo",(unsigned long long *)(& x_22)); /* scanf_va_69 */
+ scanf("%llo",& x_22); /* scanf_va_69 */
printf("%llo",x_22); /* printf_va_69 */
- scanf("%llu",(unsigned long long *)(& x_22)); /* scanf_va_70 */
+ scanf("%llu",& x_22); /* scanf_va_70 */
printf("%llu",x_22); /* printf_va_70 */
- scanf("%llx",(unsigned long long *)(& x_22)); /* scanf_va_71 */
+ scanf("%llx",& x_22); /* scanf_va_71 */
printf("%llx",x_22); /* printf_va_71 */
- scanf("%llx",(unsigned long long *)(& x_22)); /* scanf_va_72 */
+ scanf("%llx",& x_22); /* scanf_va_72 */
printf("%llX",x_22); /* printf_va_72 */
}
{
intmax_t x_23;
- scanf("%lld",(long long *)(& x_23)); /* scanf_va_73 */
+ scanf("%lld",& x_23); /* scanf_va_73 */
printf("%lld",x_23); /* printf_va_73 */
- scanf("%lli",(long long *)(& x_23)); /* scanf_va_74 */
+ scanf("%lli",& x_23); /* scanf_va_74 */
printf("%lli",x_23); /* printf_va_74 */
}
{
uintmax_t x_24;
- scanf("%llo",(unsigned long long *)(& x_24)); /* scanf_va_75 */
+ scanf("%llo",& x_24); /* scanf_va_75 */
printf("%llo",x_24); /* printf_va_75 */
- scanf("%llu",(unsigned long long *)(& x_24)); /* scanf_va_76 */
+ scanf("%llu",& x_24); /* scanf_va_76 */
printf("%llu",x_24); /* printf_va_76 */
- scanf("%llx",(unsigned long long *)(& x_24)); /* scanf_va_77 */
+ scanf("%llx",& x_24); /* scanf_va_77 */
printf("%llx",x_24); /* printf_va_77 */
- scanf("%llx",(unsigned long long *)(& x_24)); /* scanf_va_78 */
+ scanf("%llx",& x_24); /* scanf_va_78 */
printf("%llX",x_24); /* printf_va_78 */
}
{
intptr_t x_25;
- scanf("%ld",(long *)(& x_25)); /* scanf_va_79 */
+ scanf("%ld",& x_25); /* scanf_va_79 */
printf("%ld",x_25); /* printf_va_79 */
- scanf("%li",(long *)(& x_25)); /* scanf_va_80 */
+ scanf("%li",& x_25); /* scanf_va_80 */
printf("%li",x_25); /* printf_va_80 */
}
{
uintptr_t x_26;
- scanf("%lo",(unsigned long *)(& x_26)); /* scanf_va_81 */
+ scanf("%lo",& x_26); /* scanf_va_81 */
printf("%lo",x_26); /* printf_va_81 */
- scanf("%lu",(unsigned long *)(& x_26)); /* scanf_va_82 */
+ scanf("%lu",& x_26); /* scanf_va_82 */
printf("%lu",x_26); /* printf_va_82 */
- scanf("%lx",(unsigned long *)(& x_26)); /* scanf_va_83 */
+ scanf("%lx",& x_26); /* scanf_va_83 */
printf("%lx",x_26); /* printf_va_83 */
- scanf("%lx",(unsigned long *)(& x_26)); /* scanf_va_84 */
+ scanf("%lx",& x_26); /* scanf_va_84 */
printf("%lX",x_26); /* printf_va_84 */
}
__retres = 0;
diff --git a/tests/libc/oracle/inttypes_h.1.res.oracle b/tests/libc/oracle/inttypes_h.1.res.oracle
index abcdf695f6af89de36cb3f94168c581330432ad6..b784a2af0234671e5052dd119e5c71adb2d4e83a 100644
--- a/tests/libc/oracle/inttypes_h.1.res.oracle
+++ b/tests/libc/oracle/inttypes_h.1.res.oracle
@@ -2531,254 +2531,254 @@ int main(void)
int __retres;
{
int8_t x;
- scanf("%hhd",(signed char *)(& x)); /* scanf_va_1 */
+ scanf("%hhd",& x); /* scanf_va_1 */
printf("%hhd",(int)x); /* printf_va_1 */
- scanf("%hhi",(signed char *)(& x)); /* scanf_va_2 */
+ scanf("%hhi",& x); /* scanf_va_2 */
printf("%hhi",(int)x); /* printf_va_2 */
}
{
uint8_t x_0;
- scanf("%hho",(unsigned char *)(& x_0)); /* scanf_va_3 */
+ scanf("%hho",& x_0); /* scanf_va_3 */
printf("%hho",(int)x_0); /* printf_va_3 */
- scanf("%hhu",(unsigned char *)(& x_0)); /* scanf_va_4 */
+ scanf("%hhu",& x_0); /* scanf_va_4 */
printf("%hhu",(int)x_0); /* printf_va_4 */
- scanf("%hhx",(unsigned char *)(& x_0)); /* scanf_va_5 */
+ scanf("%hhx",& x_0); /* scanf_va_5 */
printf("%hhx",(int)x_0); /* printf_va_5 */
- scanf("%hhx",(unsigned char *)(& x_0)); /* scanf_va_6 */
+ scanf("%hhx",& x_0); /* scanf_va_6 */
printf("%hhX",(int)x_0); /* printf_va_6 */
}
{
int16_t x_1;
- scanf("%hd",(short *)(& x_1)); /* scanf_va_7 */
+ scanf("%hd",& x_1); /* scanf_va_7 */
printf("%hd",(int)x_1); /* printf_va_7 */
- scanf("%hi",(short *)(& x_1)); /* scanf_va_8 */
+ scanf("%hi",& x_1); /* scanf_va_8 */
printf("%hi",(int)x_1); /* printf_va_8 */
}
{
uint16_t x_2;
- scanf("%ho",(unsigned short *)(& x_2)); /* scanf_va_9 */
+ scanf("%ho",& x_2); /* scanf_va_9 */
printf("%ho",(int)x_2); /* printf_va_9 */
- scanf("%hu",(unsigned short *)(& x_2)); /* scanf_va_10 */
+ scanf("%hu",& x_2); /* scanf_va_10 */
printf("%hu",(int)x_2); /* printf_va_10 */
- scanf("%hx",(unsigned short *)(& x_2)); /* scanf_va_11 */
+ scanf("%hx",& x_2); /* scanf_va_11 */
printf("%hx",(int)x_2); /* printf_va_11 */
- scanf("%hx",(unsigned short *)(& x_2)); /* scanf_va_12 */
+ scanf("%hx",& x_2); /* scanf_va_12 */
printf("%hX",(int)x_2); /* printf_va_12 */
}
{
int32_t x_3;
- scanf("%d",(int *)(& x_3)); /* scanf_va_13 */
+ scanf("%d",& x_3); /* scanf_va_13 */
printf("%d",x_3); /* printf_va_13 */
- scanf("%i",(int *)(& x_3)); /* scanf_va_14 */
+ scanf("%i",& x_3); /* scanf_va_14 */
printf("%i",x_3); /* printf_va_14 */
}
{
uint32_t x_4;
- scanf("%o",(unsigned int *)(& x_4)); /* scanf_va_15 */
+ scanf("%o",& x_4); /* scanf_va_15 */
printf("%o",x_4); /* printf_va_15 */
- scanf("%u",(unsigned int *)(& x_4)); /* scanf_va_16 */
+ scanf("%u",& x_4); /* scanf_va_16 */
printf("%u",x_4); /* printf_va_16 */
- scanf("%x",(unsigned int *)(& x_4)); /* scanf_va_17 */
+ scanf("%x",& x_4); /* scanf_va_17 */
printf("%x",x_4); /* printf_va_17 */
- scanf("%x",(unsigned int *)(& x_4)); /* scanf_va_18 */
+ scanf("%x",& x_4); /* scanf_va_18 */
printf("%X",x_4); /* printf_va_18 */
}
{
int64_t x_5;
- scanf("%lld",(long long *)(& x_5)); /* scanf_va_19 */
+ scanf("%lld",& x_5); /* scanf_va_19 */
printf("%lld",x_5); /* printf_va_19 */
- scanf("%lli",(long long *)(& x_5)); /* scanf_va_20 */
+ scanf("%lli",& x_5); /* scanf_va_20 */
printf("%lli",x_5); /* printf_va_20 */
}
{
uint64_t x_6;
- scanf("%llo",(unsigned long long *)(& x_6)); /* scanf_va_21 */
+ scanf("%llo",& x_6); /* scanf_va_21 */
printf("%llo",x_6); /* printf_va_21 */
- scanf("%llu",(unsigned long long *)(& x_6)); /* scanf_va_22 */
+ scanf("%llu",& x_6); /* scanf_va_22 */
printf("%llu",x_6); /* printf_va_22 */
- scanf("%llx",(unsigned long long *)(& x_6)); /* scanf_va_23 */
+ scanf("%llx",& x_6); /* scanf_va_23 */
printf("%llx",x_6); /* printf_va_23 */
- scanf("%llx",(unsigned long long *)(& x_6)); /* scanf_va_24 */
+ scanf("%llx",& x_6); /* scanf_va_24 */
printf("%llX",x_6); /* printf_va_24 */
}
{
int_least8_t x_7;
- scanf("%hhd",(signed char *)(& x_7)); /* scanf_va_25 */
+ scanf("%hhd",& x_7); /* scanf_va_25 */
printf("%hhd",(int)x_7); /* printf_va_25 */
- scanf("%hhi",(signed char *)(& x_7)); /* scanf_va_26 */
+ scanf("%hhi",& x_7); /* scanf_va_26 */
printf("%hhi",(int)x_7); /* printf_va_26 */
}
{
uint_least8_t x_8;
- scanf("%hho",(unsigned char *)(& x_8)); /* scanf_va_27 */
+ scanf("%hho",& x_8); /* scanf_va_27 */
printf("%hho",(int)x_8); /* printf_va_27 */
- scanf("%hhu",(unsigned char *)(& x_8)); /* scanf_va_28 */
+ scanf("%hhu",& x_8); /* scanf_va_28 */
printf("%hhu",(int)x_8); /* printf_va_28 */
- scanf("%hhx",(unsigned char *)(& x_8)); /* scanf_va_29 */
+ scanf("%hhx",& x_8); /* scanf_va_29 */
printf("%hhx",(int)x_8); /* printf_va_29 */
- scanf("%hhx",(unsigned char *)(& x_8)); /* scanf_va_30 */
+ scanf("%hhx",& x_8); /* scanf_va_30 */
printf("%hhX",(int)x_8); /* printf_va_30 */
}
{
int_least16_t x_9;
- scanf("%hd",(short *)(& x_9)); /* scanf_va_31 */
+ scanf("%hd",& x_9); /* scanf_va_31 */
printf("%hd",(int)x_9); /* printf_va_31 */
- scanf("%hi",(short *)(& x_9)); /* scanf_va_32 */
+ scanf("%hi",& x_9); /* scanf_va_32 */
printf("%hi",(int)x_9); /* printf_va_32 */
}
{
uint_least16_t x_10;
- scanf("%ho",(unsigned short *)(& x_10)); /* scanf_va_33 */
+ scanf("%ho",& x_10); /* scanf_va_33 */
printf("%ho",(int)x_10); /* printf_va_33 */
- scanf("%hu",(unsigned short *)(& x_10)); /* scanf_va_34 */
+ scanf("%hu",& x_10); /* scanf_va_34 */
printf("%hu",(int)x_10); /* printf_va_34 */
- scanf("%hx",(unsigned short *)(& x_10)); /* scanf_va_35 */
+ scanf("%hx",& x_10); /* scanf_va_35 */
printf("%hx",(int)x_10); /* printf_va_35 */
- scanf("%hx",(unsigned short *)(& x_10)); /* scanf_va_36 */
+ scanf("%hx",& x_10); /* scanf_va_36 */
printf("%hX",(int)x_10); /* printf_va_36 */
}
{
int_least32_t x_11;
- scanf("%d",(int *)(& x_11)); /* scanf_va_37 */
+ scanf("%d",& x_11); /* scanf_va_37 */
printf("%d",x_11); /* printf_va_37 */
- scanf("%i",(int *)(& x_11)); /* scanf_va_38 */
+ scanf("%i",& x_11); /* scanf_va_38 */
printf("%i",x_11); /* printf_va_38 */
}
{
uint_least32_t x_12;
- scanf("%o",(unsigned int *)(& x_12)); /* scanf_va_39 */
+ scanf("%o",& x_12); /* scanf_va_39 */
printf("%o",x_12); /* printf_va_39 */
- scanf("%u",(unsigned int *)(& x_12)); /* scanf_va_40 */
+ scanf("%u",& x_12); /* scanf_va_40 */
printf("%u",x_12); /* printf_va_40 */
- scanf("%x",(unsigned int *)(& x_12)); /* scanf_va_41 */
+ scanf("%x",& x_12); /* scanf_va_41 */
printf("%x",x_12); /* printf_va_41 */
- scanf("%x",(unsigned int *)(& x_12)); /* scanf_va_42 */
+ scanf("%x",& x_12); /* scanf_va_42 */
printf("%X",x_12); /* printf_va_42 */
}
{
int_least64_t x_13;
- scanf("%lld",(long long *)(& x_13)); /* scanf_va_43 */
+ scanf("%lld",& x_13); /* scanf_va_43 */
printf("%lld",x_13); /* printf_va_43 */
- scanf("%lli",(long long *)(& x_13)); /* scanf_va_44 */
+ scanf("%lli",& x_13); /* scanf_va_44 */
printf("%lli",x_13); /* printf_va_44 */
}
{
uint_least64_t x_14;
- scanf("%llo",(unsigned long long *)(& x_14)); /* scanf_va_45 */
+ scanf("%llo",& x_14); /* scanf_va_45 */
printf("%llo",x_14); /* printf_va_45 */
- scanf("%llu",(unsigned long long *)(& x_14)); /* scanf_va_46 */
+ scanf("%llu",& x_14); /* scanf_va_46 */
printf("%llu",x_14); /* printf_va_46 */
- scanf("%llx",(unsigned long long *)(& x_14)); /* scanf_va_47 */
+ scanf("%llx",& x_14); /* scanf_va_47 */
printf("%llx",x_14); /* printf_va_47 */
- scanf("%llx",(unsigned long long *)(& x_14)); /* scanf_va_48 */
+ scanf("%llx",& x_14); /* scanf_va_48 */
printf("%llX",x_14); /* printf_va_48 */
}
{
int_fast8_t x_15;
- scanf("%hhd",(signed char *)(& x_15)); /* scanf_va_49 */
+ scanf("%hhd",& x_15); /* scanf_va_49 */
printf("%hhd",(int)x_15); /* printf_va_49 */
- scanf("%hhi",(signed char *)(& x_15)); /* scanf_va_50 */
+ scanf("%hhi",& x_15); /* scanf_va_50 */
printf("%hhi",(int)x_15); /* printf_va_50 */
}
{
uint_fast8_t x_16;
- scanf("%hho",(unsigned char *)(& x_16)); /* scanf_va_51 */
+ scanf("%hho",& x_16); /* scanf_va_51 */
printf("%hho",(int)x_16); /* printf_va_51 */
- scanf("%hhu",(unsigned char *)(& x_16)); /* scanf_va_52 */
+ scanf("%hhu",& x_16); /* scanf_va_52 */
printf("%hhu",(int)x_16); /* printf_va_52 */
- scanf("%hhx",(unsigned char *)(& x_16)); /* scanf_va_53 */
+ scanf("%hhx",& x_16); /* scanf_va_53 */
printf("%hhx",(int)x_16); /* printf_va_53 */
- scanf("%hhx",(unsigned char *)(& x_16)); /* scanf_va_54 */
+ scanf("%hhx",& x_16); /* scanf_va_54 */
printf("%hhX",(int)x_16); /* printf_va_54 */
}
{
int_fast16_t x_17;
- scanf("%d",(int *)(& x_17)); /* scanf_va_55 */
+ scanf("%d",& x_17); /* scanf_va_55 */
printf("%d",x_17); /* printf_va_55 */
- scanf("%i",(int *)(& x_17)); /* scanf_va_56 */
+ scanf("%i",& x_17); /* scanf_va_56 */
printf("%i",x_17); /* printf_va_56 */
}
{
uint_fast16_t x_18;
- scanf("%o",(unsigned int *)(& x_18)); /* scanf_va_57 */
+ scanf("%o",& x_18); /* scanf_va_57 */
printf("%o",x_18); /* printf_va_57 */
- scanf("%u",(unsigned int *)(& x_18)); /* scanf_va_58 */
+ scanf("%u",& x_18); /* scanf_va_58 */
printf("%u",x_18); /* printf_va_58 */
- scanf("%x",(unsigned int *)(& x_18)); /* scanf_va_59 */
+ scanf("%x",& x_18); /* scanf_va_59 */
printf("%x",x_18); /* printf_va_59 */
- scanf("%x",(unsigned int *)(& x_18)); /* scanf_va_60 */
+ scanf("%x",& x_18); /* scanf_va_60 */
printf("%X",x_18); /* printf_va_60 */
}
{
int_fast32_t x_19;
- scanf("%d",(int *)(& x_19)); /* scanf_va_61 */
+ scanf("%d",& x_19); /* scanf_va_61 */
printf("%d",x_19); /* printf_va_61 */
- scanf("%i",(int *)(& x_19)); /* scanf_va_62 */
+ scanf("%i",& x_19); /* scanf_va_62 */
printf("%i",x_19); /* printf_va_62 */
}
{
uint_fast32_t x_20;
- scanf("%o",(unsigned int *)(& x_20)); /* scanf_va_63 */
+ scanf("%o",& x_20); /* scanf_va_63 */
printf("%o",x_20); /* printf_va_63 */
- scanf("%u",(unsigned int *)(& x_20)); /* scanf_va_64 */
+ scanf("%u",& x_20); /* scanf_va_64 */
printf("%u",x_20); /* printf_va_64 */
- scanf("%x",(unsigned int *)(& x_20)); /* scanf_va_65 */
+ scanf("%x",& x_20); /* scanf_va_65 */
printf("%x",x_20); /* printf_va_65 */
- scanf("%x",(unsigned int *)(& x_20)); /* scanf_va_66 */
+ scanf("%x",& x_20); /* scanf_va_66 */
printf("%X",x_20); /* printf_va_66 */
}
{
int_fast64_t x_21;
- scanf("%lld",(long long *)(& x_21)); /* scanf_va_67 */
+ scanf("%lld",& x_21); /* scanf_va_67 */
printf("%lld",x_21); /* printf_va_67 */
- scanf("%lli",(long long *)(& x_21)); /* scanf_va_68 */
+ scanf("%lli",& x_21); /* scanf_va_68 */
printf("%lli",x_21); /* printf_va_68 */
}
{
uint_fast64_t x_22;
- scanf("%llo",(unsigned long long *)(& x_22)); /* scanf_va_69 */
+ scanf("%llo",& x_22); /* scanf_va_69 */
printf("%llo",x_22); /* printf_va_69 */
- scanf("%llu",(unsigned long long *)(& x_22)); /* scanf_va_70 */
+ scanf("%llu",& x_22); /* scanf_va_70 */
printf("%llu",x_22); /* printf_va_70 */
- scanf("%llx",(unsigned long long *)(& x_22)); /* scanf_va_71 */
+ scanf("%llx",& x_22); /* scanf_va_71 */
printf("%llx",x_22); /* printf_va_71 */
- scanf("%llx",(unsigned long long *)(& x_22)); /* scanf_va_72 */
+ scanf("%llx",& x_22); /* scanf_va_72 */
printf("%llX",x_22); /* printf_va_72 */
}
{
intmax_t x_23;
- scanf("%lld",(long long *)(& x_23)); /* scanf_va_73 */
+ scanf("%lld",& x_23); /* scanf_va_73 */
printf("%lld",x_23); /* printf_va_73 */
- scanf("%lli",(long long *)(& x_23)); /* scanf_va_74 */
+ scanf("%lli",& x_23); /* scanf_va_74 */
printf("%lli",x_23); /* printf_va_74 */
}
{
uintmax_t x_24;
- scanf("%llo",(unsigned long long *)(& x_24)); /* scanf_va_75 */
+ scanf("%llo",& x_24); /* scanf_va_75 */
printf("%llo",x_24); /* printf_va_75 */
- scanf("%llu",(unsigned long long *)(& x_24)); /* scanf_va_76 */
+ scanf("%llu",& x_24); /* scanf_va_76 */
printf("%llu",x_24); /* printf_va_76 */
- scanf("%llx",(unsigned long long *)(& x_24)); /* scanf_va_77 */
+ scanf("%llx",& x_24); /* scanf_va_77 */
printf("%llx",x_24); /* printf_va_77 */
- scanf("%llx",(unsigned long long *)(& x_24)); /* scanf_va_78 */
+ scanf("%llx",& x_24); /* scanf_va_78 */
printf("%llX",x_24); /* printf_va_78 */
}
{
intptr_t x_25;
- scanf("%d",(int *)(& x_25)); /* scanf_va_79 */
+ scanf("%d",& x_25); /* scanf_va_79 */
printf("%d",x_25); /* printf_va_79 */
- scanf("%i",(int *)(& x_25)); /* scanf_va_80 */
+ scanf("%i",& x_25); /* scanf_va_80 */
printf("%i",x_25); /* printf_va_80 */
}
{
uintptr_t x_26;
- scanf("%o",(unsigned int *)(& x_26)); /* scanf_va_81 */
+ scanf("%o",& x_26); /* scanf_va_81 */
printf("%o",x_26); /* printf_va_81 */
- scanf("%u",(unsigned int *)(& x_26)); /* scanf_va_82 */
+ scanf("%u",& x_26); /* scanf_va_82 */
printf("%u",x_26); /* printf_va_82 */
- scanf("%x",(unsigned int *)(& x_26)); /* scanf_va_83 */
+ scanf("%x",& x_26); /* scanf_va_83 */
printf("%x",x_26); /* printf_va_83 */
- scanf("%x",(unsigned int *)(& x_26)); /* scanf_va_84 */
+ scanf("%x",& x_26); /* scanf_va_84 */
printf("%X",x_26); /* printf_va_84 */
}
__retres = 0;
diff --git a/tests/libc/oracle/inttypes_h.2.res.oracle b/tests/libc/oracle/inttypes_h.2.res.oracle
index 3ef1a5ea234d154e5347aab4bcd51115632381d4..92f400d2eb09f2eaf2e35ed7bd2037d5632d7974 100644
--- a/tests/libc/oracle/inttypes_h.2.res.oracle
+++ b/tests/libc/oracle/inttypes_h.2.res.oracle
@@ -2531,254 +2531,254 @@ int main(void)
int __retres;
{
int8_t x;
- scanf("%hhd",(signed char *)(& x)); /* scanf_va_1 */
+ scanf("%hhd",& x); /* scanf_va_1 */
printf("%hhd",(int)x); /* printf_va_1 */
- scanf("%hhi",(signed char *)(& x)); /* scanf_va_2 */
+ scanf("%hhi",& x); /* scanf_va_2 */
printf("%hhi",(int)x); /* printf_va_2 */
}
{
uint8_t x_0;
- scanf("%hho",(unsigned char *)(& x_0)); /* scanf_va_3 */
+ scanf("%hho",& x_0); /* scanf_va_3 */
printf("%hho",(int)x_0); /* printf_va_3 */
- scanf("%hhu",(unsigned char *)(& x_0)); /* scanf_va_4 */
+ scanf("%hhu",& x_0); /* scanf_va_4 */
printf("%hhu",(int)x_0); /* printf_va_4 */
- scanf("%hhx",(unsigned char *)(& x_0)); /* scanf_va_5 */
+ scanf("%hhx",& x_0); /* scanf_va_5 */
printf("%hhx",(int)x_0); /* printf_va_5 */
- scanf("%hhx",(unsigned char *)(& x_0)); /* scanf_va_6 */
+ scanf("%hhx",& x_0); /* scanf_va_6 */
printf("%hhX",(int)x_0); /* printf_va_6 */
}
{
int16_t x_1;
- scanf("%hd",(short *)(& x_1)); /* scanf_va_7 */
+ scanf("%hd",& x_1); /* scanf_va_7 */
printf("%hd",(int)x_1); /* printf_va_7 */
- scanf("%hi",(short *)(& x_1)); /* scanf_va_8 */
+ scanf("%hi",& x_1); /* scanf_va_8 */
printf("%hi",(int)x_1); /* printf_va_8 */
}
{
uint16_t x_2;
- scanf("%ho",(unsigned short *)(& x_2)); /* scanf_va_9 */
+ scanf("%ho",& x_2); /* scanf_va_9 */
printf("%ho",(int)x_2); /* printf_va_9 */
- scanf("%hu",(unsigned short *)(& x_2)); /* scanf_va_10 */
+ scanf("%hu",& x_2); /* scanf_va_10 */
printf("%hu",(int)x_2); /* printf_va_10 */
- scanf("%hx",(unsigned short *)(& x_2)); /* scanf_va_11 */
+ scanf("%hx",& x_2); /* scanf_va_11 */
printf("%hx",(int)x_2); /* printf_va_11 */
- scanf("%hx",(unsigned short *)(& x_2)); /* scanf_va_12 */
+ scanf("%hx",& x_2); /* scanf_va_12 */
printf("%hX",(int)x_2); /* printf_va_12 */
}
{
int32_t x_3;
- scanf("%d",(int *)(& x_3)); /* scanf_va_13 */
+ scanf("%d",& x_3); /* scanf_va_13 */
printf("%d",x_3); /* printf_va_13 */
- scanf("%i",(int *)(& x_3)); /* scanf_va_14 */
+ scanf("%i",& x_3); /* scanf_va_14 */
printf("%i",x_3); /* printf_va_14 */
}
{
uint32_t x_4;
- scanf("%o",(unsigned int *)(& x_4)); /* scanf_va_15 */
+ scanf("%o",& x_4); /* scanf_va_15 */
printf("%o",x_4); /* printf_va_15 */
- scanf("%u",(unsigned int *)(& x_4)); /* scanf_va_16 */
+ scanf("%u",& x_4); /* scanf_va_16 */
printf("%u",x_4); /* printf_va_16 */
- scanf("%x",(unsigned int *)(& x_4)); /* scanf_va_17 */
+ scanf("%x",& x_4); /* scanf_va_17 */
printf("%x",x_4); /* printf_va_17 */
- scanf("%x",(unsigned int *)(& x_4)); /* scanf_va_18 */
+ scanf("%x",& x_4); /* scanf_va_18 */
printf("%X",x_4); /* printf_va_18 */
}
{
int64_t x_5;
- scanf("%ld",(long *)(& x_5)); /* scanf_va_19 */
+ scanf("%ld",& x_5); /* scanf_va_19 */
printf("%ld",x_5); /* printf_va_19 */
- scanf("%li",(long *)(& x_5)); /* scanf_va_20 */
+ scanf("%li",& x_5); /* scanf_va_20 */
printf("%li",x_5); /* printf_va_20 */
}
{
uint64_t x_6;
- scanf("%lo",(unsigned long *)(& x_6)); /* scanf_va_21 */
+ scanf("%lo",& x_6); /* scanf_va_21 */
printf("%lo",x_6); /* printf_va_21 */
- scanf("%lu",(unsigned long *)(& x_6)); /* scanf_va_22 */
+ scanf("%lu",& x_6); /* scanf_va_22 */
printf("%lu",x_6); /* printf_va_22 */
- scanf("%lx",(unsigned long *)(& x_6)); /* scanf_va_23 */
+ scanf("%lx",& x_6); /* scanf_va_23 */
printf("%lx",x_6); /* printf_va_23 */
- scanf("%lx",(unsigned long *)(& x_6)); /* scanf_va_24 */
+ scanf("%lx",& x_6); /* scanf_va_24 */
printf("%lX",x_6); /* printf_va_24 */
}
{
int_least8_t x_7;
- scanf("%hhd",(signed char *)(& x_7)); /* scanf_va_25 */
+ scanf("%hhd",& x_7); /* scanf_va_25 */
printf("%hhd",(int)x_7); /* printf_va_25 */
- scanf("%hhi",(signed char *)(& x_7)); /* scanf_va_26 */
+ scanf("%hhi",& x_7); /* scanf_va_26 */
printf("%hhi",(int)x_7); /* printf_va_26 */
}
{
uint_least8_t x_8;
- scanf("%hho",(unsigned char *)(& x_8)); /* scanf_va_27 */
+ scanf("%hho",& x_8); /* scanf_va_27 */
printf("%hho",(int)x_8); /* printf_va_27 */
- scanf("%hhu",(unsigned char *)(& x_8)); /* scanf_va_28 */
+ scanf("%hhu",& x_8); /* scanf_va_28 */
printf("%hhu",(int)x_8); /* printf_va_28 */
- scanf("%hhx",(unsigned char *)(& x_8)); /* scanf_va_29 */
+ scanf("%hhx",& x_8); /* scanf_va_29 */
printf("%hhx",(int)x_8); /* printf_va_29 */
- scanf("%hhx",(unsigned char *)(& x_8)); /* scanf_va_30 */
+ scanf("%hhx",& x_8); /* scanf_va_30 */
printf("%hhX",(int)x_8); /* printf_va_30 */
}
{
int_least16_t x_9;
- scanf("%hd",(short *)(& x_9)); /* scanf_va_31 */
+ scanf("%hd",& x_9); /* scanf_va_31 */
printf("%hd",(int)x_9); /* printf_va_31 */
- scanf("%hi",(short *)(& x_9)); /* scanf_va_32 */
+ scanf("%hi",& x_9); /* scanf_va_32 */
printf("%hi",(int)x_9); /* printf_va_32 */
}
{
uint_least16_t x_10;
- scanf("%ho",(unsigned short *)(& x_10)); /* scanf_va_33 */
+ scanf("%ho",& x_10); /* scanf_va_33 */
printf("%ho",(int)x_10); /* printf_va_33 */
- scanf("%hu",(unsigned short *)(& x_10)); /* scanf_va_34 */
+ scanf("%hu",& x_10); /* scanf_va_34 */
printf("%hu",(int)x_10); /* printf_va_34 */
- scanf("%hx",(unsigned short *)(& x_10)); /* scanf_va_35 */
+ scanf("%hx",& x_10); /* scanf_va_35 */
printf("%hx",(int)x_10); /* printf_va_35 */
- scanf("%hx",(unsigned short *)(& x_10)); /* scanf_va_36 */
+ scanf("%hx",& x_10); /* scanf_va_36 */
printf("%hX",(int)x_10); /* printf_va_36 */
}
{
int_least32_t x_11;
- scanf("%d",(int *)(& x_11)); /* scanf_va_37 */
+ scanf("%d",& x_11); /* scanf_va_37 */
printf("%d",x_11); /* printf_va_37 */
- scanf("%i",(int *)(& x_11)); /* scanf_va_38 */
+ scanf("%i",& x_11); /* scanf_va_38 */
printf("%i",x_11); /* printf_va_38 */
}
{
uint_least32_t x_12;
- scanf("%o",(unsigned int *)(& x_12)); /* scanf_va_39 */
+ scanf("%o",& x_12); /* scanf_va_39 */
printf("%o",x_12); /* printf_va_39 */
- scanf("%u",(unsigned int *)(& x_12)); /* scanf_va_40 */
+ scanf("%u",& x_12); /* scanf_va_40 */
printf("%u",x_12); /* printf_va_40 */
- scanf("%x",(unsigned int *)(& x_12)); /* scanf_va_41 */
+ scanf("%x",& x_12); /* scanf_va_41 */
printf("%x",x_12); /* printf_va_41 */
- scanf("%x",(unsigned int *)(& x_12)); /* scanf_va_42 */
+ scanf("%x",& x_12); /* scanf_va_42 */
printf("%X",x_12); /* printf_va_42 */
}
{
int_least64_t x_13;
- scanf("%ld",(long *)(& x_13)); /* scanf_va_43 */
+ scanf("%ld",& x_13); /* scanf_va_43 */
printf("%ld",x_13); /* printf_va_43 */
- scanf("%li",(long *)(& x_13)); /* scanf_va_44 */
+ scanf("%li",& x_13); /* scanf_va_44 */
printf("%li",x_13); /* printf_va_44 */
}
{
uint_least64_t x_14;
- scanf("%lo",(unsigned long *)(& x_14)); /* scanf_va_45 */
+ scanf("%lo",& x_14); /* scanf_va_45 */
printf("%lo",x_14); /* printf_va_45 */
- scanf("%lu",(unsigned long *)(& x_14)); /* scanf_va_46 */
+ scanf("%lu",& x_14); /* scanf_va_46 */
printf("%lu",x_14); /* printf_va_46 */
- scanf("%lx",(unsigned long *)(& x_14)); /* scanf_va_47 */
+ scanf("%lx",& x_14); /* scanf_va_47 */
printf("%lx",x_14); /* printf_va_47 */
- scanf("%lx",(unsigned long *)(& x_14)); /* scanf_va_48 */
+ scanf("%lx",& x_14); /* scanf_va_48 */
printf("%lX",x_14); /* printf_va_48 */
}
{
int_fast8_t x_15;
- scanf("%hhd",(signed char *)(& x_15)); /* scanf_va_49 */
+ scanf("%hhd",& x_15); /* scanf_va_49 */
printf("%hhd",(int)x_15); /* printf_va_49 */
- scanf("%hhi",(signed char *)(& x_15)); /* scanf_va_50 */
+ scanf("%hhi",& x_15); /* scanf_va_50 */
printf("%hhi",(int)x_15); /* printf_va_50 */
}
{
uint_fast8_t x_16;
- scanf("%hho",(unsigned char *)(& x_16)); /* scanf_va_51 */
+ scanf("%hho",& x_16); /* scanf_va_51 */
printf("%hho",(int)x_16); /* printf_va_51 */
- scanf("%hhu",(unsigned char *)(& x_16)); /* scanf_va_52 */
+ scanf("%hhu",& x_16); /* scanf_va_52 */
printf("%hhu",(int)x_16); /* printf_va_52 */
- scanf("%hhx",(unsigned char *)(& x_16)); /* scanf_va_53 */
+ scanf("%hhx",& x_16); /* scanf_va_53 */
printf("%hhx",(int)x_16); /* printf_va_53 */
- scanf("%hhx",(unsigned char *)(& x_16)); /* scanf_va_54 */
+ scanf("%hhx",& x_16); /* scanf_va_54 */
printf("%hhX",(int)x_16); /* printf_va_54 */
}
{
int_fast16_t x_17;
- scanf("%d",(int *)(& x_17)); /* scanf_va_55 */
+ scanf("%d",& x_17); /* scanf_va_55 */
printf("%d",x_17); /* printf_va_55 */
- scanf("%i",(int *)(& x_17)); /* scanf_va_56 */
+ scanf("%i",& x_17); /* scanf_va_56 */
printf("%i",x_17); /* printf_va_56 */
}
{
uint_fast16_t x_18;
- scanf("%o",(unsigned int *)(& x_18)); /* scanf_va_57 */
+ scanf("%o",& x_18); /* scanf_va_57 */
printf("%o",x_18); /* printf_va_57 */
- scanf("%u",(unsigned int *)(& x_18)); /* scanf_va_58 */
+ scanf("%u",& x_18); /* scanf_va_58 */
printf("%u",x_18); /* printf_va_58 */
- scanf("%x",(unsigned int *)(& x_18)); /* scanf_va_59 */
+ scanf("%x",& x_18); /* scanf_va_59 */
printf("%x",x_18); /* printf_va_59 */
- scanf("%x",(unsigned int *)(& x_18)); /* scanf_va_60 */
+ scanf("%x",& x_18); /* scanf_va_60 */
printf("%X",x_18); /* printf_va_60 */
}
{
int_fast32_t x_19;
- scanf("%d",(int *)(& x_19)); /* scanf_va_61 */
+ scanf("%d",& x_19); /* scanf_va_61 */
printf("%d",x_19); /* printf_va_61 */
- scanf("%i",(int *)(& x_19)); /* scanf_va_62 */
+ scanf("%i",& x_19); /* scanf_va_62 */
printf("%i",x_19); /* printf_va_62 */
}
{
uint_fast32_t x_20;
- scanf("%o",(unsigned int *)(& x_20)); /* scanf_va_63 */
+ scanf("%o",& x_20); /* scanf_va_63 */
printf("%o",x_20); /* printf_va_63 */
- scanf("%u",(unsigned int *)(& x_20)); /* scanf_va_64 */
+ scanf("%u",& x_20); /* scanf_va_64 */
printf("%u",x_20); /* printf_va_64 */
- scanf("%x",(unsigned int *)(& x_20)); /* scanf_va_65 */
+ scanf("%x",& x_20); /* scanf_va_65 */
printf("%x",x_20); /* printf_va_65 */
- scanf("%x",(unsigned int *)(& x_20)); /* scanf_va_66 */
+ scanf("%x",& x_20); /* scanf_va_66 */
printf("%X",x_20); /* printf_va_66 */
}
{
int_fast64_t x_21;
- scanf("%ld",(long *)(& x_21)); /* scanf_va_67 */
+ scanf("%ld",& x_21); /* scanf_va_67 */
printf("%ld",x_21); /* printf_va_67 */
- scanf("%li",(long *)(& x_21)); /* scanf_va_68 */
+ scanf("%li",& x_21); /* scanf_va_68 */
printf("%li",x_21); /* printf_va_68 */
}
{
uint_fast64_t x_22;
- scanf("%lo",(unsigned long *)(& x_22)); /* scanf_va_69 */
+ scanf("%lo",& x_22); /* scanf_va_69 */
printf("%lo",x_22); /* printf_va_69 */
- scanf("%lu",(unsigned long *)(& x_22)); /* scanf_va_70 */
+ scanf("%lu",& x_22); /* scanf_va_70 */
printf("%lu",x_22); /* printf_va_70 */
- scanf("%lx",(unsigned long *)(& x_22)); /* scanf_va_71 */
+ scanf("%lx",& x_22); /* scanf_va_71 */
printf("%lx",x_22); /* printf_va_71 */
- scanf("%lx",(unsigned long *)(& x_22)); /* scanf_va_72 */
+ scanf("%lx",& x_22); /* scanf_va_72 */
printf("%lX",x_22); /* printf_va_72 */
}
{
intmax_t x_23;
- scanf("%lld",(long long *)(& x_23)); /* scanf_va_73 */
+ scanf("%lld",& x_23); /* scanf_va_73 */
printf("%lld",x_23); /* printf_va_73 */
- scanf("%lli",(long long *)(& x_23)); /* scanf_va_74 */
+ scanf("%lli",& x_23); /* scanf_va_74 */
printf("%lli",x_23); /* printf_va_74 */
}
{
uintmax_t x_24;
- scanf("%llo",(unsigned long long *)(& x_24)); /* scanf_va_75 */
+ scanf("%llo",& x_24); /* scanf_va_75 */
printf("%llo",x_24); /* printf_va_75 */
- scanf("%llu",(unsigned long long *)(& x_24)); /* scanf_va_76 */
+ scanf("%llu",& x_24); /* scanf_va_76 */
printf("%llu",x_24); /* printf_va_76 */
- scanf("%llx",(unsigned long long *)(& x_24)); /* scanf_va_77 */
+ scanf("%llx",& x_24); /* scanf_va_77 */
printf("%llx",x_24); /* printf_va_77 */
- scanf("%llx",(unsigned long long *)(& x_24)); /* scanf_va_78 */
+ scanf("%llx",& x_24); /* scanf_va_78 */
printf("%llX",x_24); /* printf_va_78 */
}
{
intptr_t x_25;
- scanf("%ld",(long *)(& x_25)); /* scanf_va_79 */
+ scanf("%ld",& x_25); /* scanf_va_79 */
printf("%ld",x_25); /* printf_va_79 */
- scanf("%li",(long *)(& x_25)); /* scanf_va_80 */
+ scanf("%li",& x_25); /* scanf_va_80 */
printf("%li",x_25); /* printf_va_80 */
}
{
uintptr_t x_26;
- scanf("%lo",(unsigned long *)(& x_26)); /* scanf_va_81 */
+ scanf("%lo",& x_26); /* scanf_va_81 */
printf("%lo",x_26); /* printf_va_81 */
- scanf("%lu",(unsigned long *)(& x_26)); /* scanf_va_82 */
+ scanf("%lu",& x_26); /* scanf_va_82 */
printf("%lu",x_26); /* printf_va_82 */
- scanf("%lx",(unsigned long *)(& x_26)); /* scanf_va_83 */
+ scanf("%lx",& x_26); /* scanf_va_83 */
printf("%lx",x_26); /* printf_va_83 */
- scanf("%lx",(unsigned long *)(& x_26)); /* scanf_va_84 */
+ scanf("%lx",& x_26); /* scanf_va_84 */
printf("%lX",x_26); /* printf_va_84 */
}
__retres = 0;
diff --git a/tests/libc/oracle/inttypes_h.3.res.oracle b/tests/libc/oracle/inttypes_h.3.res.oracle
index aaac74691f5c7c89d39025891f6b0596d6376935..256d275c25b295dbf09dff30931381e3bd9bd4ae 100644
--- a/tests/libc/oracle/inttypes_h.3.res.oracle
+++ b/tests/libc/oracle/inttypes_h.3.res.oracle
@@ -2531,254 +2531,254 @@ int main(void)
int __retres;
{
int8_t x;
- scanf("%hhd",(signed char *)(& x)); /* scanf_va_1 */
+ scanf("%hhd",& x); /* scanf_va_1 */
printf("%hhd",(int)x); /* printf_va_1 */
- scanf("%hhi",(signed char *)(& x)); /* scanf_va_2 */
+ scanf("%hhi",& x); /* scanf_va_2 */
printf("%hhi",(int)x); /* printf_va_2 */
}
{
uint8_t x_0;
- scanf("%hho",(unsigned char *)(& x_0)); /* scanf_va_3 */
+ scanf("%hho",& x_0); /* scanf_va_3 */
printf("%hho",(int)x_0); /* printf_va_3 */
- scanf("%hhu",(unsigned char *)(& x_0)); /* scanf_va_4 */
+ scanf("%hhu",& x_0); /* scanf_va_4 */
printf("%hhu",(int)x_0); /* printf_va_4 */
- scanf("%hhx",(unsigned char *)(& x_0)); /* scanf_va_5 */
+ scanf("%hhx",& x_0); /* scanf_va_5 */
printf("%hhx",(int)x_0); /* printf_va_5 */
- scanf("%hhx",(unsigned char *)(& x_0)); /* scanf_va_6 */
+ scanf("%hhx",& x_0); /* scanf_va_6 */
printf("%hhX",(int)x_0); /* printf_va_6 */
}
{
int16_t x_1;
- scanf("%hd",(short *)(& x_1)); /* scanf_va_7 */
+ scanf("%hd",& x_1); /* scanf_va_7 */
printf("%hd",(int)x_1); /* printf_va_7 */
- scanf("%hi",(short *)(& x_1)); /* scanf_va_8 */
+ scanf("%hi",& x_1); /* scanf_va_8 */
printf("%hi",(int)x_1); /* printf_va_8 */
}
{
uint16_t x_2;
- scanf("%ho",(unsigned short *)(& x_2)); /* scanf_va_9 */
+ scanf("%ho",& x_2); /* scanf_va_9 */
printf("%ho",(unsigned int)x_2); /* printf_va_9 */
- scanf("%hu",(unsigned short *)(& x_2)); /* scanf_va_10 */
+ scanf("%hu",& x_2); /* scanf_va_10 */
printf("%hu",(unsigned int)x_2); /* printf_va_10 */
- scanf("%hx",(unsigned short *)(& x_2)); /* scanf_va_11 */
+ scanf("%hx",& x_2); /* scanf_va_11 */
printf("%hx",(unsigned int)x_2); /* printf_va_11 */
- scanf("%hx",(unsigned short *)(& x_2)); /* scanf_va_12 */
+ scanf("%hx",& x_2); /* scanf_va_12 */
printf("%hX",(unsigned int)x_2); /* printf_va_12 */
}
{
int32_t x_3;
- scanf("%ld",(long *)(& x_3)); /* scanf_va_13 */
+ scanf("%ld",& x_3); /* scanf_va_13 */
printf("%ld",x_3); /* printf_va_13 */
- scanf("%li",(long *)(& x_3)); /* scanf_va_14 */
+ scanf("%li",& x_3); /* scanf_va_14 */
printf("%li",x_3); /* printf_va_14 */
}
{
uint32_t x_4;
- scanf("%lo",(unsigned long *)(& x_4)); /* scanf_va_15 */
+ scanf("%lo",& x_4); /* scanf_va_15 */
printf("%lo",x_4); /* printf_va_15 */
- scanf("%lu",(unsigned long *)(& x_4)); /* scanf_va_16 */
+ scanf("%lu",& x_4); /* scanf_va_16 */
printf("%lu",x_4); /* printf_va_16 */
- scanf("%lx",(unsigned long *)(& x_4)); /* scanf_va_17 */
+ scanf("%lx",& x_4); /* scanf_va_17 */
printf("%lx",x_4); /* printf_va_17 */
- scanf("%lx",(unsigned long *)(& x_4)); /* scanf_va_18 */
+ scanf("%lx",& x_4); /* scanf_va_18 */
printf("%lX",x_4); /* printf_va_18 */
}
{
int64_t x_5;
- scanf("%lld",(long long *)(& x_5)); /* scanf_va_19 */
+ scanf("%lld",& x_5); /* scanf_va_19 */
printf("%lld",x_5); /* printf_va_19 */
- scanf("%lli",(long long *)(& x_5)); /* scanf_va_20 */
+ scanf("%lli",& x_5); /* scanf_va_20 */
printf("%lli",x_5); /* printf_va_20 */
}
{
uint64_t x_6;
- scanf("%llo",(unsigned long long *)(& x_6)); /* scanf_va_21 */
+ scanf("%llo",& x_6); /* scanf_va_21 */
printf("%llo",x_6); /* printf_va_21 */
- scanf("%llu",(unsigned long long *)(& x_6)); /* scanf_va_22 */
+ scanf("%llu",& x_6); /* scanf_va_22 */
printf("%llu",x_6); /* printf_va_22 */
- scanf("%llx",(unsigned long long *)(& x_6)); /* scanf_va_23 */
+ scanf("%llx",& x_6); /* scanf_va_23 */
printf("%llx",x_6); /* printf_va_23 */
- scanf("%llx",(unsigned long long *)(& x_6)); /* scanf_va_24 */
+ scanf("%llx",& x_6); /* scanf_va_24 */
printf("%llX",x_6); /* printf_va_24 */
}
{
int_least8_t x_7;
- scanf("%hhd",(signed char *)(& x_7)); /* scanf_va_25 */
+ scanf("%hhd",& x_7); /* scanf_va_25 */
printf("%hhd",(int)x_7); /* printf_va_25 */
- scanf("%hhi",(signed char *)(& x_7)); /* scanf_va_26 */
+ scanf("%hhi",& x_7); /* scanf_va_26 */
printf("%hhi",(int)x_7); /* printf_va_26 */
}
{
uint_least8_t x_8;
- scanf("%hho",(unsigned char *)(& x_8)); /* scanf_va_27 */
+ scanf("%hho",& x_8); /* scanf_va_27 */
printf("%hho",(int)x_8); /* printf_va_27 */
- scanf("%hhu",(unsigned char *)(& x_8)); /* scanf_va_28 */
+ scanf("%hhu",& x_8); /* scanf_va_28 */
printf("%hhu",(int)x_8); /* printf_va_28 */
- scanf("%hhx",(unsigned char *)(& x_8)); /* scanf_va_29 */
+ scanf("%hhx",& x_8); /* scanf_va_29 */
printf("%hhx",(int)x_8); /* printf_va_29 */
- scanf("%hhx",(unsigned char *)(& x_8)); /* scanf_va_30 */
+ scanf("%hhx",& x_8); /* scanf_va_30 */
printf("%hhX",(int)x_8); /* printf_va_30 */
}
{
int_least16_t x_9;
- scanf("%hd",(short *)(& x_9)); /* scanf_va_31 */
+ scanf("%hd",& x_9); /* scanf_va_31 */
printf("%hd",(int)x_9); /* printf_va_31 */
- scanf("%hi",(short *)(& x_9)); /* scanf_va_32 */
+ scanf("%hi",& x_9); /* scanf_va_32 */
printf("%hi",(int)x_9); /* printf_va_32 */
}
{
uint_least16_t x_10;
- scanf("%ho",(unsigned short *)(& x_10)); /* scanf_va_33 */
+ scanf("%ho",& x_10); /* scanf_va_33 */
printf("%ho",(unsigned int)x_10); /* printf_va_33 */
- scanf("%hu",(unsigned short *)(& x_10)); /* scanf_va_34 */
+ scanf("%hu",& x_10); /* scanf_va_34 */
printf("%hu",(unsigned int)x_10); /* printf_va_34 */
- scanf("%hx",(unsigned short *)(& x_10)); /* scanf_va_35 */
+ scanf("%hx",& x_10); /* scanf_va_35 */
printf("%hx",(unsigned int)x_10); /* printf_va_35 */
- scanf("%hx",(unsigned short *)(& x_10)); /* scanf_va_36 */
+ scanf("%hx",& x_10); /* scanf_va_36 */
printf("%hX",(unsigned int)x_10); /* printf_va_36 */
}
{
int_least32_t x_11;
- scanf("%ld",(long *)(& x_11)); /* scanf_va_37 */
+ scanf("%ld",& x_11); /* scanf_va_37 */
printf("%ld",x_11); /* printf_va_37 */
- scanf("%li",(long *)(& x_11)); /* scanf_va_38 */
+ scanf("%li",& x_11); /* scanf_va_38 */
printf("%li",x_11); /* printf_va_38 */
}
{
uint_least32_t x_12;
- scanf("%lo",(unsigned long *)(& x_12)); /* scanf_va_39 */
+ scanf("%lo",& x_12); /* scanf_va_39 */
printf("%lo",x_12); /* printf_va_39 */
- scanf("%lu",(unsigned long *)(& x_12)); /* scanf_va_40 */
+ scanf("%lu",& x_12); /* scanf_va_40 */
printf("%lu",x_12); /* printf_va_40 */
- scanf("%lx",(unsigned long *)(& x_12)); /* scanf_va_41 */
+ scanf("%lx",& x_12); /* scanf_va_41 */
printf("%lx",x_12); /* printf_va_41 */
- scanf("%lx",(unsigned long *)(& x_12)); /* scanf_va_42 */
+ scanf("%lx",& x_12); /* scanf_va_42 */
printf("%lX",x_12); /* printf_va_42 */
}
{
int_least64_t x_13;
- scanf("%lld",(long long *)(& x_13)); /* scanf_va_43 */
+ scanf("%lld",& x_13); /* scanf_va_43 */
printf("%lld",x_13); /* printf_va_43 */
- scanf("%lli",(long long *)(& x_13)); /* scanf_va_44 */
+ scanf("%lli",& x_13); /* scanf_va_44 */
printf("%lli",x_13); /* printf_va_44 */
}
{
uint_least64_t x_14;
- scanf("%llo",(unsigned long long *)(& x_14)); /* scanf_va_45 */
+ scanf("%llo",& x_14); /* scanf_va_45 */
printf("%llo",x_14); /* printf_va_45 */
- scanf("%llu",(unsigned long long *)(& x_14)); /* scanf_va_46 */
+ scanf("%llu",& x_14); /* scanf_va_46 */
printf("%llu",x_14); /* printf_va_46 */
- scanf("%llx",(unsigned long long *)(& x_14)); /* scanf_va_47 */
+ scanf("%llx",& x_14); /* scanf_va_47 */
printf("%llx",x_14); /* printf_va_47 */
- scanf("%llx",(unsigned long long *)(& x_14)); /* scanf_va_48 */
+ scanf("%llx",& x_14); /* scanf_va_48 */
printf("%llX",x_14); /* printf_va_48 */
}
{
int_fast8_t x_15;
- scanf("%hhd",(signed char *)(& x_15)); /* scanf_va_49 */
+ scanf("%hhd",& x_15); /* scanf_va_49 */
printf("%hhd",(int)x_15); /* printf_va_49 */
- scanf("%hhi",(signed char *)(& x_15)); /* scanf_va_50 */
+ scanf("%hhi",& x_15); /* scanf_va_50 */
printf("%hhi",(int)x_15); /* printf_va_50 */
}
{
uint_fast8_t x_16;
- scanf("%hho",(unsigned char *)(& x_16)); /* scanf_va_51 */
+ scanf("%hho",& x_16); /* scanf_va_51 */
printf("%hho",(int)x_16); /* printf_va_51 */
- scanf("%hhu",(unsigned char *)(& x_16)); /* scanf_va_52 */
+ scanf("%hhu",& x_16); /* scanf_va_52 */
printf("%hhu",(int)x_16); /* printf_va_52 */
- scanf("%hhx",(unsigned char *)(& x_16)); /* scanf_va_53 */
+ scanf("%hhx",& x_16); /* scanf_va_53 */
printf("%hhx",(int)x_16); /* printf_va_53 */
- scanf("%hhx",(unsigned char *)(& x_16)); /* scanf_va_54 */
+ scanf("%hhx",& x_16); /* scanf_va_54 */
printf("%hhX",(int)x_16); /* printf_va_54 */
}
{
int_fast16_t x_17;
- scanf("%d",(int *)(& x_17)); /* scanf_va_55 */
+ scanf("%d",& x_17); /* scanf_va_55 */
printf("%d",x_17); /* printf_va_55 */
- scanf("%i",(int *)(& x_17)); /* scanf_va_56 */
+ scanf("%i",& x_17); /* scanf_va_56 */
printf("%i",x_17); /* printf_va_56 */
}
{
uint_fast16_t x_18;
- scanf("%o",(unsigned int *)(& x_18)); /* scanf_va_57 */
+ scanf("%o",& x_18); /* scanf_va_57 */
printf("%o",x_18); /* printf_va_57 */
- scanf("%u",(unsigned int *)(& x_18)); /* scanf_va_58 */
+ scanf("%u",& x_18); /* scanf_va_58 */
printf("%u",x_18); /* printf_va_58 */
- scanf("%x",(unsigned int *)(& x_18)); /* scanf_va_59 */
+ scanf("%x",& x_18); /* scanf_va_59 */
printf("%x",x_18); /* printf_va_59 */
- scanf("%x",(unsigned int *)(& x_18)); /* scanf_va_60 */
+ scanf("%x",& x_18); /* scanf_va_60 */
printf("%X",x_18); /* printf_va_60 */
}
{
int_fast32_t x_19;
- scanf("%ld",(long *)(& x_19)); /* scanf_va_61 */
+ scanf("%ld",& x_19); /* scanf_va_61 */
printf("%ld",x_19); /* printf_va_61 */
- scanf("%li",(long *)(& x_19)); /* scanf_va_62 */
+ scanf("%li",& x_19); /* scanf_va_62 */
printf("%li",x_19); /* printf_va_62 */
}
{
uint_fast32_t x_20;
- scanf("%lo",(unsigned long *)(& x_20)); /* scanf_va_63 */
+ scanf("%lo",& x_20); /* scanf_va_63 */
printf("%lo",x_20); /* printf_va_63 */
- scanf("%lu",(unsigned long *)(& x_20)); /* scanf_va_64 */
+ scanf("%lu",& x_20); /* scanf_va_64 */
printf("%lu",x_20); /* printf_va_64 */
- scanf("%lx",(unsigned long *)(& x_20)); /* scanf_va_65 */
+ scanf("%lx",& x_20); /* scanf_va_65 */
printf("%lx",x_20); /* printf_va_65 */
- scanf("%lx",(unsigned long *)(& x_20)); /* scanf_va_66 */
+ scanf("%lx",& x_20); /* scanf_va_66 */
printf("%lX",x_20); /* printf_va_66 */
}
{
int_fast64_t x_21;
- scanf("%lld",(long long *)(& x_21)); /* scanf_va_67 */
+ scanf("%lld",& x_21); /* scanf_va_67 */
printf("%lld",x_21); /* printf_va_67 */
- scanf("%lli",(long long *)(& x_21)); /* scanf_va_68 */
+ scanf("%lli",& x_21); /* scanf_va_68 */
printf("%lli",x_21); /* printf_va_68 */
}
{
uint_fast64_t x_22;
- scanf("%llo",(unsigned long long *)(& x_22)); /* scanf_va_69 */
+ scanf("%llo",& x_22); /* scanf_va_69 */
printf("%llo",x_22); /* printf_va_69 */
- scanf("%llu",(unsigned long long *)(& x_22)); /* scanf_va_70 */
+ scanf("%llu",& x_22); /* scanf_va_70 */
printf("%llu",x_22); /* printf_va_70 */
- scanf("%llx",(unsigned long long *)(& x_22)); /* scanf_va_71 */
+ scanf("%llx",& x_22); /* scanf_va_71 */
printf("%llx",x_22); /* printf_va_71 */
- scanf("%llx",(unsigned long long *)(& x_22)); /* scanf_va_72 */
+ scanf("%llx",& x_22); /* scanf_va_72 */
printf("%llX",x_22); /* printf_va_72 */
}
{
intmax_t x_23;
- scanf("%lld",(long long *)(& x_23)); /* scanf_va_73 */
+ scanf("%lld",& x_23); /* scanf_va_73 */
printf("%lld",x_23); /* printf_va_73 */
- scanf("%lli",(long long *)(& x_23)); /* scanf_va_74 */
+ scanf("%lli",& x_23); /* scanf_va_74 */
printf("%lli",x_23); /* printf_va_74 */
}
{
uintmax_t x_24;
- scanf("%llo",(unsigned long long *)(& x_24)); /* scanf_va_75 */
+ scanf("%llo",& x_24); /* scanf_va_75 */
printf("%llo",x_24); /* printf_va_75 */
- scanf("%llu",(unsigned long long *)(& x_24)); /* scanf_va_76 */
+ scanf("%llu",& x_24); /* scanf_va_76 */
printf("%llu",x_24); /* printf_va_76 */
- scanf("%llx",(unsigned long long *)(& x_24)); /* scanf_va_77 */
+ scanf("%llx",& x_24); /* scanf_va_77 */
printf("%llx",x_24); /* printf_va_77 */
- scanf("%llx",(unsigned long long *)(& x_24)); /* scanf_va_78 */
+ scanf("%llx",& x_24); /* scanf_va_78 */
printf("%llX",x_24); /* printf_va_78 */
}
{
intptr_t x_25;
- scanf("%ld",(long *)(& x_25)); /* scanf_va_79 */
+ scanf("%ld",& x_25); /* scanf_va_79 */
printf("%ld",x_25); /* printf_va_79 */
- scanf("%li",(long *)(& x_25)); /* scanf_va_80 */
+ scanf("%li",& x_25); /* scanf_va_80 */
printf("%li",x_25); /* printf_va_80 */
}
{
uintptr_t x_26;
- scanf("%lo",(unsigned long *)(& x_26)); /* scanf_va_81 */
+ scanf("%lo",& x_26); /* scanf_va_81 */
printf("%lo",x_26); /* printf_va_81 */
- scanf("%lu",(unsigned long *)(& x_26)); /* scanf_va_82 */
+ scanf("%lu",& x_26); /* scanf_va_82 */
printf("%lu",x_26); /* printf_va_82 */
- scanf("%lx",(unsigned long *)(& x_26)); /* scanf_va_83 */
+ scanf("%lx",& x_26); /* scanf_va_83 */
printf("%lx",x_26); /* printf_va_83 */
- scanf("%lx",(unsigned long *)(& x_26)); /* scanf_va_84 */
+ scanf("%lx",& x_26); /* scanf_va_84 */
printf("%lX",x_26); /* printf_va_84 */
}
__retres = 0;
diff --git a/tests/libc/oracle/inttypes_h.4.res.oracle b/tests/libc/oracle/inttypes_h.4.res.oracle
index abcdf695f6af89de36cb3f94168c581330432ad6..b784a2af0234671e5052dd119e5c71adb2d4e83a 100644
--- a/tests/libc/oracle/inttypes_h.4.res.oracle
+++ b/tests/libc/oracle/inttypes_h.4.res.oracle
@@ -2531,254 +2531,254 @@ int main(void)
int __retres;
{
int8_t x;
- scanf("%hhd",(signed char *)(& x)); /* scanf_va_1 */
+ scanf("%hhd",& x); /* scanf_va_1 */
printf("%hhd",(int)x); /* printf_va_1 */
- scanf("%hhi",(signed char *)(& x)); /* scanf_va_2 */
+ scanf("%hhi",& x); /* scanf_va_2 */
printf("%hhi",(int)x); /* printf_va_2 */
}
{
uint8_t x_0;
- scanf("%hho",(unsigned char *)(& x_0)); /* scanf_va_3 */
+ scanf("%hho",& x_0); /* scanf_va_3 */
printf("%hho",(int)x_0); /* printf_va_3 */
- scanf("%hhu",(unsigned char *)(& x_0)); /* scanf_va_4 */
+ scanf("%hhu",& x_0); /* scanf_va_4 */
printf("%hhu",(int)x_0); /* printf_va_4 */
- scanf("%hhx",(unsigned char *)(& x_0)); /* scanf_va_5 */
+ scanf("%hhx",& x_0); /* scanf_va_5 */
printf("%hhx",(int)x_0); /* printf_va_5 */
- scanf("%hhx",(unsigned char *)(& x_0)); /* scanf_va_6 */
+ scanf("%hhx",& x_0); /* scanf_va_6 */
printf("%hhX",(int)x_0); /* printf_va_6 */
}
{
int16_t x_1;
- scanf("%hd",(short *)(& x_1)); /* scanf_va_7 */
+ scanf("%hd",& x_1); /* scanf_va_7 */
printf("%hd",(int)x_1); /* printf_va_7 */
- scanf("%hi",(short *)(& x_1)); /* scanf_va_8 */
+ scanf("%hi",& x_1); /* scanf_va_8 */
printf("%hi",(int)x_1); /* printf_va_8 */
}
{
uint16_t x_2;
- scanf("%ho",(unsigned short *)(& x_2)); /* scanf_va_9 */
+ scanf("%ho",& x_2); /* scanf_va_9 */
printf("%ho",(int)x_2); /* printf_va_9 */
- scanf("%hu",(unsigned short *)(& x_2)); /* scanf_va_10 */
+ scanf("%hu",& x_2); /* scanf_va_10 */
printf("%hu",(int)x_2); /* printf_va_10 */
- scanf("%hx",(unsigned short *)(& x_2)); /* scanf_va_11 */
+ scanf("%hx",& x_2); /* scanf_va_11 */
printf("%hx",(int)x_2); /* printf_va_11 */
- scanf("%hx",(unsigned short *)(& x_2)); /* scanf_va_12 */
+ scanf("%hx",& x_2); /* scanf_va_12 */
printf("%hX",(int)x_2); /* printf_va_12 */
}
{
int32_t x_3;
- scanf("%d",(int *)(& x_3)); /* scanf_va_13 */
+ scanf("%d",& x_3); /* scanf_va_13 */
printf("%d",x_3); /* printf_va_13 */
- scanf("%i",(int *)(& x_3)); /* scanf_va_14 */
+ scanf("%i",& x_3); /* scanf_va_14 */
printf("%i",x_3); /* printf_va_14 */
}
{
uint32_t x_4;
- scanf("%o",(unsigned int *)(& x_4)); /* scanf_va_15 */
+ scanf("%o",& x_4); /* scanf_va_15 */
printf("%o",x_4); /* printf_va_15 */
- scanf("%u",(unsigned int *)(& x_4)); /* scanf_va_16 */
+ scanf("%u",& x_4); /* scanf_va_16 */
printf("%u",x_4); /* printf_va_16 */
- scanf("%x",(unsigned int *)(& x_4)); /* scanf_va_17 */
+ scanf("%x",& x_4); /* scanf_va_17 */
printf("%x",x_4); /* printf_va_17 */
- scanf("%x",(unsigned int *)(& x_4)); /* scanf_va_18 */
+ scanf("%x",& x_4); /* scanf_va_18 */
printf("%X",x_4); /* printf_va_18 */
}
{
int64_t x_5;
- scanf("%lld",(long long *)(& x_5)); /* scanf_va_19 */
+ scanf("%lld",& x_5); /* scanf_va_19 */
printf("%lld",x_5); /* printf_va_19 */
- scanf("%lli",(long long *)(& x_5)); /* scanf_va_20 */
+ scanf("%lli",& x_5); /* scanf_va_20 */
printf("%lli",x_5); /* printf_va_20 */
}
{
uint64_t x_6;
- scanf("%llo",(unsigned long long *)(& x_6)); /* scanf_va_21 */
+ scanf("%llo",& x_6); /* scanf_va_21 */
printf("%llo",x_6); /* printf_va_21 */
- scanf("%llu",(unsigned long long *)(& x_6)); /* scanf_va_22 */
+ scanf("%llu",& x_6); /* scanf_va_22 */
printf("%llu",x_6); /* printf_va_22 */
- scanf("%llx",(unsigned long long *)(& x_6)); /* scanf_va_23 */
+ scanf("%llx",& x_6); /* scanf_va_23 */
printf("%llx",x_6); /* printf_va_23 */
- scanf("%llx",(unsigned long long *)(& x_6)); /* scanf_va_24 */
+ scanf("%llx",& x_6); /* scanf_va_24 */
printf("%llX",x_6); /* printf_va_24 */
}
{
int_least8_t x_7;
- scanf("%hhd",(signed char *)(& x_7)); /* scanf_va_25 */
+ scanf("%hhd",& x_7); /* scanf_va_25 */
printf("%hhd",(int)x_7); /* printf_va_25 */
- scanf("%hhi",(signed char *)(& x_7)); /* scanf_va_26 */
+ scanf("%hhi",& x_7); /* scanf_va_26 */
printf("%hhi",(int)x_7); /* printf_va_26 */
}
{
uint_least8_t x_8;
- scanf("%hho",(unsigned char *)(& x_8)); /* scanf_va_27 */
+ scanf("%hho",& x_8); /* scanf_va_27 */
printf("%hho",(int)x_8); /* printf_va_27 */
- scanf("%hhu",(unsigned char *)(& x_8)); /* scanf_va_28 */
+ scanf("%hhu",& x_8); /* scanf_va_28 */
printf("%hhu",(int)x_8); /* printf_va_28 */
- scanf("%hhx",(unsigned char *)(& x_8)); /* scanf_va_29 */
+ scanf("%hhx",& x_8); /* scanf_va_29 */
printf("%hhx",(int)x_8); /* printf_va_29 */
- scanf("%hhx",(unsigned char *)(& x_8)); /* scanf_va_30 */
+ scanf("%hhx",& x_8); /* scanf_va_30 */
printf("%hhX",(int)x_8); /* printf_va_30 */
}
{
int_least16_t x_9;
- scanf("%hd",(short *)(& x_9)); /* scanf_va_31 */
+ scanf("%hd",& x_9); /* scanf_va_31 */
printf("%hd",(int)x_9); /* printf_va_31 */
- scanf("%hi",(short *)(& x_9)); /* scanf_va_32 */
+ scanf("%hi",& x_9); /* scanf_va_32 */
printf("%hi",(int)x_9); /* printf_va_32 */
}
{
uint_least16_t x_10;
- scanf("%ho",(unsigned short *)(& x_10)); /* scanf_va_33 */
+ scanf("%ho",& x_10); /* scanf_va_33 */
printf("%ho",(int)x_10); /* printf_va_33 */
- scanf("%hu",(unsigned short *)(& x_10)); /* scanf_va_34 */
+ scanf("%hu",& x_10); /* scanf_va_34 */
printf("%hu",(int)x_10); /* printf_va_34 */
- scanf("%hx",(unsigned short *)(& x_10)); /* scanf_va_35 */
+ scanf("%hx",& x_10); /* scanf_va_35 */
printf("%hx",(int)x_10); /* printf_va_35 */
- scanf("%hx",(unsigned short *)(& x_10)); /* scanf_va_36 */
+ scanf("%hx",& x_10); /* scanf_va_36 */
printf("%hX",(int)x_10); /* printf_va_36 */
}
{
int_least32_t x_11;
- scanf("%d",(int *)(& x_11)); /* scanf_va_37 */
+ scanf("%d",& x_11); /* scanf_va_37 */
printf("%d",x_11); /* printf_va_37 */
- scanf("%i",(int *)(& x_11)); /* scanf_va_38 */
+ scanf("%i",& x_11); /* scanf_va_38 */
printf("%i",x_11); /* printf_va_38 */
}
{
uint_least32_t x_12;
- scanf("%o",(unsigned int *)(& x_12)); /* scanf_va_39 */
+ scanf("%o",& x_12); /* scanf_va_39 */
printf("%o",x_12); /* printf_va_39 */
- scanf("%u",(unsigned int *)(& x_12)); /* scanf_va_40 */
+ scanf("%u",& x_12); /* scanf_va_40 */
printf("%u",x_12); /* printf_va_40 */
- scanf("%x",(unsigned int *)(& x_12)); /* scanf_va_41 */
+ scanf("%x",& x_12); /* scanf_va_41 */
printf("%x",x_12); /* printf_va_41 */
- scanf("%x",(unsigned int *)(& x_12)); /* scanf_va_42 */
+ scanf("%x",& x_12); /* scanf_va_42 */
printf("%X",x_12); /* printf_va_42 */
}
{
int_least64_t x_13;
- scanf("%lld",(long long *)(& x_13)); /* scanf_va_43 */
+ scanf("%lld",& x_13); /* scanf_va_43 */
printf("%lld",x_13); /* printf_va_43 */
- scanf("%lli",(long long *)(& x_13)); /* scanf_va_44 */
+ scanf("%lli",& x_13); /* scanf_va_44 */
printf("%lli",x_13); /* printf_va_44 */
}
{
uint_least64_t x_14;
- scanf("%llo",(unsigned long long *)(& x_14)); /* scanf_va_45 */
+ scanf("%llo",& x_14); /* scanf_va_45 */
printf("%llo",x_14); /* printf_va_45 */
- scanf("%llu",(unsigned long long *)(& x_14)); /* scanf_va_46 */
+ scanf("%llu",& x_14); /* scanf_va_46 */
printf("%llu",x_14); /* printf_va_46 */
- scanf("%llx",(unsigned long long *)(& x_14)); /* scanf_va_47 */
+ scanf("%llx",& x_14); /* scanf_va_47 */
printf("%llx",x_14); /* printf_va_47 */
- scanf("%llx",(unsigned long long *)(& x_14)); /* scanf_va_48 */
+ scanf("%llx",& x_14); /* scanf_va_48 */
printf("%llX",x_14); /* printf_va_48 */
}
{
int_fast8_t x_15;
- scanf("%hhd",(signed char *)(& x_15)); /* scanf_va_49 */
+ scanf("%hhd",& x_15); /* scanf_va_49 */
printf("%hhd",(int)x_15); /* printf_va_49 */
- scanf("%hhi",(signed char *)(& x_15)); /* scanf_va_50 */
+ scanf("%hhi",& x_15); /* scanf_va_50 */
printf("%hhi",(int)x_15); /* printf_va_50 */
}
{
uint_fast8_t x_16;
- scanf("%hho",(unsigned char *)(& x_16)); /* scanf_va_51 */
+ scanf("%hho",& x_16); /* scanf_va_51 */
printf("%hho",(int)x_16); /* printf_va_51 */
- scanf("%hhu",(unsigned char *)(& x_16)); /* scanf_va_52 */
+ scanf("%hhu",& x_16); /* scanf_va_52 */
printf("%hhu",(int)x_16); /* printf_va_52 */
- scanf("%hhx",(unsigned char *)(& x_16)); /* scanf_va_53 */
+ scanf("%hhx",& x_16); /* scanf_va_53 */
printf("%hhx",(int)x_16); /* printf_va_53 */
- scanf("%hhx",(unsigned char *)(& x_16)); /* scanf_va_54 */
+ scanf("%hhx",& x_16); /* scanf_va_54 */
printf("%hhX",(int)x_16); /* printf_va_54 */
}
{
int_fast16_t x_17;
- scanf("%d",(int *)(& x_17)); /* scanf_va_55 */
+ scanf("%d",& x_17); /* scanf_va_55 */
printf("%d",x_17); /* printf_va_55 */
- scanf("%i",(int *)(& x_17)); /* scanf_va_56 */
+ scanf("%i",& x_17); /* scanf_va_56 */
printf("%i",x_17); /* printf_va_56 */
}
{
uint_fast16_t x_18;
- scanf("%o",(unsigned int *)(& x_18)); /* scanf_va_57 */
+ scanf("%o",& x_18); /* scanf_va_57 */
printf("%o",x_18); /* printf_va_57 */
- scanf("%u",(unsigned int *)(& x_18)); /* scanf_va_58 */
+ scanf("%u",& x_18); /* scanf_va_58 */
printf("%u",x_18); /* printf_va_58 */
- scanf("%x",(unsigned int *)(& x_18)); /* scanf_va_59 */
+ scanf("%x",& x_18); /* scanf_va_59 */
printf("%x",x_18); /* printf_va_59 */
- scanf("%x",(unsigned int *)(& x_18)); /* scanf_va_60 */
+ scanf("%x",& x_18); /* scanf_va_60 */
printf("%X",x_18); /* printf_va_60 */
}
{
int_fast32_t x_19;
- scanf("%d",(int *)(& x_19)); /* scanf_va_61 */
+ scanf("%d",& x_19); /* scanf_va_61 */
printf("%d",x_19); /* printf_va_61 */
- scanf("%i",(int *)(& x_19)); /* scanf_va_62 */
+ scanf("%i",& x_19); /* scanf_va_62 */
printf("%i",x_19); /* printf_va_62 */
}
{
uint_fast32_t x_20;
- scanf("%o",(unsigned int *)(& x_20)); /* scanf_va_63 */
+ scanf("%o",& x_20); /* scanf_va_63 */
printf("%o",x_20); /* printf_va_63 */
- scanf("%u",(unsigned int *)(& x_20)); /* scanf_va_64 */
+ scanf("%u",& x_20); /* scanf_va_64 */
printf("%u",x_20); /* printf_va_64 */
- scanf("%x",(unsigned int *)(& x_20)); /* scanf_va_65 */
+ scanf("%x",& x_20); /* scanf_va_65 */
printf("%x",x_20); /* printf_va_65 */
- scanf("%x",(unsigned int *)(& x_20)); /* scanf_va_66 */
+ scanf("%x",& x_20); /* scanf_va_66 */
printf("%X",x_20); /* printf_va_66 */
}
{
int_fast64_t x_21;
- scanf("%lld",(long long *)(& x_21)); /* scanf_va_67 */
+ scanf("%lld",& x_21); /* scanf_va_67 */
printf("%lld",x_21); /* printf_va_67 */
- scanf("%lli",(long long *)(& x_21)); /* scanf_va_68 */
+ scanf("%lli",& x_21); /* scanf_va_68 */
printf("%lli",x_21); /* printf_va_68 */
}
{
uint_fast64_t x_22;
- scanf("%llo",(unsigned long long *)(& x_22)); /* scanf_va_69 */
+ scanf("%llo",& x_22); /* scanf_va_69 */
printf("%llo",x_22); /* printf_va_69 */
- scanf("%llu",(unsigned long long *)(& x_22)); /* scanf_va_70 */
+ scanf("%llu",& x_22); /* scanf_va_70 */
printf("%llu",x_22); /* printf_va_70 */
- scanf("%llx",(unsigned long long *)(& x_22)); /* scanf_va_71 */
+ scanf("%llx",& x_22); /* scanf_va_71 */
printf("%llx",x_22); /* printf_va_71 */
- scanf("%llx",(unsigned long long *)(& x_22)); /* scanf_va_72 */
+ scanf("%llx",& x_22); /* scanf_va_72 */
printf("%llX",x_22); /* printf_va_72 */
}
{
intmax_t x_23;
- scanf("%lld",(long long *)(& x_23)); /* scanf_va_73 */
+ scanf("%lld",& x_23); /* scanf_va_73 */
printf("%lld",x_23); /* printf_va_73 */
- scanf("%lli",(long long *)(& x_23)); /* scanf_va_74 */
+ scanf("%lli",& x_23); /* scanf_va_74 */
printf("%lli",x_23); /* printf_va_74 */
}
{
uintmax_t x_24;
- scanf("%llo",(unsigned long long *)(& x_24)); /* scanf_va_75 */
+ scanf("%llo",& x_24); /* scanf_va_75 */
printf("%llo",x_24); /* printf_va_75 */
- scanf("%llu",(unsigned long long *)(& x_24)); /* scanf_va_76 */
+ scanf("%llu",& x_24); /* scanf_va_76 */
printf("%llu",x_24); /* printf_va_76 */
- scanf("%llx",(unsigned long long *)(& x_24)); /* scanf_va_77 */
+ scanf("%llx",& x_24); /* scanf_va_77 */
printf("%llx",x_24); /* printf_va_77 */
- scanf("%llx",(unsigned long long *)(& x_24)); /* scanf_va_78 */
+ scanf("%llx",& x_24); /* scanf_va_78 */
printf("%llX",x_24); /* printf_va_78 */
}
{
intptr_t x_25;
- scanf("%d",(int *)(& x_25)); /* scanf_va_79 */
+ scanf("%d",& x_25); /* scanf_va_79 */
printf("%d",x_25); /* printf_va_79 */
- scanf("%i",(int *)(& x_25)); /* scanf_va_80 */
+ scanf("%i",& x_25); /* scanf_va_80 */
printf("%i",x_25); /* printf_va_80 */
}
{
uintptr_t x_26;
- scanf("%o",(unsigned int *)(& x_26)); /* scanf_va_81 */
+ scanf("%o",& x_26); /* scanf_va_81 */
printf("%o",x_26); /* printf_va_81 */
- scanf("%u",(unsigned int *)(& x_26)); /* scanf_va_82 */
+ scanf("%u",& x_26); /* scanf_va_82 */
printf("%u",x_26); /* printf_va_82 */
- scanf("%x",(unsigned int *)(& x_26)); /* scanf_va_83 */
+ scanf("%x",& x_26); /* scanf_va_83 */
printf("%x",x_26); /* printf_va_83 */
- scanf("%x",(unsigned int *)(& x_26)); /* scanf_va_84 */
+ scanf("%x",& x_26); /* scanf_va_84 */
printf("%X",x_26); /* printf_va_84 */
}
__retres = 0;
diff --git a/tests/libc/oracle/inttypes_h.5.res.oracle b/tests/libc/oracle/inttypes_h.5.res.oracle
index 3ef1a5ea234d154e5347aab4bcd51115632381d4..92f400d2eb09f2eaf2e35ed7bd2037d5632d7974 100644
--- a/tests/libc/oracle/inttypes_h.5.res.oracle
+++ b/tests/libc/oracle/inttypes_h.5.res.oracle
@@ -2531,254 +2531,254 @@ int main(void)
int __retres;
{
int8_t x;
- scanf("%hhd",(signed char *)(& x)); /* scanf_va_1 */
+ scanf("%hhd",& x); /* scanf_va_1 */
printf("%hhd",(int)x); /* printf_va_1 */
- scanf("%hhi",(signed char *)(& x)); /* scanf_va_2 */
+ scanf("%hhi",& x); /* scanf_va_2 */
printf("%hhi",(int)x); /* printf_va_2 */
}
{
uint8_t x_0;
- scanf("%hho",(unsigned char *)(& x_0)); /* scanf_va_3 */
+ scanf("%hho",& x_0); /* scanf_va_3 */
printf("%hho",(int)x_0); /* printf_va_3 */
- scanf("%hhu",(unsigned char *)(& x_0)); /* scanf_va_4 */
+ scanf("%hhu",& x_0); /* scanf_va_4 */
printf("%hhu",(int)x_0); /* printf_va_4 */
- scanf("%hhx",(unsigned char *)(& x_0)); /* scanf_va_5 */
+ scanf("%hhx",& x_0); /* scanf_va_5 */
printf("%hhx",(int)x_0); /* printf_va_5 */
- scanf("%hhx",(unsigned char *)(& x_0)); /* scanf_va_6 */
+ scanf("%hhx",& x_0); /* scanf_va_6 */
printf("%hhX",(int)x_0); /* printf_va_6 */
}
{
int16_t x_1;
- scanf("%hd",(short *)(& x_1)); /* scanf_va_7 */
+ scanf("%hd",& x_1); /* scanf_va_7 */
printf("%hd",(int)x_1); /* printf_va_7 */
- scanf("%hi",(short *)(& x_1)); /* scanf_va_8 */
+ scanf("%hi",& x_1); /* scanf_va_8 */
printf("%hi",(int)x_1); /* printf_va_8 */
}
{
uint16_t x_2;
- scanf("%ho",(unsigned short *)(& x_2)); /* scanf_va_9 */
+ scanf("%ho",& x_2); /* scanf_va_9 */
printf("%ho",(int)x_2); /* printf_va_9 */
- scanf("%hu",(unsigned short *)(& x_2)); /* scanf_va_10 */
+ scanf("%hu",& x_2); /* scanf_va_10 */
printf("%hu",(int)x_2); /* printf_va_10 */
- scanf("%hx",(unsigned short *)(& x_2)); /* scanf_va_11 */
+ scanf("%hx",& x_2); /* scanf_va_11 */
printf("%hx",(int)x_2); /* printf_va_11 */
- scanf("%hx",(unsigned short *)(& x_2)); /* scanf_va_12 */
+ scanf("%hx",& x_2); /* scanf_va_12 */
printf("%hX",(int)x_2); /* printf_va_12 */
}
{
int32_t x_3;
- scanf("%d",(int *)(& x_3)); /* scanf_va_13 */
+ scanf("%d",& x_3); /* scanf_va_13 */
printf("%d",x_3); /* printf_va_13 */
- scanf("%i",(int *)(& x_3)); /* scanf_va_14 */
+ scanf("%i",& x_3); /* scanf_va_14 */
printf("%i",x_3); /* printf_va_14 */
}
{
uint32_t x_4;
- scanf("%o",(unsigned int *)(& x_4)); /* scanf_va_15 */
+ scanf("%o",& x_4); /* scanf_va_15 */
printf("%o",x_4); /* printf_va_15 */
- scanf("%u",(unsigned int *)(& x_4)); /* scanf_va_16 */
+ scanf("%u",& x_4); /* scanf_va_16 */
printf("%u",x_4); /* printf_va_16 */
- scanf("%x",(unsigned int *)(& x_4)); /* scanf_va_17 */
+ scanf("%x",& x_4); /* scanf_va_17 */
printf("%x",x_4); /* printf_va_17 */
- scanf("%x",(unsigned int *)(& x_4)); /* scanf_va_18 */
+ scanf("%x",& x_4); /* scanf_va_18 */
printf("%X",x_4); /* printf_va_18 */
}
{
int64_t x_5;
- scanf("%ld",(long *)(& x_5)); /* scanf_va_19 */
+ scanf("%ld",& x_5); /* scanf_va_19 */
printf("%ld",x_5); /* printf_va_19 */
- scanf("%li",(long *)(& x_5)); /* scanf_va_20 */
+ scanf("%li",& x_5); /* scanf_va_20 */
printf("%li",x_5); /* printf_va_20 */
}
{
uint64_t x_6;
- scanf("%lo",(unsigned long *)(& x_6)); /* scanf_va_21 */
+ scanf("%lo",& x_6); /* scanf_va_21 */
printf("%lo",x_6); /* printf_va_21 */
- scanf("%lu",(unsigned long *)(& x_6)); /* scanf_va_22 */
+ scanf("%lu",& x_6); /* scanf_va_22 */
printf("%lu",x_6); /* printf_va_22 */
- scanf("%lx",(unsigned long *)(& x_6)); /* scanf_va_23 */
+ scanf("%lx",& x_6); /* scanf_va_23 */
printf("%lx",x_6); /* printf_va_23 */
- scanf("%lx",(unsigned long *)(& x_6)); /* scanf_va_24 */
+ scanf("%lx",& x_6); /* scanf_va_24 */
printf("%lX",x_6); /* printf_va_24 */
}
{
int_least8_t x_7;
- scanf("%hhd",(signed char *)(& x_7)); /* scanf_va_25 */
+ scanf("%hhd",& x_7); /* scanf_va_25 */
printf("%hhd",(int)x_7); /* printf_va_25 */
- scanf("%hhi",(signed char *)(& x_7)); /* scanf_va_26 */
+ scanf("%hhi",& x_7); /* scanf_va_26 */
printf("%hhi",(int)x_7); /* printf_va_26 */
}
{
uint_least8_t x_8;
- scanf("%hho",(unsigned char *)(& x_8)); /* scanf_va_27 */
+ scanf("%hho",& x_8); /* scanf_va_27 */
printf("%hho",(int)x_8); /* printf_va_27 */
- scanf("%hhu",(unsigned char *)(& x_8)); /* scanf_va_28 */
+ scanf("%hhu",& x_8); /* scanf_va_28 */
printf("%hhu",(int)x_8); /* printf_va_28 */
- scanf("%hhx",(unsigned char *)(& x_8)); /* scanf_va_29 */
+ scanf("%hhx",& x_8); /* scanf_va_29 */
printf("%hhx",(int)x_8); /* printf_va_29 */
- scanf("%hhx",(unsigned char *)(& x_8)); /* scanf_va_30 */
+ scanf("%hhx",& x_8); /* scanf_va_30 */
printf("%hhX",(int)x_8); /* printf_va_30 */
}
{
int_least16_t x_9;
- scanf("%hd",(short *)(& x_9)); /* scanf_va_31 */
+ scanf("%hd",& x_9); /* scanf_va_31 */
printf("%hd",(int)x_9); /* printf_va_31 */
- scanf("%hi",(short *)(& x_9)); /* scanf_va_32 */
+ scanf("%hi",& x_9); /* scanf_va_32 */
printf("%hi",(int)x_9); /* printf_va_32 */
}
{
uint_least16_t x_10;
- scanf("%ho",(unsigned short *)(& x_10)); /* scanf_va_33 */
+ scanf("%ho",& x_10); /* scanf_va_33 */
printf("%ho",(int)x_10); /* printf_va_33 */
- scanf("%hu",(unsigned short *)(& x_10)); /* scanf_va_34 */
+ scanf("%hu",& x_10); /* scanf_va_34 */
printf("%hu",(int)x_10); /* printf_va_34 */
- scanf("%hx",(unsigned short *)(& x_10)); /* scanf_va_35 */
+ scanf("%hx",& x_10); /* scanf_va_35 */
printf("%hx",(int)x_10); /* printf_va_35 */
- scanf("%hx",(unsigned short *)(& x_10)); /* scanf_va_36 */
+ scanf("%hx",& x_10); /* scanf_va_36 */
printf("%hX",(int)x_10); /* printf_va_36 */
}
{
int_least32_t x_11;
- scanf("%d",(int *)(& x_11)); /* scanf_va_37 */
+ scanf("%d",& x_11); /* scanf_va_37 */
printf("%d",x_11); /* printf_va_37 */
- scanf("%i",(int *)(& x_11)); /* scanf_va_38 */
+ scanf("%i",& x_11); /* scanf_va_38 */
printf("%i",x_11); /* printf_va_38 */
}
{
uint_least32_t x_12;
- scanf("%o",(unsigned int *)(& x_12)); /* scanf_va_39 */
+ scanf("%o",& x_12); /* scanf_va_39 */
printf("%o",x_12); /* printf_va_39 */
- scanf("%u",(unsigned int *)(& x_12)); /* scanf_va_40 */
+ scanf("%u",& x_12); /* scanf_va_40 */
printf("%u",x_12); /* printf_va_40 */
- scanf("%x",(unsigned int *)(& x_12)); /* scanf_va_41 */
+ scanf("%x",& x_12); /* scanf_va_41 */
printf("%x",x_12); /* printf_va_41 */
- scanf("%x",(unsigned int *)(& x_12)); /* scanf_va_42 */
+ scanf("%x",& x_12); /* scanf_va_42 */
printf("%X",x_12); /* printf_va_42 */
}
{
int_least64_t x_13;
- scanf("%ld",(long *)(& x_13)); /* scanf_va_43 */
+ scanf("%ld",& x_13); /* scanf_va_43 */
printf("%ld",x_13); /* printf_va_43 */
- scanf("%li",(long *)(& x_13)); /* scanf_va_44 */
+ scanf("%li",& x_13); /* scanf_va_44 */
printf("%li",x_13); /* printf_va_44 */
}
{
uint_least64_t x_14;
- scanf("%lo",(unsigned long *)(& x_14)); /* scanf_va_45 */
+ scanf("%lo",& x_14); /* scanf_va_45 */
printf("%lo",x_14); /* printf_va_45 */
- scanf("%lu",(unsigned long *)(& x_14)); /* scanf_va_46 */
+ scanf("%lu",& x_14); /* scanf_va_46 */
printf("%lu",x_14); /* printf_va_46 */
- scanf("%lx",(unsigned long *)(& x_14)); /* scanf_va_47 */
+ scanf("%lx",& x_14); /* scanf_va_47 */
printf("%lx",x_14); /* printf_va_47 */
- scanf("%lx",(unsigned long *)(& x_14)); /* scanf_va_48 */
+ scanf("%lx",& x_14); /* scanf_va_48 */
printf("%lX",x_14); /* printf_va_48 */
}
{
int_fast8_t x_15;
- scanf("%hhd",(signed char *)(& x_15)); /* scanf_va_49 */
+ scanf("%hhd",& x_15); /* scanf_va_49 */
printf("%hhd",(int)x_15); /* printf_va_49 */
- scanf("%hhi",(signed char *)(& x_15)); /* scanf_va_50 */
+ scanf("%hhi",& x_15); /* scanf_va_50 */
printf("%hhi",(int)x_15); /* printf_va_50 */
}
{
uint_fast8_t x_16;
- scanf("%hho",(unsigned char *)(& x_16)); /* scanf_va_51 */
+ scanf("%hho",& x_16); /* scanf_va_51 */
printf("%hho",(int)x_16); /* printf_va_51 */
- scanf("%hhu",(unsigned char *)(& x_16)); /* scanf_va_52 */
+ scanf("%hhu",& x_16); /* scanf_va_52 */
printf("%hhu",(int)x_16); /* printf_va_52 */
- scanf("%hhx",(unsigned char *)(& x_16)); /* scanf_va_53 */
+ scanf("%hhx",& x_16); /* scanf_va_53 */
printf("%hhx",(int)x_16); /* printf_va_53 */
- scanf("%hhx",(unsigned char *)(& x_16)); /* scanf_va_54 */
+ scanf("%hhx",& x_16); /* scanf_va_54 */
printf("%hhX",(int)x_16); /* printf_va_54 */
}
{
int_fast16_t x_17;
- scanf("%d",(int *)(& x_17)); /* scanf_va_55 */
+ scanf("%d",& x_17); /* scanf_va_55 */
printf("%d",x_17); /* printf_va_55 */
- scanf("%i",(int *)(& x_17)); /* scanf_va_56 */
+ scanf("%i",& x_17); /* scanf_va_56 */
printf("%i",x_17); /* printf_va_56 */
}
{
uint_fast16_t x_18;
- scanf("%o",(unsigned int *)(& x_18)); /* scanf_va_57 */
+ scanf("%o",& x_18); /* scanf_va_57 */
printf("%o",x_18); /* printf_va_57 */
- scanf("%u",(unsigned int *)(& x_18)); /* scanf_va_58 */
+ scanf("%u",& x_18); /* scanf_va_58 */
printf("%u",x_18); /* printf_va_58 */
- scanf("%x",(unsigned int *)(& x_18)); /* scanf_va_59 */
+ scanf("%x",& x_18); /* scanf_va_59 */
printf("%x",x_18); /* printf_va_59 */
- scanf("%x",(unsigned int *)(& x_18)); /* scanf_va_60 */
+ scanf("%x",& x_18); /* scanf_va_60 */
printf("%X",x_18); /* printf_va_60 */
}
{
int_fast32_t x_19;
- scanf("%d",(int *)(& x_19)); /* scanf_va_61 */
+ scanf("%d",& x_19); /* scanf_va_61 */
printf("%d",x_19); /* printf_va_61 */
- scanf("%i",(int *)(& x_19)); /* scanf_va_62 */
+ scanf("%i",& x_19); /* scanf_va_62 */
printf("%i",x_19); /* printf_va_62 */
}
{
uint_fast32_t x_20;
- scanf("%o",(unsigned int *)(& x_20)); /* scanf_va_63 */
+ scanf("%o",& x_20); /* scanf_va_63 */
printf("%o",x_20); /* printf_va_63 */
- scanf("%u",(unsigned int *)(& x_20)); /* scanf_va_64 */
+ scanf("%u",& x_20); /* scanf_va_64 */
printf("%u",x_20); /* printf_va_64 */
- scanf("%x",(unsigned int *)(& x_20)); /* scanf_va_65 */
+ scanf("%x",& x_20); /* scanf_va_65 */
printf("%x",x_20); /* printf_va_65 */
- scanf("%x",(unsigned int *)(& x_20)); /* scanf_va_66 */
+ scanf("%x",& x_20); /* scanf_va_66 */
printf("%X",x_20); /* printf_va_66 */
}
{
int_fast64_t x_21;
- scanf("%ld",(long *)(& x_21)); /* scanf_va_67 */
+ scanf("%ld",& x_21); /* scanf_va_67 */
printf("%ld",x_21); /* printf_va_67 */
- scanf("%li",(long *)(& x_21)); /* scanf_va_68 */
+ scanf("%li",& x_21); /* scanf_va_68 */
printf("%li",x_21); /* printf_va_68 */
}
{
uint_fast64_t x_22;
- scanf("%lo",(unsigned long *)(& x_22)); /* scanf_va_69 */
+ scanf("%lo",& x_22); /* scanf_va_69 */
printf("%lo",x_22); /* printf_va_69 */
- scanf("%lu",(unsigned long *)(& x_22)); /* scanf_va_70 */
+ scanf("%lu",& x_22); /* scanf_va_70 */
printf("%lu",x_22); /* printf_va_70 */
- scanf("%lx",(unsigned long *)(& x_22)); /* scanf_va_71 */
+ scanf("%lx",& x_22); /* scanf_va_71 */
printf("%lx",x_22); /* printf_va_71 */
- scanf("%lx",(unsigned long *)(& x_22)); /* scanf_va_72 */
+ scanf("%lx",& x_22); /* scanf_va_72 */
printf("%lX",x_22); /* printf_va_72 */
}
{
intmax_t x_23;
- scanf("%lld",(long long *)(& x_23)); /* scanf_va_73 */
+ scanf("%lld",& x_23); /* scanf_va_73 */
printf("%lld",x_23); /* printf_va_73 */
- scanf("%lli",(long long *)(& x_23)); /* scanf_va_74 */
+ scanf("%lli",& x_23); /* scanf_va_74 */
printf("%lli",x_23); /* printf_va_74 */
}
{
uintmax_t x_24;
- scanf("%llo",(unsigned long long *)(& x_24)); /* scanf_va_75 */
+ scanf("%llo",& x_24); /* scanf_va_75 */
printf("%llo",x_24); /* printf_va_75 */
- scanf("%llu",(unsigned long long *)(& x_24)); /* scanf_va_76 */
+ scanf("%llu",& x_24); /* scanf_va_76 */
printf("%llu",x_24); /* printf_va_76 */
- scanf("%llx",(unsigned long long *)(& x_24)); /* scanf_va_77 */
+ scanf("%llx",& x_24); /* scanf_va_77 */
printf("%llx",x_24); /* printf_va_77 */
- scanf("%llx",(unsigned long long *)(& x_24)); /* scanf_va_78 */
+ scanf("%llx",& x_24); /* scanf_va_78 */
printf("%llX",x_24); /* printf_va_78 */
}
{
intptr_t x_25;
- scanf("%ld",(long *)(& x_25)); /* scanf_va_79 */
+ scanf("%ld",& x_25); /* scanf_va_79 */
printf("%ld",x_25); /* printf_va_79 */
- scanf("%li",(long *)(& x_25)); /* scanf_va_80 */
+ scanf("%li",& x_25); /* scanf_va_80 */
printf("%li",x_25); /* printf_va_80 */
}
{
uintptr_t x_26;
- scanf("%lo",(unsigned long *)(& x_26)); /* scanf_va_81 */
+ scanf("%lo",& x_26); /* scanf_va_81 */
printf("%lo",x_26); /* printf_va_81 */
- scanf("%lu",(unsigned long *)(& x_26)); /* scanf_va_82 */
+ scanf("%lu",& x_26); /* scanf_va_82 */
printf("%lu",x_26); /* printf_va_82 */
- scanf("%lx",(unsigned long *)(& x_26)); /* scanf_va_83 */
+ scanf("%lx",& x_26); /* scanf_va_83 */
printf("%lx",x_26); /* printf_va_83 */
- scanf("%lx",(unsigned long *)(& x_26)); /* scanf_va_84 */
+ scanf("%lx",& x_26); /* scanf_va_84 */
printf("%lX",x_26); /* printf_va_84 */
}
__retres = 0;
diff --git a/tests/libc/oracle/inttypes_h.6.res.oracle b/tests/libc/oracle/inttypes_h.6.res.oracle
index abcdf695f6af89de36cb3f94168c581330432ad6..b784a2af0234671e5052dd119e5c71adb2d4e83a 100644
--- a/tests/libc/oracle/inttypes_h.6.res.oracle
+++ b/tests/libc/oracle/inttypes_h.6.res.oracle
@@ -2531,254 +2531,254 @@ int main(void)
int __retres;
{
int8_t x;
- scanf("%hhd",(signed char *)(& x)); /* scanf_va_1 */
+ scanf("%hhd",& x); /* scanf_va_1 */
printf("%hhd",(int)x); /* printf_va_1 */
- scanf("%hhi",(signed char *)(& x)); /* scanf_va_2 */
+ scanf("%hhi",& x); /* scanf_va_2 */
printf("%hhi",(int)x); /* printf_va_2 */
}
{
uint8_t x_0;
- scanf("%hho",(unsigned char *)(& x_0)); /* scanf_va_3 */
+ scanf("%hho",& x_0); /* scanf_va_3 */
printf("%hho",(int)x_0); /* printf_va_3 */
- scanf("%hhu",(unsigned char *)(& x_0)); /* scanf_va_4 */
+ scanf("%hhu",& x_0); /* scanf_va_4 */
printf("%hhu",(int)x_0); /* printf_va_4 */
- scanf("%hhx",(unsigned char *)(& x_0)); /* scanf_va_5 */
+ scanf("%hhx",& x_0); /* scanf_va_5 */
printf("%hhx",(int)x_0); /* printf_va_5 */
- scanf("%hhx",(unsigned char *)(& x_0)); /* scanf_va_6 */
+ scanf("%hhx",& x_0); /* scanf_va_6 */
printf("%hhX",(int)x_0); /* printf_va_6 */
}
{
int16_t x_1;
- scanf("%hd",(short *)(& x_1)); /* scanf_va_7 */
+ scanf("%hd",& x_1); /* scanf_va_7 */
printf("%hd",(int)x_1); /* printf_va_7 */
- scanf("%hi",(short *)(& x_1)); /* scanf_va_8 */
+ scanf("%hi",& x_1); /* scanf_va_8 */
printf("%hi",(int)x_1); /* printf_va_8 */
}
{
uint16_t x_2;
- scanf("%ho",(unsigned short *)(& x_2)); /* scanf_va_9 */
+ scanf("%ho",& x_2); /* scanf_va_9 */
printf("%ho",(int)x_2); /* printf_va_9 */
- scanf("%hu",(unsigned short *)(& x_2)); /* scanf_va_10 */
+ scanf("%hu",& x_2); /* scanf_va_10 */
printf("%hu",(int)x_2); /* printf_va_10 */
- scanf("%hx",(unsigned short *)(& x_2)); /* scanf_va_11 */
+ scanf("%hx",& x_2); /* scanf_va_11 */
printf("%hx",(int)x_2); /* printf_va_11 */
- scanf("%hx",(unsigned short *)(& x_2)); /* scanf_va_12 */
+ scanf("%hx",& x_2); /* scanf_va_12 */
printf("%hX",(int)x_2); /* printf_va_12 */
}
{
int32_t x_3;
- scanf("%d",(int *)(& x_3)); /* scanf_va_13 */
+ scanf("%d",& x_3); /* scanf_va_13 */
printf("%d",x_3); /* printf_va_13 */
- scanf("%i",(int *)(& x_3)); /* scanf_va_14 */
+ scanf("%i",& x_3); /* scanf_va_14 */
printf("%i",x_3); /* printf_va_14 */
}
{
uint32_t x_4;
- scanf("%o",(unsigned int *)(& x_4)); /* scanf_va_15 */
+ scanf("%o",& x_4); /* scanf_va_15 */
printf("%o",x_4); /* printf_va_15 */
- scanf("%u",(unsigned int *)(& x_4)); /* scanf_va_16 */
+ scanf("%u",& x_4); /* scanf_va_16 */
printf("%u",x_4); /* printf_va_16 */
- scanf("%x",(unsigned int *)(& x_4)); /* scanf_va_17 */
+ scanf("%x",& x_4); /* scanf_va_17 */
printf("%x",x_4); /* printf_va_17 */
- scanf("%x",(unsigned int *)(& x_4)); /* scanf_va_18 */
+ scanf("%x",& x_4); /* scanf_va_18 */
printf("%X",x_4); /* printf_va_18 */
}
{
int64_t x_5;
- scanf("%lld",(long long *)(& x_5)); /* scanf_va_19 */
+ scanf("%lld",& x_5); /* scanf_va_19 */
printf("%lld",x_5); /* printf_va_19 */
- scanf("%lli",(long long *)(& x_5)); /* scanf_va_20 */
+ scanf("%lli",& x_5); /* scanf_va_20 */
printf("%lli",x_5); /* printf_va_20 */
}
{
uint64_t x_6;
- scanf("%llo",(unsigned long long *)(& x_6)); /* scanf_va_21 */
+ scanf("%llo",& x_6); /* scanf_va_21 */
printf("%llo",x_6); /* printf_va_21 */
- scanf("%llu",(unsigned long long *)(& x_6)); /* scanf_va_22 */
+ scanf("%llu",& x_6); /* scanf_va_22 */
printf("%llu",x_6); /* printf_va_22 */
- scanf("%llx",(unsigned long long *)(& x_6)); /* scanf_va_23 */
+ scanf("%llx",& x_6); /* scanf_va_23 */
printf("%llx",x_6); /* printf_va_23 */
- scanf("%llx",(unsigned long long *)(& x_6)); /* scanf_va_24 */
+ scanf("%llx",& x_6); /* scanf_va_24 */
printf("%llX",x_6); /* printf_va_24 */
}
{
int_least8_t x_7;
- scanf("%hhd",(signed char *)(& x_7)); /* scanf_va_25 */
+ scanf("%hhd",& x_7); /* scanf_va_25 */
printf("%hhd",(int)x_7); /* printf_va_25 */
- scanf("%hhi",(signed char *)(& x_7)); /* scanf_va_26 */
+ scanf("%hhi",& x_7); /* scanf_va_26 */
printf("%hhi",(int)x_7); /* printf_va_26 */
}
{
uint_least8_t x_8;
- scanf("%hho",(unsigned char *)(& x_8)); /* scanf_va_27 */
+ scanf("%hho",& x_8); /* scanf_va_27 */
printf("%hho",(int)x_8); /* printf_va_27 */
- scanf("%hhu",(unsigned char *)(& x_8)); /* scanf_va_28 */
+ scanf("%hhu",& x_8); /* scanf_va_28 */
printf("%hhu",(int)x_8); /* printf_va_28 */
- scanf("%hhx",(unsigned char *)(& x_8)); /* scanf_va_29 */
+ scanf("%hhx",& x_8); /* scanf_va_29 */
printf("%hhx",(int)x_8); /* printf_va_29 */
- scanf("%hhx",(unsigned char *)(& x_8)); /* scanf_va_30 */
+ scanf("%hhx",& x_8); /* scanf_va_30 */
printf("%hhX",(int)x_8); /* printf_va_30 */
}
{
int_least16_t x_9;
- scanf("%hd",(short *)(& x_9)); /* scanf_va_31 */
+ scanf("%hd",& x_9); /* scanf_va_31 */
printf("%hd",(int)x_9); /* printf_va_31 */
- scanf("%hi",(short *)(& x_9)); /* scanf_va_32 */
+ scanf("%hi",& x_9); /* scanf_va_32 */
printf("%hi",(int)x_9); /* printf_va_32 */
}
{
uint_least16_t x_10;
- scanf("%ho",(unsigned short *)(& x_10)); /* scanf_va_33 */
+ scanf("%ho",& x_10); /* scanf_va_33 */
printf("%ho",(int)x_10); /* printf_va_33 */
- scanf("%hu",(unsigned short *)(& x_10)); /* scanf_va_34 */
+ scanf("%hu",& x_10); /* scanf_va_34 */
printf("%hu",(int)x_10); /* printf_va_34 */
- scanf("%hx",(unsigned short *)(& x_10)); /* scanf_va_35 */
+ scanf("%hx",& x_10); /* scanf_va_35 */
printf("%hx",(int)x_10); /* printf_va_35 */
- scanf("%hx",(unsigned short *)(& x_10)); /* scanf_va_36 */
+ scanf("%hx",& x_10); /* scanf_va_36 */
printf("%hX",(int)x_10); /* printf_va_36 */
}
{
int_least32_t x_11;
- scanf("%d",(int *)(& x_11)); /* scanf_va_37 */
+ scanf("%d",& x_11); /* scanf_va_37 */
printf("%d",x_11); /* printf_va_37 */
- scanf("%i",(int *)(& x_11)); /* scanf_va_38 */
+ scanf("%i",& x_11); /* scanf_va_38 */
printf("%i",x_11); /* printf_va_38 */
}
{
uint_least32_t x_12;
- scanf("%o",(unsigned int *)(& x_12)); /* scanf_va_39 */
+ scanf("%o",& x_12); /* scanf_va_39 */
printf("%o",x_12); /* printf_va_39 */
- scanf("%u",(unsigned int *)(& x_12)); /* scanf_va_40 */
+ scanf("%u",& x_12); /* scanf_va_40 */
printf("%u",x_12); /* printf_va_40 */
- scanf("%x",(unsigned int *)(& x_12)); /* scanf_va_41 */
+ scanf("%x",& x_12); /* scanf_va_41 */
printf("%x",x_12); /* printf_va_41 */
- scanf("%x",(unsigned int *)(& x_12)); /* scanf_va_42 */
+ scanf("%x",& x_12); /* scanf_va_42 */
printf("%X",x_12); /* printf_va_42 */
}
{
int_least64_t x_13;
- scanf("%lld",(long long *)(& x_13)); /* scanf_va_43 */
+ scanf("%lld",& x_13); /* scanf_va_43 */
printf("%lld",x_13); /* printf_va_43 */
- scanf("%lli",(long long *)(& x_13)); /* scanf_va_44 */
+ scanf("%lli",& x_13); /* scanf_va_44 */
printf("%lli",x_13); /* printf_va_44 */
}
{
uint_least64_t x_14;
- scanf("%llo",(unsigned long long *)(& x_14)); /* scanf_va_45 */
+ scanf("%llo",& x_14); /* scanf_va_45 */
printf("%llo",x_14); /* printf_va_45 */
- scanf("%llu",(unsigned long long *)(& x_14)); /* scanf_va_46 */
+ scanf("%llu",& x_14); /* scanf_va_46 */
printf("%llu",x_14); /* printf_va_46 */
- scanf("%llx",(unsigned long long *)(& x_14)); /* scanf_va_47 */
+ scanf("%llx",& x_14); /* scanf_va_47 */
printf("%llx",x_14); /* printf_va_47 */
- scanf("%llx",(unsigned long long *)(& x_14)); /* scanf_va_48 */
+ scanf("%llx",& x_14); /* scanf_va_48 */
printf("%llX",x_14); /* printf_va_48 */
}
{
int_fast8_t x_15;
- scanf("%hhd",(signed char *)(& x_15)); /* scanf_va_49 */
+ scanf("%hhd",& x_15); /* scanf_va_49 */
printf("%hhd",(int)x_15); /* printf_va_49 */
- scanf("%hhi",(signed char *)(& x_15)); /* scanf_va_50 */
+ scanf("%hhi",& x_15); /* scanf_va_50 */
printf("%hhi",(int)x_15); /* printf_va_50 */
}
{
uint_fast8_t x_16;
- scanf("%hho",(unsigned char *)(& x_16)); /* scanf_va_51 */
+ scanf("%hho",& x_16); /* scanf_va_51 */
printf("%hho",(int)x_16); /* printf_va_51 */
- scanf("%hhu",(unsigned char *)(& x_16)); /* scanf_va_52 */
+ scanf("%hhu",& x_16); /* scanf_va_52 */
printf("%hhu",(int)x_16); /* printf_va_52 */
- scanf("%hhx",(unsigned char *)(& x_16)); /* scanf_va_53 */
+ scanf("%hhx",& x_16); /* scanf_va_53 */
printf("%hhx",(int)x_16); /* printf_va_53 */
- scanf("%hhx",(unsigned char *)(& x_16)); /* scanf_va_54 */
+ scanf("%hhx",& x_16); /* scanf_va_54 */
printf("%hhX",(int)x_16); /* printf_va_54 */
}
{
int_fast16_t x_17;
- scanf("%d",(int *)(& x_17)); /* scanf_va_55 */
+ scanf("%d",& x_17); /* scanf_va_55 */
printf("%d",x_17); /* printf_va_55 */
- scanf("%i",(int *)(& x_17)); /* scanf_va_56 */
+ scanf("%i",& x_17); /* scanf_va_56 */
printf("%i",x_17); /* printf_va_56 */
}
{
uint_fast16_t x_18;
- scanf("%o",(unsigned int *)(& x_18)); /* scanf_va_57 */
+ scanf("%o",& x_18); /* scanf_va_57 */
printf("%o",x_18); /* printf_va_57 */
- scanf("%u",(unsigned int *)(& x_18)); /* scanf_va_58 */
+ scanf("%u",& x_18); /* scanf_va_58 */
printf("%u",x_18); /* printf_va_58 */
- scanf("%x",(unsigned int *)(& x_18)); /* scanf_va_59 */
+ scanf("%x",& x_18); /* scanf_va_59 */
printf("%x",x_18); /* printf_va_59 */
- scanf("%x",(unsigned int *)(& x_18)); /* scanf_va_60 */
+ scanf("%x",& x_18); /* scanf_va_60 */
printf("%X",x_18); /* printf_va_60 */
}
{
int_fast32_t x_19;
- scanf("%d",(int *)(& x_19)); /* scanf_va_61 */
+ scanf("%d",& x_19); /* scanf_va_61 */
printf("%d",x_19); /* printf_va_61 */
- scanf("%i",(int *)(& x_19)); /* scanf_va_62 */
+ scanf("%i",& x_19); /* scanf_va_62 */
printf("%i",x_19); /* printf_va_62 */
}
{
uint_fast32_t x_20;
- scanf("%o",(unsigned int *)(& x_20)); /* scanf_va_63 */
+ scanf("%o",& x_20); /* scanf_va_63 */
printf("%o",x_20); /* printf_va_63 */
- scanf("%u",(unsigned int *)(& x_20)); /* scanf_va_64 */
+ scanf("%u",& x_20); /* scanf_va_64 */
printf("%u",x_20); /* printf_va_64 */
- scanf("%x",(unsigned int *)(& x_20)); /* scanf_va_65 */
+ scanf("%x",& x_20); /* scanf_va_65 */
printf("%x",x_20); /* printf_va_65 */
- scanf("%x",(unsigned int *)(& x_20)); /* scanf_va_66 */
+ scanf("%x",& x_20); /* scanf_va_66 */
printf("%X",x_20); /* printf_va_66 */
}
{
int_fast64_t x_21;
- scanf("%lld",(long long *)(& x_21)); /* scanf_va_67 */
+ scanf("%lld",& x_21); /* scanf_va_67 */
printf("%lld",x_21); /* printf_va_67 */
- scanf("%lli",(long long *)(& x_21)); /* scanf_va_68 */
+ scanf("%lli",& x_21); /* scanf_va_68 */
printf("%lli",x_21); /* printf_va_68 */
}
{
uint_fast64_t x_22;
- scanf("%llo",(unsigned long long *)(& x_22)); /* scanf_va_69 */
+ scanf("%llo",& x_22); /* scanf_va_69 */
printf("%llo",x_22); /* printf_va_69 */
- scanf("%llu",(unsigned long long *)(& x_22)); /* scanf_va_70 */
+ scanf("%llu",& x_22); /* scanf_va_70 */
printf("%llu",x_22); /* printf_va_70 */
- scanf("%llx",(unsigned long long *)(& x_22)); /* scanf_va_71 */
+ scanf("%llx",& x_22); /* scanf_va_71 */
printf("%llx",x_22); /* printf_va_71 */
- scanf("%llx",(unsigned long long *)(& x_22)); /* scanf_va_72 */
+ scanf("%llx",& x_22); /* scanf_va_72 */
printf("%llX",x_22); /* printf_va_72 */
}
{
intmax_t x_23;
- scanf("%lld",(long long *)(& x_23)); /* scanf_va_73 */
+ scanf("%lld",& x_23); /* scanf_va_73 */
printf("%lld",x_23); /* printf_va_73 */
- scanf("%lli",(long long *)(& x_23)); /* scanf_va_74 */
+ scanf("%lli",& x_23); /* scanf_va_74 */
printf("%lli",x_23); /* printf_va_74 */
}
{
uintmax_t x_24;
- scanf("%llo",(unsigned long long *)(& x_24)); /* scanf_va_75 */
+ scanf("%llo",& x_24); /* scanf_va_75 */
printf("%llo",x_24); /* printf_va_75 */
- scanf("%llu",(unsigned long long *)(& x_24)); /* scanf_va_76 */
+ scanf("%llu",& x_24); /* scanf_va_76 */
printf("%llu",x_24); /* printf_va_76 */
- scanf("%llx",(unsigned long long *)(& x_24)); /* scanf_va_77 */
+ scanf("%llx",& x_24); /* scanf_va_77 */
printf("%llx",x_24); /* printf_va_77 */
- scanf("%llx",(unsigned long long *)(& x_24)); /* scanf_va_78 */
+ scanf("%llx",& x_24); /* scanf_va_78 */
printf("%llX",x_24); /* printf_va_78 */
}
{
intptr_t x_25;
- scanf("%d",(int *)(& x_25)); /* scanf_va_79 */
+ scanf("%d",& x_25); /* scanf_va_79 */
printf("%d",x_25); /* printf_va_79 */
- scanf("%i",(int *)(& x_25)); /* scanf_va_80 */
+ scanf("%i",& x_25); /* scanf_va_80 */
printf("%i",x_25); /* printf_va_80 */
}
{
uintptr_t x_26;
- scanf("%o",(unsigned int *)(& x_26)); /* scanf_va_81 */
+ scanf("%o",& x_26); /* scanf_va_81 */
printf("%o",x_26); /* printf_va_81 */
- scanf("%u",(unsigned int *)(& x_26)); /* scanf_va_82 */
+ scanf("%u",& x_26); /* scanf_va_82 */
printf("%u",x_26); /* printf_va_82 */
- scanf("%x",(unsigned int *)(& x_26)); /* scanf_va_83 */
+ scanf("%x",& x_26); /* scanf_va_83 */
printf("%x",x_26); /* printf_va_83 */
- scanf("%x",(unsigned int *)(& x_26)); /* scanf_va_84 */
+ scanf("%x",& x_26); /* scanf_va_84 */
printf("%X",x_26); /* printf_va_84 */
}
__retres = 0;
diff --git a/tests/libc/oracle/inttypes_h.7.res.oracle b/tests/libc/oracle/inttypes_h.7.res.oracle
index c27c42dd3c9733703a45f7cd63ee15b4a14a40e0..ce03e384bbab61d19f7e5b5cf16caacf7b3ad204 100644
--- a/tests/libc/oracle/inttypes_h.7.res.oracle
+++ b/tests/libc/oracle/inttypes_h.7.res.oracle
@@ -2531,254 +2531,254 @@ int main(void)
int __retres;
{
int8_t x;
- scanf("%hhd",(signed char *)(& x)); /* scanf_va_1 */
+ scanf("%hhd",& x); /* scanf_va_1 */
printf("%hhd",(int)x); /* printf_va_1 */
- scanf("%hhi",(signed char *)(& x)); /* scanf_va_2 */
+ scanf("%hhi",& x); /* scanf_va_2 */
printf("%hhi",(int)x); /* printf_va_2 */
}
{
uint8_t x_0;
- scanf("%hho",(unsigned char *)(& x_0)); /* scanf_va_3 */
+ scanf("%hho",& x_0); /* scanf_va_3 */
printf("%hho",(int)x_0); /* printf_va_3 */
- scanf("%hhu",(unsigned char *)(& x_0)); /* scanf_va_4 */
+ scanf("%hhu",& x_0); /* scanf_va_4 */
printf("%hhu",(int)x_0); /* printf_va_4 */
- scanf("%hhx",(unsigned char *)(& x_0)); /* scanf_va_5 */
+ scanf("%hhx",& x_0); /* scanf_va_5 */
printf("%hhx",(int)x_0); /* printf_va_5 */
- scanf("%hhx",(unsigned char *)(& x_0)); /* scanf_va_6 */
+ scanf("%hhx",& x_0); /* scanf_va_6 */
printf("%hhX",(int)x_0); /* printf_va_6 */
}
{
int16_t x_1;
- scanf("%hd",(short *)(& x_1)); /* scanf_va_7 */
+ scanf("%hd",& x_1); /* scanf_va_7 */
printf("%hd",(int)x_1); /* printf_va_7 */
- scanf("%hi",(short *)(& x_1)); /* scanf_va_8 */
+ scanf("%hi",& x_1); /* scanf_va_8 */
printf("%hi",(int)x_1); /* printf_va_8 */
}
{
uint16_t x_2;
- scanf("%ho",(unsigned short *)(& x_2)); /* scanf_va_9 */
+ scanf("%ho",& x_2); /* scanf_va_9 */
printf("%ho",(int)x_2); /* printf_va_9 */
- scanf("%hu",(unsigned short *)(& x_2)); /* scanf_va_10 */
+ scanf("%hu",& x_2); /* scanf_va_10 */
printf("%hu",(int)x_2); /* printf_va_10 */
- scanf("%hx",(unsigned short *)(& x_2)); /* scanf_va_11 */
+ scanf("%hx",& x_2); /* scanf_va_11 */
printf("%hx",(int)x_2); /* printf_va_11 */
- scanf("%hx",(unsigned short *)(& x_2)); /* scanf_va_12 */
+ scanf("%hx",& x_2); /* scanf_va_12 */
printf("%hX",(int)x_2); /* printf_va_12 */
}
{
int32_t x_3;
- scanf("%d",(int *)(& x_3)); /* scanf_va_13 */
+ scanf("%d",& x_3); /* scanf_va_13 */
printf("%d",x_3); /* printf_va_13 */
- scanf("%i",(int *)(& x_3)); /* scanf_va_14 */
+ scanf("%i",& x_3); /* scanf_va_14 */
printf("%i",x_3); /* printf_va_14 */
}
{
uint32_t x_4;
- scanf("%o",(unsigned int *)(& x_4)); /* scanf_va_15 */
+ scanf("%o",& x_4); /* scanf_va_15 */
printf("%o",x_4); /* printf_va_15 */
- scanf("%u",(unsigned int *)(& x_4)); /* scanf_va_16 */
+ scanf("%u",& x_4); /* scanf_va_16 */
printf("%u",x_4); /* printf_va_16 */
- scanf("%x",(unsigned int *)(& x_4)); /* scanf_va_17 */
+ scanf("%x",& x_4); /* scanf_va_17 */
printf("%x",x_4); /* printf_va_17 */
- scanf("%x",(unsigned int *)(& x_4)); /* scanf_va_18 */
+ scanf("%x",& x_4); /* scanf_va_18 */
printf("%X",x_4); /* printf_va_18 */
}
{
int64_t x_5;
- scanf("%lld",(__int64 *)(& x_5)); /* scanf_va_19 */
+ scanf("%lld",& x_5); /* scanf_va_19 */
printf("%lld",x_5); /* printf_va_19 */
- scanf("%lli",(__int64 *)(& x_5)); /* scanf_va_20 */
+ scanf("%lli",& x_5); /* scanf_va_20 */
printf("%lli",x_5); /* printf_va_20 */
}
{
uint64_t x_6;
- scanf("%llo",(unsigned __int64 *)(& x_6)); /* scanf_va_21 */
+ scanf("%llo",& x_6); /* scanf_va_21 */
printf("%llo",x_6); /* printf_va_21 */
- scanf("%llu",(unsigned __int64 *)(& x_6)); /* scanf_va_22 */
+ scanf("%llu",& x_6); /* scanf_va_22 */
printf("%llu",x_6); /* printf_va_22 */
- scanf("%llx",(unsigned __int64 *)(& x_6)); /* scanf_va_23 */
+ scanf("%llx",& x_6); /* scanf_va_23 */
printf("%llx",x_6); /* printf_va_23 */
- scanf("%llx",(unsigned __int64 *)(& x_6)); /* scanf_va_24 */
+ scanf("%llx",& x_6); /* scanf_va_24 */
printf("%llX",x_6); /* printf_va_24 */
}
{
int_least8_t x_7;
- scanf("%hhd",(signed char *)(& x_7)); /* scanf_va_25 */
+ scanf("%hhd",& x_7); /* scanf_va_25 */
printf("%hhd",(int)x_7); /* printf_va_25 */
- scanf("%hhi",(signed char *)(& x_7)); /* scanf_va_26 */
+ scanf("%hhi",& x_7); /* scanf_va_26 */
printf("%hhi",(int)x_7); /* printf_va_26 */
}
{
uint_least8_t x_8;
- scanf("%hho",(unsigned char *)(& x_8)); /* scanf_va_27 */
+ scanf("%hho",& x_8); /* scanf_va_27 */
printf("%hho",(int)x_8); /* printf_va_27 */
- scanf("%hhu",(unsigned char *)(& x_8)); /* scanf_va_28 */
+ scanf("%hhu",& x_8); /* scanf_va_28 */
printf("%hhu",(int)x_8); /* printf_va_28 */
- scanf("%hhx",(unsigned char *)(& x_8)); /* scanf_va_29 */
+ scanf("%hhx",& x_8); /* scanf_va_29 */
printf("%hhx",(int)x_8); /* printf_va_29 */
- scanf("%hhx",(unsigned char *)(& x_8)); /* scanf_va_30 */
+ scanf("%hhx",& x_8); /* scanf_va_30 */
printf("%hhX",(int)x_8); /* printf_va_30 */
}
{
int_least16_t x_9;
- scanf("%hd",(short *)(& x_9)); /* scanf_va_31 */
+ scanf("%hd",& x_9); /* scanf_va_31 */
printf("%hd",(int)x_9); /* printf_va_31 */
- scanf("%hi",(short *)(& x_9)); /* scanf_va_32 */
+ scanf("%hi",& x_9); /* scanf_va_32 */
printf("%hi",(int)x_9); /* printf_va_32 */
}
{
uint_least16_t x_10;
- scanf("%ho",(unsigned short *)(& x_10)); /* scanf_va_33 */
+ scanf("%ho",& x_10); /* scanf_va_33 */
printf("%ho",(int)x_10); /* printf_va_33 */
- scanf("%hu",(unsigned short *)(& x_10)); /* scanf_va_34 */
+ scanf("%hu",& x_10); /* scanf_va_34 */
printf("%hu",(int)x_10); /* printf_va_34 */
- scanf("%hx",(unsigned short *)(& x_10)); /* scanf_va_35 */
+ scanf("%hx",& x_10); /* scanf_va_35 */
printf("%hx",(int)x_10); /* printf_va_35 */
- scanf("%hx",(unsigned short *)(& x_10)); /* scanf_va_36 */
+ scanf("%hx",& x_10); /* scanf_va_36 */
printf("%hX",(int)x_10); /* printf_va_36 */
}
{
int_least32_t x_11;
- scanf("%d",(int *)(& x_11)); /* scanf_va_37 */
+ scanf("%d",& x_11); /* scanf_va_37 */
printf("%d",x_11); /* printf_va_37 */
- scanf("%i",(int *)(& x_11)); /* scanf_va_38 */
+ scanf("%i",& x_11); /* scanf_va_38 */
printf("%i",x_11); /* printf_va_38 */
}
{
uint_least32_t x_12;
- scanf("%o",(unsigned int *)(& x_12)); /* scanf_va_39 */
+ scanf("%o",& x_12); /* scanf_va_39 */
printf("%o",x_12); /* printf_va_39 */
- scanf("%u",(unsigned int *)(& x_12)); /* scanf_va_40 */
+ scanf("%u",& x_12); /* scanf_va_40 */
printf("%u",x_12); /* printf_va_40 */
- scanf("%x",(unsigned int *)(& x_12)); /* scanf_va_41 */
+ scanf("%x",& x_12); /* scanf_va_41 */
printf("%x",x_12); /* printf_va_41 */
- scanf("%x",(unsigned int *)(& x_12)); /* scanf_va_42 */
+ scanf("%x",& x_12); /* scanf_va_42 */
printf("%X",x_12); /* printf_va_42 */
}
{
int_least64_t x_13;
- scanf("%lld",(__int64 *)(& x_13)); /* scanf_va_43 */
+ scanf("%lld",& x_13); /* scanf_va_43 */
printf("%lld",x_13); /* printf_va_43 */
- scanf("%lli",(__int64 *)(& x_13)); /* scanf_va_44 */
+ scanf("%lli",& x_13); /* scanf_va_44 */
printf("%lli",x_13); /* printf_va_44 */
}
{
uint_least64_t x_14;
- scanf("%llo",(unsigned __int64 *)(& x_14)); /* scanf_va_45 */
+ scanf("%llo",& x_14); /* scanf_va_45 */
printf("%llo",x_14); /* printf_va_45 */
- scanf("%llu",(unsigned __int64 *)(& x_14)); /* scanf_va_46 */
+ scanf("%llu",& x_14); /* scanf_va_46 */
printf("%llu",x_14); /* printf_va_46 */
- scanf("%llx",(unsigned __int64 *)(& x_14)); /* scanf_va_47 */
+ scanf("%llx",& x_14); /* scanf_va_47 */
printf("%llx",x_14); /* printf_va_47 */
- scanf("%llx",(unsigned __int64 *)(& x_14)); /* scanf_va_48 */
+ scanf("%llx",& x_14); /* scanf_va_48 */
printf("%llX",x_14); /* printf_va_48 */
}
{
int_fast8_t x_15;
- scanf("%hhd",(signed char *)(& x_15)); /* scanf_va_49 */
+ scanf("%hhd",& x_15); /* scanf_va_49 */
printf("%hhd",(int)x_15); /* printf_va_49 */
- scanf("%hhi",(signed char *)(& x_15)); /* scanf_va_50 */
+ scanf("%hhi",& x_15); /* scanf_va_50 */
printf("%hhi",(int)x_15); /* printf_va_50 */
}
{
uint_fast8_t x_16;
- scanf("%hho",(unsigned char *)(& x_16)); /* scanf_va_51 */
+ scanf("%hho",& x_16); /* scanf_va_51 */
printf("%hho",(int)x_16); /* printf_va_51 */
- scanf("%hhu",(unsigned char *)(& x_16)); /* scanf_va_52 */
+ scanf("%hhu",& x_16); /* scanf_va_52 */
printf("%hhu",(int)x_16); /* printf_va_52 */
- scanf("%hhx",(unsigned char *)(& x_16)); /* scanf_va_53 */
+ scanf("%hhx",& x_16); /* scanf_va_53 */
printf("%hhx",(int)x_16); /* printf_va_53 */
- scanf("%hhx",(unsigned char *)(& x_16)); /* scanf_va_54 */
+ scanf("%hhx",& x_16); /* scanf_va_54 */
printf("%hhX",(int)x_16); /* printf_va_54 */
}
{
int_fast16_t x_17;
- scanf("%d",(int *)(& x_17)); /* scanf_va_55 */
+ scanf("%d",& x_17); /* scanf_va_55 */
printf("%d",x_17); /* printf_va_55 */
- scanf("%i",(int *)(& x_17)); /* scanf_va_56 */
+ scanf("%i",& x_17); /* scanf_va_56 */
printf("%i",x_17); /* printf_va_56 */
}
{
uint_fast16_t x_18;
- scanf("%o",(unsigned int *)(& x_18)); /* scanf_va_57 */
+ scanf("%o",& x_18); /* scanf_va_57 */
printf("%o",x_18); /* printf_va_57 */
- scanf("%u",(unsigned int *)(& x_18)); /* scanf_va_58 */
+ scanf("%u",& x_18); /* scanf_va_58 */
printf("%u",x_18); /* printf_va_58 */
- scanf("%x",(unsigned int *)(& x_18)); /* scanf_va_59 */
+ scanf("%x",& x_18); /* scanf_va_59 */
printf("%x",x_18); /* printf_va_59 */
- scanf("%x",(unsigned int *)(& x_18)); /* scanf_va_60 */
+ scanf("%x",& x_18); /* scanf_va_60 */
printf("%X",x_18); /* printf_va_60 */
}
{
int_fast32_t x_19;
- scanf("%d",(int *)(& x_19)); /* scanf_va_61 */
+ scanf("%d",& x_19); /* scanf_va_61 */
printf("%d",x_19); /* printf_va_61 */
- scanf("%i",(int *)(& x_19)); /* scanf_va_62 */
+ scanf("%i",& x_19); /* scanf_va_62 */
printf("%i",x_19); /* printf_va_62 */
}
{
uint_fast32_t x_20;
- scanf("%o",(unsigned int *)(& x_20)); /* scanf_va_63 */
+ scanf("%o",& x_20); /* scanf_va_63 */
printf("%o",x_20); /* printf_va_63 */
- scanf("%u",(unsigned int *)(& x_20)); /* scanf_va_64 */
+ scanf("%u",& x_20); /* scanf_va_64 */
printf("%u",x_20); /* printf_va_64 */
- scanf("%x",(unsigned int *)(& x_20)); /* scanf_va_65 */
+ scanf("%x",& x_20); /* scanf_va_65 */
printf("%x",x_20); /* printf_va_65 */
- scanf("%x",(unsigned int *)(& x_20)); /* scanf_va_66 */
+ scanf("%x",& x_20); /* scanf_va_66 */
printf("%X",x_20); /* printf_va_66 */
}
{
int_fast64_t x_21;
- scanf("%lld",(__int64 *)(& x_21)); /* scanf_va_67 */
+ scanf("%lld",& x_21); /* scanf_va_67 */
printf("%lld",x_21); /* printf_va_67 */
- scanf("%lli",(__int64 *)(& x_21)); /* scanf_va_68 */
+ scanf("%lli",& x_21); /* scanf_va_68 */
printf("%lli",x_21); /* printf_va_68 */
}
{
uint_fast64_t x_22;
- scanf("%llo",(unsigned __int64 *)(& x_22)); /* scanf_va_69 */
+ scanf("%llo",& x_22); /* scanf_va_69 */
printf("%llo",x_22); /* printf_va_69 */
- scanf("%llu",(unsigned __int64 *)(& x_22)); /* scanf_va_70 */
+ scanf("%llu",& x_22); /* scanf_va_70 */
printf("%llu",x_22); /* printf_va_70 */
- scanf("%llx",(unsigned __int64 *)(& x_22)); /* scanf_va_71 */
+ scanf("%llx",& x_22); /* scanf_va_71 */
printf("%llx",x_22); /* printf_va_71 */
- scanf("%llx",(unsigned __int64 *)(& x_22)); /* scanf_va_72 */
+ scanf("%llx",& x_22); /* scanf_va_72 */
printf("%llX",x_22); /* printf_va_72 */
}
{
intmax_t x_23;
- scanf("%lld",(__int64 *)(& x_23)); /* scanf_va_73 */
+ scanf("%lld",& x_23); /* scanf_va_73 */
printf("%lld",x_23); /* printf_va_73 */
- scanf("%lli",(__int64 *)(& x_23)); /* scanf_va_74 */
+ scanf("%lli",& x_23); /* scanf_va_74 */
printf("%lli",x_23); /* printf_va_74 */
}
{
uintmax_t x_24;
- scanf("%llo",(unsigned __int64 *)(& x_24)); /* scanf_va_75 */
+ scanf("%llo",& x_24); /* scanf_va_75 */
printf("%llo",x_24); /* printf_va_75 */
- scanf("%llu",(unsigned __int64 *)(& x_24)); /* scanf_va_76 */
+ scanf("%llu",& x_24); /* scanf_va_76 */
printf("%llu",x_24); /* printf_va_76 */
- scanf("%llx",(unsigned __int64 *)(& x_24)); /* scanf_va_77 */
+ scanf("%llx",& x_24); /* scanf_va_77 */
printf("%llx",x_24); /* printf_va_77 */
- scanf("%llx",(unsigned __int64 *)(& x_24)); /* scanf_va_78 */
+ scanf("%llx",& x_24); /* scanf_va_78 */
printf("%llX",x_24); /* printf_va_78 */
}
{
intptr_t x_25;
- scanf("%lld",(__int64 *)(& x_25)); /* scanf_va_79 */
+ scanf("%lld",& x_25); /* scanf_va_79 */
printf("%lld",x_25); /* printf_va_79 */
- scanf("%lli",(__int64 *)(& x_25)); /* scanf_va_80 */
+ scanf("%lli",& x_25); /* scanf_va_80 */
printf("%lli",x_25); /* printf_va_80 */
}
{
uintptr_t x_26;
- scanf("%llo",(unsigned __int64 *)(& x_26)); /* scanf_va_81 */
+ scanf("%llo",& x_26); /* scanf_va_81 */
printf("%llo",x_26); /* printf_va_81 */
- scanf("%llu",(unsigned __int64 *)(& x_26)); /* scanf_va_82 */
+ scanf("%llu",& x_26); /* scanf_va_82 */
printf("%llu",x_26); /* printf_va_82 */
- scanf("%llx",(unsigned __int64 *)(& x_26)); /* scanf_va_83 */
+ scanf("%llx",& x_26); /* scanf_va_83 */
printf("%llx",x_26); /* printf_va_83 */
- scanf("%llx",(unsigned __int64 *)(& x_26)); /* scanf_va_84 */
+ scanf("%llx",& x_26); /* scanf_va_84 */
printf("%llX",x_26); /* printf_va_84 */
}
__retres = 0;
diff --git a/tests/libc/oracle/socket_h.res.oracle b/tests/libc/oracle/socket_h.res.oracle
index 1b50d5781ffd4b976d3805c528190ddde6247bf0..f46e7a13fd1552f6249cbd35da7871aa2c345fd1 100644
--- a/tests/libc/oracle/socket_h.res.oracle
+++ b/tests/libc/oracle/socket_h.res.oracle
@@ -82,7 +82,7 @@
[eva] socket_h.c:31:
function recvfrom: precondition 'valid_buffer_length' got status valid.
[eva] socket_h.c:31:
- function recvfrom: precondition 'valid_addrbuf_or_null' got status valid.
+ function recvfrom: precondition 'valid_addrbuf_or_null,initialization' got status valid.
[eva] Done for function recvfrom
[eva] socket_h.c:35: assertion got status valid.
[eva] computing for function recvfrom <- main.
@@ -92,7 +92,7 @@
[eva] socket_h.c:37:
function recvfrom: precondition 'valid_buffer_length' got status valid.
[eva] socket_h.c:37:
- function recvfrom: precondition 'valid_addrbuf_or_null' got status valid.
+ function recvfrom: precondition 'valid_addrbuf_or_null,initialization' got status valid.
[eva:invalid-assigns] socket_h.c:37:
Completely invalid destination for assigns clause *addrbuf_len. Ignoring.
[eva:invalid-assigns] socket_h.c:37:
diff --git a/tests/libc/oracle/stdio_c.res.oracle b/tests/libc/oracle/stdio_c.res.oracle
index e8a8e4a0300a957743cb698a57b3a5db228b86b7..87610795caa3a32a698653b4bbc4173b5224d238 100644
--- a/tests/libc/oracle/stdio_c.res.oracle
+++ b/tests/libc/oracle/stdio_c.res.oracle
@@ -261,7 +261,7 @@
function Frama_C_make_unknown: precondition 'valid_p' got status unknown.
[eva] Done for function Frama_C_make_unknown
[eva:alarm] FRAMAC_SHARE/libc/stdio.c:131: Warning:
- out of bounds write. assert \valid(*strp + (unsigned int)(len - 1U));
+ out of bounds write. assert \valid(*strp + (size_t)(len - 1U));
[eva] Recording results for asprintf
[eva] Done for function asprintf
[eva] computing for function printf_va_1 <- main.
diff --git a/tests/libc/oracle/stdlib_c.0.res.oracle b/tests/libc/oracle/stdlib_c.0.res.oracle
index af921e770cc1936ae368cc2c64cfb63c0fb91ead..eb2edb9decf77dc91d8595d9841c47bcac09e7aa 100644
--- a/tests/libc/oracle/stdlib_c.0.res.oracle
+++ b/tests/libc/oracle/stdlib_c.0.res.oracle
@@ -38,7 +38,7 @@
[eva:malloc] stdlib_c.c:33:
resizing variable `__calloc_w_main_l33' (0..31) to fit 0..63
[eva:alarm] stdlib_c.c:34: Warning:
- out of bounds write. assert \valid(s + (unsigned int)(i - 1));
+ out of bounds write. assert \valid(s + (size_t)(i - 1));
[eva] stdlib_c.c:32: starting to merge loop iterations
[eva] stdlib_c.c:33: Call to builtin Frama_C_calloc for function calloc
[eva:malloc] stdlib_c.c:33:
diff --git a/tests/libc/oracle/stdlib_c.1.res.oracle b/tests/libc/oracle/stdlib_c.1.res.oracle
index 0e783c36cecab2628bc61df7ff7114ed781223cc..96a5d173a353310558116dac6f02425b4a3d3b39 100644
--- a/tests/libc/oracle/stdlib_c.1.res.oracle
+++ b/tests/libc/oracle/stdlib_c.1.res.oracle
@@ -33,7 +33,7 @@
[eva:malloc] stdlib_c.c:33:
resizing variable `__calloc_w_main_l33' (0..31/63) to fit 0..63
[eva:alarm] stdlib_c.c:34: Warning:
- out of bounds write. assert \valid(s + (unsigned int)(i - 1));
+ out of bounds write. assert \valid(s + (size_t)(i - 1));
[eva] stdlib_c.c:33: Call to builtin Frama_C_calloc for function calloc
[eva:malloc] stdlib_c.c:33:
resizing variable `__calloc_w_main_l33' (0..31/63) to fit 0..95
diff --git a/tests/libc/oracle/stdlib_c.2.res.oracle b/tests/libc/oracle/stdlib_c.2.res.oracle
index df04a967191d49395cf181bbc4a39a6cc72ced26..ff5db5635efaa67de7c7c6da5d9953b25c86a9c4 100644
--- a/tests/libc/oracle/stdlib_c.2.res.oracle
+++ b/tests/libc/oracle/stdlib_c.2.res.oracle
@@ -61,7 +61,7 @@
[eva] Recording results for calloc
[eva] Done for function calloc
[eva:alarm] stdlib_c.c:34: Warning:
- out of bounds write. assert \valid(s + (unsigned int)(i - 1));
+ out of bounds write. assert \valid(s + (size_t)(i - 1));
[eva] computing for function calloc <- main.
Called from stdlib_c.c:33.
[eva] FRAMAC_SHARE/libc/stdlib.c:72: Call to builtin Frama_C_malloc
diff --git a/tests/libc/oracle/sys_socket_h.res.oracle b/tests/libc/oracle/sys_socket_h.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..bd668507be702ce8fb2db931063de1a8cea31f2a
--- /dev/null
+++ b/tests/libc/oracle/sys_socket_h.res.oracle
@@ -0,0 +1,65 @@
+[kernel] Parsing sys_socket_h.c (with preprocessing)
+[eva] Analyzing a complete application starting at main
+[eva] Computing initial state
+[eva] Initial state computed
+[eva:initial-state] Values of globals at initialization
+ dest ∈ [--..--]
+ v ∈ [--..--]
+[eva] sys_socket_h.c:26: Call to builtin strlen
+[eva] sys_socket_h.c:26:
+ function strlen: precondition 'valid_string_s' got status valid.
+[eva] computing for function socket <- main.
+ Called from sys_socket_h.c:40.
+[eva] using specification for function socket
+[eva] Done for function socket
+[eva] computing for function sendmsg <- main.
+ Called from sys_socket_h.c:42.
+[eva] using specification for function sendmsg
+[eva] sys_socket_h.c:42:
+ function sendmsg: precondition 'available_sockfd' got status valid.
+[eva] sys_socket_h.c:42:
+ function sendmsg: precondition 'valid_message' got status valid.
+[eva] sys_socket_h.c:42:
+ function sendmsg: precondition 'valid_msg_iov' got status valid.
+[eva] Done for function sendmsg
+[eva] sys_socket_h.c:43: assertion 'valid' got status valid.
+[eva] computing for function sendmsg <- main.
+ Called from sys_socket_h.c:47.
+[eva] sys_socket_h.c:47:
+ function sendmsg: precondition 'available_sockfd' got status valid.
+[eva] sys_socket_h.c:47:
+ function sendmsg: precondition 'valid_message' got status valid.
+[eva:alarm] sys_socket_h.c:47: Warning:
+ function sendmsg: precondition 'valid_msg_iov' got status invalid.
+[eva] Done for function sendmsg
+[eva] Recording results for main
+[eva] done for function main
+[eva] ====== VALUES COMPUTED ======
+[eva:final-states] Values at end of function main:
+ __fc_sockfds[0..1023] ∈ [--..--]
+ __fc_socket_counter ∈ [--..--]
+ d1 ∈ {{ "message" }}
+ s1.a ∈ {42}
+ .b ∈ {65}
+ .[bits 40 to 63] ∈ {0}
+ s2.p ∈ {0}
+ .d ∈ {3.125}
+ n ∈ {501}
+ d ∈ {5.5}
+ iov[0].iov_base ∈ {{ "message" }}
+ [0].iov_len ∈ {7}
+ [1].iov_base ∈ {{ (void *)&s1 }}
+ [1].iov_len ∈ {8}
+ [2].iov_base ∈ {{ (void *)&s2 }}
+ [2].iov_len ∈ {12}
+ [3].iov_base ∈ {{ (void *)&n }}
+ [3].iov_len ∈ {4}
+ [4].iov_base ∈ {{ (void *)&d }}
+ [4].iov_len ∈ {8}
+ msg{.msg_name; .msg_namelen} ∈ {0}
+ .msg_iov ∈ {{ &iov[0] }}
+ .msg_iovlen ∈ {5; 6}
+ {.msg_control; .msg_controllen; .msg_flags} ∈ UNINITIALIZED
+ sockfd ∈ [-1..1023]
+ r ∈ [-1..2147483647]
+ __retres ∈ {0; 1}
diff --git a/tests/libc/oracle/unistd_h.0.res.oracle b/tests/libc/oracle/unistd_h.0.res.oracle
index 5536fefad65c76c09eba172cc37c61cf7b27249b..2c6070858f6f0ab0c1849eab3272d2ddba7fc3be 100644
--- a/tests/libc/oracle/unistd_h.0.res.oracle
+++ b/tests/libc/oracle/unistd_h.0.res.oracle
@@ -9,6 +9,7 @@
\return(gethostname) == 0 (auto)
\return(getpgrp) == 0 (auto)
\return(isatty) == 0 (auto)
+ \return(lseek) == -1 (auto)
\return(pipe) == 0 (auto)
\return(setegid) == 0 (auto)
\return(seteuid) == 0 (auto)
diff --git a/tests/libc/oracle/unistd_h.1.res.oracle b/tests/libc/oracle/unistd_h.1.res.oracle
index 6f144d2ae3b10806f5b3c54a39f2e485f23eca8f..31219df8042f56171d9fabbbe9c30c8662d4ab4b 100644
--- a/tests/libc/oracle/unistd_h.1.res.oracle
+++ b/tests/libc/oracle/unistd_h.1.res.oracle
@@ -9,6 +9,7 @@
\return(gethostname) == 0 (auto)
\return(getpgrp) == 0 (auto)
\return(isatty) == 0 (auto)
+ \return(lseek) == -1 (auto)
\return(pipe) == 0 (auto)
\return(setegid) == 0 (auto)
\return(seteuid) == 0 (auto)
diff --git a/tests/libc/sys_socket_h.c b/tests/libc/sys_socket_h.c
new file mode 100644
index 0000000000000000000000000000000000000000..77aeabb54afb2eb690f4cfdd5df1149aed570a9d
--- /dev/null
+++ b/tests/libc/sys_socket_h.c
@@ -0,0 +1,51 @@
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <string.h>
+
+struct s1 {
+ int a;
+ char b;
+};
+
+struct s2 {
+ int *p;
+ double d;
+};
+
+volatile struct sockaddr_in dest;
+volatile int v;
+
+int main() {
+ char *d1 = "message";
+ struct s1 s1 = {42, 'A'};
+ struct s2 s2 = {0, 3.125};
+ int n = 501;
+ double d = 5.5;
+ struct iovec iov[5];
+ iov[0].iov_base = d1;
+ iov[0].iov_len = strlen(d1);
+ iov[1].iov_base = &s1;
+ iov[1].iov_len = sizeof(struct s1);
+ iov[2].iov_base = &s2;
+ iov[2].iov_len = sizeof(struct s2);
+ iov[3].iov_base = &n;
+ iov[3].iov_len = sizeof(int);
+ iov[4].iov_base = &d;
+ iov[4].iov_len = sizeof(double);
+ struct msghdr msg;
+ msg.msg_name = 0;
+ msg.msg_namelen = 0;
+ msg.msg_iov = iov;
+ msg.msg_iovlen = 5;
+ int sockfd = socket(AF_INET, SOCK_STREAM, 0);
+ if (sockfd < 0) return 1;
+ int r = sendmsg(sockfd, &msg, 0);
+ //@ assert valid: r == -1 || r >= 0;
+
+ msg.msg_iovlen = 6; // invalid length
+ if (v) {
+ sendmsg(sockfd, &msg, 0); // must fail
+ //@ assert unreachable: \false;
+ }
+ return 0;
+}
diff --git a/tests/metrics/oracle/libc.json b/tests/metrics/oracle/libc.json
index 8a649c6d13357fbe4cfde951f36879f8c534a506..7acca29f4fea0e177826075be8ee65194383e8da 100644
--- a/tests/metrics/oracle/libc.json
+++ b/tests/metrics/oracle/libc.json
@@ -88,6 +88,7 @@
{ "isspace": { "calls": 0, "address_taken": false } },
{ "isupper": { "calls": 0, "address_taken": false } },
{ "isxdigit": { "calls": 0, "address_taken": false } },
+ { "link": { "calls": 0, "address_taken": false } },
{ "lseek": { "calls": 0, "address_taken": false } },
{ "pathconf": { "calls": 0, "address_taken": false } },
{ "pclose": { "calls": 0, "address_taken": false } },
diff --git a/tests/misc/exception.ml b/tests/misc/exception.ml
index 0f5029a48ab9aa00c90f2c2f913c613760390768..08de229679131457770c774e61e52cb739887789 100644
--- a/tests/misc/exception.ml
+++ b/tests/misc/exception.ml
@@ -32,10 +32,16 @@ let add_my_exn my_exn f =
let c = Cil.evar (List.hd f.sformals) in
let exn_type = TComp(my_exn,[]) in
let loc = Cil_datatype.Location.unknown in
+ let my_field = List.hd (Option.get my_exn.cfields) in
+ let kind =
+ match my_field.ftype with
+ | TInt(ik,_) -> ik
+ | _ -> Kernel.fatal "Unexpected struct for the test"
+ in
let init =
CompoundInit(
exn_type,
- [Field(List.hd (Option.get my_exn.cfields), NoOffset), SingleInit (Cil.zero ~loc)])
+ [Field(my_field, NoOffset), SingleInit (Cil.kinteger ~loc kind 0)])
in
add_throw_test f exn_type c init
@@ -61,8 +67,9 @@ let add_int_ptr_exn glob f =
let add_catch my_exn my_exn2 f =
let exn_type = TComp(my_exn, []) in
let exn_type2 = TComp(my_exn2, []) in
- let exn_field = Field (List.hd (Option.get my_exn.cfields), NoOffset) in
- let exn2_field = Field (List.hd (Option.get my_exn2.cfields), NoOffset) in
+ let exn_field = List.hd (Option.get my_exn.cfields) in
+ let exn_field_offset = Field(exn_field,NoOffset) in
+ let exn2_field = List.hd (Option.get my_exn2.cfields) in
let loc = Cil_datatype.Location.unknown in
let real_locals = f.sbody.blocals in
let v1 = Cil.makeLocalVar f "exn" exn_type in
@@ -76,10 +83,9 @@ let add_catch my_exn my_exn2 f =
in
let convert_exn_block =
Cil.mkBlock
- [ Cil.mkStmtOneInstr
- (Set ((Var v1, exn_field),
- Cil.new_exp ~loc (Lval (Var v4, exn2_field)),
- loc))]
+ [ Cil_builder.Pure.(
+ cil_stmt ~loc
+ (field (var v1) exn_field := field (var v4) exn2_field)) ]
in
let catch_stmt =
Cil.mkStmt
@@ -89,7 +95,7 @@ let add_catch my_exn my_exn2 f =
Cil.mkBlock
[ Cil.mkStmt
(Return
- (Some (Cil.new_exp ~loc (Lval (Var v1, exn_field))),
+ (Some (Cil.new_exp ~loc (Lval (Var v1,exn_field_offset))),
loc))];
Catch_exn (v2,[]),
Cil.mkBlock
diff --git a/tests/misc/oracle/exception.0.res.oracle b/tests/misc/oracle/exception.0.res.oracle
index 2dc193612ffeaa7f8f028d2067d42c7d741eebbe..cfcd1e770106132c42d5cad28542eca83ce646a9 100644
--- a/tests/misc/oracle/exception.0.res.oracle
+++ b/tests/misc/oracle/exception.0.res.oracle
@@ -92,7 +92,7 @@ int f4(int c)
int __retres;
if (c) {
struct my_exn2 exn;
- exn.c = 0;
+ exn.c = (char)0;
throw (exn);
}
else {
diff --git a/tests/misc/oracle/exception.1.res.oracle b/tests/misc/oracle/exception.1.res.oracle
index 98382a040e8a1ff90e691530903804f58a697b07..1161a6b43a0550c139c0c3aca33a732332edf151 100644
--- a/tests/misc/oracle/exception.1.res.oracle
+++ b/tests/misc/oracle/exception.1.res.oracle
@@ -136,7 +136,7 @@ int f4(int c)
int __retres;
if (c) {
struct my_exn2 exn;
- exn.c = 0;
+ exn.c = (char)0;
__fc_exn.exn_uncaught = 1;
__fc_exn.exn_kind = __fc_exn_kind___fc_Smy_exn2;
__fc_exn.exn_obj.__fc_Smy_exn2 = exn;
@@ -198,7 +198,7 @@ int h(int c)
if (0) {
struct my_exn2 exn2;
__fc_Smy_exn2_2: exn2 = __fc_exn.exn_obj.__fc_Smy_exn2;
- exn.e = exn2.c;
+ exn.e = (int)exn2.c;
goto __fc_Smy_exn;
}
if (0) {
diff --git a/tests/pdg/oracle/bts1194.res.oracle b/tests/pdg/oracle/bts1194.res.oracle
index 47e6cda07df505a5319c1e6a660712eb26020172..145aeb752d3a920752391a5eaaa261f9a2e3e284 100644
--- a/tests/pdg/oracle/bts1194.res.oracle
+++ b/tests/pdg/oracle/bts1194.res.oracle
@@ -24,7 +24,6 @@
[eva] bts1194.c:20: function g: no state left, postcondition got status valid.
[eva] Recording results for g
[from] Computing for function g
-[from] Non-terminating function g (no dependencies)
[from] Done for function g
[eva] Done for function g
[eva] Recording results for h
diff --git a/tests/pdg/oracle/top_pdg_input.res.oracle b/tests/pdg/oracle/top_pdg_input.res.oracle
index 72f904673274a5504962f083902fd9626ec5e46a..4560b0573061290b9ec67795f6988d164a980fc6 100644
--- a/tests/pdg/oracle/top_pdg_input.res.oracle
+++ b/tests/pdg/oracle/top_pdg_input.res.oracle
@@ -256,17 +256,12 @@ Cannot filter: dumping raw memory (including unchanged variables)
[from] Done for function fun_asm
[from] Computing for function main_asm
[from] Done for function main_asm
-[from] Computing for function no_results
-[from] Done for function no_results
[from] ====== DEPENDENCIES COMPUTED ======
These dependencies hold at termination for the executions that terminate:
[from] Function fun_asm:
\result FROM i
[from] Function main_asm:
\result FROM \nothing
-[from] Function no_results:
- FROMTOP
- \result FROM ANYTHING(origin:Unknown)
[from] ====== END OF DEPENDENCIES ======
[inout] Out (internal) for function fun_asm:
__retres
@@ -285,8 +280,6 @@ Cannot filter: dumping raw memory (including unchanged variables)
[pdg] done for function fun_asm
[pdg] computing for function main_asm
[pdg] done for function main_asm
-[pdg] computing for function no_results
-[pdg] Top for function no_results
[pdg] ====== PDG GRAPH COMPUTED ======
[pdg] PDG for fun_asm
{n47}: InCtrl
@@ -333,5 +326,3 @@ Cannot filter: dumping raw memory (including unchanged variables)
-[--d]-> 61
{n63}: OutRet
-[--d]-> 62
-[pdg] PDG for no_results
- Top PDG
diff --git a/tests/rte/oracle/addsub_typedef.res.oracle b/tests/rte/oracle/addsub_typedef.res.oracle
index 3c40e7028ebc3850682949bc120e4907f6867404..84af60c46ab6b5efd668f1bb79d551e03d68f8f8 100644
--- a/tests/rte/oracle/addsub_typedef.res.oracle
+++ b/tests/rte/oracle/addsub_typedef.res.oracle
@@ -12,7 +12,7 @@
[rte] addsub_typedef.c:13: Warning:
guaranteed RTE:
assert
- signed_overflow: -2147483648 ≤ (int)(-((int)((int)(-0x7fffffff) - 1))) - 1;
+ signed_overflow: -2147483648 ≤ (tint)(-((int)((int)(-0x7fffffff) - 1))) - 1;
/* Generated by Frama-C */
typedef int tint;
int main(void)
@@ -30,7 +30,7 @@ int main(void)
/*@ assert rte: signed_overflow: -2147483647 ≤ (int)(-0x7fffffff) - 1; */
/*@ assert
rte: signed_overflow:
- -2147483648 ≤ (int)(-((int)((int)(-0x7fffffff) - 1))) - 1;
+ -2147483648 ≤ (tint)(-((int)((int)(-0x7fffffff) - 1))) - 1;
*/
z = - (-0x7fffffff - 1) - 1;
z = 0x7fffffff + 0;
@@ -38,7 +38,8 @@ int main(void)
/*@ assert rte: signed_overflow: -2147483648 ≤ x + y; */
/*@ assert rte: signed_overflow: x + y ≤ 2147483647; */
z = x + y;
- /*@ assert rte: signed_overflow: -2147483648 ≤ (int)(-0x7ffffffc) - y; */
+ /*@ assert rte: signed_overflow: -2147483648 ≤ (tint)(-0x7ffffffc) - y;
+ */
z = -0x7ffffffc - y;
/*@ assert rte: signed_overflow: -2147483647 ≤ x; */
/*@ assert rte: signed_overflow: -2147483648 ≤ (tint)(-x) - 0x7ffffffc;
diff --git a/tests/rte/oracle/divmod_typedef.res.oracle b/tests/rte/oracle/divmod_typedef.res.oracle
index e87059926ae6ea679c3aa891622f42e1b1b96f7f..9bf2d9db039ff682b472bd157edb0c259d00c8d5 100644
--- a/tests/rte/oracle/divmod_typedef.res.oracle
+++ b/tests/rte/oracle/divmod_typedef.res.oracle
@@ -31,9 +31,9 @@ int main(void)
tint x = 0;
tint y = 0;
tint z = 0;
- tuint ux = (unsigned int)0;
- tuint uy = (unsigned int)0;
- tuint uz = (unsigned int)0;
+ tuint ux = (tuint)0;
+ tuint uy = (tuint)0;
+ tuint uz = (tuint)0;
/*@ assert
rte: signed_overflow:
(int)((int)(-2147483647) - 1) / (int)(-1) ≤ 2147483647;
@@ -41,16 +41,16 @@ int main(void)
z = (-2147483647 - 1) / -1;
z = (-2147483647 - 1) % -1;
/*@ assert rte: division_by_zero: 0 ≢ 0; */
- uz = (unsigned int)(1 / 0);
+ uz = (tuint)(1 / 0);
/*@ assert rte: division_by_zero: (unsigned int)(0xffffffff + 1) ≢ 0; */
uz = (unsigned int)1 / (0xffffffff + (unsigned int)1);
ux = 0x80000000;
uy = 0xffffffff;
/*@ assert rte: signed_downcast: ux ≤ 2147483647; */
/*@ assert rte: signed_downcast: uy ≤ 2147483647; */
- /*@ assert rte: division_by_zero: (int)uy ≢ 0; */
- /*@ assert rte: signed_overflow: (int)ux / (int)uy ≤ 2147483647; */
- uz = (unsigned int)((int)ux / (int)uy);
+ /*@ assert rte: division_by_zero: (tint)uy ≢ 0; */
+ /*@ assert rte: signed_overflow: (tint)ux / (tint)uy ≤ 2147483647; */
+ uz = (tuint)((tint)ux / (tint)uy);
/*@ assert rte: division_by_zero: uy ≢ 0; */
uz = ux / uy;
/*@ assert rte: division_by_zero: (unsigned int)(0xffffffff + 1) ≢ 0; */
@@ -59,10 +59,10 @@ int main(void)
rte: signed_overflow:
(int)((int)(-0x7fffffff) - 1) / (int)(-1) ≤ 2147483647;
*/
- uz = (unsigned int)((-0x7fffffff - 1) / -1);
+ uz = (tuint)((-0x7fffffff - 1) / -1);
uz = (unsigned int)(-0x7fffffff - 1) / 0xffffffff;
uz = 0x80000000 / (unsigned int)(-1);
- uz = (unsigned int)((int)(0x80000000 / 0xffffffff));
+ uz = (tuint)((tint)(0x80000000 / 0xffffffff));
/*@ assert rte: signed_overflow: -2147483648 ≤ x + y; */
/*@ assert rte: signed_overflow: x + y ≤ 2147483647; */
/*@ assert rte: division_by_zero: (tint)(x + y) ≢ 0; */
@@ -76,9 +76,9 @@ int main(void)
(long long)((long long)(-2147483648L) / (long long)((long)(-1L))) ≤
2147483647;
*/
- z = (int)(-2147483648L / (long long)(-1L));
- z = (int)(0x80000000 / (unsigned int)(-1));
- z = (int)(0x80000000 / 0xffffffff);
+ z = (tint)(-2147483648L / (long long)(-1L));
+ z = (tint)(0x80000000 / (unsigned int)(-1));
+ z = (tint)(0x80000000 / 0xffffffff);
__retres = 0;
return __retres;
}
diff --git a/tests/slicing/oracle/min_call.res.oracle b/tests/slicing/oracle/min_call.res.oracle
index 858153ee93740c28d7b7379d50f8de6beca11e87..f3607c3ab3b4940722b6795cd9097a58361a414b 100644
--- a/tests/slicing/oracle/min_call.res.oracle
+++ b/tests/slicing/oracle/min_call.res.oracle
@@ -104,10 +104,10 @@
[slicing] applying all slicing requests...
[slicing] applying 1 actions...
[slicing] applying actions: 1/1...
-[pdg] computing for function f
-[pdg] done for function f
[pdg] computing for function g
[pdg] done for function g
+[pdg] computing for function f
+[pdg] done for function f
Project1 - result1 :
[slicing] exporting project to 'Sliced code'...
[slicing] applying all slicing requests...
@@ -464,14 +464,14 @@ void f_slice_1(void)
[slicing] applying all slicing requests...
[slicing] applying 0 actions...
Slicing project worklist [default] =
-[f = (n:26 ,<[acd], [---]>)(n:33 ,<[acd], [---]>)(n:41 ,<[acd], [---]>)][g = (n:60 ,
+[f = (n:45 ,<[acd], [---]>)(n:52 ,<[acd], [---]>)(n:60 ,<[acd], [---]>)][g = (n:27 ,
<[acd],
[---]>)]
Slicing project worklist [default] =
-[f_slice_1 = choose_call for call 17][f_slice_1 = choose_call for call 16][f_slice_1 = choose_call for call 15][g = propagate (n:68 ,
+[f_slice_1 = choose_call for call 17][f_slice_1 = choose_call for call 16][f_slice_1 = choose_call for call 15][g = propagate (n:35 ,
<[acd],
-[---]>)][Appli : calls to f][g = (n:60 ,<[acd], [---]>)]
+[---]>)][Appli : calls to f][g = (n:27 ,<[acd], [---]>)]
[slicing] applying all slicing requests...
[slicing] applying 6 actions...
diff --git a/tests/sparecode/oracle/bts334.2.res.oracle b/tests/sparecode/oracle/bts334.2.res.oracle
index 06b83c96a7ef143df4a3b8ca490632b2bcbb2f78..46154e7440ca51b5e742d0548aad9600d1ff5c1a 100644
--- a/tests/sparecode/oracle/bts334.2.res.oracle
+++ b/tests/sparecode/oracle/bts334.2.res.oracle
@@ -97,7 +97,6 @@
[eva] Done for function loop_body
[eva] Recording results for process
[from] Computing for function process
-[from] Non-terminating function process (no dependencies)
[from] Done for function process
[eva] Done for function process
[eva] Recording results for main_init
diff --git a/tests/sparecode/oracle/glob_decls.0.res.oracle b/tests/sparecode/oracle/glob_decls.0.res.oracle
index 9971a7bf8f206d7c8b635eda647440b5ce363118..3bb7b21327955acb59747a43a7ca368962fb7750 100644
--- a/tests/sparecode/oracle/glob_decls.0.res.oracle
+++ b/tests/sparecode/oracle/glob_decls.0.res.oracle
@@ -63,7 +63,7 @@ typedef int Int;
typedef Int Tx;
Ts2 S2;
char Size;
-Tx X = (int)sizeof(Size);
+Tx X = (Tx)sizeof(Size);
int main(int x)
{
int __retres;
diff --git a/tests/sparecode/oracle/glob_decls.1.res.oracle b/tests/sparecode/oracle/glob_decls.1.res.oracle
index e260eefd069d4af68e01647f3164fe359e75841a..40cd8e42ce5b0e55a58ef628ee1c130799383bcd 100644
--- a/tests/sparecode/oracle/glob_decls.1.res.oracle
+++ b/tests/sparecode/oracle/glob_decls.1.res.oracle
@@ -59,7 +59,7 @@ typedef int Int;
typedef Int Tx;
Ts2 S2;
char Size;
-Tx X = (int)sizeof(Size);
+Tx X = (Tx)sizeof(Size);
/*@ requires S2.a > S2.b; */
int main(int x)
{
diff --git a/tests/sparecode/oracle/glob_decls.2.res.oracle b/tests/sparecode/oracle/glob_decls.2.res.oracle
index 6ceff3b59b372384b225705b8f73a33e758116c2..d5e83032365641dee2547f0d97a2e9db75692e1f 100644
--- a/tests/sparecode/oracle/glob_decls.2.res.oracle
+++ b/tests/sparecode/oracle/glob_decls.2.res.oracle
@@ -29,7 +29,7 @@ int f(void)
}
char Size;
-Tx X = (int)sizeof(Size);
+Tx X = (Tx)sizeof(Size);
int Y;
int use_in_PX_init;
int *PX;
diff --git a/tests/spec/oracle/acsl_basic_allocator.res.oracle b/tests/spec/oracle/acsl_basic_allocator.res.oracle
index 6d2b0811ba69bc10fbfb29d0b59134a6fde783f1..210a19385d1f4cde81b259ccbafc0a45e170ce20 100644
--- a/tests/spec/oracle/acsl_basic_allocator.res.oracle
+++ b/tests/spec/oracle/acsl_basic_allocator.res.oracle
@@ -73,7 +73,7 @@ memory_block *memory_alloc(memory_pool *arena, size_t s)
}
mbl = mbl->next;
}
- if ((size_t)1000 < s) mb_size = s; else mb_size = (unsigned int)1000;
+ if ((size_t)1000 < s) mb_size = s; else mb_size = (size_t)1000;
mb_data = (char *)malloc(mb_size);
mb = (memory_block *)malloc(sizeof(memory_block));
mb->size = mb_size;
diff --git a/tests/spec/oracle/conversion.res.oracle b/tests/spec/oracle/conversion.res.oracle
index b79d46ad10e3a734ba2f6dc6bb1f3da14732b869..6c6fda7c533a5c74e0a450d55a869f9192fd528b 100644
--- a/tests/spec/oracle/conversion.res.oracle
+++ b/tests/spec/oracle/conversion.res.oracle
@@ -34,7 +34,7 @@ int g(void)
T const X;
T const Tab[4];
T_PTR_T4 const Tab_Ptr =
- {(int *)(& X), (int *)(& X), (int *)(& X), (int *)(& X)};
+ {(T_PTR)(& X), (T_PTR)(& X), (T_PTR)(& X), (T_PTR)(& X)};
/*@
axiomatic useless_logic_cast {
logic ℤ v2= 1 + 1;
diff --git a/tests/syntax/cpp-command.c b/tests/syntax/cpp-command.c
index 2510c0664e13ed50791184392085a1abf20a793e..dc71436e8b0da41c34da48c7f39c1559f580a5dc 100644
--- a/tests/syntax/cpp-command.c
+++ b/tests/syntax/cpp-command.c
@@ -5,9 +5,9 @@
OPT: -machdep x86_32 -cpp-frama-c-compliant -cpp-command "printf \"%s\n\" \"using \\% has no effect : \$(basename \"\%input\")\""
OPT: -machdep x86_32 -cpp-frama-c-compliant -cpp-command "echo %var is not an interpreted placeholder"
OPT: -machdep x86_32 -print-cpp-commands
- OPT: -cpp-extra-args-per-file=@PTEST_FILE@:"-DPF=\\\"cp%02d_3f\\\"" @PTEST_FILE@ -print
+ OPT: -cpp-extra-args-per-file=@PTEST_FILE@:"-DPF=\\\"cp%02d_%.3f\\\"" -cpp-extra-args="-DPF2=\\\"cp%02d_%.3f\\\"" -no-autoload-plugins @PTEST_FILE@ -print
+ OPT: -cpp-extra-args-per-file=@PTEST_FILE@:"file_extra" -cpp-extra-args="global_extra" -cpp-command "echo 'extra_args: %args'" -no-autoload-plugins @PTEST_FILE@ -print
*/
-
#include <stdio.h>
void printer(int i, float f) {
printf(PF, i, f);
diff --git a/tests/syntax/oracle/array_cast_bts1099.res.oracle b/tests/syntax/oracle/array_cast_bts1099.res.oracle
index 3219449ef21d91a5df0139abc6139157e1546fe1..256825a239562a0d621c9e444b30c01ddf3bee99 100644
--- a/tests/syntax/oracle/array_cast_bts1099.res.oracle
+++ b/tests/syntax/oracle/array_cast_bts1099.res.oracle
@@ -1,6 +1,6 @@
[kernel] Parsing array_cast_bts1099.i (no preprocessing)
[kernel] array_cast_bts1099.i:12: User Error:
- Cast over a non-scalar type int [10]
+ Cast over a non-scalar type t
10 int tab1[4];
11 u* p = &tab1;
12 t* p2 = (t) p;
diff --git a/tests/syntax/oracle/assembly_gmp.0.res.oracle b/tests/syntax/oracle/assembly_gmp.0.res.oracle
index 5c32c280c28f6e5a8712156a8caa9a31907370ea..1797d1ec6f5bae78f37b0ff6a4417291424e3d9b 100644
--- a/tests/syntax/oracle/assembly_gmp.0.res.oracle
+++ b/tests/syntax/oracle/assembly_gmp.0.res.oracle
@@ -38,12 +38,12 @@ mp_limb_t mpn_mod_1_1p(mp_srcptr ap, mp_size_t n, mp_limb_t b,
B2modb = *(bmodb + 3);
B2mb = B2modb - b;
{
- UDItype __m0 = (unsigned long)r1;
- UDItype __m1 = (unsigned long)B2modb;
+ UDItype __m0 = (UDItype)r1;
+ UDItype __m1 = (UDItype)B2modb;
/*@ assigns p1;
assigns p1 \from r1, B2modb; */
__asm__ ("umulh %r1,%2,%0" : "=r" (p1) : "%rJ" (r1), "rI" (B2modb));
- p0 = (long)(__m0 * __m1);
+ p0 = (mp_limb_t)(__m0 * __m1);
}
tmp = USItype(r0);
tmp_0 = USItype(p1);
@@ -70,12 +70,12 @@ mp_limb_t mpn_mod_1_1p(mp_srcptr ap, mp_size_t n, mp_limb_t b,
int tmp_5;
int tmp_6;
{
- UDItype __m0_0 = (unsigned long)r1;
- UDItype __m1_0 = (unsigned long)B2modb;
+ UDItype __m0_0 = (UDItype)r1;
+ UDItype __m1_0 = (UDItype)B2modb;
/*@ assigns p1;
assigns p1 \from r1, B2modb; */
__asm__ ("umulh %r1,%2,%0" : "=r" (p1) : "%rJ" (r1), "rI" (B2modb));
- p0 = (long)(__m0_0 * __m1_0);
+ p0 = (mp_limb_t)(__m0_0 * __m1_0);
}
ADDC_LIMB(cy,r0,r0,r2 & B2modb);
r0 -= - cy & b;
@@ -96,7 +96,7 @@ mp_limb_t mpn_mod_1_1p(mp_srcptr ap, mp_size_t n, mp_limb_t b,
: "1" (tmp_3), "g" (tmp_4), "%2" (tmp_5), "g" (tmp_6)
);
}
- j -= (mp_size_t)1;
+ j --;
}
r1 -= r2 & b;
}
@@ -105,12 +105,12 @@ mp_limb_t mpn_mod_1_1p(mp_srcptr ap, mp_size_t n, mp_limb_t b,
mp_limb_t t;
mp_limb_t B1modb = *(bmodb + 2);
{
- UDItype __m0_1 = (unsigned long)r1;
- UDItype __m1_1 = (unsigned long)B1modb;
+ UDItype __m0_1 = (UDItype)r1;
+ UDItype __m1_1 = (UDItype)B1modb;
/*@ assigns r1;
assigns r1 \from r1, B1modb; */
__asm__ ("umulh %r1,%2,%0" : "=r" (r1) : "%rJ" (r1), "rI" (B1modb));
- t = (long)(__m0_1 * __m1_1);
+ t = (mp_limb_t)(__m0_1 * __m1_1);
}
r0 += t;
r1 += (mp_limb_t)(r0 < t);
@@ -118,7 +118,7 @@ mp_limb_t mpn_mod_1_1p(mp_srcptr ap, mp_size_t n, mp_limb_t b,
r0 <<= cnt;
}
else {
- mp_limb_t mask = - ((long)(r1 >= b));
+ mp_limb_t mask = - ((mp_limb_t)(r1 >= b));
r1 -= mask & b;
}
bi = *(bmodb + 0);
diff --git a/tests/syntax/oracle/assembly_gmp.1.res.oracle b/tests/syntax/oracle/assembly_gmp.1.res.oracle
index 0ec2933aaa15b996a99d4a4aa753fc615e21da24..a7c070cdd18fcba87039994014d04832be603b8b 100644
--- a/tests/syntax/oracle/assembly_gmp.1.res.oracle
+++ b/tests/syntax/oracle/assembly_gmp.1.res.oracle
@@ -30,38 +30,37 @@ mp_limb_t mpn_mod_1_1p(mp_srcptr ap, mp_size_t n, mp_limb_t b,
B2modb = *(bmodb + 3);
B2mb = B2modb - b;
{
- UDItype __m0 = (unsigned long)r1;
- UDItype __m1 = (unsigned long)B2modb;
+ UDItype __m0 = (UDItype)r1;
+ UDItype __m1 = (UDItype)B2modb;
/*@ assigns p1;
assigns p1 \from r1, B2modb; */
__asm__ ("umulh %r1,%2,%0" : "=r" (p1) : "%rJ" (r1), "rI" (B2modb));
- p0 = (long)(__m0 * __m1);
+ p0 = (mp_limb_t)(__m0 * __m1);
}
/*@ assigns r2, r1, r0;
- assigns r2 \from r0, p1, *(ap + (unsigned long)(n - 3)), p0;
- assigns r1 \from r0, p1, *(ap + (unsigned long)(n - 3)), p0;
- assigns r0 \from r0, p1, *(ap + (unsigned long)(n - 3)), p0;
+ assigns r2 \from r0, p1, *(ap + (mp_size_t)(n - 3)), p0;
+ assigns r1 \from r0, p1, *(ap + (mp_size_t)(n - 3)), p0;
+ assigns r0 \from r0, p1, *(ap + (mp_size_t)(n - 3)), p0;
*/
__asm__ (
"add\t%6, %q2\n\t"
"adc\t%4, %q1\n\t"
"sbb\t%q0, %q0"
: "=r" (r2), "=r" (r1), "=&r" (r0)
- : "1" ((unsigned long)r0), "rme" ((unsigned long)p1),
- "%2" ((unsigned long)*(ap + (n - (mp_size_t)3))),
- "rme" ((unsigned long)p0)
+ : "1" ((UDItype)r0), "rme" ((UDItype)p1),
+ "%2" ((UDItype)*(ap + (n - (mp_size_t)3))), "rme" ((UDItype)p0)
);
j = n - (mp_size_t)4;
while (j >= (mp_size_t)0) {
{
mp_limb_t cy;
{
- UDItype __m0_0 = (unsigned long)r1;
- UDItype __m1_0 = (unsigned long)B2modb;
+ UDItype __m0_0 = (UDItype)r1;
+ UDItype __m1_0 = (UDItype)B2modb;
/*@ assigns p1;
assigns p1 \from r1, B2modb; */
__asm__ ("umulh %r1,%2,%0" : "=r" (p1) : "%rJ" (r1), "rI" (B2modb));
- p0 = (long)(__m0_0 * __m1_0);
+ p0 = (mp_limb_t)(__m0_0 * __m1_0);
}
ADDC_LIMB(cy,r0,r0,r2 & B2modb);
r0 -= - cy & b;
@@ -75,11 +74,11 @@ mp_limb_t mpn_mod_1_1p(mp_srcptr ap, mp_size_t n, mp_limb_t b,
"adc\t%4, %q1\n\t"
"sbb\t%q0, %q0"
: "=r" (r2), "=r" (r1), "=&r" (r0)
- : "1" ((unsigned long)r0), "rme" ((unsigned long)p1),
- "%2" ((unsigned long)*(ap + j)), "rme" ((unsigned long)p0)
+ : "1" ((UDItype)r0), "rme" ((UDItype)p1),
+ "%2" ((UDItype)*(ap + j)), "rme" ((UDItype)p0)
);
}
- j -= (mp_size_t)1;
+ j --;
}
r1 -= r2 & b;
}
@@ -88,12 +87,12 @@ mp_limb_t mpn_mod_1_1p(mp_srcptr ap, mp_size_t n, mp_limb_t b,
mp_limb_t t;
mp_limb_t B1modb = *(bmodb + 2);
{
- UDItype __m0_1 = (unsigned long)r1;
- UDItype __m1_1 = (unsigned long)B1modb;
+ UDItype __m0_1 = (UDItype)r1;
+ UDItype __m1_1 = (UDItype)B1modb;
/*@ assigns r1;
assigns r1 \from r1, B1modb; */
__asm__ ("umulh %r1,%2,%0" : "=r" (r1) : "%rJ" (r1), "rI" (B1modb));
- t = (long)(__m0_1 * __m1_1);
+ t = (mp_limb_t)(__m0_1 * __m1_1);
}
r0 += t;
r1 += (mp_limb_t)(r0 < t);
@@ -101,7 +100,7 @@ mp_limb_t mpn_mod_1_1p(mp_srcptr ap, mp_size_t n, mp_limb_t b,
r0 <<= cnt;
}
else {
- mp_limb_t mask = - ((long)(r1 >= b));
+ mp_limb_t mask = - ((mp_limb_t)(r1 >= b));
r1 -= mask & b;
}
bi = *(bmodb + 0);
diff --git a/tests/syntax/oracle/assembly_gmp.2.res.oracle b/tests/syntax/oracle/assembly_gmp.2.res.oracle
index 3b3b101646ad40223bf120c2e2ea0cabb4c26092..cec6659a998b0b59c3702950c946fa404840f6b4 100644
--- a/tests/syntax/oracle/assembly_gmp.2.res.oracle
+++ b/tests/syntax/oracle/assembly_gmp.2.res.oracle
@@ -30,17 +30,17 @@ mp_limb_t mpn_mod_1_1p(mp_srcptr ap, mp_size_t n, mp_limb_t b,
B2modb = *(bmodb + 3);
B2mb = B2modb - b;
{
- UDItype __m0 = (unsigned long)r1;
- UDItype __m1 = (unsigned long)B2modb;
+ UDItype __m0 = (UDItype)r1;
+ UDItype __m1 = (UDItype)B2modb;
/*@ assigns p1;
assigns p1 \from r1, B2modb; */
__asm__ ("umulh %r1,%2,%0" : "=r" (p1) : "%rJ" (r1), "rI" (B2modb));
- p0 = (long)(__m0 * __m1);
+ p0 = (mp_limb_t)(__m0 * __m1);
}
/*@ assigns r2, r1, r0;
- assigns r2 \from r0, p1, *(ap + (unsigned int)(n - 3)), p0;
- assigns r1 \from r0, p1, *(ap + (unsigned int)(n - 3)), p0;
- assigns r0 \from r0, p1, *(ap + (unsigned int)(n - 3)), p0;
+ assigns r2 \from r0, p1, *(ap + (mp_size_t)(n - 3)), p0;
+ assigns r1 \from r0, p1, *(ap + (mp_size_t)(n - 3)), p0;
+ assigns r0 \from r0, p1, *(ap + (mp_size_t)(n - 3)), p0;
*/
__asm__ (
"add%I6c\t%2, %5, %6\n\t"
@@ -55,12 +55,12 @@ mp_limb_t mpn_mod_1_1p(mp_srcptr ap, mp_size_t n, mp_limb_t b,
{
mp_limb_t cy;
{
- UDItype __m0_0 = (unsigned long)r1;
- UDItype __m1_0 = (unsigned long)B2modb;
+ UDItype __m0_0 = (UDItype)r1;
+ UDItype __m1_0 = (UDItype)B2modb;
/*@ assigns p1;
assigns p1 \from r1, B2modb; */
__asm__ ("umulh %r1,%2,%0" : "=r" (p1) : "%rJ" (r1), "rI" (B2modb));
- p0 = (long)(__m0_0 * __m1_0);
+ p0 = (mp_limb_t)(__m0_0 * __m1_0);
}
ADDC_LIMB(cy,r0,r0,r2 & B2modb);
r0 -= - cy & b;
@@ -78,7 +78,7 @@ mp_limb_t mpn_mod_1_1p(mp_srcptr ap, mp_size_t n, mp_limb_t b,
: "r" (r0), "r" (p1), "%r" (*(ap + j)), "rI" (p0)
);
}
- j -= (mp_size_t)1;
+ j --;
}
r1 -= r2 & b;
}
@@ -87,12 +87,12 @@ mp_limb_t mpn_mod_1_1p(mp_srcptr ap, mp_size_t n, mp_limb_t b,
mp_limb_t t;
mp_limb_t B1modb = *(bmodb + 2);
{
- UDItype __m0_1 = (unsigned long)r1;
- UDItype __m1_1 = (unsigned long)B1modb;
+ UDItype __m0_1 = (UDItype)r1;
+ UDItype __m1_1 = (UDItype)B1modb;
/*@ assigns r1;
assigns r1 \from r1, B1modb; */
__asm__ ("umulh %r1,%2,%0" : "=r" (r1) : "%rJ" (r1), "rI" (B1modb));
- t = (long)(__m0_1 * __m1_1);
+ t = (mp_limb_t)(__m0_1 * __m1_1);
}
r0 += t;
r1 += (mp_limb_t)(r0 < t);
@@ -100,7 +100,7 @@ mp_limb_t mpn_mod_1_1p(mp_srcptr ap, mp_size_t n, mp_limb_t b,
r0 <<= cnt;
}
else {
- mp_limb_t mask = - ((long)(r1 >= b));
+ mp_limb_t mask = - ((mp_limb_t)(r1 >= b));
r1 -= mask & b;
}
bi = *(bmodb + 0);
diff --git a/tests/syntax/oracle/attributes-declarations-definitions.0.res.oracle b/tests/syntax/oracle/attributes-declarations-definitions.0.res.oracle
index 8b1788aed0bd7e192a379383c2218fae475bf784..d47e7ccfd11e49ed64f6de8d7b1c80aa08d47661 100644
--- a/tests/syntax/oracle/attributes-declarations-definitions.0.res.oracle
+++ b/tests/syntax/oracle/attributes-declarations-definitions.0.res.oracle
@@ -29,7 +29,7 @@ aint g(int __attribute__((__a2__)) i3);
aint g(int __attribute__((__a2__)) i3)
{
aint __retres;
- __retres = (int __attribute__((__a1__)))i3;
+ __retres = (aint)i3;
return __retres;
}
@@ -38,7 +38,7 @@ iptr h(iptr volatile ip2);
iptr h(iptr volatile ip2)
{
iptr __retres;
- __retres = (int __attribute__((__p1__)) *)0;
+ __retres = (iptr)0;
return __retres;
}
diff --git a/tests/syntax/oracle/cpp-command.5.res.oracle b/tests/syntax/oracle/cpp-command.5.res.oracle
index 48860bc0cfb1ba8cc3b430b41b1659291445c0a6..1c90e0192879b68cdefbcfae1eac5a6b7564a5b1 100644
--- a/tests/syntax/oracle/cpp-command.5.res.oracle
+++ b/tests/syntax/oracle/cpp-command.5.res.oracle
@@ -6,7 +6,7 @@
#include "stdio.h"
void printer(int i, float f)
{
- printf("cp%02d_3f",i,(double)f);
+ printf("cp%02d_%.3f",i,(double)f);
return;
}
diff --git a/tests/syntax/oracle/cpp-command.6.res.oracle b/tests/syntax/oracle/cpp-command.6.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..cd4b804010bbc298960b786eedcdb421bf3772ee
--- /dev/null
+++ b/tests/syntax/oracle/cpp-command.6.res.oracle
@@ -0,0 +1,7 @@
+[kernel] Warning: your preprocessor is not known to handle option `-nostdinc'. If pre-processing fails because of it, please add -no-cpp-frama-c-compliant option to Frama-C's command-line. If you do not want to see this warning again, explicitly use option -cpp-frama-c-compliant.
+[kernel] Warning: your preprocessor is not known to handle option `-dD'. If pre-processing fails because of it, please add -no-cpp-frama-c-compliant option to Frama-C's command-line. If you do not want to see this warning again, explicitly use option -cpp-frama-c-compliant.
+[kernel] Parsing cpp-command.c (with preprocessing)
+extra_args: -IFRAMAC_SHARE/libc -D__FRAMAC__ -D__FC_MACHDEP_X86_64 -dD -nostdinc -m64 file_extra global_extra
+[kernel] Warning: trying to preprocess annotation with an unknown preprocessor.
+/* Generated by Frama-C */
+
diff --git a/tests/syntax/oracle/define_string_logic_pp_bts2101.res.oracle b/tests/syntax/oracle/define_string_logic_pp_bts2101.res.oracle
index e4786af29d71f8a3404c9f84c7efe43f334a938f..f3676f59c8f9af0afb1ef429ba8a5c8903330b2d 100644
--- a/tests/syntax/oracle/define_string_logic_pp_bts2101.res.oracle
+++ b/tests/syntax/oracle/define_string_logic_pp_bts2101.res.oracle
@@ -15,7 +15,7 @@ int main(void)
(char)'\000'};
char const d[5] =
{(char)'t', (char)'o', (char)'t', (char)'o', (char)'\000'};
- char const e = (char)7815260946135808373ULL;
+ char const e = (char)117;
/*@ assert p("to/*to") ∧ p("toto"); */ ;
/*@ assert (char)7815260946135808373 ≡ 'u'; */ ;
__retres = (int)c[sizeof(c) - (unsigned int)1];
diff --git a/tests/syntax/oracle/enum_repr.0.res.oracle b/tests/syntax/oracle/enum_repr.0.res.oracle
index c38989f20002635b68b04d656751e37811767047..9d288accee58c741ab7a5fe92a339eb34351fd98 100644
--- a/tests/syntax/oracle/enum_repr.0.res.oracle
+++ b/tests/syntax/oracle/enum_repr.0.res.oracle
@@ -1,26 +1,15 @@
[kernel] Parsing enum_repr.i (no preprocessing)
-[kernel] enum_repr.i:40:
- Inserted implicit cast from unsigned int to enum __anonenum_bu2_4
-[kernel] enum_repr.i:41:
- Inserted implicit cast from long long to enum __anonenum_bu3_5
-[kernel] enum_repr.i:43:
- Inserted implicit cast from unsigned int to enum __anonenum_bs2_7
-[kernel] enum_repr.i:44:
- Inserted implicit cast from long long to enum __anonenum_bs3_8
-[kernel] enum_repr.i:45:
- Inserted implicit cast from signed char to enum __anonenum_bc1_9
-[kernel] enum_repr.i:46:
- Inserted implicit cast from unsigned char to enum __anonenum_bc2_10
-[kernel] enum_repr.i:47:
- Inserted implicit cast from signed char to enum __anonenum_bd1_11
-[kernel] enum_repr.i:48:
- Inserted implicit cast from unsigned char to enum __anonenum_bd2_12
-[kernel] enum_repr.i:66:
- Inserted implicit cast from enum __anonenum_foo_1 to unsigned int
-[kernel] enum_repr.i:67:
- Inserted implicit cast from unsigned int to enum __anonenum_foo_1
-[kernel] enum_repr.i:68:
- Inserted implicit cast from unsigned int to enum __anonenum_foo_1
+[kernel] enum_repr.i:40: Inserted implicit cast from unsigned int to bu2
+[kernel] enum_repr.i:41: Inserted implicit cast from long long to bu3
+[kernel] enum_repr.i:43: Inserted implicit cast from unsigned int to bs2
+[kernel] enum_repr.i:44: Inserted implicit cast from long long to bs3
+[kernel] enum_repr.i:45: Inserted implicit cast from signed char to bc1
+[kernel] enum_repr.i:46: Inserted implicit cast from unsigned char to bc2
+[kernel] enum_repr.i:47: Inserted implicit cast from signed char to bd1
+[kernel] enum_repr.i:48: Inserted implicit cast from unsigned char to bd2
+[kernel] enum_repr.i:66: Inserted implicit cast from foo to bla
+[kernel] enum_repr.i:67: Inserted implicit cast from bla to foo
+[kernel] enum_repr.i:68: Inserted implicit cast from unsigned int to foo
[kernel] Enum __anonenum_foo_1 is represented by int
[kernel] Enum __anonenum_bar_2 is represented by int
[kernel] Enum __anonenum_bu1_3 is represented by int
@@ -95,14 +84,14 @@ int main(void)
bar y = B;
bu1 u1 = Bu1;
bu2 u2 = Bu2;
- bu3 u3 = (enum __anonenum_bu3_5)Bu3;
+ bu3 u3 = (bu3)Bu3;
bs1 s1 = Bs1;
bs2 s2 = Bs2;
- bs3 s3 = (enum __anonenum_bs3_8)Bs3;
- bc1 c1 = (enum __anonenum_bc1_9)Bc1;
- bc2 c2 = (enum __anonenum_bc2_10)Bc2;
- bd1 d1 = (enum __anonenum_bd1_11)Bd1;
- bd2 d2 = (enum __anonenum_bd2_12)Bd2;
+ bs3 s3 = (bs3)Bs3;
+ bc1 c1 = (bc1)Bc1;
+ bc2 c2 = (bc2)Bc2;
+ bd1 d1 = (bd1)Bd1;
+ bd2 d2 = (bd2)Bd2;
if (x == A)
if (y == B) {
__retres = 0;
@@ -132,14 +121,14 @@ int g(void)
int tmp_3;
int tmp_4;
foo x = A;
- int res = f1((unsigned int)x);
+ int res = f1((bla)x);
tmp_0 = f2((unsigned int)x);
res += tmp_0;
- tmp_1 = f3((unsigned int)x);
+ tmp_1 = f3((bla)x);
res += tmp_1;
- tmp_2 = h1((enum __anonenum_foo_1)((unsigned int)x));
+ tmp_2 = h1((foo)((bla)x));
res += tmp_2;
- tmp_3 = h2((enum __anonenum_foo_1)((unsigned int)x));
+ tmp_3 = h2((foo)((unsigned int)x));
res += tmp_3;
tmp_4 = h3(x);
res += tmp_4;
diff --git a/tests/syntax/oracle/enum_repr.1.res.oracle b/tests/syntax/oracle/enum_repr.1.res.oracle
index 1251ed7ec1bc10c6dd346c4d219205215f763aaa..aa3f97bfcad2398c0925d59748a80d2e8746fac1 100644
--- a/tests/syntax/oracle/enum_repr.1.res.oracle
+++ b/tests/syntax/oracle/enum_repr.1.res.oracle
@@ -1,28 +1,17 @@
[kernel] Parsing enum_repr.i (no preprocessing)
-[kernel] enum_repr.i:37:
- Inserted implicit cast from int to enum __anonenum_foo_1
-[kernel] enum_repr.i:38:
- Inserted implicit cast from int to enum __anonenum_bar_2
-[kernel] enum_repr.i:39:
- Inserted implicit cast from int to enum __anonenum_bu1_3
-[kernel] enum_repr.i:41:
- Inserted implicit cast from long long to enum __anonenum_bu3_5
-[kernel] enum_repr.i:43:
- Inserted implicit cast from unsigned int to enum __anonenum_bs2_7
-[kernel] enum_repr.i:45:
- Inserted implicit cast from signed char to enum __anonenum_bc1_9
-[kernel] enum_repr.i:48:
- Inserted implicit cast from unsigned char to enum __anonenum_bd2_12
+[kernel] enum_repr.i:37: Inserted implicit cast from int to foo
+[kernel] enum_repr.i:38: Inserted implicit cast from int to bar
+[kernel] enum_repr.i:39: Inserted implicit cast from int to bu1
+[kernel] enum_repr.i:41: Inserted implicit cast from long long to bu3
+[kernel] enum_repr.i:43: Inserted implicit cast from unsigned int to bs2
+[kernel] enum_repr.i:45: Inserted implicit cast from signed char to bc1
+[kernel] enum_repr.i:48: Inserted implicit cast from unsigned char to bd2
[kernel] enum_repr.i:49: Inserted implicit cast from foo to int
[kernel] enum_repr.i:49: Inserted implicit cast from bar to int
-[kernel] enum_repr.i:63:
- Inserted implicit cast from int to enum __anonenum_foo_1
-[kernel] enum_repr.i:66:
- Inserted implicit cast from enum __anonenum_foo_1 to unsigned int
-[kernel] enum_repr.i:67:
- Inserted implicit cast from unsigned int to enum __anonenum_foo_1
-[kernel] enum_repr.i:68:
- Inserted implicit cast from unsigned int to enum __anonenum_foo_1
+[kernel] enum_repr.i:63: Inserted implicit cast from int to foo
+[kernel] enum_repr.i:66: Inserted implicit cast from foo to bla
+[kernel] enum_repr.i:67: Inserted implicit cast from bla to foo
+[kernel] enum_repr.i:68: Inserted implicit cast from unsigned int to foo
[kernel] Enum __anonenum_foo_1 is represented by unsigned char
[kernel] Enum __anonenum_bar_2 is represented by unsigned char
[kernel] Enum __anonenum_bu1_3 is represented by unsigned int
@@ -93,13 +82,13 @@ typedef unsigned int bla;
int main(void)
{
int __retres;
- foo x = (enum __anonenum_foo_1)A;
- bar y = (enum __anonenum_bar_2)B;
+ foo x = (foo)A;
+ bar y = (bar)B;
bu1 u1 = Bu1;
bu2 u2 = Bu2;
bu3 u3 = Bu3;
bs1 s1 = Bs1;
- bs2 s2 = (enum __anonenum_bs2_7)Bs2;
+ bs2 s2 = (bs2)Bs2;
bs3 s3 = Bs3;
bc1 c1 = Bc1;
bc2 c2 = Bc2;
@@ -133,15 +122,15 @@ int g(void)
int tmp_2;
int tmp_3;
int tmp_4;
- foo x = (enum __anonenum_foo_1)A;
- int res = f1((unsigned int)x);
+ foo x = (foo)A;
+ int res = f1((bla)x);
tmp_0 = f2((unsigned int)x);
res += tmp_0;
- tmp_1 = f3((unsigned int)x);
+ tmp_1 = f3((bla)x);
res += tmp_1;
- tmp_2 = h1((enum __anonenum_foo_1)((unsigned int)x));
+ tmp_2 = h1((foo)((bla)x));
res += tmp_2;
- tmp_3 = h2((enum __anonenum_foo_1)((unsigned int)x));
+ tmp_3 = h2((foo)((unsigned int)x));
res += tmp_3;
tmp_4 = h3(x);
res += tmp_4;
diff --git a/tests/syntax/oracle/enum_repr.2.res.oracle b/tests/syntax/oracle/enum_repr.2.res.oracle
index 49446d4c181caea8bc5194fb2461ac452de18001..232112a2f95ddc1dcc24aa3ff44c4bf223237d1c 100644
--- a/tests/syntax/oracle/enum_repr.2.res.oracle
+++ b/tests/syntax/oracle/enum_repr.2.res.oracle
@@ -1,26 +1,16 @@
[kernel] Parsing enum_repr.i (no preprocessing)
-[kernel] enum_repr.i:37:
- Inserted implicit cast from int to enum __anonenum_foo_1
-[kernel] enum_repr.i:38:
- Inserted implicit cast from int to enum __anonenum_bar_2
-[kernel] enum_repr.i:39:
- Inserted implicit cast from int to enum __anonenum_bu1_3
-[kernel] enum_repr.i:41:
- Inserted implicit cast from long long to enum __anonenum_bu3_5
-[kernel] enum_repr.i:43:
- Inserted implicit cast from unsigned int to enum __anonenum_bs2_7
-[kernel] enum_repr.i:45:
- Inserted implicit cast from signed char to enum __anonenum_bc1_9
-[kernel] enum_repr.i:46:
- Inserted implicit cast from unsigned char to enum __anonenum_bc2_10
-[kernel] enum_repr.i:47:
- Inserted implicit cast from signed char to enum __anonenum_bd1_11
-[kernel] enum_repr.i:48:
- Inserted implicit cast from unsigned char to enum __anonenum_bd2_12
+[kernel] enum_repr.i:37: Inserted implicit cast from int to foo
+[kernel] enum_repr.i:38: Inserted implicit cast from int to bar
+[kernel] enum_repr.i:39: Inserted implicit cast from int to bu1
+[kernel] enum_repr.i:41: Inserted implicit cast from long long to bu3
+[kernel] enum_repr.i:43: Inserted implicit cast from unsigned int to bs2
+[kernel] enum_repr.i:45: Inserted implicit cast from signed char to bc1
+[kernel] enum_repr.i:46: Inserted implicit cast from unsigned char to bc2
+[kernel] enum_repr.i:47: Inserted implicit cast from signed char to bd1
+[kernel] enum_repr.i:48: Inserted implicit cast from unsigned char to bd2
[kernel] enum_repr.i:49: Inserted implicit cast from int to unsigned int
[kernel] enum_repr.i:49: Inserted implicit cast from bar to int
-[kernel] enum_repr.i:63:
- Inserted implicit cast from int to enum __anonenum_foo_1
+[kernel] enum_repr.i:63: Inserted implicit cast from int to foo
[kernel] Enum __anonenum_foo_1 is represented by unsigned int
[kernel] Enum __anonenum_bar_2 is represented by unsigned char
[kernel] Enum __anonenum_bu1_3 is represented by unsigned int
@@ -92,17 +82,17 @@ int main(void)
{
int __retres;
foo x = A;
- bar y = (enum __anonenum_bar_2)B;
+ bar y = (bar)B;
bu1 u1 = Bu1;
bu2 u2 = Bu2;
bu3 u3 = Bu3;
bs1 s1 = Bs1;
- bs2 s2 = (enum __anonenum_bs2_7)Bs2;
+ bs2 s2 = (bs2)Bs2;
bs3 s3 = Bs3;
- bc1 c1 = (enum __anonenum_bc1_9)Bc1;
- bc2 c2 = (enum __anonenum_bc2_10)Bc2;
- bd1 d1 = (enum __anonenum_bd1_11)Bd1;
- bd2 d2 = (enum __anonenum_bd2_12)Bd2;
+ bc1 c1 = (bc1)Bc1;
+ bc2 c2 = (bc2)Bc2;
+ bd1 d1 = (bd1)Bd1;
+ bd2 d2 = (bd2)Bd2;
if (x == (unsigned int)A)
if ((int)y == B) {
__retres = 0;
@@ -132,12 +122,12 @@ int g(void)
int tmp_3;
int tmp_4;
foo x = A;
- int res = f1((unsigned int)x);
+ int res = f1((bla)x);
tmp_0 = f2((unsigned int)x);
res += tmp_0;
tmp_1 = f3(x);
res += tmp_1;
- tmp_2 = h1((unsigned int)x);
+ tmp_2 = h1((bla)x);
res += tmp_2;
tmp_3 = h2((unsigned int)x);
res += tmp_3;
diff --git a/tests/syntax/oracle/gcc_builtins.res.oracle b/tests/syntax/oracle/gcc_builtins.res.oracle
index 3288584e07b6e7358c50b37313bacb637b506a01..8ebd3d736a09ed5a4591635a90cc0f2bff4e46ef 100644
--- a/tests/syntax/oracle/gcc_builtins.res.oracle
+++ b/tests/syntax/oracle/gcc_builtins.res.oracle
@@ -221,9 +221,9 @@ void main(void)
int tmp;
{
int16_t result;
- int16_t content = (short)100;
+ int16_t content = (int16_t)100;
int16_t volatile *ptr = (int16_t volatile *)(& content);
- int16_t value = (short)33;
+ int16_t value = (int16_t)33;
{
void *__va_args[1] = {(void *)0};
result = __sync_fetch_and_add_int16_t(ptr,value,
@@ -281,9 +281,9 @@ void main(void)
}
{
int64_t result_1;
- int64_t content_1 = (long long)100;
+ int64_t content_1 = (int64_t)100;
int64_t volatile *ptr_1 = (int64_t volatile *)(& content_1);
- int64_t value_1 = (long long)33;
+ int64_t value_1 = (int64_t)33;
{
void *__va_args_49[1] = {(void *)0};
result_1 = __sync_fetch_and_add_int64_t(ptr_1,value_1,
@@ -311,10 +311,10 @@ void main(void)
}
{
int result_2;
- uint16_t content_2 = (unsigned short)100;
+ uint16_t content_2 = (uint16_t)100;
uint16_t volatile *ptr_2 = (uint16_t volatile *)(& content_2);
- uint16_t oldval = (unsigned short)100;
- uint16_t newval = (unsigned short)133;
+ uint16_t oldval = (uint16_t)100;
+ uint16_t newval = (uint16_t)133;
{
void *__va_args_57[1] = {(void *)0};
result_2 = __sync_bool_compare_and_swap_uint16_t(ptr_2,oldval,newval,
@@ -324,10 +324,10 @@ void main(void)
}
{
int result_3;
- uint32_t content_3 = (unsigned int)100;
+ uint32_t content_3 = (uint32_t)100;
uint32_t volatile *ptr_3 = (uint32_t volatile *)(& content_3);
- uint32_t oldval_0 = (unsigned int)100;
- uint32_t newval_0 = (unsigned int)133;
+ uint32_t oldval_0 = (uint32_t)100;
+ uint32_t newval_0 = (uint32_t)133;
{
void *__va_args_59[1] = {(void *)0};
result_3 = __sync_bool_compare_and_swap_uint32_t(ptr_3,oldval_0,
@@ -338,10 +338,10 @@ void main(void)
}
{
int result_4;
- uint64_t content_4 = (unsigned long long)100;
+ uint64_t content_4 = (uint64_t)100;
uint64_t volatile *ptr_4 = (uint64_t volatile *)(& content_4);
- uint64_t oldval_1 = (unsigned long long)100;
- uint64_t newval_1 = (unsigned long long)133;
+ uint64_t oldval_1 = (uint64_t)100;
+ uint64_t newval_1 = (uint64_t)133;
{
void *__va_args_61[1] = {(void *)0};
result_4 = __sync_bool_compare_and_swap_uint64_t(ptr_4,oldval_1,
diff --git a/tests/syntax/oracle/incompatible_qualifiers.1.res.oracle b/tests/syntax/oracle/incompatible_qualifiers.1.res.oracle
index 6b474ebcb72fdee3dbc5d199cc1c468508e077f0..04b6994f796649ce89915dec160a82cb41cdf68c 100644
--- a/tests/syntax/oracle/incompatible_qualifiers.1.res.oracle
+++ b/tests/syntax/oracle/incompatible_qualifiers.1.res.oracle
@@ -47,7 +47,7 @@ int main(void)
n((int *(*)(int , fp1 **))0);
o((char)0,(char)0);
p(0);
- q((int *)0);
+ q((iptr)0);
r((int (*)(char ))0,(int (*)(char ))0);
s((int *)0,(int *)0);
__retres = 0;
diff --git a/tests/syntax/oracle/offset.res.oracle b/tests/syntax/oracle/offset.res.oracle
index 4aebbc69c8dfa72f29457b9e9b48da71b74facb0..02951ec9257ec238d7386c0afa4476588f65f0a4 100644
--- a/tests/syntax/oracle/offset.res.oracle
+++ b/tests/syntax/oracle/offset.res.oracle
@@ -1,6 +1,6 @@
[kernel] Parsing offset.c (with preprocessing)
/* Generated by Frama-C */
#include "__fc_define_off_t.h"
-off_t x = (long)0;
-off64_t y = (long long)0;
+off_t x = (off_t)0;
+off64_t y = (off64_t)0;
diff --git a/tests/syntax/oracle/struct_linking.res.oracle b/tests/syntax/oracle/struct_linking.res.oracle
new file mode 100644
index 0000000000000000000000000000000000000000..25104361657ec95f8471fee49a1e22fee22a8e22
--- /dev/null
+++ b/tests/syntax/oracle/struct_linking.res.oracle
@@ -0,0 +1,27 @@
+[kernel] Parsing struct_linking.i (no preprocessing)
+[kernel] Parsing struct_linking_2.i (no preprocessing)
+/* Generated by Frama-C */
+struct Foo {
+ double z ;
+ int t ;
+ char u ;
+};
+struct Foo_0 {
+ int x ;
+ double y ;
+};
+void g(void)
+{
+ struct Foo g_0 = {.z = (double)0, .t = 0, .u = (char)0};
+ g_0.z = 36.0;
+ return;
+}
+
+void f(void)
+{
+ struct Foo_0 f_0 = {.x = 0, .y = 0.};
+ f_0.y = 42.0;
+ return;
+}
+
+
diff --git a/tests/syntax/oracle/type_compat_call.res.oracle b/tests/syntax/oracle/type_compat_call.res.oracle
index b6b486502d48088dcf1d03e4f8cbdbe436a20ab5..346233f20ddee04a7efc4465361951971064e185 100644
--- a/tests/syntax/oracle/type_compat_call.res.oracle
+++ b/tests/syntax/oracle/type_compat_call.res.oracle
@@ -1,12 +1,13 @@
[kernel] Parsing type_compat_call.c (with preprocessing)
-[kernel:typing:incompatible-types-call] type_compat_call.c:14: Warning:
- expected 'int32_t *' but got argument of type 'int const *': & i
[kernel:typing:incompatible-types-call] type_compat_call.c:18: Warning:
+ expected 'int32_t *' but got argument of type 'int const *': & i
+[kernel:typing:incompatible-types-call] type_compat_call.c:22: Warning:
expected 'uint8_t const *' but got argument of type 'char const *': & c
-[kernel:typing:incompatible-types-call] type_compat_call.c:20: Warning:
+[kernel:typing:incompatible-types-call] type_compat_call.c:24: Warning:
expected 'int8_t const *' but got argument of type 'char const *': & c
/* Generated by Frama-C */
#include "stdint.h"
+typedef uint8_t buf_content;
void f(int32_t const *p);
void g(int32_t * const p);
@@ -17,21 +18,25 @@ void m(int8_t const *p);
void n(int volatile *p);
+void o(uint8_t *p);
+
int main(void)
{
int __retres;
+ buf_content buf[3];
int const i = 42;
- f((int32_t const *)(& i));
+ f(& i);
g((int32_t *)(& i));
char const c = (char)'c';
signed char const s = (signed char)'s';
unsigned char const u = (unsigned char)'u';
h((uint8_t const *)(& c));
- h((uint8_t const *)(& u));
+ h(& u);
m((int8_t const *)(& c));
- m((int8_t const *)(& s));
+ m(& s);
int j = 51;
n((int volatile *)(& j));
+ o(buf);
__retres = 0;
return __retres;
}
diff --git a/tests/syntax/oracle/unroll_visit.res.oracle b/tests/syntax/oracle/unroll_visit.res.oracle
index 1fdd3426d7a97da06e02ae5b9a44f83f5b436dbf..9c64eaa41d01d9d154ab7646cefd871806977002 100644
--- a/tests/syntax/oracle/unroll_visit.res.oracle
+++ b/tests/syntax/oracle/unroll_visit.res.oracle
@@ -26,26 +26,26 @@
typedef char i8;
void main(void)
{
- i8 i = (char)0;
+ i8 i = (i8)0;
if (! ((int)i < 100)) goto unrolling_2_loop;
- i = (char)((int)i - 1);
+ i = (i8)((int)i - 1);
/*@ assert i < 100; */ ;
- i = (char)((int)i + 1);
- i = (char)((int)i + 1);
+ i = (i8)((int)i + 1);
+ i = (i8)((int)i + 1);
unrolling_4_loop: ;
if (! ((int)i < 100)) goto unrolling_2_loop;
- i = (char)((int)i - 1);
+ i = (i8)((int)i - 1);
/*@ assert i < 100; */ ;
- i = (char)((int)i + 1);
- i = (char)((int)i + 1);
+ i = (i8)((int)i + 1);
+ i = (i8)((int)i + 1);
unrolling_3_loop: ;
/*@ loop pragma UNROLL 2;
loop pragma UNROLL "done", 2; */
while ((int)i < 100) {
- i = (char)((int)i - 1);
+ i = (i8)((int)i - 1);
/*@ assert i < 100; */ ;
- i = (char)((int)i + 1);
- i = (char)((int)i + 1);
+ i = (i8)((int)i + 1);
+ i = (i8)((int)i + 1);
}
unrolling_2_loop: ;
return;
diff --git a/tests/syntax/oracle/vla_strlen.res.oracle b/tests/syntax/oracle/vla_strlen.res.oracle
index ef641c312619fc9ea7d5b74db2fc7c60b12fb664..204989bc5c441feadacbc5e8131edd71f43bd5bb 100644
--- a/tests/syntax/oracle/vla_strlen.res.oracle
+++ b/tests/syntax/oracle/vla_strlen.res.oracle
@@ -18,8 +18,7 @@ void f(char *s)
size_t tmp;
tmp = strlen((char const *)s);
/*@
- assert
- alloca_bounds: 0 < sizeof(char) * (unsigned int)(tmp + 1) ≤ 4294967295;
+ assert alloca_bounds: 0 < sizeof(char) * (size_t)(tmp + 1) ≤ 4294967295;
*/
;
__lengthof_t = tmp + (size_t)1;
diff --git a/tests/syntax/struct_linking.i b/tests/syntax/struct_linking.i
new file mode 100644
index 0000000000000000000000000000000000000000..52794ca30fb87216b752e081755f14802b6d973d
--- /dev/null
+++ b/tests/syntax/struct_linking.i
@@ -0,0 +1,13 @@
+/* run.config
+OPT: %{dep:@PTEST_NAME@_2.i} -print
+*/
+struct Foo {
+ double z;
+ int t;
+ char u;
+};
+
+void g () {
+ struct Foo g = { 0 };
+ g.z = 36.0;
+}
diff --git a/tests/syntax/struct_linking_2.i b/tests/syntax/struct_linking_2.i
new file mode 100644
index 0000000000000000000000000000000000000000..6a3ba3c651e2323c57b46b39655a56445ae5aea6
--- /dev/null
+++ b/tests/syntax/struct_linking_2.i
@@ -0,0 +1,11 @@
+/* run.config
+DONTRUN: main entry of test is in struct_linking.i
+*/
+struct Foo {
+int x; double y;
+};
+
+void f() {
+ struct Foo f = { 0 };
+ f.y = 42.0;
+}
diff --git a/tests/syntax/type_compat_call.c b/tests/syntax/type_compat_call.c
index 67e0a6b3d378b63df3452dc85d129c4b4251f2af..b393221c5d8c4d47992ce2b5a11ae05e49bef7a6 100644
--- a/tests/syntax/type_compat_call.c
+++ b/tests/syntax/type_compat_call.c
@@ -3,11 +3,15 @@
*/
#include <stdint.h>
+typedef uint8_t buf_content;
+
void f(int32_t const *p);
void g(int32_t *const p);
void h(uint8_t const *p);
void m(int8_t const *p);
-void n(int volatile *p);
+void n(int volatile* p);
+void o(uint8_t* p);
+
int main() {
int const i = 42;
f(&i); // compatible
@@ -21,5 +25,7 @@ int main() {
m(&s); // incompatible
int j = 51;
n(&j); // 'volatile' discarded: no warning
+ buf_content buf[3];
+ o(&buf[0]); // compatible
return 0;
}
diff --git a/tests/value/oracle/backward_add_ptr.res.oracle b/tests/value/oracle/backward_add_ptr.res.oracle
index e7ad5824993d541eb15feb7a9448aa83116249bd..98ae39a1f63ce05bb1cc2ded07e11fcf47e81ab3 100644
--- a/tests/value/oracle/backward_add_ptr.res.oracle
+++ b/tests/value/oracle/backward_add_ptr.res.oracle
@@ -7,16 +7,15 @@
[eva] computing for function main1 <- main.
Called from backward_add_ptr.c:185.
[eva:alarm] backward_add_ptr.c:25: Warning:
- out of bounds read. assert \valid_read(p + (unsigned int)q);
+ out of bounds read. assert \valid_read(p + (uintptr_t)q);
[eva] backward_add_ptr.c:26: Frama_C_show_each_only_a: {0; 1}, {{ &a }}, {0}
[eva:alarm] backward_add_ptr.c:32: Warning:
- out of bounds read. assert \valid_read((char *)p + (unsigned int)q);
+ out of bounds read. assert \valid_read((char *)p + (uintptr_t)q);
[eva] backward_add_ptr.c:33:
Frama_C_show_each_reduced_offset:
{0; 1}, {{ NULL + {0; 1; 2; 3} ; &a }}, {{ NULL + {0; 1; 2; 3} ; &b }}
[eva:alarm] backward_add_ptr.c:38: Warning:
- out of bounds read.
- assert \valid_read(p + (unsigned int)((unsigned int)q / 4));
+ out of bounds read. assert \valid_read(p + (uintptr_t)((uintptr_t)q / 4));
[eva] backward_add_ptr.c:39:
Frama_C_show_each_no_reduction:
{0; 1}, {{ NULL + [0..4294967295] ; &a }}, {{ NULL + [0..4294967295] ; &b }}
@@ -25,11 +24,11 @@
[eva] computing for function main2 <- main.
Called from backward_add_ptr.c:186.
[eva:alarm] backward_add_ptr.c:54: Warning:
- out of bounds read. assert \valid_read((int *)((char *)p + (unsigned int)q));
+ out of bounds read. assert \valid_read((int *)((char *)p + (uintptr_t)q));
[eva] backward_add_ptr.c:55: Frama_C_show_each_int_if: {{ &a }}, {0}
[eva] backward_add_ptr.c:57: Frama_C_show_each_int_else: {0}, {{ &b }}
[eva:alarm] backward_add_ptr.c:60: Warning:
- out of bounds read. assert \valid_read((char *)p + (unsigned int)q);
+ out of bounds read. assert \valid_read((char *)p + (uintptr_t)q);
[eva] backward_add_ptr.c:61:
Frama_C_show_each_char_if:
{{ NULL + {1; 2; 3} ; &a }}, {{ NULL + {0; 1; 2; 3} ; &b }}
@@ -52,12 +51,12 @@
Assigning imprecise value to p.
The imprecision originates from Arithmetic {backward_add_ptr.c:68}
[eva:alarm] backward_add_ptr.c:81: Warning:
- out of bounds read. assert \valid_read(p + (unsigned int)q);
+ out of bounds read. assert \valid_read(p + (uintptr_t)q);
[eva] backward_add_ptr.c:82:
Frama_C_show_each_GM_only_a:
{{ &a + [-17179869180..0],0%4 }}, [0..4294967295]
[eva:alarm] backward_add_ptr.c:87: Warning:
- out of bounds read. assert \valid_read((char *)p + (unsigned int)q);
+ out of bounds read. assert \valid_read((char *)p + (uintptr_t)q);
[eva] backward_add_ptr.c:88:
Frama_C_show_each_GM_reduce_p_offset:
{{ NULL + {0; 1; 2; 3} ; &a + [-4294967295..3] }},
@@ -67,7 +66,7 @@
Assigning imprecise value to p.
The imprecision originates from Arithmetic {backward_add_ptr.c:68}
[eva:alarm] backward_add_ptr.c:96: Warning:
- out of bounds read. assert \valid_read(p + (unsigned int)q);
+ out of bounds read. assert \valid_read(p + (uintptr_t)q);
[eva] computing for function gm <- main3 <- main.
Called from backward_add_ptr.c:100.
[eva] Recording results for gm
@@ -76,7 +75,7 @@
Assigning imprecise value to p.
The imprecision originates from Arithmetic {backward_add_ptr.c:68}
[eva:alarm] backward_add_ptr.c:106: Warning:
- out of bounds read. assert \valid_read(p + (unsigned int)q);
+ out of bounds read. assert \valid_read(p + (uintptr_t)q);
[eva] backward_add_ptr.c:107:
Frama_C_show_each_GM_no_reduction:
{{ garbled mix of &{a; b}
@@ -87,10 +86,10 @@
Assigning imprecise value to p.
The imprecision originates from Arithmetic {backward_add_ptr.c:68}
[eva:alarm] backward_add_ptr.c:115: Warning:
- out of bounds read. assert \valid_read((char *)p + (unsigned int)q);
+ out of bounds read. assert \valid_read((char *)p + (uintptr_t)q);
[eva] backward_add_ptr.c:116: Frama_C_show_each_GM_only_c: {0}, {{ &c }}
[eva:alarm] backward_add_ptr.c:121: Warning:
- out of bounds read. assert \valid_read(p + (unsigned int)q);
+ out of bounds read. assert \valid_read(p + (uintptr_t)q);
[eva] backward_add_ptr.c:122:
Frama_C_show_each_GM_only_b:
{{ &b + [-17179869180..0],0%4 }}, [0..4294967295]
@@ -99,9 +98,9 @@
Assigning imprecise value to p.
The imprecision originates from Arithmetic {backward_add_ptr.c:68}
[eva:alarm] backward_add_ptr.c:130: Warning:
- out of bounds read. assert \valid_read((char *)p + (unsigned int)q);
+ out of bounds read. assert \valid_read((char *)p + (uintptr_t)q);
[eva:alarm] backward_add_ptr.c:136: Warning:
- out of bounds read. assert \valid_read((char *)p + (unsigned int)q);
+ out of bounds read. assert \valid_read((char *)p + (uintptr_t)q);
[eva] backward_add_ptr.c:137:
Frama_C_show_each_GM_only_b_and_gm:
{{ garbled mix of &{b}
@@ -129,7 +128,7 @@
Assigning imprecise value to q.
The imprecision originates from Arithmetic {backward_add_ptr.c:68}
[eva:alarm] backward_add_ptr.c:150: Warning:
- out of bounds read. assert \valid_read(p + (unsigned int)q);
+ out of bounds read. assert \valid_read(p + (uintptr_t)q);
[eva] backward_add_ptr.c:151:
Frama_C_show_each_2GM_no_reduction:
{{ garbled mix of &{a; b}
@@ -137,7 +136,7 @@
{{ garbled mix of &{c}
(origin: Arithmetic {backward_add_ptr.c:68}) }}
[eva:alarm] backward_add_ptr.c:156: Warning:
- out of bounds read. assert \valid_read((char *)p + (unsigned int)q);
+ out of bounds read. assert \valid_read((char *)p + (uintptr_t)q);
[eva] backward_add_ptr.c:157:
Frama_C_show_each_2GM_only_b:
{{ garbled mix of &{b}
@@ -155,7 +154,7 @@
Assigning imprecise value to q.
The imprecision originates from Arithmetic {backward_add_ptr.c:68}
[eva:alarm] backward_add_ptr.c:165: Warning:
- out of bounds read. assert \valid_read((char *)p + (unsigned int)q);
+ out of bounds read. assert \valid_read((char *)p + (uintptr_t)q);
[eva] backward_add_ptr.c:166:
Frama_C_show_each_2GM_TEST:
{{ garbled mix of &{b}
@@ -163,7 +162,7 @@
{{ garbled mix of &{b}
(origin: Arithmetic {backward_add_ptr.c:68}) }}
[eva:alarm] backward_add_ptr.c:171: Warning:
- out of bounds read. assert \valid_read(p + (unsigned int)q);
+ out of bounds read. assert \valid_read(p + (uintptr_t)q);
[eva] backward_add_ptr.c:172:
Frama_C_show_each_2GM_gm_of_a_b:
{{ garbled mix of &{a; b}
@@ -171,7 +170,7 @@
{{ garbled mix of &{b}
(origin: Arithmetic {backward_add_ptr.c:68}) }}
[eva:alarm] backward_add_ptr.c:177: Warning:
- out of bounds read. assert \valid_read((char *)p + (unsigned int)q);
+ out of bounds read. assert \valid_read((char *)p + (uintptr_t)q);
[eva] backward_add_ptr.c:178:
Frama_C_show_each_2GM_gm_of_b_c:
{{ garbled mix of &{b}
diff --git a/tests/value/oracle/cmp_ptr_follow_all_branches.0.res.oracle b/tests/value/oracle/cmp_ptr_follow_all_branches.0.res.oracle
index 8eada729302d08390a67c641b574ec7d112dc613..3aebd25e834407dc55c94292c7233abea7ec9f57 100644
--- a/tests/value/oracle/cmp_ptr_follow_all_branches.0.res.oracle
+++ b/tests/value/oracle/cmp_ptr_follow_all_branches.0.res.oracle
@@ -10,15 +10,13 @@
invalid pointer comparison: invalid pointer(s)
[eva:alarm] cmp_ptr_follow_all_branches.i:14: Warning:
pointer comparison.
- assert
- \pointer_comparable((void *)(p + (unsigned int)((int)(-5))), (void *)p);
+ assert \pointer_comparable((void *)(p + (size_t)((int)(-5))), (void *)p);
[eva] cmp_ptr_follow_all_branches.i:14: Frama_C_show_each_2:
[eva:pointer-comparison] cmp_ptr_follow_all_branches.i:15:
invalid pointer comparison: invalid pointer(s)
[eva:alarm] cmp_ptr_follow_all_branches.i:15: Warning:
pointer comparison.
- assert
- \pointer_comparable((void *)(q + (unsigned int)((int)(-5))), (void *)q);
+ assert \pointer_comparable((void *)(q + (size_t)((int)(-5))), (void *)q);
[eva] cmp_ptr_follow_all_branches.i:15: Frama_C_show_each_4:
[eva] Recording results for main
[eva] done for function main
diff --git a/tests/value/oracle/cmp_ptr_follow_all_branches.1.res.oracle b/tests/value/oracle/cmp_ptr_follow_all_branches.1.res.oracle
index 4d03fa78462f46ca49e6beaa10013cea02f43543..5dbedf5245f43a7ea2ac7577c6390de2b106aeda 100644
--- a/tests/value/oracle/cmp_ptr_follow_all_branches.1.res.oracle
+++ b/tests/value/oracle/cmp_ptr_follow_all_branches.1.res.oracle
@@ -12,8 +12,7 @@
evaluating condition to {0; 1} instead of {1} because of UPCPA
[eva:alarm] cmp_ptr_follow_all_branches.i:14: Warning:
pointer comparison.
- assert
- \pointer_comparable((void *)(p + (unsigned int)((int)(-5))), (void *)p);
+ assert \pointer_comparable((void *)(p + (size_t)((int)(-5))), (void *)p);
[eva] cmp_ptr_follow_all_branches.i:14: Frama_C_show_each_1:
[eva:pointer-comparison] cmp_ptr_follow_all_branches.i:14:
evaluating condition to {0; 1} instead of {0} because of UPCPA
@@ -24,8 +23,7 @@
evaluating condition to {0; 1} instead of {1} because of UPCPA
[eva:alarm] cmp_ptr_follow_all_branches.i:15: Warning:
pointer comparison.
- assert
- \pointer_comparable((void *)(q + (unsigned int)((int)(-5))), (void *)q);
+ assert \pointer_comparable((void *)(q + (size_t)((int)(-5))), (void *)q);
[eva] cmp_ptr_follow_all_branches.i:15: Frama_C_show_each_3:
[eva:pointer-comparison] cmp_ptr_follow_all_branches.i:15:
evaluating condition to {0; 1} instead of {0} because of UPCPA
diff --git a/tests/value/oracle/fun_ptr.1.res.oracle b/tests/value/oracle/fun_ptr.1.res.oracle
index 2c0114c2a15df9f998c05232f6ab5d8bbdb58397..2ec8f10d50d24215a4be92cd90932f6921ba2d0c 100644
--- a/tests/value/oracle/fun_ptr.1.res.oracle
+++ b/tests/value/oracle/fun_ptr.1.res.oracle
@@ -24,7 +24,7 @@
Called from fun_ptr.i:78.
[eva:alarm] fun_ptr.i:28: Warning:
pointer to function with incompatible type.
- assert \valid_function((int (*)(int ))t[nd]);
+ assert \valid_function((fptr1)t[nd]);
[eva] computing for function f <- test1 <- main.
Called from fun_ptr.i:28.
[eva] Recording results for f
@@ -35,7 +35,7 @@
Called from fun_ptr.i:79.
[eva:alarm] fun_ptr.i:33: Warning:
pointer to function with incompatible type.
- assert \valid_function((int (*)(int , int ))t[nd]);
+ assert \valid_function((fptr2)t[nd]);
[eva] computing for function g <- test2 <- main.
Called from fun_ptr.i:33.
[eva] Recording results for g
@@ -47,7 +47,7 @@
Called from fun_ptr.i:80.
[eva:alarm] fun_ptr.i:38: Warning:
pointer to function with incompatible type.
- assert \valid_function((double (*)(int ))t[nd]);
+ assert \valid_function((fptr3)t[nd]);
[eva] Recording results for test3
[eva] Done for function test3
[eva:alarm] fun_ptr.i:83: Warning:
diff --git a/tests/value/oracle/invalid_pointer.0.res.oracle b/tests/value/oracle/invalid_pointer.0.res.oracle
index 281853ab1dd5a6e0ce3a062bf25f536e9239257c..02094a3d2587a1e8bd27b042c3b297414cc01211 100644
--- a/tests/value/oracle/invalid_pointer.0.res.oracle
+++ b/tests/value/oracle/invalid_pointer.0.res.oracle
@@ -112,8 +112,7 @@
[eva:alarm] invalid_pointer.c:142: Warning:
invalid pointer creation.
assert
- \object_pointer((int *)((unsigned int)((unsigned int)(&x) +
- (unsigned int)undet)));
+ \object_pointer((int *)((uintptr_t)((uintptr_t)(&x) + (uintptr_t)undet)));
[eva] invalid_pointer.c:143: assertion got status valid.
[eva] invalid_pointer.c:144: assertion got status valid.
[eva] invalid_pointer.c:145:
diff --git a/tests/value/oracle/loopfun.0.res.oracle b/tests/value/oracle/loopfun.0.res.oracle
index c7543f7da625ee78a4aa75d0e958968a19680090..02f251803d78aa639a83968d99ce891aa2168226 100644
--- a/tests/value/oracle/loopfun.0.res.oracle
+++ b/tests/value/oracle/loopfun.0.res.oracle
@@ -42,23 +42,23 @@
[eva] Recording results for main
[eva] done for function main
[eva] ====== VALUES COMPUTED ======
-[from] Computing for function main2
-[from] Done for function main2
-[from] Computing for function test
-[from] Done for function test
[from] Computing for function main
[from] Done for function main
+[from] Computing for function test
+[from] Done for function test
[from] ====== DEPENDENCIES COMPUTED ======
These dependencies hold at termination for the executions that terminate:
-[from] Function main2:
- FROMTOP
-[from] Function test:
+[from] Function main:
FROMTOP
\result FROM ANYTHING(origin:Unknown)
-[from] Function main:
+[from] Function test:
FROMTOP
\result FROM ANYTHING(origin:Unknown)
[from] ====== END OF DEPENDENCIES ======
+[inout] Out (internal) for function main:
+ ANYTHING(origin:Unknown)
+[inout] Inputs for function main:
+ ANYTHING(origin:Unknown)
[inout] Out (internal) for function main2:
\nothing
[inout] Inputs for function main2:
@@ -67,7 +67,3 @@
tmp; a
[inout] Inputs for function test:
a
-[inout] Out (internal) for function main:
- ANYTHING(origin:Unknown)
-[inout] Inputs for function main:
- ANYTHING(origin:Unknown)
diff --git a/tests/value/oracle/partitioning-annots.0.res.oracle b/tests/value/oracle/partitioning-annots.0.res.oracle
index 55c450297df40885a409f0f701b45ffd30284441..a9944c463d097f25c3d87b231526dd26e7f0ce46 100644
--- a/tests/value/oracle/partitioning-annots.0.res.oracle
+++ b/tests/value/oracle/partitioning-annots.0.res.oracle
@@ -76,8 +76,7 @@
[eva] partitioning-annots.c:100: Frama_C_show_each_split_with_uninit: {2}, {2}
[eva] partitioning-annots.c:100: Frama_C_show_each_split_with_uninit: {1}, {1}
[eva] partitioning-annots.c:100: Frama_C_show_each_split_with_uninit: {0}, {0}
-[eva] partitioning-annots.c:100:
- Frama_C_show_each_split_with_uninit: Bottom, Bottom
+[eva] partitioning-annots.c:100: Frama_C_show_each_split_with_uninit: ⊥, ⊥
[eva] partitioning-annots.c:102: Frama_C_show_each_no_split: {0}, {0; 1; 2}
[eva] computing for function Frama_C_interval <- test_dynamic_split <- main.
Called from partitioning-annots.c:103.
diff --git a/tests/value/oracle_apron/backward_add_ptr.res.oracle b/tests/value/oracle_apron/backward_add_ptr.res.oracle
index a33b88dea93ebab7fd1f47ee28c8a3f24a8b8ff1..0b3c21f037c9ee69262a15f6e7398ffa44360062 100644
--- a/tests/value/oracle_apron/backward_add_ptr.res.oracle
+++ b/tests/value/oracle_apron/backward_add_ptr.res.oracle
@@ -1,25 +1,25 @@
-65c65,68
+64c64,67
< [eva] backward_add_ptr.c:91: Reusing old results for call to gm
---
> [eva] computing for function gm <- main3 <- main.
> Called from backward_add_ptr.c:91.
> [eva] Recording results for gm
> [eva] Done for function gm
-85c88,91
+84c87,90
< [eva] backward_add_ptr.c:110: Reusing old results for call to gm
---
> [eva] computing for function gm <- main3 <- main.
> Called from backward_add_ptr.c:110.
> [eva] Recording results for gm
> [eva] Done for function gm
-97c103,106
+96c102,105
< [eva] backward_add_ptr.c:125: Reusing old results for call to gm
---
> [eva] computing for function gm <- main3 <- main.
> Called from backward_add_ptr.c:125.
> [eva] Recording results for gm
> [eva] Done for function gm
-146c155,158
+145c154,157
< [eva] backward_add_ptr.c:160: Reusing old results for call to gm
---
> [eva] computing for function gm <- main4 <- main.
diff --git a/tests/value/oracle_equality/backward_add_ptr.res.oracle b/tests/value/oracle_equality/backward_add_ptr.res.oracle
index 5b5b8346ea63aba56797a7f8e1788fa6678940a7..3a6305e610f4b9491eff8fa269924571213a2b3b 100644
--- a/tests/value/oracle_equality/backward_add_ptr.res.oracle
+++ b/tests/value/oracle_equality/backward_add_ptr.res.oracle
@@ -2,25 +2,25 @@
< [eva] backward_add_ptr.c:26: Frama_C_show_each_only_a: {0; 1}, {{ &a }}, {0}
---
> [eva] backward_add_ptr.c:26: Frama_C_show_each_only_a: {0}, {{ &a }}, {0}
-85c85,88
+84c84,87
< [eva] backward_add_ptr.c:110: Reusing old results for call to gm
---
> [eva] computing for function gm <- main3 <- main.
> Called from backward_add_ptr.c:110.
> [eva] Recording results for gm
> [eva] Done for function gm
-97c100,103
+96c99,102
< [eva] backward_add_ptr.c:125: Reusing old results for call to gm
---
> [eva] computing for function gm <- main3 <- main.
> Called from backward_add_ptr.c:125.
> [eva] Recording results for gm
> [eva] Done for function gm
-108c114
+107c113
< (origin: Arithmetic {backward_add_ptr.c:68}) }},
---
> (origin: Arithmetic Bottom) }},
-143,146c149,153
+142,145c148,152
< {{ garbled mix of &{b}
< (origin: Arithmetic {backward_add_ptr.c:68}) }},
< [0..4294967295]
@@ -31,50 +31,50 @@
> Called from backward_add_ptr.c:160.
> [eva] Recording results for gm
> [eva] Done for function gm
-162c169
+161c168
< (origin: Arithmetic {backward_add_ptr.c:68}) }},
---
> (origin: Arithmetic Bottom) }},
-164c171
+163c170
< (origin: Arithmetic {backward_add_ptr.c:68}) }}
---
> (origin: Arithmetic Bottom) }}
-172c179
+171c178
< (origin: Arithmetic {backward_add_ptr.c:68}) }}
---
> (origin: Arithmetic Bottom) }}
-178c185
+177c184
< (origin: Arithmetic {backward_add_ptr.c:68}) }},
---
> (origin: Arithmetic Bottom) }},
-190a198,199
+189a197,198
> {{ garbled mix of &{b} (origin: Arithmetic {backward_add_ptr.c:33}) }}
> {{ garbled mix of &{a} (origin: Arithmetic {backward_add_ptr.c:33}) }}
-201a211
+200a210
> {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:106}) }}
-203c213
+202c212
< {{ garbled mix of &{c} (origin: Arithmetic {backward_add_ptr.c:115}) }}
---
> {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:107}) }}
-204a215,217
+203a214,216
> {{ garbled mix of &{c} (origin: Arithmetic {backward_add_ptr.c:115}) }}
> {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:116}) }}
> {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:121}) }}
-205a219,220
+204a218,219
> {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:122}) }}
> {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:130}) }}
-206a222
+205a221
> {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:136}) }}
-207a224
+206a223
> {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:137}) }}
-208a226
+207a225
> {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:145}) }}
-209a228,231
+208a227,230
> {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:150}) }}
> {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:151}) }}
> {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:156}) }}
> {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:157}) }}
-210a233,244
+209a232,243
> {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:165}) }}
> {{ garbled mix of &{b; c} (origin: Arithmetic {backward_add_ptr.c:165}) }}
> {{ garbled mix of &{a; b} (origin: Arithmetic {backward_add_ptr.c:166}) }}