From 9bbadc2a395b248aa5ab4e077cd2f59641961c98 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Fri, 17 Nov 2017 00:20:52 +0000
Subject: [PATCH] Add maskmerge script

Signed-off-by: Clifford Wolf <clifford@clifford.at>
Signed-off-by: Tim 'mithro' Ansell <mithro@mithis.com>
---
 fuzzers/050-intpips/Makefile |  8 ++++----
 utils/environment.sh         |  1 +
 utils/maskmerge.sh           | 16 ++++++++++++++++
 3 files changed, 21 insertions(+), 4 deletions(-)
 create mode 100644 utils/maskmerge.sh

diff --git a/fuzzers/050-intpips/Makefile b/fuzzers/050-intpips/Makefile
index 122791f8..e412fe3d 100644
--- a/fuzzers/050-intpips/Makefile
+++ b/fuzzers/050-intpips/Makefile
@@ -6,10 +6,10 @@ SPECIMENS_OK := $(addsuffix /OK,$(SPECIMENS))
 database: $(SPECIMENS_OK)
 	${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_l.segbits $(addsuffix /segdata_clbl[lm]_l.txt,$(SPECIMENS))
 	${XRAY_SEGMATCH} -m 5 -M 15 -o seg_int_r.segbits $(addsuffix /segdata_clbl[lm]_r.txt,$(SPECIMENS))
-	grep -h ^bit $(addsuffix /segdata_clbll_l.txt,$(SPECIMENS)) | sort -u > mask_clbll_l.segbits
-	grep -h ^bit $(addsuffix /segdata_clbll_r.txt,$(SPECIMENS)) | sort -u > mask_clbll_r.segbits
-	grep -h ^bit $(addsuffix /segdata_clblm_l.txt,$(SPECIMENS)) | sort -u > mask_clblm_l.segbits
-	grep -h ^bit $(addsuffix /segdata_clblm_r.txt,$(SPECIMENS)) | sort -u > mask_clblm_r.segbits
+	${XRAY_MASKMERGE} mask_clbll_l.segbits $(addsuffix /segdata_clbll_l.txt,$(SPECIMENS))
+	${XRAY_MASKMERGE} mask_clbll_r.segbits $(addsuffix /segdata_clbll_r.txt,$(SPECIMENS))
+	${XRAY_MASKMERGE} mask_clblm_l.segbits $(addsuffix /segdata_clblm_l.txt,$(SPECIMENS))
+	${XRAY_MASKMERGE} mask_clblm_r.segbits $(addsuffix /segdata_clblm_r.txt,$(SPECIMENS))
 
 pushdb:
 	${XRAY_MERGEDB} int_l seg_int_l.segbits
diff --git a/utils/environment.sh b/utils/environment.sh
index c89225dc..3a0cb901 100644
--- a/utils/environment.sh
+++ b/utils/environment.sh
@@ -13,5 +13,6 @@ export XRAY_TOOLS_DIR="${XRAY_DIR}/build/tools"
 export XRAY_GENHEADER="${XRAY_UTILS_DIR}/genheader.sh"
 export XRAY_BITREAD="${XRAY_TOOLS_DIR}/bitread"
 export XRAY_MERGEDB="bash ${XRAY_UTILS_DIR}/mergedb.sh"
+export XRAY_MASKMERGE="bash ${XRAY_UTILS_DIR}/maskmerge.sh"
 export XRAY_SEGMATCH="${XRAY_TOOLS_DIR}/segmatch"
 export XRAY_SEGPRINT="python2 ${XRAY_UTILS_DIR}/segprint.py"
diff --git a/utils/maskmerge.sh b/utils/maskmerge.sh
new file mode 100644
index 00000000..e334b65b
--- /dev/null
+++ b/utils/maskmerge.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+outfile="$1"
+shift
+
+touch "$outfile"
+mv "$outfile" "$outfile.tmp"
+
+for infile; do
+	echo "Reading mask bits from $infile."
+	grep ^bit "$infile" | sort -u >> "$outfile.tmp"
+done
+
+sort -u < "$outfile.tmp" > "$outfile"
+rm -f "$outfile.tmp"
+