Make my modifications to asxv5pxx more proper for sending to upstream

diff --git a/.gitignore b/.gitignore
index 865d49f..1b2bec3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@
 *.bin
 *.hdr
 *.hlr
-*.i86
 *.ihx
 *.lst
 *.map

diff --git a/asxv5pxx b/asxv5pxx
index 3f9daba..cd97f12 160000 (submodule)
--- a/asxv5pxx
+++ b/asxv5pxx
@@ -1 +1 @@
-Subproject commit 3f9dabaf4788ce734ac80be7bfce11329e2a66c8
+Subproject commit cd97f12f9ffb90aa6c6711f875f5203efa79a4e4

diff --git a/disasm/Makefile b/disasm/Makefile
index 3c2608d..222aec8 100644 (file)
--- a/disasm/Makefile
+++ b/disasm/Makefile
@@ -41,7 +41,7 @@ star_blazer.ihx \
 
 star_blazer.ihx: star_blazer.rel
        # add for DHGR: -b data1=0x15c00
-       ${ASLINK} -n -m -u -i \
+       ${ASLINK} -n -m -u -il \
 -b zpage=0 \
 -b udata0=0x200 \
 -b udata1=0x400 \
@@ -49,8 +49,7 @@ star_blazer.ihx: star_blazer.rel
 -b data0=0x4000 \
 -b udata2=0xa800 \
 -b data1=0x15c00 \
-star_blazer.i86 $<
-       mv star_blazer.i86 star_blazer.ihx
+$@ $<
 
 star_blazer.rel: \
 star_blazer.asm \
@@ -61,7 +60,7 @@ pixel_shape_index.inc \
 pixel_shape_data.inc \
 shape_index.inc \
 shape_data.inc
-       ${AS6500} -l -o $<
+       ${AS6500} -3 -l -o $<
 
 star_blazer.asm: \
 trace.txt \
@@ -134,7 +133,6 @@ clean:
 *.a2bin \
 *.bin \
 *.hlr \
-*.i86 \
 *.ihx \
 *.lst \
 *.map \

diff --git a/loader/Makefile b/loader/Makefile
index 39bb20f..e0ba312 100755 (executable)
--- a/loader/Makefile
+++ b/loader/Makefile
@@ -38,8 +38,7 @@ lzss_unpack_rev.bin: lzss_unpack_rev.ihx
        ${HEX2BIN} $< $@
 
 lzss_unpack_rev.ihx: lzss_unpack_rev.rel
-       ${ASLINK} -n -m -u -i -b text=0 lzss_unpack_rev.i86 $^
-       mv lzss_unpack_rev.i86 $@
+       ${ASLINK} -n -m -u -il -b text=0 $@ $^
 
 lzss_unpack_rev.rel: lzss_unpack_rev.asm
        ${AS6500} -l -o $<
@@ -49,8 +48,7 @@ lzss_unpack_rev_aux_mem.bin: lzss_unpack_rev_aux_mem.ihx
 
 lzss_unpack_rev_aux_mem.ihx: lzss_unpack_rev_aux_mem.rel
        # note: runs from stack so its base is 0x100 and it can use jmp
-       ${ASLINK} -n -m -u -i -b text=0x100 lzss_unpack_rev_aux_mem.i86 $^
-       mv lzss_unpack_rev_aux_mem.i86 $@
+       ${ASLINK} -n -m -u -il -b text=0x100 $@ $^
 
 lzss_unpack_rev_aux_mem.rel: lzss_unpack_rev.asm
        sed -e 's/^AUX_MEM = 0/AUX_MEM = 1/' <$< >lzss_unpack_rev_aux_mem.asm
@@ -61,8 +59,7 @@ lzss_unpack_fwd.bin: lzss_unpack_fwd.ihx
        ${HEX2BIN} $< $@
 
 lzss_unpack_fwd.ihx: lzss_unpack_fwd.rel
-       ${ASLINK} -n -m -u -i -b text=0 lzss_unpack_fwd.i86 $^
-       mv lzss_unpack_fwd.i86 $@
+       ${ASLINK} -n -m -u -il -b text=0 $@ $^
 
 lzss_unpack_fwd.rel: lzss_unpack_fwd.asm
        ${AS6500} -l -o $<
@@ -72,8 +69,7 @@ lzss_unpack_fwd_aux_mem.bin: lzss_unpack_fwd_aux_mem.ihx
 
 lzss_unpack_fwd_aux_mem.ihx: lzss_unpack_fwd_aux_mem.rel
        # note: runs from stack so its base is 0x100 and it can use jmp
-       ${ASLINK} -n -m -u -i -b text=0x100 lzss_fwd_aux_mem.i86 $^
-       mv lzss_fwd_aux_mem.i86 $@
+       ${ASLINK} -n -m -u -il -b text=0x100 $@ $^
 
 lzss_unpack_fwd_aux_mem.rel: lzss_unpack_fwd.asm
        sed -e 's/^AUX_MEM = 0/AUX_MEM = 1/' <$< >lzss_unpack_fwd_aux_mem.asm
@@ -99,8 +95,7 @@ lzss_loader.bin: lzss_loader.ihx
        ${HEX2BIN} $< $@
 
 lzss_loader.ihx: lzss_loader.rel
-       ${ASLINK} -n -m -u -i -b text=${LZSS_LOADER} lzss_loader.i86 $^
-       mv lzss_loader.i86 $@
+       ${ASLINK} -n -m -u -il -b text=${LZSS_LOADER} $@ $^
 
 lzss_loader.rel: lzss_loader.asm
        ${AS6500} -l -o $<
@@ -112,8 +107,7 @@ recrack_loader.bin: recrack_loader.ihx
        ${HEX2BIN} $< $@
 
 recrack_loader.ihx: recrack_loader.rel
-       ${ASLINK} -n -m -u -i -b text=${RECRACK_LOADER} recrack_loader.i86 $^
-       mv recrack_loader.i86 $@
+       ${ASLINK} -n -m -u -il -b text=${RECRACK_LOADER} $@ $^
 
 recrack_loader.rel: recrack_loader.asm
        ${AS6500} -l -o $<
@@ -123,7 +117,6 @@ clean:
 *.a2bin \
 *.bin \
 *.hlr \
-*.i86 \
 *.ihx \
 *.lst \
 *.map \

diff --git a/test/Makefile b/test/Makefile
index 2d24d99..016d2af 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -24,8 +24,7 @@ dhgr.a2bin: dhgr.ihx
        rm __temp__.bin
 
 dhgr.ihx: dhgr.rel
-       ${ASLINK} -n -m -u -i -b text=${LOAD_ADDR} dhgr.i86 $^
-       mv dhgr.i86 $@
+       ${ASLINK} -n -m -u -il -b text=${LOAD_ADDR} $@ $^
 
 dhgr.rel: dhgr.asm
        ${AS6500} -l -o $<
@@ -40,8 +39,7 @@ dhgr_viewer.bin: dhgr_viewer.ihx
        ${HEX2BIN} $< $@
 
 dhgr_viewer.ihx: dhgr_viewer.rel
-       ${ASLINK} -n -m -u -i -b text=${LOAD_ADDR} dhgr_viewer.i86 $^
-       mv dhgr_viewer.i86 $@
+       ${ASLINK} -n -m -u -il -b text=${LOAD_ADDR} $@ $^
 
 dhgr_viewer.rel: dhgr_viewer.asm
        ${AS6500} -l -o $<
@@ -52,7 +50,6 @@ clean:
 *.a2bin \
 *.bin \
 *.hlr \
-*.i86 \
 *.ihx \
 *.lst \
 *.map \