From 0b5a943a0e517378d54047a7f2ff1e588c9e21aa Mon Sep 17 00:00:00 2001
From: an7s <an7s@git.zephyr-software.com>
Date: Tue, 22 Mar 2011 14:43:42 +0000
Subject: [PATCH] refactoring

---
 tools/p1xform.doxform.sh | 15 ++++++++++-----
 tools/p1xform.sh         |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/tools/p1xform.doxform.sh b/tools/p1xform.doxform.sh
index 6e2026c22..d95e03ba2 100755
--- a/tools/p1xform.doxform.sh
+++ b/tools/p1xform.doxform.sh
@@ -7,13 +7,17 @@
 #   Binary spri file specification for P1 xform 
 #
 
+FNS=$1             # file containing name of functions to evaluate
+P1_DIR=$2       # directory with assembly SPRI rules
+ASPRI_DIR=$3       # directory with assembly SPRI rules
+
 echo "=========================================="
-echo "Running p1xform.pbed.sh"
+echo "Running p1xform.doxform.sh"
+echo "            FNS: $FNS"
+echo "         P1_DIR: $P1_DIR"
+echo "      ASPRI_DIR: $ASPRI_DIR"
 echo "=========================================="
 
-FNS=$1             # file containing name of functions to evaluate
-ASPRI_DIR=$2       # directory with assembly SPRI rules
-
 NEW_ASPRI_FILE=$ASPRI_DIR/p1.final.aspri
 touch $NEW_ASPRI_FILE
 
@@ -22,4 +26,5 @@ do
   cat $ASPRI_DIR/p1.$fn.aspri >> $NEW_ASPRI_FILE
 done < $FNS
 
-$STRATA_REWRITE/tools/spasm/spasm $NEW_ASPRI_FILE p1.final.bspri
+echo "p1xform.doxform.sh: issuing cmd: $STRATA_REWRITE/tools/spasm/spasm $NEW_ASPRI_FILE p1.final.bspri"
+$STRATA_REWRITE/tools/spasm/spasm $NEW_ASPRI_FILE $P1_DIR/p1.final.bspri
diff --git a/tools/p1xform.sh b/tools/p1xform.sh
index b35ff0483..d37485a85 100755
--- a/tools/p1xform.sh
+++ b/tools/p1xform.sh
@@ -97,6 +97,6 @@ cd $CURRENT_DIR
 $PEASOUP_HOME/tools/p1xform.pbed.sh $P1_DIR $KEEPS $CONCOLIC $BSPRI_DIR
 
 cd $CURRENT_DIR
-$PEASOUP_HOME/tools/p1xform.doxform.sh $P1_DIR/p1.final $ASPRI_DIR
+$PEASOUP_HOME/tools/p1xform.doxform.sh $P1_DIR/p1.final $P1_DIR $ASPRI_DIR
 
 
-- 
GitLab