From 221d303aa7cfe3a3aa04378f8ca0f03a2297e206 Mon Sep 17 00:00:00 2001
From: an7s <an7s@git.zephyr-software.com>
Date: Tue, 5 Dec 2017 20:43:07 +0000
Subject: [PATCH] Add DSX and SI configs

Former-commit-id: a70d9a13c756144117a55c6448d87331409ed6a1
---
 .gitattributes                                       |  4 ++++
 .../cfar_probNog_probSS_probDSX_phase1_zipr.sh       | 12 ++++++++++++
 ...cfar_probNog_probSS_probDSX_probSI_phase1_zipr.sh | 12 ++++++++++++
 ...far_structNogOF_structSS_structDSX_phase1_zipr.sh |  6 ++++++
 ...tNogOF_structSS_structDSX_structSI_phase1_zipr.sh |  6 ++++++
 5 files changed, 40 insertions(+)
 create mode 100755 tools/cfar_configs/cfar_probNog_probSS_probDSX_phase1_zipr.sh
 create mode 100755 tools/cfar_configs/cfar_probNog_probSS_probDSX_probSI_phase1_zipr.sh
 create mode 100755 tools/cfar_configs/cfar_structNogOF_structSS_structDSX_phase1_zipr.sh
 create mode 100755 tools/cfar_configs/cfar_structNogOF_structSS_structDSX_structSI_phase1_zipr.sh

diff --git a/.gitattributes b/.gitattributes
index e95bb07e7..7d2dfa5aa 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -954,6 +954,8 @@ tools/cfar_configs/cfar_probNog_phase1_zipr.sh -text
 tools/cfar_configs/cfar_probNog_probBilr_zipr.sh -text
 tools/cfar_configs/cfar_probNog_probNol_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh -text
 tools/cfar_configs/cfar_probNog_probSS_phase1_zipr.sh -text
+tools/cfar_configs/cfar_probNog_probSS_probDSX_phase1_zipr.sh -text
+tools/cfar_configs/cfar_probNog_probSS_probDSX_probSI_phase1_zipr.sh -text
 tools/cfar_configs/cfar_probNog_probSS_probDS_phase1_zipr.sh -text
 tools/cfar_configs/cfar_probNoh_probIlr_probP1_probHeaprand_probNos_strata.sh -text
 tools/cfar_configs/cfar_probNoh_probNos_probBilr_probP1_probHeaprand_zipr.sh -text
@@ -984,6 +986,8 @@ tools/cfar_configs/cfar_structNoc_zipr.sh -text
 tools/cfar_configs/cfar_structNogOF_phase1_zipr.sh -text
 tools/cfar_configs/cfar_structNogOF_structSS_phase1_zipr.sh -text
 tools/cfar_configs/cfar_structNogOF_structSS_probDS_phase1_zipr.sh -text
+tools/cfar_configs/cfar_structNogOF_structSS_structDSX_phase1_zipr.sh -text
+tools/cfar_configs/cfar_structNogOF_structSS_structDSX_structSI_phase1_zipr.sh -text
 tools/cfar_configs/cfar_structNogOF_structSS_structDS_phase1_zipr.sh -text
 tools/cfar_configs/cfar_structNog_phase1_zipr.sh -text
 tools/cfar_configs/cfar_structNog_structNol_structNoh_structNos_structNoc_probHeaprand_zipr.sh -text
diff --git a/tools/cfar_configs/cfar_probNog_probSS_probDSX_phase1_zipr.sh b/tools/cfar_configs/cfar_probNog_probSS_probDSX_phase1_zipr.sh
new file mode 100755
index 000000000..7080b20f2
--- /dev/null
+++ b/tools/cfar_configs/cfar_probNog_probSS_probDSX_phase1_zipr.sh
@@ -0,0 +1,12 @@
+#!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
+
+#
+# The calling script is responsible for setting up the options for duck_season
+#    --json 
+#    --imagename
+#    [ --xor ]
+#
+
+$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --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" --step-option zipr:"--large_only:nog_on true" --step noh=on --step nol=on --step stack_stamp=on  --step-option move_globals:-d --step-option move_globals:.interp --step-option move_globals:--aggressive --step-option duck_season:--xor
diff --git a/tools/cfar_configs/cfar_probNog_probSS_probDSX_probSI_phase1_zipr.sh b/tools/cfar_configs/cfar_probNog_probSS_probDSX_probSI_phase1_zipr.sh
new file mode 100755
index 000000000..b856525f2
--- /dev/null
+++ b/tools/cfar_configs/cfar_probNog_probSS_probDSX_probSI_phase1_zipr.sh
@@ -0,0 +1,12 @@
+#!/bin/bash 
+source $(dirname $0)/../ps_wrapper.source $0
+
+
+#
+# The calling script is responsible for setting up the options for duck_season
+#    --json 
+#    --imagename
+#    [ --xor ]
+#
+
+$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step diehard=on --step p1transform=on --step duck_season=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step initialize_stack=on --step-option initialize_stack:"--initvalue $$" --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 --step stack_stamp=on  --step-option move_globals:-d --step-option move_globals:.interp --step-option move_globals:--aggressive --step-option duck_season:--xor 
diff --git a/tools/cfar_configs/cfar_structNogOF_structSS_structDSX_phase1_zipr.sh b/tools/cfar_configs/cfar_structNogOF_structSS_structDSX_phase1_zipr.sh
new file mode 100755
index 000000000..fb24c0d58
--- /dev/null
+++ b/tools/cfar_configs/cfar_structNogOF_structSS_structDSX_phase1_zipr.sh
@@ -0,0 +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 --structured_ds --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 --step-option move_globals:-d --step-option move_globals:.interp --step-option move_globals:--aggressive --step-option duck_season:--xor
+
diff --git a/tools/cfar_configs/cfar_structNogOF_structSS_structDSX_structSI_phase1_zipr.sh b/tools/cfar_configs/cfar_structNogOF_structSS_structDSX_structSI_phase1_zipr.sh
new file mode 100755
index 000000000..11278dccd
--- /dev/null
+++ b/tools/cfar_configs/cfar_structNogOF_structSS_structDSX_structSI_phase1_zipr.sh
@@ -0,0 +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 initialize_stack=on --structured_stack_init --structured_ds --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 --step-option move_globals:-d --step-option move_globals:.interp --step-option move_globals:--aggressive --step-option duck_season:--xor 
+
-- 
GitLab