From 9ab4953b11bcb84b26842a535cd2c1f27507827f Mon Sep 17 00:00:00 2001
From: jdh8d <jdh8d@git.zephyr-software.com>
Date: Thu, 11 May 2017 15:23:20 +0000
Subject: [PATCH] Former-commit-id: 65386ab002116a01cca731fb0efce0617ed90961
---
Makefile | 1 +
tools/cfar.sh | 7 ++++---
...ol_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh | 3 +++
...ructNos_structNoc_structP1Canaries_probHeaprand_zipr.sh | 2 ++
tools/cfar_configs/cfar_probBilr_libtwitcher_zipr.sh | 2 ++
tools/cfar_configs/cfar_probBilr_probHeaprand_zipr.sh | 2 ++
tools/cfar_configs/cfar_probBilr_probNoh_zipr.sh | 2 ++
.../cfar_probBilr_probNos_probNol_probNoh_zipr.sh | 2 ++
tools/cfar_configs/cfar_probBilr_probNos_probNol_zipr.sh | 2 ++
tools/cfar_configs/cfar_probBilr_probNos_zipr.sh | 2 ++
.../cfar_configs/cfar_probBilr_probP1_probHeaprand_zipr.sh | 2 ++
.../cfar_probBilr_probP1_probNos_probNol_probNoh_zipr.sh | 2 ++
.../cfar_probBilr_probP1_probNos_probNol_zipr.sh | 2 ++
tools/cfar_configs/cfar_probBilr_probP1_zipr.sh | 2 ++
tools/cfar_configs/cfar_probBilr_zipr.sh | 2 ++
.../cfar_probIlr_probP1_probHeaprand_probNos_strata.sh | 2 ++
.../cfar_probIlr_probP1_probHeaprand_strata.sh | 2 ++
tools/cfar_configs/cfar_probIlr_probP1_strata.sh | 2 ++
tools/cfar_configs/cfar_probIlr_strata.sh | 2 ++
...probIlr_structP1Canaries_probHeaprand_probNos_strata.sh | 2 ++
.../cfar_probIlr_structP1Canaries_probHeaprand_strata.sh | 2 ++
...obIlr_structP1Canaries_probHeaprand_structNos_strata.sh | 2 ++
tools/cfar_configs/cfar_probIlr_structP1Canaries_strata.sh | 2 ++
tools/cfar_configs/cfar_probNog_phase1_zipr.sh | 2 ++
...ol_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh | 2 ++
.../cfar_configs/cfar_probNog_probSS_probDS_phase1_zipr.sh | 2 ++
...r_probNoh_probIlr_probP1_probHeaprand_probNos_strata.sh | 2 ++
...ar_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh | 2 ++
...l_probNoh_probIlr_probP1_probHeaprand_probNos_strata.sh | 2 ++
...r_probNol_probNoh_probNos_probBilr_probHeaprand_zipr.sh | 2 ++
...ol_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh | 2 ++
.../cfar_probNos_probBilr_probP1_probHeaprand_zipr.sh | 2 ++
...probNos_structNoc_structP1Canaries_probHeaprand_zipr.sh | 2 ++
tools/cfar_configs/cfar_probP1FloatingCanary_zipr.sh | 2 ++
tools/cfar_configs/cfar_probP1_strata.sh | 2 ++
tools/cfar_configs/cfar_probP1_zipr.sh | 2 ++
tools/cfar_configs/cfar_scfi_zipr.sh | 2 ++
.../cfar_structNoc_probP1_probHeaprand_zipr.sh | 2 ++
tools/cfar_configs/cfar_structNoc_probP1_zipr.sh | 2 ++
tools/cfar_configs/cfar_structNoc_structNoh_zipr.sh | 2 ++
.../cfar_structNoc_structNos_structNol_structNoh_zipr.sh | 2 ++
.../cfar_structNoc_structNos_structNol_zipr.sh | 2 ++
tools/cfar_configs/cfar_structNoc_structNos_zipr.sh | 2 ++
.../cfar_structNoc_structP1Canaries_probBilr_zipr.sh | 2 ++
.../cfar_structNoc_structP1Canaries_probHeaprand_zipr.sh | 2 ++
..._structP1Canaries_structNos_structNol_structNoh_zipr.sh | 2 ++
..._structNoc_structP1Canaries_structNos_structNol_zipr.sh | 2 ++
tools/cfar_configs/cfar_structNoc_structP1Canaries_zipr.sh | 2 ++
...1FloatingCanaries_structNos_structNol_structNoh_zipr.sh | 2 ++
tools/cfar_configs/cfar_structNoc_zipr.sh | 2 ++
tools/cfar_configs/cfar_structNogOF_phase1_zipr.sh | 2 ++
.../cfar_configs/cfar_structNogOF_structSS_phase1_zipr.sh | 2 ++
.../cfar_structNogOF_structSS_probDS_phase1_zipr.sh | 2 ++
tools/cfar_configs/cfar_structNog_phase1_zipr.sh | 2 ++
...tNol_structNoh_structNos_structNoc_probHeaprand_zipr.sh | 2 ++
...ructNos_structNoc_structP1Canaries_probHeaprand_zipr.sh | 2 ++
...obIlr_structP1Canaries_probHeaprand_structNos_strata.sh | 2 ++
...ructNos_structNoc_structP1Canaries_probHeaprand_zipr.sh | 2 ++
...obIlr_structP1Canaries_probHeaprand_structNos_strata.sh | 2 ++
...tNol_structNoh_structNos_structNoc_probHeaprand_zipr.sh | 2 ++
...ructNos_structNoc_structP1Canaries_probHeaprand_zipr.sh | 2 ++
...ructNos_structNoc_structP1Canaries_probHeaprand_zipr.sh | 2 ++
tools/cfar_configs/cfar_structP1Canaries_zipr.sh | 2 ++
tools/cfar_configs/cfar_structP1FloatingCanary_zipr.sh | 2 ++
64 files changed, 130 insertions(+), 3 deletions(-)
diff --git a/Makefile b/Makefile
index 91e15eb01..024a763e4 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@
all:
cd chopzero_src; make
if [ -d cgc_spri ]; then cd cgc_spri; make; fi
+ $(PEDI_HOME)/pedi -m manifest.txt
clean:
cd chopzero_src; make clean
diff --git a/tools/cfar.sh b/tools/cfar.sh
index 9d3d7c96f..dd56ac562 100755
--- a/tools/cfar.sh
+++ b/tools/cfar.sh
@@ -1,5 +1,6 @@
-#!/bin/bash
+#!/bin/bash -x
+source $(dirname $0)/ps_wrapper.source $0
is_so()
{
@@ -162,9 +163,9 @@ do
myin=$(echo $in|sed "s/<<VARNUM>>/$seq/g")
# invoke $PS.
- #echo "PGDATABASE=peasoup_${USER}_v$seq $zipr_env $PEASOUP_HOME/tools/ps_analyze.sh $in $baseoutdir/v${seq}/${in_base} " "${new_cmd_line_options[@]}" "${per_variant_options[@]}"
+ #echo "PGDATABASE=peasoup_${USER}_v$seq $zipr_env $PS $in $baseoutdir/v${seq}/${in_base} " "${new_cmd_line_options[@]}" "${per_variant_options[@]}"
set -x
- PGDATABASE=peasoup_${USER}_v$seq $zipr_env $PEASOUP_HOME/tools/ps_analyze.sh $myin $baseoutdir/v${seq}/${in_base} "${new_cmd_line_options[@]}" "${per_variant_options[@]}" > $baseoutdir/v${seq}/variant_output.txt 2>&1 &
+ PGDATABASE=peasoup_${USER}_v$seq $zipr_env $PS $myin $baseoutdir/v${seq}/${in_base} "${new_cmd_line_options[@]}" "${per_variant_options[@]}" > $baseoutdir/v${seq}/variant_output.txt 2>&1 &
# remember the pid.
pids="$pids $!"
diff --git a/tools/cfar_configs/cfar_partProbNog_probNol_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_partProbNog_probNol_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh
index 43df32cd8..f67024ba7 100755
--- a/tools/cfar_configs/cfar_partProbNog_probNol_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_partProbNog_probNol_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh
@@ -1,5 +1,8 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
+
file $2|grep "ELF 64-bit LSB executable" > /dev/null
if [ $? = 0 ]; then
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step move_globals=on --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --step-option zipr:"--large_only:nog_on true" --step diehard=on --step noh=on --step nol=on
diff --git a/tools/cfar_configs/cfar_partStructNog_structNol_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_partStructNog_structNol_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
index 03fed96f6..beb2d3648 100755
--- a/tools/cfar_configs/cfar_partStructNog_structNol_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_partStructNog_structNol_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
@@ -1,4 +1,6 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
file $2|grep "ELF 64-bit LSB executable" > /dev/null
if [ $? = 0 ]; then
diff --git a/tools/cfar_configs/cfar_probBilr_libtwitcher_zipr.sh b/tools/cfar_configs/cfar_probBilr_libtwitcher_zipr.sh
index 16f71bf02..51b874083 100755
--- a/tools/cfar_configs/cfar_probBilr_libtwitcher_zipr.sh
+++ b/tools/cfar_configs/cfar_probBilr_libtwitcher_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --config_name $(basename $0 .sh|sed "s/cfar_//") --step libtwitcher=on
diff --git a/tools/cfar_configs/cfar_probBilr_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_probBilr_probHeaprand_zipr.sh
index f7a1b40b1..85996a3aa 100755
--- a/tools/cfar_configs/cfar_probBilr_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_probBilr_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --config_name $(basename $0 .sh|sed "s/cfar_//") --step diehard=on
diff --git a/tools/cfar_configs/cfar_probBilr_probNoh_zipr.sh b/tools/cfar_configs/cfar_probBilr_probNoh_zipr.sh
index 52aa02739..27b3e1d8f 100755
--- a/tools/cfar_configs/cfar_probBilr_probNoh_zipr.sh
+++ b/tools/cfar_configs/cfar_probBilr_probNoh_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --config_name $(basename $0 .sh|sed "s/cfar_//") --step noh=on
diff --git a/tools/cfar_configs/cfar_probBilr_probNos_probNol_probNoh_zipr.sh b/tools/cfar_configs/cfar_probBilr_probNos_probNol_probNoh_zipr.sh
index 20f4d64d7..f0fc41395 100755
--- a/tools/cfar_configs/cfar_probBilr_probNos_probNol_probNoh_zipr.sh
+++ b/tools/cfar_configs/cfar_probBilr_probNos_probNol_probNoh_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --step nol=on --step noh=on
diff --git a/tools/cfar_configs/cfar_probBilr_probNos_probNol_zipr.sh b/tools/cfar_configs/cfar_probBilr_probNos_probNol_zipr.sh
index 080574127..15d604e72 100755
--- a/tools/cfar_configs/cfar_probBilr_probNos_probNol_zipr.sh
+++ b/tools/cfar_configs/cfar_probBilr_probNos_probNol_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --step nol=on
diff --git a/tools/cfar_configs/cfar_probBilr_probNos_zipr.sh b/tools/cfar_configs/cfar_probBilr_probNos_zipr.sh
index fcb21700d..83eae9191 100755
--- a/tools/cfar_configs/cfar_probBilr_probNos_zipr.sh
+++ b/tools/cfar_configs/cfar_probBilr_probNos_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_probBilr_probP1_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_probBilr_probP1_probHeaprand_zipr.sh
index 70f0d725e..5a697cb87 100755
--- a/tools/cfar_configs/cfar_probBilr_probP1_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_probBilr_probP1_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step diehard=on
diff --git a/tools/cfar_configs/cfar_probBilr_probP1_probNos_probNol_probNoh_zipr.sh b/tools/cfar_configs/cfar_probBilr_probP1_probNos_probNol_probNoh_zipr.sh
index 289aee070..4a1e79396 100755
--- a/tools/cfar_configs/cfar_probBilr_probP1_probNos_probNol_probNoh_zipr.sh
+++ b/tools/cfar_configs/cfar_probBilr_probP1_probNos_probNol_probNoh_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --step nol=on --step noh=on
diff --git a/tools/cfar_configs/cfar_probBilr_probP1_probNos_probNol_zipr.sh b/tools/cfar_configs/cfar_probBilr_probP1_probNos_probNol_zipr.sh
index 01bd06ec3..38b686753 100755
--- a/tools/cfar_configs/cfar_probBilr_probP1_probNos_probNol_zipr.sh
+++ b/tools/cfar_configs/cfar_probBilr_probP1_probNos_probNol_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --step nol=on
diff --git a/tools/cfar_configs/cfar_probBilr_probP1_zipr.sh b/tools/cfar_configs/cfar_probBilr_probP1_zipr.sh
index 5c51c6e3e..24043c958 100755
--- a/tools/cfar_configs/cfar_probBilr_probP1_zipr.sh
+++ b/tools/cfar_configs/cfar_probBilr_probP1_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_probBilr_zipr.sh b/tools/cfar_configs/cfar_probBilr_zipr.sh
index 6fdb14fc8..c5de13438 100755
--- a/tools/cfar_configs/cfar_probBilr_zipr.sh
+++ b/tools/cfar_configs/cfar_probBilr_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_probIlr_probP1_probHeaprand_probNos_strata.sh b/tools/cfar_configs/cfar_probIlr_probP1_probHeaprand_probNos_strata.sh
index 6c89b9585..01f4094d7 100755
--- a/tools/cfar_configs/cfar_probIlr_probP1_probHeaprand_probNos_strata.sh
+++ b/tools/cfar_configs/cfar_probIlr_probP1_probHeaprand_probNos_strata.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend strata --step non_overlapping_stack=on --step ilr=on --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step diehard=on
diff --git a/tools/cfar_configs/cfar_probIlr_probP1_probHeaprand_strata.sh b/tools/cfar_configs/cfar_probIlr_probP1_probHeaprand_strata.sh
index f48737f1f..2158f400f 100755
--- a/tools/cfar_configs/cfar_probIlr_probP1_probHeaprand_strata.sh
+++ b/tools/cfar_configs/cfar_probIlr_probP1_probHeaprand_strata.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend strata --step ilr=on --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step diehard=on
diff --git a/tools/cfar_configs/cfar_probIlr_probP1_strata.sh b/tools/cfar_configs/cfar_probIlr_probP1_strata.sh
index b49c43208..50987a155 100755
--- a/tools/cfar_configs/cfar_probIlr_probP1_strata.sh
+++ b/tools/cfar_configs/cfar_probIlr_probP1_strata.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend strata --step ilr=on --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_probIlr_strata.sh b/tools/cfar_configs/cfar_probIlr_strata.sh
index 086a0432e..6041c3f9a 100755
--- a/tools/cfar_configs/cfar_probIlr_strata.sh
+++ b/tools/cfar_configs/cfar_probIlr_strata.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend strata --step ilr=on --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_probIlr_structP1Canaries_probHeaprand_probNos_strata.sh b/tools/cfar_configs/cfar_probIlr_structP1Canaries_probHeaprand_probNos_strata.sh
index 80671d636..c624a6b09 100755
--- a/tools/cfar_configs/cfar_probIlr_structP1Canaries_probHeaprand_probNos_strata.sh
+++ b/tools/cfar_configs/cfar_probIlr_structP1Canaries_probHeaprand_probNos_strata.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend strata --step ilr=on --structured_p1_canaries --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step diehard=on --step non_overlapping_stack=on
diff --git a/tools/cfar_configs/cfar_probIlr_structP1Canaries_probHeaprand_strata.sh b/tools/cfar_configs/cfar_probIlr_structP1Canaries_probHeaprand_strata.sh
index 7ffe24f9e..b2870be62 100755
--- a/tools/cfar_configs/cfar_probIlr_structP1Canaries_probHeaprand_strata.sh
+++ b/tools/cfar_configs/cfar_probIlr_structP1Canaries_probHeaprand_strata.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend strata --step ilr=on --structured_p1_canaries --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step diehard=on
diff --git a/tools/cfar_configs/cfar_probIlr_structP1Canaries_probHeaprand_structNos_strata.sh b/tools/cfar_configs/cfar_probIlr_structP1Canaries_probHeaprand_structNos_strata.sh
index 5f1fe7bdf..655bb3bfb 100755
--- a/tools/cfar_configs/cfar_probIlr_structP1Canaries_probHeaprand_structNos_strata.sh
+++ b/tools/cfar_configs/cfar_probIlr_structP1Canaries_probHeaprand_structNos_strata.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend strata --step ilr=on --structured_p1_canaries --structured_nos --step non_overlapping_stack=on --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step diehard=on
diff --git a/tools/cfar_configs/cfar_probIlr_structP1Canaries_strata.sh b/tools/cfar_configs/cfar_probIlr_structP1Canaries_strata.sh
index 87bc59f31..d04ace820 100755
--- a/tools/cfar_configs/cfar_probIlr_structP1Canaries_strata.sh
+++ b/tools/cfar_configs/cfar_probIlr_structP1Canaries_strata.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend strata --step ilr=on --structured_p1_canaries --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_probNog_phase1_zipr.sh b/tools/cfar_configs/cfar_probNog_phase1_zipr.sh
index 26d127592..8563eb45c 100755
--- a/tools/cfar_configs/cfar_probNog_phase1_zipr.sh
+++ b/tools/cfar_configs/cfar_probNog_phase1_zipr.sh
@@ -1,4 +1,6 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step move_globals=on --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --step-option zipr:"--large_only:nog_on true" --step noh=on --step nol=on
diff --git a/tools/cfar_configs/cfar_probNog_probNol_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_probNog_probNol_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh
index 040067b49..3ab21ad92 100755
--- a/tools/cfar_configs/cfar_probNog_probNol_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_probNog_probNol_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step move_globals=on --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --step-option zipr:"--large_only:nog_on true" --step noh=on --step nol=on
diff --git a/tools/cfar_configs/cfar_probNog_probSS_probDS_phase1_zipr.sh b/tools/cfar_configs/cfar_probNog_probSS_probDS_phase1_zipr.sh
index 243e2640b..f572105f6 100755
--- a/tools/cfar_configs/cfar_probNog_probSS_probDS_phase1_zipr.sh
+++ b/tools/cfar_configs/cfar_probNog_probSS_probDS_phase1_zipr.sh
@@ -1,4 +1,6 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
#
# The calling script is responsible for setting up the options for duck_season
diff --git a/tools/cfar_configs/cfar_probNoh_probIlr_probP1_probHeaprand_probNos_strata.sh b/tools/cfar_configs/cfar_probNoh_probIlr_probP1_probHeaprand_probNos_strata.sh
index db8abe90e..63f9fcd27 100755
--- a/tools/cfar_configs/cfar_probNoh_probIlr_probP1_probHeaprand_probNos_strata.sh
+++ b/tools/cfar_configs/cfar_probNoh_probIlr_probP1_probHeaprand_probNos_strata.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend strata --step non_overlapping_stack=on --step ilr=on --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step diehard=on --step noh=on
diff --git a/tools/cfar_configs/cfar_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh
index 8a20998d2..a3e5157e2 100755
--- a/tools/cfar_configs/cfar_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step noh=on
diff --git a/tools/cfar_configs/cfar_probNol_probNoh_probIlr_probP1_probHeaprand_probNos_strata.sh b/tools/cfar_configs/cfar_probNol_probNoh_probIlr_probP1_probHeaprand_probNos_strata.sh
index b9a00546e..947add2b5 100755
--- a/tools/cfar_configs/cfar_probNol_probNoh_probIlr_probP1_probHeaprand_probNos_strata.sh
+++ b/tools/cfar_configs/cfar_probNol_probNoh_probIlr_probP1_probHeaprand_probNos_strata.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
# nol, noh not set here, passed only to gen_mvee_config.
$PEASOUP_HOME/tools/cfar.sh "$@" --backend strata --step non_overlapping_stack=on --step ilr=on --step p1transform=on --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --config_name $(basename $0 .sh|sed "s/cfar_//") --step diehard=on --step noh=on --step nol=on
diff --git a/tools/cfar_configs/cfar_probNol_probNoh_probNos_probBilr_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_probNol_probNoh_probNos_probBilr_probHeaprand_zipr.sh
index 35399c59b..5bad90d8a 100755
--- a/tools/cfar_configs/cfar_probNol_probNoh_probNos_probBilr_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_probNol_probNoh_probNos_probBilr_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step non_overlapping_stack=on --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --config_name $(basename $0 .sh|sed "s/cfar_//") --step noh=on --step nol=on
diff --git a/tools/cfar_configs/cfar_probNol_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_probNol_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh
index 2a1e826db..2aee26021 100755
--- a/tools/cfar_configs/cfar_probNol_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_probNol_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step p1transform=on --step non_overlapping_stack=on --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --config_name $(basename $0 .sh|sed "s/cfar_//") --step noh=on --step nol=on
diff --git a/tools/cfar_configs/cfar_probNos_probBilr_probP1_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_probNos_probBilr_probP1_probHeaprand_zipr.sh
index 12a5fc4c2..25e97f314 100755
--- a/tools/cfar_configs/cfar_probNos_probBilr_probP1_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_probNos_probBilr_probP1_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_probNos_structNoc_structP1Canaries_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_probNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
index 5f4abfd58..482ed7cae 100755
--- a/tools/cfar_configs/cfar_probNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_probNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step-option zipr:"--zipr:seed $$" --structured_noc --step-option zipr:"--large_only:on true" --structured_p1_canaries --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_probP1FloatingCanary_zipr.sh b/tools/cfar_configs/cfar_probP1FloatingCanary_zipr.sh
index 0ec10d36e..941fbf768 100755
--- a/tools/cfar_configs/cfar_probP1FloatingCanary_zipr.sh
+++ b/tools/cfar_configs/cfar_probP1FloatingCanary_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step p1transform=on --step-option p1transform:"--canaries=on --floating_canary" --step-option zipr:"--zipr:seed $$" --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_probP1_strata.sh b/tools/cfar_configs/cfar_probP1_strata.sh
index 70b538320..eea0751c1 100755
--- a/tools/cfar_configs/cfar_probP1_strata.sh
+++ b/tools/cfar_configs/cfar_probP1_strata.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
SPASM_SEED=$$ $PEASOUP_HOME/tools/cfar.sh "$@" --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_probP1_zipr.sh b/tools/cfar_configs/cfar_probP1_zipr.sh
index 072c34081..4dc8ab567 100755
--- a/tools/cfar_configs/cfar_probP1_zipr.sh
+++ b/tools/cfar_configs/cfar_probP1_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step p1transform=on --step-option zipr:"--zipr:seed $$" --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_scfi_zipr.sh b/tools/cfar_configs/cfar_scfi_zipr.sh
index f40fb0471..6b138a9fd 100755
--- a/tools/cfar_configs/cfar_scfi_zipr.sh
+++ b/tools/cfar_configs/cfar_scfi_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --config_name $(basename $0 .sh|sed "s/cfar_//") --step move_globals=on --step-option move_globals:--cfi --step selective_cfi=on --step-option selective_cfi:--multimodule --step-option fix_calls:--fix-all --backend zipr
diff --git a/tools/cfar_configs/cfar_structNoc_probP1_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_structNoc_probP1_probHeaprand_zipr.sh
index 6e30e8da4..2b0d764e4 100755
--- a/tools/cfar_configs/cfar_structNoc_probP1_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_structNoc_probP1_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step-option zipr:"--zipr:seed $$" --structured_noc --step-option zipr:"--large_only:on true" --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step diehard=on
diff --git a/tools/cfar_configs/cfar_structNoc_probP1_zipr.sh b/tools/cfar_configs/cfar_structNoc_probP1_zipr.sh
index a39f99ca6..7e1e440c6 100755
--- a/tools/cfar_configs/cfar_structNoc_probP1_zipr.sh
+++ b/tools/cfar_configs/cfar_structNoc_probP1_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step-option zipr:"--zipr:seed $$" --structured_noc --step-option zipr:"--large_only:on true" --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_structNoc_structNoh_zipr.sh b/tools/cfar_configs/cfar_structNoc_structNoh_zipr.sh
index 7135d7827..59b22d3fb 100755
--- a/tools/cfar_configs/cfar_structNoc_structNoh_zipr.sh
+++ b/tools/cfar_configs/cfar_structNoc_structNoh_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step-option zipr:"--zipr:seed $$" --structured_noc --step-option zipr:"--large_only:on true" --config_name $(basename $0 .sh|sed "s/cfar_//") --step noh=on
diff --git a/tools/cfar_configs/cfar_structNoc_structNos_structNol_structNoh_zipr.sh b/tools/cfar_configs/cfar_structNoc_structNos_structNol_structNoh_zipr.sh
index 0a1bf9d3c..944f47166 100755
--- a/tools/cfar_configs/cfar_structNoc_structNos_structNol_structNoh_zipr.sh
+++ b/tools/cfar_configs/cfar_structNoc_structNos_structNol_structNoh_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --step nol=on --step noh=on
diff --git a/tools/cfar_configs/cfar_structNoc_structNos_structNol_zipr.sh b/tools/cfar_configs/cfar_structNoc_structNos_structNol_zipr.sh
index 59ec527b6..efb86807a 100755
--- a/tools/cfar_configs/cfar_structNoc_structNos_structNol_zipr.sh
+++ b/tools/cfar_configs/cfar_structNoc_structNos_structNol_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --step nol=on
diff --git a/tools/cfar_configs/cfar_structNoc_structNos_zipr.sh b/tools/cfar_configs/cfar_structNoc_structNos_zipr.sh
index f4ab40d95..eadecbe88 100755
--- a/tools/cfar_configs/cfar_structNoc_structNos_zipr.sh
+++ b/tools/cfar_configs/cfar_structNoc_structNos_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_structNoc_structP1Canaries_probBilr_zipr.sh b/tools/cfar_configs/cfar_structNoc_structP1Canaries_probBilr_zipr.sh
index 93f4f3f06..dd7d181c6 100755
--- a/tools/cfar_configs/cfar_structNoc_structP1Canaries_probBilr_zipr.sh
+++ b/tools/cfar_configs/cfar_structNoc_structP1Canaries_probBilr_zipr.sh
@@ -1,4 +1,6 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
echo NOC+Bilr generates working binaries, but Bilr is not yet applied. Avoid this config for now.
exit 1
diff --git a/tools/cfar_configs/cfar_structNoc_structP1Canaries_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_structNoc_structP1Canaries_probHeaprand_zipr.sh
index 30fc4b432..66d207dcc 100755
--- a/tools/cfar_configs/cfar_structNoc_structP1Canaries_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_structNoc_structP1Canaries_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step-option zipr:"--zipr:seed $$" --structured_noc --step-option zipr:"--large_only:on true" --structured_p1_canaries --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_structNoc_structP1Canaries_structNos_structNol_structNoh_zipr.sh b/tools/cfar_configs/cfar_structNoc_structP1Canaries_structNos_structNol_structNoh_zipr.sh
index 2f7a99275..e94b8402b 100755
--- a/tools/cfar_configs/cfar_structNoc_structP1Canaries_structNos_structNol_structNoh_zipr.sh
+++ b/tools/cfar_configs/cfar_structNoc_structP1Canaries_structNos_structNol_structNoh_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --step nol=on --structured_p1_canaries --step p1transform=on --step noh=on
diff --git a/tools/cfar_configs/cfar_structNoc_structP1Canaries_structNos_structNol_zipr.sh b/tools/cfar_configs/cfar_structNoc_structP1Canaries_structNos_structNol_zipr.sh
index 7069eaf3a..d4a92f86f 100755
--- a/tools/cfar_configs/cfar_structNoc_structP1Canaries_structNos_structNol_zipr.sh
+++ b/tools/cfar_configs/cfar_structNoc_structP1Canaries_structNos_structNol_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --step nol=on --structured_p1_canaries --step p1transform=on
diff --git a/tools/cfar_configs/cfar_structNoc_structP1Canaries_zipr.sh b/tools/cfar_configs/cfar_structNoc_structP1Canaries_zipr.sh
index cd2fb5d85..a293667b3 100755
--- a/tools/cfar_configs/cfar_structNoc_structP1Canaries_zipr.sh
+++ b/tools/cfar_configs/cfar_structNoc_structP1Canaries_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step-option zipr:"--zipr:seed $$" --structured_noc --step-option zipr:"--large_only:on true" --structured_p1_canaries --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_structNoc_structP1FloatingCanaries_structNos_structNol_structNoh_zipr.sh b/tools/cfar_configs/cfar_structNoc_structP1FloatingCanaries_structNos_structNol_structNoh_zipr.sh
index f6df67ed5..30b741a40 100755
--- a/tools/cfar_configs/cfar_structNoc_structP1FloatingCanaries_structNos_structNol_structNoh_zipr.sh
+++ b/tools/cfar_configs/cfar_structNoc_structP1FloatingCanaries_structNos_structNol_structNoh_zipr.sh
@@ -1,4 +1,6 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
if [ ! -z $NO_FLOAT ];
then
diff --git a/tools/cfar_configs/cfar_structNoc_zipr.sh b/tools/cfar_configs/cfar_structNoc_zipr.sh
index 095f63624..46c492753 100755
--- a/tools/cfar_configs/cfar_structNoc_zipr.sh
+++ b/tools/cfar_configs/cfar_structNoc_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step-option zipr:"--zipr:seed $$" --structured_noc --step-option zipr:"--large_only:on true" --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_structNogOF_phase1_zipr.sh b/tools/cfar_configs/cfar_structNogOF_phase1_zipr.sh
index d116d2b47..f63e955f6 100755
--- a/tools/cfar_configs/cfar_structNogOF_phase1_zipr.sh
+++ b/tools/cfar_configs/cfar_structNogOF_phase1_zipr.sh
@@ -1,4 +1,6 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --structured_p1_canaries --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step move_globals=on --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --structured_nog --step-option zipr:"--large_only:nog_on true --large_only:overflow_protection true" --step noh=on --step nol=on
diff --git a/tools/cfar_configs/cfar_structNogOF_structSS_phase1_zipr.sh b/tools/cfar_configs/cfar_structNogOF_structSS_phase1_zipr.sh
index 2da6d60d0..a8099d7d4 100755
--- a/tools/cfar_configs/cfar_structNogOF_structSS_phase1_zipr.sh
+++ b/tools/cfar_configs/cfar_structNogOF_structSS_phase1_zipr.sh
@@ -1,4 +1,6 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --structured_p1_canaries --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step move_globals=on --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --structured_nog --step-option zipr:"--large_only:nog_on true --large_only:overflow_protection true" --step noh=on --step nol=on --step stack_stamp=on --structured_stack_stamp
diff --git a/tools/cfar_configs/cfar_structNogOF_structSS_probDS_phase1_zipr.sh b/tools/cfar_configs/cfar_structNogOF_structSS_probDS_phase1_zipr.sh
index 6219e640d..93359588f 100755
--- a/tools/cfar_configs/cfar_structNogOF_structSS_probDS_phase1_zipr.sh
+++ b/tools/cfar_configs/cfar_structNogOF_structSS_probDS_phase1_zipr.sh
@@ -1,4 +1,6 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --structured_p1_canaries --step p1transform=on --step duck_season=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step move_globals=on --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --structured_nog --step-option zipr:"--large_only:nog_on true --large_only:overflow_protection true" --step noh=on --step nol=on --step stack_stamp=on --structured_stack_stamp
diff --git a/tools/cfar_configs/cfar_structNog_phase1_zipr.sh b/tools/cfar_configs/cfar_structNog_phase1_zipr.sh
index f05957ade..010bf86bb 100755
--- a/tools/cfar_configs/cfar_structNog_phase1_zipr.sh
+++ b/tools/cfar_configs/cfar_structNog_phase1_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --structured_p1_canaries --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step move_globals=on --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --structured_nog --step-option zipr:"--large_only:nog_on true" --step noh=on --step nol=on
diff --git a/tools/cfar_configs/cfar_structNog_structNol_structNoh_structNos_structNoc_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_structNog_structNol_structNoh_structNos_structNoc_probHeaprand_zipr.sh
index 042a1d9e5..28e9c6ecc 100755
--- a/tools/cfar_configs/cfar_structNog_structNol_structNoh_structNos_structNoc_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_structNog_structNol_structNoh_structNos_structNoc_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step move_globals=on --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --structured_nog --step-option zipr:"--large_only:nog_on true" --step noh=on --step nol=on
diff --git a/tools/cfar_configs/cfar_structNog_structNol_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_structNog_structNol_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
index f05957ade..010bf86bb 100755
--- a/tools/cfar_configs/cfar_structNog_structNol_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_structNog_structNol_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --structured_p1_canaries --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step move_globals=on --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --structured_nog --step-option zipr:"--large_only:nog_on true" --step noh=on --step nol=on
diff --git a/tools/cfar_configs/cfar_structNoh_probIlr_structP1Canaries_probHeaprand_structNos_strata.sh b/tools/cfar_configs/cfar_structNoh_probIlr_structP1Canaries_probHeaprand_structNos_strata.sh
index 40c464ddc..a2fa33916 100755
--- a/tools/cfar_configs/cfar_structNoh_probIlr_structP1Canaries_probHeaprand_structNos_strata.sh
+++ b/tools/cfar_configs/cfar_structNoh_probIlr_structP1Canaries_probHeaprand_structNos_strata.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend strata --step ilr=on --structured_p1_canaries --structured_nos --step non_overlapping_stack=on --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step diehard=on --step noh=on
diff --git a/tools/cfar_configs/cfar_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
index 0c4ab3920..56507e9d8 100755
--- a/tools/cfar_configs/cfar_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --structured_p1_canaries --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step noh=on
diff --git a/tools/cfar_configs/cfar_structNol_structNoh_probIlr_structP1Canaries_probHeaprand_structNos_strata.sh b/tools/cfar_configs/cfar_structNol_structNoh_probIlr_structP1Canaries_probHeaprand_structNos_strata.sh
index 14b0e394f..ea3685b4b 100755
--- a/tools/cfar_configs/cfar_structNol_structNoh_probIlr_structP1Canaries_probHeaprand_structNos_strata.sh
+++ b/tools/cfar_configs/cfar_structNol_structNoh_probIlr_structP1Canaries_probHeaprand_structNos_strata.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend strata --step ilr=on --structured_p1_canaries --structured_nos --step non_overlapping_stack=on --step p1transform=on --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --config_name $(basename $0 .sh|sed "s/cfar_//") --step diehard=on --step noh=on --step nol=on
diff --git a/tools/cfar_configs/cfar_structNol_structNoh_structNos_structNoc_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_structNol_structNoh_structNos_structNoc_probHeaprand_zipr.sh
index f1648b7ce..2165f4266 100755
--- a/tools/cfar_configs/cfar_structNol_structNoh_structNos_structNoc_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_structNol_structNoh_structNos_structNoc_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --step non_overlapping_stack=on --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --config_name $(basename $0 .sh|sed "s/cfar_//") --step noh=on --step nol=on
diff --git a/tools/cfar_configs/cfar_structNol_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_structNol_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
index 278c6e79a..59bfb348c 100755
--- a/tools/cfar_configs/cfar_structNol_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_structNol_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --structured_p1_canaries --step p1transform=on --step non_overlapping_stack=on --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --config_name $(basename $0 .sh|sed "s/cfar_//") --step noh=on --step nol=on
diff --git a/tools/cfar_configs/cfar_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh b/tools/cfar_configs/cfar_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
index 44d177815..c54c8546d 100755
--- a/tools/cfar_configs/cfar_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
+++ b/tools/cfar_configs/cfar_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --structured_p1_canaries --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_structP1Canaries_zipr.sh b/tools/cfar_configs/cfar_structP1Canaries_zipr.sh
index 0c3ca5bc9..9f04cfd0d 100755
--- a/tools/cfar_configs/cfar_structP1Canaries_zipr.sh
+++ b/tools/cfar_configs/cfar_structP1Canaries_zipr.sh
@@ -1,3 +1,5 @@
#!/bin/bash
+source $(dirname $0)/../ps_wrapper.source $0
+
$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step-option zipr:"--zipr:seed $$" --structured_p1_canaries --step p1transform=on --config_name $(basename $0 .sh|sed "s/cfar_//")
diff --git a/tools/cfar_configs/cfar_structP1FloatingCanary_zipr.sh b/tools/cfar_configs/cfar_structP1FloatingCanary_zipr.sh
index 3923cf132..6d87aec4a 100755
--- a/tools/cfar_configs/cfar_structP1FloatingCanary_zipr.sh
+++ b/tools/cfar_configs/cfar_structP1FloatingCanary_zipr.sh
@@ -1,4 +1,6 @@
#!/bin/bash -x
+source $(dirname $0)/../ps_wrapper.source $0
+
if [ ! -z $NO_FLOAT ];
then
--
GitLab