From 5846b4b0940c3521ea5cc664355207a443beb7ae Mon Sep 17 00:00:00 2001
From: Steffen Schulz <steffen.schulz@intel.com>
Date: Tue, 26 Apr 2022 20:47:02 +0200
Subject: [PATCH 1/4] cosmetic overhaul for compile_qemu_nyx.sh

---
 compile_qemu_nyx.sh | 151 ++++++++++++++++----------------------------
 1 file changed, 55 insertions(+), 96 deletions(-)

diff --git a/compile_qemu_nyx.sh b/compile_qemu_nyx.sh
index e36fe285f8..2d7ec6c466 100755
--- a/compile_qemu_nyx.sh
+++ b/compile_qemu_nyx.sh
@@ -1,5 +1,4 @@
 #!/bin/bash
-set -e
 
 # Copyright (C) 2021 Sergej Schumilo
 # 
@@ -18,12 +17,14 @@ set -e
 # You should have received a copy of the GNU General Public License
 # along with QEMU-PT.  If not, see <http://www.gnu.org/licenses/>.
 
+set -e
 
 if [ -z "$BASH_VERSION" ]; then
   exit 0
 fi
 
-error () {
+error()
+{
   echo "$0: <option>"
   echo ""
   echo "Available compile options: "
@@ -33,111 +34,69 @@ error () {
   echo " -  debug         enable several debug options"
   echo " -  debug_static  enable several debug options and statically link libxdc and capstone4"
   echo ""
-  exit 3
+  exit 1
 }
 
-compile_libraries (){
-  echo "[!] compiling capstone4..."
-  cd capstone_v4
-  make -j
-  cd ..
-  echo "[!] capstone4 is ready!"
+compile_libraries()
+{
+  echo "[!] Compiling capstone4..."
+  make -C capstone_v4 -j $(nproc)
 
-  echo "[!] compiling libxdc..."
-  cd libxdc
-  CFLAGS="-I../capstone_v4/include/" V=1 make libxdc.a
-  cd ..
-  echo "[!] libxdc is ready!"
+  echo "[!] Compiling libxdc..."
+  CFLAGS="-I$PWD/capstone_v4/include/" make -C libxdc -j $(nproc)
+
+  case $1 in
+    "dynamic"|"debug")
+      echo "[!] Installing capstone4..."
+      sudo make -C capstone_v4 install
+      echo "[!] Installing libxdc..."
+      sudo make -C libxdc install
+      ;;
+  esac
 }
 
-compile_and_install_libraries () {
-  if [ ! -f "/usr/lib/libcapstone.so" ] || [ ! -d "/usr/include/capstone/" ]; then
-    echo "[!] capstone not found! Installing..."
-    cd capstone_v4
-    make -j
-    echo "[ ] requesting permissions to install capstone4 ..."
-    sudo make install
-    echo "[!] done ..."
-    cd ..
-  fi
+configure_qemu()
+{
+  QEMU_CONFIGURE="./configure --target-list=x86_64-softmmu --disable-gtk --disable-docs --enable-gtk --disable-werror --disable-capstone --disable-libssh --disable-tools"
 
-  if [ ! -f "/usr/lib/libxdc.so" ] || [ ! -f "/usr/include/libxdc.h" ]; then
-    echo "[!] libxdc not found! Installing..."
-    cd libxdc
-    make -j
-    echo "[ ] requesting permissions to install libxdc ..."
-    sudo make install
-    echo "[!] done ..."
-    cd ..
-  fi
+  case $1 in
+    "dynamic")
+      $QEMU_CONFIGURE --enable-nyx
+      ;;
+    "debug")
+      $QEMU_CONFIGURE --enable-nyx --enable-sanitizers --enable-debug
+      ;;
+    "debug_static")
+      $QEMU_CONFIGURE --enable-nyx --enable-sanitizers --enable-debug --enable-nyx-static
+      ;;
+    "static")
+      $QEMU_CONFIGURE --enable-nyx --enable-nyx-static
+      ;;
+    "lto")
+      $QEMU_CONFIGURE --enable-nyx --enable-nyx-static --enable-nyx-flto
+      ;;
+    *)
+      error
+      ;;
+  esac
 }
 
-compile () {
-  if [ -f GNUmakefile ]; then
-    rm GNUmakefile 2> /dev/null
-  fi
-
-  make -j
-  echo "[!] QEMU-Nyx is ready!"
+compile_qemu()
+{
+  test -f GNUmakefile && rm GNUmakefile 2> /dev/null
+  make -j $(nproc)
 }
 
+
+if [ "$#" -ne 1 ] ; then
+  error
+fi
+
 git submodule init
 git submodule update libxdc
 git submodule update capstone_v4
 
-if [ "$#" == 0 ] ; then
-  error
-fi
-
-if [ "$1" == "dynamic" ]; 
-then 
-
-  make clean
-  compile_and_install_libraries
-  ./configure --target-list=x86_64-softmmu --disable-gtk --disable-docs --enable-gtk --disable-werror --disable-capstone --disable-libssh --enable-nyx --disable-tools
-  compile
-  exit 0
-fi
-
-if [ "$1" == "debug" ]; 
-then 
-
-  make clean
-  compile_and_install_libraries
-  ./configure --target-list=x86_64-softmmu --disable-gtk --disable-docs --enable-gtk --disable-werror --disable-capstone --disable-libssh --enable-nyx --enable-sanitizers --enable-debug --disable-tools
-  compile
-  exit 0
-fi
-
-if [ "$1" == "debug_static" ]; 
-then 
-
-  make clean
-  compile_libraries
-  ./configure --target-list=x86_64-softmmu --disable-gtk --disable-docs --enable-gtk --disable-werror --disable-capstone --disable-libssh --enable-nyx --enable-sanitizers --enable-debug --enable-nyx-static --disable-tools
-  compile
-  exit 0
-fi
-
-if [ "$1" == "static" ]; 
-then 
-
-  make clean
-  compile_libraries
-  ./configure --target-list=x86_64-softmmu --disable-gtk --disable-docs --enable-gtk --disable-werror --disable-capstone --disable-libssh --enable-nyx --enable-nyx-static --disable-tools
-  compile
-  exit 0
-fi
-
-if [ "$1" == "lto" ]; 
-then 
-
-  make clean
-  compile_libraries
-  ./configure --target-list=x86_64-softmmu --disable-gtk --disable-docs --enable-gtk --disable-werror --disable-capstone --disable-libssh --enable-nyx --enable-nyx-static --enable-nyx-flto --disable-tools
-  compile
-  exit 0
-fi
-
-error
-exit 1
+make clean
+compile_libraries $1
+configure_qemu $1
+compile_qemu

From c3bbf86ddd757c2c31b4237e43d3f4a05b30e8fa Mon Sep 17 00:00:00 2001
From: Steffen Schulz <steffen.schulz@intel.com>
Date: Wed, 27 Apr 2022 00:45:39 +0200
Subject: [PATCH 2/4] avoid hardcoded paths in configure script

Allows calling configure with custom libxdc/capstone locations
---
 compile_qemu_nyx.sh | 10 ++++++++++
 configure           |  3 +--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/compile_qemu_nyx.sh b/compile_qemu_nyx.sh
index 2d7ec6c466..8b236ec2bf 100755
--- a/compile_qemu_nyx.sh
+++ b/compile_qemu_nyx.sh
@@ -59,6 +59,16 @@ configure_qemu()
 {
   QEMU_CONFIGURE="./configure --target-list=x86_64-softmmu --disable-gtk --disable-docs --enable-gtk --disable-werror --disable-capstone --disable-libssh --disable-tools"
 
+  case $1 in
+    "debug_static"|"static"|"lto")
+      export LIBS="-L$PWD/capstone_v4/ -L$PWD/libxdc/ $LIBS"
+      export QEMU_CFLAGS="-I$PWD/capstone_v4/include/ -I$PWD/libxdc/ $QEMU_CFLAGS"
+      ;;
+    *)
+      error
+      ;;
+  esac
+
   case $1 in
     "dynamic")
       $QEMU_CONFIGURE --enable-nyx
diff --git a/configure b/configure
index b753ee9c64..af144b6690 100755
--- a/configure
+++ b/configure
@@ -6105,8 +6105,7 @@ if test "$nyx" = "yes" ; then
   CFLAGS="-DNESTED_PATCH -Wno-error=maybe-uninitialized -DQEMU_NYX -g -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $QEMU_CFLAGS"
 
   if test "$nyx_static" = "yes" ; then
-    LIBS="-L$PWD/capstone_v4/ -l:libcapstone.a -L$PWD/libxdc/ -l:libxdc.a -I$PWD/capstone_v4/include/ -I$PWD/libxdc/ $LIBS"
-    QEMU_INCLUDES=" -I$PWD/capstone_v4/include/ -I$PWD/libxdc/ $QEMU_INCLUDES"
+    LIBS="-l:libcapstone.a -l:libxdc.a $LIBS"
   else
     LIBS="-lcapstone -lxdc $LIBS"
   fi

From ec36a3551f10a7f78ea8909a16079b5a034e6b66 Mon Sep 17 00:00:00 2001
From: Steffen Schulz <steffen.schulz@intel.com>
Date: Wed, 27 Apr 2022 01:28:10 +0200
Subject: [PATCH 3/4] extra LDFLAGS needed for libxdc `dev` version +
 ptdump_static

Note sure why -Llibxdc is needed when libxdc Makefile contains -L.?
---
 compile_qemu_nyx.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compile_qemu_nyx.sh b/compile_qemu_nyx.sh
index 8b236ec2bf..533409fee2 100755
--- a/compile_qemu_nyx.sh
+++ b/compile_qemu_nyx.sh
@@ -43,7 +43,7 @@ compile_libraries()
   make -C capstone_v4 -j $(nproc)
 
   echo "[!] Compiling libxdc..."
-  CFLAGS="-I$PWD/capstone_v4/include/" make -C libxdc -j $(nproc)
+  LDFLAGS="-L$PWD/capstone_v4 -L$PWD/libxdc" CFLAGS="-I$PWD/capstone_v4/include/" make -C libxdc -j $(nproc)
 
   case $1 in
     "dynamic"|"debug")

From 02d6e1545cc8ef9ee842543a1127221df2f8310b Mon Sep 17 00:00:00 2001
From: Steffen Schulz <steffen.schulz@intel.com>
Date: Wed, 27 Apr 2022 01:34:08 +0200
Subject: [PATCH 4/4] allow to override libxdc/capstone repo locations

Fetch submodules only if either LIBXDC_ROOT or CAPSTONE_ROOT are empty.
---
 compile_qemu_nyx.sh | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/compile_qemu_nyx.sh b/compile_qemu_nyx.sh
index 533409fee2..0dc40aa558 100755
--- a/compile_qemu_nyx.sh
+++ b/compile_qemu_nyx.sh
@@ -40,17 +40,17 @@ error()
 compile_libraries()
 {
   echo "[!] Compiling capstone4..."
-  make -C capstone_v4 -j $(nproc)
+  make -C $CAPSTONE_ROOT -j $(nproc)
 
   echo "[!] Compiling libxdc..."
-  LDFLAGS="-L$PWD/capstone_v4 -L$PWD/libxdc" CFLAGS="-I$PWD/capstone_v4/include/" make -C libxdc -j $(nproc)
+  LDFLAGS="-L$CAPSTONE_ROOT -L$LIBXDC_ROOT" CFLAGS="-I$CAPSTONE_ROOT/include/" make -C $LIBXDC_ROOT -j $(nproc)
 
   case $1 in
     "dynamic"|"debug")
       echo "[!] Installing capstone4..."
-      sudo make -C capstone_v4 install
+      sudo make -C $CAPSTONE_ROOT install
       echo "[!] Installing libxdc..."
-      sudo make -C libxdc install
+      sudo make -C $LIBXDC_ROOT install
       ;;
   esac
 }
@@ -61,8 +61,8 @@ configure_qemu()
 
   case $1 in
     "debug_static"|"static"|"lto")
-      export LIBS="-L$PWD/capstone_v4/ -L$PWD/libxdc/ $LIBS"
-      export QEMU_CFLAGS="-I$PWD/capstone_v4/include/ -I$PWD/libxdc/ $QEMU_CFLAGS"
+      export LIBS="-L$CAPSTONE_ROOT -L$LIBXDC_ROOT/ $LIBS"
+      export QEMU_CFLAGS="-I$CAPSTONE_ROOT/include/ -I$LIBXDC_ROOT/ $QEMU_CFLAGS"
       ;;
     *)
       error
@@ -102,9 +102,14 @@ if [ "$#" -ne 1 ] ; then
   error
 fi
 
-git submodule init
-git submodule update libxdc
-git submodule update capstone_v4
+if [ -z "$LIBXDC_ROOT" -o -z "$CAPSTONE_ROOT" ]; then
+	git submodule init
+	git submodule update libxdc
+	git submodule update capstone_v4
+	
+	LIBXDC_ROOT="$PWD/libxdc"
+	CAPSTONE_ROOT="$PWD/capstone_v4"
+fi
 
 make clean
 compile_libraries $1