diff --git a/tools/p1xform.doxform.sh b/tools/p1xform.doxform.sh index 6e2026c222d0efbe27cfe5e3fa6dbb8b464d1e23..d95e03ba289d2d6817c84459b6cdceb0083c28d3 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 b35ff04831651e832bb9489eba1af1d7d22d788c..d37485a857ed1e136b91b8dc18afced824328265 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