Mercurial > hg > Members > kono > nitros9-code

changeset 2664:09feb97c181f lwtools-port

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Initial changes to use lwasm instead of mamou Initial high level changes to use lwasm instead of mamou.
author William Astle <lost@l-w.ca>
date Sun, 10 Jun 2012 12:40:11 -0600
parents 2b5464e388a2
children ead8a007432b
files level1/coco/cmds/makefile level1/coco/defs/makefile level1/coco/modules/makefile level2/coco3_6309/makefile rules.mak
diffstat 5 files changed, 82 insertions(+), 82 deletions(-) [+]
line wrap: on
line diff
--- a/level1/coco/cmds/makefile	Wed May 30 22:20:07 2012 -0600
+++ b/level1/coco/cmds/makefile	Sun Jun 10 12:40:11 2012 -0600
@@ -6,7 +6,7 @@
 
 DEPENDS		= ./makefile
 
-AFLAGS		+= -i=$(NITROS9DIR)/3rdparty/packages/basic09
+AFLAGS		+= --includedir=$(NITROS9DIR)/3rdparty/packages/basic09
 LFLAGS		+= -l=$(NITROS9DIR)/lib/net.l -l=$(NITROS9DIR)/lib/alib.l -l=$(NITROS9DIR)/lib/sys6809l1.l
 
 BASIC09FILES	= basic09.asm runb.asm gfx.asm inkey.asm syscall.asm
--- a/level1/coco/defs/makefile	Wed May 30 22:20:07 2012 -0600
+++ b/level1/coco/defs/makefile	Sun Jun 10 12:40:11 2012 -0600
@@ -3,7 +3,7 @@
 
 DEPENDS		= ./makefile
 
-DEFOPTS		= -ls -x -z -aLevel=1
+DEFOPTS		= -DLevel=1
 DEFSDIR		= ../../../defs
 DEFS		= defsfile os9.d rbf.d scf.d coco.d cocovtio.d
 ALLOBJS		= $(DEFS)
@@ -14,19 +14,19 @@
 	$(AS) $(DEFOPTS) -p $< > $@
 
 os9.d: $(DEFSDIR)/os9.d
-	$(AS) $(DEFOPTS) -aOS9.D=0 $< > $@
+	$(AS) $(DEFOPTS) -DOS9.D=0 $< > $@
 
 rbf.d: $(DEFSDIR)/rbf.d
-	$(AS) $(DEFOPTS) -aRBF.D=0 $< > $@
+	$(AS) $(DEFOPTS) -DRBF.D=0 $< > $@
 
 scf.d: $(DEFSDIR)/scf.d
-	$(AS) $(DEFOPTS) -aSCF.D=0 $< > $@
+	$(AS) $(DEFOPTS) -DSCF.D=0 $< > $@
 
 coco.d: $(DEFSDIR)/coco.d
-	$(AS) $(DEFOPTS) -aCOCO.D=0 $< > $@
+	$(AS) $(DEFOPTS) -DCOCO.D=0 $< > $@
 
 cocovtio.d: $(DEFSDIR)/cocovtio.d
-	$(AS) $(DEFOPTS) -aCOCOVTIO.D=0 $< > $@
+	$(AS) $(DEFOPTS) -DCOCOVTIO.D=0 $< > $@
 
 clean:
 	$(RM) $(DEFS)
--- a/level1/coco/modules/makefile	Wed May 30 22:20:07 2012 -0600
+++ b/level1/coco/modules/makefile	Sun Jun 10 12:40:11 2012 -0600
@@ -5,18 +5,18 @@
 
 AFLAGS		+= -I$(LEVEL1)/modules
 
-CLOCKELIM       = -aRTCElim=1
-CLOCKDISTO2     = -aRTCDsto2=1
-CLOCKDISTO4     = -aRTCDsto4=1
-CLOCKBNB        = -aRTCBB=1
-CLOCKSMART      = -aRTCSmart=1 -aMPIFlag=1
-CLOCKHARRIS     = -aRTCHarrs=1
-CLOCKCLOUD9     = -aRTCCloud9=1
-CLOCKSOFT       = -aRTCSoft=1
-CLOCKMESSEMU    = -aRTCMessEmu=1
-CLOCKJVEMU      = -aRTCJVEmu=1
-TC3FLAGS        = $(AFLAGS) -aTC3=1 $(FLAGS)
-IDEFLAGS        = $(AFLAGS) -aIDE=1 $(FLAGS)
+CLOCKELIM       = -DRTCElim=1
+CLOCKDISTO2     = -DRTCDsto2=1
+CLOCKDISTO4     = -DRTCDsto4=1
+CLOCKBNB        = -DRTCBB=1
+CLOCKSMART      = -DRTCSmart=1 -DMPIFlag=1
+CLOCKHARRIS     = -DRTCHarrs=1
+CLOCKCLOUD9     = -DRTCCloud9=1
+CLOCKSOFT       = -DRTCSoft=1
+CLOCKMESSEMU    = -DRTCMessEmu=1
+CLOCKJVEMU      = -DRTCJVEmu=1
+TC3FLAGS        = $(AFLAGS) -DTC3=1 $(FLAGS)
+IDEFLAGS        = $(AFLAGS) -DIDE=1 $(FLAGS)
 
 DEPENDS		= ./makefile
 TPB		= $(3RDPARTY)/booters
@@ -81,22 +81,22 @@
 
 # DriveWire 3
 boot_dw3_coco1: boot_dw3.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aBAUD38400=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DBAUD38400=1
 
 dw3_coco1.sb: dw3.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aBAUD38400=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DBAUD38400=1
 
 boot_1773_6ms:	boot_1773.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0 -aSTEP=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=0 -DSTEP=0
 
 boot_1773_30ms:	boot_1773.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0 -aSTEP=3
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=0 -DSTEP=3
 
 rb1773_scii_ff74.dr:	rb1773.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aSCII=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DSCII=1
 
 rb1773_scii_ff58.dr:	rb1773.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aSCII=1 -aSCIIALT=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DSCII=1 -DSCIIALT=1
 
 # TC^3 SCSI Driver
 lltc3.dr: llscsi.asm
@@ -107,120 +107,120 @@
 	$(AS) $(ASOUT)$@ $< $(IDEFLAGS)
 
 # Floppy descriptors
-SSDD35		= -aCyls=35 -aSides=1 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=3 -aSAS=8 -aDensity=1
-DSDD40		= -aCyls=40 -aSides=2 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=3 -aSAS=8 -aDensity=1
-DSDD80		= -aCyls=80 -aSides=2 -aSectTrk=18 -aSectTrk0=18 \
-		-aInterlv=3 -aSAS=8 -aDensity=1 -aD35
+SSDD35		= -DCyls=35 -DSides=1 -DSectTrk=18 -DSectTrk0=18 \
+		-DInterlv=3 -DSAS=8 -DDensity=1
+DSDD40		= -DCyls=40 -DSides=2 -DSectTrk=18 -DSectTrk0=18 \
+		-DInterlv=3 -DSAS=8 -DDensity=1
+DSDD80		= -DCyls=80 -DSides=2 -DSectTrk=18 -DSectTrk0=18 \
+		-DInterlv=3 -DSAS=8 -DDensity=1 -DD35
 
 ddd0_35s.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=0 -aDD=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -DDNum=0 -DDD=1
 
 d0_35s.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -DDNum=0
 
 d1_35s.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -DDNum=1
 
 d2_35s.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=2
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -DDNum=2
 
 d3_35s.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -aDNum=3
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(SSDD35) -DDNum=3
 
 ddd0_40d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=0 -aDD=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -DDNum=0 -DDD=1
 
 d0_40d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -DDNum=0
 
 d1_40d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -DDNum=1
 
 d2_40d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -aDNum=2
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD40) -DDNum=2
 
 ddd0_80d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=0 -aDD=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=0 -DDD=1
 
 d0_80d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=0
 
 d1_80d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=1
 
 d2_80d.dd: rb1773desc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -aDNum=2
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) $(DSDD80) -DDNum=2
 
 # DriveWire 3 SCF descriptors
 term_scdwn.dt: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=0
 
 n_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=255
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=255
 
 n1_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=1
 
 n2_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=2
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=2
 
 n3_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=3
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=3
 
 n4_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=4
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=4
 
 n5_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=5
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=5
 
 n6_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=6
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=6
 
 n7_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=7
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=7
 
 n8_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=8
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=8
 
 n9_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=9
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=9
 
 n10_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=10
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=10
 
 n11_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=11
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=11
 
 n12_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=12
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=12
 
 n13_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=13
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=13
 
 midi_scdwn.dd: scdwndesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aAddr=14
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DAddr=14
 
 # DriveWire 3 RBF descriptors
 ddx0.dd: dwdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDD=1 -aDNum=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDD=1 -DDNum=0
 
 x0.dd: dwdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=0
 
 x1.dd: dwdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=1
 
 x2.dd: dwdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=2
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=2
 
 x3.dd: dwdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=3
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=3
 
 # TC^3 SCSI Descriptors
 dds0_tc3.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID0) -aDD=1
+	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID0) -DDD=1
 
 s0_tc3.dd: superdesc.asm
 	$(AS) $(ASOUT)$@ $< $(TC3FLAGS) $(ID0) $(SCSI_HD)
@@ -248,7 +248,7 @@
 
 # IDE Descriptors
 ddi0_ide.dd: superdesc.asm
-	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(MASTER) -aDD=1
+	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(MASTER) -DDD=1
 
 i0_ide.dd: superdesc.asm
 	$(AS) $(ASOUT)$@ $< $(IDEFLAGS) $(MASTER)
@@ -261,41 +261,41 @@
 
 # RFM descriptors
 ddy0.dd: rfmdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDD=1 -aDNum=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDD=1 -DDNum=0
 
 y0.dd: rfmdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=0
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=0
 
 y1.dd: rfmdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=1
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=1
 
 y2.dd: rfmdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=2
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=2
 
 y3.dd: rfmdesc.asm
-	$(AS) $< $(ASOUT)$@ $(AFLAGS) -aDNum=3
+	$(AS) $< $(ASOUT)$@ $(AFLAGS) -DDNum=3
 
 rel: rel.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aDragon64=0
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DDragon64=0
 
 sysgo_dd: sysgo.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aDD=1
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DDD=1
 
 sysgo_h0: sysgo.asm
 	$(AS) $(AFLAGS) $(ASOUT)$@ $<
 
 # Clocks
 clock_60hz: clock.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aPwrLnFrq=60
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DPwrLnFrq=60
 
 clock_50hz: clock.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aPwrLnFrq=50
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DPwrLnFrq=50
 
 clock2_bnb: clock2_ds1315.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aBNB=1
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DBNB=1
 
 clock2_cloud9: clock2_ds1315.asm
-	$(AS) $(AFLAGS) $(ASOUT)$@ $< -aCLOUD9=1
+	$(AS) $(AFLAGS) $(ASOUT)$@ $< -DCLOUD9=1
 
 clean:
 	$(CD) kernel; make $@
--- a/level2/coco3_6309/makefile	Wed May 30 22:20:07 2012 -0600
+++ b/level2/coco3_6309/makefile	Sun Jun 10 12:40:11 2012 -0600
@@ -1,4 +1,4 @@
 CPU=6309
 include ../coco3/makefile_common
-AFLAGS += -e -aH6309=1
+AFLAGS += -DH6309=1
 
--- a/rules.mak	Wed May 30 22:20:07 2012 -0600
+++ b/rules.mak	Sun Jun 10 12:40:11 2012 -0600
@@ -42,12 +42,12 @@
 #ASOUT		= o=
 
 # Use the cross assembler
-AS		= mamou -i=$(DEFSDIR)
 #AS		= os9asm -i=$(DEFSDIR)
+AS		= lwasm --6309 --format=os9 --pragma=pcaspcr,nosymbolcase,condundefzero --includedir=$(DEFSDIR)
 ASOUT		= -o
-AFLAGS		= -q -aNOS9VER=$(NOS9VER) -aNOS9MAJ=$(NOS9MAJ) -aNOS9MIN=$(NOS9MIN) -aNOS9DBG=$(NOS9DBG)
+AFLAGS		= -DNOS9VER=$(NOS9VER) -DNOS9MAJ=$(NOS9MAJ) -DNOS9MIN=$(NOS9MIN) -DNOS9DBG=$(NOS9DBG)
 ifdef PORT
-AFLAGS		+= -a$(PORT)=1
+AFLAGS		+= -D$(PORT)=1
 endif
 
 # RMA/RLINK