From 70f0f536a546f7d33d05626f7fee0676fb4a916d Mon Sep 17 00:00:00 2001
From: clc5q <clc5q@git.zephyr-software.com>
Date: Sun, 4 Feb 2018 23:32:18 +0000
Subject: [PATCH] Add probXg to several script variants.

Former-commit-id: 5d7a137a9c89b8f809a7de780ee1ab4f58d21c13
---
 .gitattributes                                              | 3 +++
 .../cfar_configs/cfar_probNog_probXg_probSS_phase1_zipr.sh  | 4 ++++
 .../cfar_structNogOF_probXg_structSS_phase1_zipr.sh         | 6 ++++++
 tools/cfar_configs/cfar_structNog_probXg_phase1_zipr.sh     | 5 +++++
 4 files changed, 18 insertions(+)
 create mode 100755 tools/cfar_configs/cfar_probNog_probXg_probSS_phase1_zipr.sh
 create mode 100755 tools/cfar_configs/cfar_structNogOF_probXg_structSS_phase1_zipr.sh
 create mode 100755 tools/cfar_configs/cfar_structNog_probXg_phase1_zipr.sh

diff --git a/.gitattributes b/.gitattributes
index 59c742b30..00cd0575d 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -959,6 +959,7 @@ 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_probNog_probXg_phase1_zipr.sh -text
 tools/cfar_configs/cfar_probNog_probXg_probBilr_zipr.sh -text
+tools/cfar_configs/cfar_probNog_probXg_probSS_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
 tools/cfar_configs/cfar_probNol_probNoh_probIlr_probP1_probHeaprand_probNos_strata.sh -text
@@ -987,6 +988,7 @@ tools/cfar_configs/cfar_structNoc_structP1FloatingCanaries_structNos_structNol_s
 tools/cfar_configs/cfar_structNoc_zipr.sh -text
 tools/cfar_configs/cfar_structNogOF_phase1_zipr.sh -text
 tools/cfar_configs/cfar_structNogOF_probHeaprand_zipr.sh -text
+tools/cfar_configs/cfar_structNogOF_probXg_structSS_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
@@ -994,6 +996,7 @@ tools/cfar_configs/cfar_structNogOF_structSS_structDSX_structSI_phase1_zipr.sh -
 tools/cfar_configs/cfar_structNogOF_structSS_structDS_phase1_zipr.sh -text
 tools/cfar_configs/cfar_structNogOF_zipr.sh -text
 tools/cfar_configs/cfar_structNog_phase1_zipr.sh -text
+tools/cfar_configs/cfar_structNog_probXg_phase1_zipr.sh -text
 tools/cfar_configs/cfar_structNog_structNol_structNoh_structNos_structNoc_probHeaprand_zipr.sh -text
 tools/cfar_configs/cfar_structNog_structNol_structNoh_structNos_structNoc_structP1Canaries_probHeaprand_zipr.sh -text
 tools/cfar_configs/cfar_structNog_structSS_phase1_zipr.sh -text
diff --git a/tools/cfar_configs/cfar_probNog_probXg_probSS_phase1_zipr.sh b/tools/cfar_configs/cfar_probNog_probXg_probSS_phase1_zipr.sh
new file mode 100755
index 000000000..54a7da67d
--- /dev/null
+++ b/tools/cfar_configs/cfar_probNog_probXg_probSS_phase1_zipr.sh
@@ -0,0 +1,4 @@
+#!/bin/bash 
+
+$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 xor-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
+
diff --git a/tools/cfar_configs/cfar_structNogOF_probXg_structSS_phase1_zipr.sh b/tools/cfar_configs/cfar_structNogOF_probXg_structSS_phase1_zipr.sh
new file mode 100755
index 000000000..38ab8d3a8
--- /dev/null
+++ b/tools/cfar_configs/cfar_structNogOF_probXg_structSS_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 non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step move_globals=on --step xor_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
+
diff --git a/tools/cfar_configs/cfar_structNog_probXg_phase1_zipr.sh b/tools/cfar_configs/cfar_structNog_probXg_phase1_zipr.sh
new file mode 100755
index 000000000..7449ec358
--- /dev/null
+++ b/tools/cfar_configs/cfar_structNog_probXg_phase1_zipr.sh
@@ -0,0 +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 xor_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 --step-option move_globals:-d --step-option move_globals:.interp --step-option move_globals:--aggressive
-- 
GitLab