From ab801fc448f0f581391f89545b30f6e3e929d8f0 Mon Sep 17 00:00:00 2001 From: clc5q <clc5q@git.zephyr-software.com> Date: Mon, 5 Feb 2018 16:19:35 +0000 Subject: [PATCH] Rename the probXg scripts to NogX naming convention. Former-commit-id: b1d2479df20acf3624e7fe19654d09fd65a149a2 --- .gitattributes | 5 +++++ tools/cfar_configs/cfar_probNogX_phase1_zipr.sh | 6 ++++++ tools/cfar_configs/cfar_probNogX_probBilr_zipr.sh | 6 ++++++ tools/cfar_configs/cfar_probNogX_probSS_phase1_zipr.sh | 4 ++++ .../cfar_configs/cfar_structNogOFX_structSS_phase1_zipr.sh | 6 ++++++ tools/cfar_configs/cfar_structNogX_phase1_zipr.sh | 5 +++++ 6 files changed, 32 insertions(+) create mode 100755 tools/cfar_configs/cfar_probNogX_phase1_zipr.sh create mode 100755 tools/cfar_configs/cfar_probNogX_probBilr_zipr.sh create mode 100755 tools/cfar_configs/cfar_probNogX_probSS_phase1_zipr.sh create mode 100755 tools/cfar_configs/cfar_structNogOFX_structSS_phase1_zipr.sh create mode 100755 tools/cfar_configs/cfar_structNogX_phase1_zipr.sh diff --git a/.gitattributes b/.gitattributes index 00cd0575d..f4cf62c4d 100644 --- a/.gitattributes +++ b/.gitattributes @@ -950,6 +950,9 @@ tools/cfar_configs/cfar_probIlr_structP1Canaries_probHeaprand_probNos_strata.sh tools/cfar_configs/cfar_probIlr_structP1Canaries_probHeaprand_strata.sh -text tools/cfar_configs/cfar_probIlr_structP1Canaries_probHeaprand_structNos_strata.sh -text tools/cfar_configs/cfar_probIlr_structP1Canaries_strata.sh -text +tools/cfar_configs/cfar_probNogX_phase1_zipr.sh -text +tools/cfar_configs/cfar_probNogX_probBilr_zipr.sh -text +tools/cfar_configs/cfar_probNogX_probSS_phase1_zipr.sh -text 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 @@ -986,6 +989,7 @@ tools/cfar_configs/cfar_structNoc_structP1Canaries_structNos_structNol_zipr.sh - tools/cfar_configs/cfar_structNoc_structP1Canaries_zipr.sh -text tools/cfar_configs/cfar_structNoc_structP1FloatingCanaries_structNos_structNol_structNoh_zipr.sh -text tools/cfar_configs/cfar_structNoc_zipr.sh -text +tools/cfar_configs/cfar_structNogOFX_structSS_phase1_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 @@ -995,6 +999,7 @@ 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_structNogOF_zipr.sh -text +tools/cfar_configs/cfar_structNogX_phase1_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 diff --git a/tools/cfar_configs/cfar_probNogX_phase1_zipr.sh b/tools/cfar_configs/cfar_probNogX_phase1_zipr.sh new file mode 100755 index 000000000..3e38f1c7a --- /dev/null +++ b/tools/cfar_configs/cfar_probNogX_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 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-option move_globals:-d --step-option move_globals:.interp --step-option move_globals:--aggressive + diff --git a/tools/cfar_configs/cfar_probNogX_probBilr_zipr.sh b/tools/cfar_configs/cfar_probNogX_probBilr_zipr.sh new file mode 100755 index 000000000..b1eb6b7b3 --- /dev/null +++ b/tools/cfar_configs/cfar_probNogX_probBilr_zipr.sh @@ -0,0 +1,6 @@ +#!/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 move_globals=on --step xor_globals=on --step-option move_globals:"--aggressive" --step-option move_globals:-d --step-option move_globals:.interp --step-option zipr:"--large_only:nog_on true" + diff --git a/tools/cfar_configs/cfar_probNogX_probSS_phase1_zipr.sh b/tools/cfar_configs/cfar_probNogX_probSS_phase1_zipr.sh new file mode 100755 index 000000000..54a7da67d --- /dev/null +++ b/tools/cfar_configs/cfar_probNogX_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_structNogOFX_structSS_phase1_zipr.sh b/tools/cfar_configs/cfar_structNogOFX_structSS_phase1_zipr.sh new file mode 100755 index 000000000..38ab8d3a8 --- /dev/null +++ b/tools/cfar_configs/cfar_structNogOFX_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_structNogX_phase1_zipr.sh b/tools/cfar_configs/cfar_structNogX_phase1_zipr.sh new file mode 100755 index 000000000..7449ec358 --- /dev/null +++ b/tools/cfar_configs/cfar_structNogX_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