diff --git a/cbmc.inc b/cbmc.inc index 32ed13a..0952457 100644 --- a/cbmc.inc +++ b/cbmc.inc @@ -14,7 +14,7 @@ run() gmon_suffix=$GMON_OUT_PREFIX export GMON_OUT_PREFIX="goto-cc_$gmon_suffix" - ./goto-cc --object-bits $OBJ_BITS -m$BIT_WIDTH --function $ENTRY "${BM[@]}" -o $LOG.bin + ./goto-cc -m$BIT_WIDTH --function $ENTRY "${BM[@]}" -o $LOG.bin if [ -n "$FAIL_FUNCTION" ]; then ./goto-instrument $LOG.bin $LOG.bin --remove-function-body "$FAIL_FUNCTION" \ --generate-function-body "$FAIL_FUNCTION" \ @@ -29,11 +29,11 @@ ulimit -v 15000000 ; \ EC=42 ; \ for c in 2 6 12 17 21 40 200 400 1025 2049 268435456 ; do \ echo "Unwind: $c" > $LOG.latest ; \ -./cbmc-binary --graphml-witness $LOG.witness --slice-formula --unwind $c --stop-on-fail --object-bits $OBJ_BITS $PROPERTY $LOG.bin >> $LOG.latest 2>&1 ; \ +./cbmc-binary --no-unwinding-assertions --no-standard-checks --graphml-witness $LOG.witness --slice-formula --unwind $c --stop-on-fail --object-bits $OBJ_BITS $PROPERTY $LOG.bin >> $LOG.latest 2>&1 ; \ ec=$? ; \ if [ $ec -eq 0 ] ; then \ if ! tail -n 10 $LOG.latest | grep -q "^VERIFICATION SUCCESSFUL$" ; then ec=1 ; else \ -./cbmc-binary --slice-formula --unwinding-assertions --unwind $c --stop-on-fail --object-bits $OBJ_BITS $PROPERTY $LOG.bin > /dev/null 2>&1 || ec=42 ; \ +./cbmc-binary --slice-formula --no-standard-checks --unwind $c --stop-on-fail --object-bits $OBJ_BITS $PROPERTY $LOG.bin > /dev/null 2>&1 || ec=42 ; \ fi ; \ fi ; \ if [ $ec -eq 10 ] ; then \