Added Basic library.

diff --git a/lib/6500/descr b/lib/6500/descr
index d6325b8..a824253 100644 (file)
--- a/lib/6500/descr
+++ b/lib/6500/descr
@@ -25,8 +25,11 @@ name asld
        mapflag -l* LNAME={EM}/{LIB}*
        mapflag -i  IFILE={EM}/{RT}i
        args {IFILE?} (.e:{HEAD}={EM}/{RT}em) \
-({RTS}:.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
-(.p:{TAIL}={EM}/{LIB}pc) (.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
-(.p.c:{TAIL}={EM}/{LIB}mon) (.e:{TAIL}={EM}/{LIB}em {EM}/{LIB}em.vend)
+               ({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+               (.p:{TAIL}={EM}/{LIB}pc) \
+               (.b:{TAIL}={EM}/{LIB}bc) \
+               (.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+               (.b.c.p:{TAIL}={EM}/{LIB}mon) \
+               (.e:{TAIL}={EM}/{LIB}em {EM}/{LIB}em.vend)
        linker
 end

diff --git a/lib/6809/descr b/lib/6809/descr
index 683a21e..c6e5b18 100644 (file)
--- a/lib/6809/descr
+++ b/lib/6809/descr
@@ -7,25 +7,30 @@ var f=4
 var d=8
 var NAME=m6809
 var M=6809
-var LIB=mach/6809/lib/tail_
-var RT=mach/6809/lib/head_
+var LIB=lib/{M}/tail_
+var RT=lib/{M}/head_
 var INCLUDES=-I{EM}/include -I/usr/include
 name be
-       from .m
+       from .m.g
        to .s
-       program {EM}/lib/{M}_be
+       program {EM}/lib/{M}/be
        args <
-       prop >
+       stdout
        need .e
 end
 name asld
        from .s.a
-       to a.out
-       program {EM}/lib/{M}_as
+       to .out
+       outfile a.out
+       program {EM}/lib/{M}/as
        mapflag -l* LNAME={EM}/{LIB}*
-       args (.e:{HEAD}={EM}/{RT}em) \
-({RTS}:.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
-(.p:{TAIL}={EM}/{LIB}pc) (.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
-(.c.p:{TAIL}={EM}/{LIB}mon) (.e:{TAIL}={EM}/{LIB}em)
-       prop C
+       mapflag -d* ASFL={ASFL?} -d*
+       args {ASFL?} (.e:{HEAD}={EM}/{RT}em) \
+               ({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+               (.p:{TAIL}={EM}/{LIB}pc) \
+               (.b:{TAIL}={EM}/{LIB}bc) \
+               (.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+               (.b.c.p:{TAIL}={EM}/{LIB}mon) \
+               (.e:{TAIL}={EM}/{LIB}em)
+       linker
 end

diff --git a/lib/em22/descr b/lib/em22/descr
index cb0eca0..96569c2 100644 (file)
--- a/lib/em22/descr
+++ b/lib/em22/descr
@@ -6,23 +6,25 @@ var f=4
 var d=8
 var M=int
 var NAME=int22
-var LIB=mach/int/lib/tail_
-var RT=mach/int/lib/head_
+var LIB=lib/int22/tail_
+var RT=lib/int22/head_
 var SIZE_FLAG=-sm
-var CCP_F=-Dunix
+var CPP_F=-Dunix
 var INCLUDES=-I{EM}/include -I/usr/include
 name asld
-       from .k.m.a
-       to e.out
+       from .k.m.a.g
+       to .out
+       outfile e.out
        program {EM}/lib/em_ass
        mapflag -l* LNAME={EM}/{LIB}*
        mapflag -+* ASS_F={ASS_F?} -+*
        mapflag --* ASS_F={ASS_F?} --*
        mapflag -s* SIZE_FLAG=-s*
        args {SIZE_FLAG} \
-               ({RTS}:.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+               ({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
                (.p:{TAIL}={EM}/{LIB}pc) \
-               (.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
-               (.c.p:{TAIL}={EM}/{LIB}mon)
-       prop C
+               (.b:{TAIL}={EM}/{LIB}bc) \
+               (.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+               (.b.c.p:{TAIL}={EM}/{LIB}mon)
+       linker
 end

diff --git a/lib/i80/descr b/lib/i80/descr
index 3c0ea49..37a75a6 100644 (file)
--- a/lib/i80/descr
+++ b/lib/i80/descr
@@ -6,22 +6,23 @@ var f=4
 var d=8
 var NAME=i8080
 var M=8080
-var LIB=mach/8080/lib/tail_
-var RT=mach/8080/lib/head_
+var LIB=lib/{M}/tail_
+var RT=lib/{M}/head_
 var INCLUDES=-I{EM}/include -I/usr/include
 name be
-       from .m
+       from .m.g
        to .s
-       program {EM}/lib/{M}_be
+       program {EM}/lib/{M}/be
        args <
-       prop >
+       stdout
        need .e
 end
 name asld
        from .s.a
-       to a.out
-       program {EM}/lib/{M}_as
+       to .out
+       outfile a.out
+       program {EM}/lib/{M}/as
        mapflag -l* LNAME={EM}/{LIB}*
        args ({RTS}:.c={EM}/{RT}cc) -o > <
-       prop C
+       linker
 end

diff --git a/lib/i86/descr b/lib/i86/descr
index 4bea559..33d914f 100644 (file)
--- a/lib/i86/descr
+++ b/lib/i86/descr
@@ -6,27 +6,30 @@ var f=4
 var d=8
 var NAME=i8086
 var M=i86
-var LIB=mach/i86/lib/tail_
-var RT=mach/i86/lib/head_
+var LIB=lib/{M}/tail_
+var RT=lib/{M}/head_
 var INCLUDES=-I{EM}/include -I/usr/include
 name be
-       from .m
+       from .m.g
        to .s
-       program {EM}/lib/{M}_cg
+       program {EM}/lib/{M}/cg
        args <
-       prop >
+       stdout
        need .e
 end
 name asld
        from .s.a
-       to a.out
-       program {EM}/lib/{M}_as
+       to .out
+       outfile a.out
+       program {EM}/lib/{M}/as
        mapflag -l* LNAME={EM}/{LIB}*
        mapflag -i  IFILE={EM}/{RT}i
        args {IFILE?} (.e:{HEAD}={EM}/{RT}em) \
-({RTS}:.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
-(.p:{TAIL}={EM}/{LIB}pc) (.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
-(.c.p.e:{TAIL}={EM}/{LIB}alo) (.c.p:{TAIL}={EM}/{LIB}mon) \
-(.e:{TAIL}={EM}/{LIB}em)
-       prop C
+               ({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+               (.p:{TAIL}={EM}/{LIB}pc) \
+               (.b:{TAIL}={EM}/{LIB}bc) \
+               (.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+               (.b.c.p.e:{TAIL}={EM}/{LIB}alo) (.b.c.p:{TAIL}={EM}/{LIB}mon) \
+               (.e:{TAIL}={EM}/{LIB}em)
+       linker
 end

diff --git a/lib/m68k2/descr b/lib/m68k2/descr
index 96ccdc0..e6c5cae 100644 (file)
--- a/lib/m68k2/descr
+++ b/lib/m68k2/descr
@@ -6,26 +6,30 @@ var f=4
 var d=8
 var NAME=m68k2
 var M=m68k2
-var LIB=mach/m68k2/lib/tail_
-var RT=mach/m68k2/lib/head_
-var CCP_F=-Dunix
+var LIB=lib/{M}/tail_
+var RT=lib/{M}/head_
+var CPP_F=-Dunix
 var INCLUDES=-I{EM}/include -I/usr/include
 name be
-       from .m
+       from .m.g
        to .s
-       program {EM}/lib/{M}_cg
+       program {EM}/lib/{M}/cg
        args <
-       prop >
+       stdout
        need .e
 end
 name asld
        from .s.a
-       to a.out
-       program {EM}/lib/{M}_as
+       to .out
+       outfile a.out
+       program {EM}/lib/{M}/as
        mapflag -l* LNAME={EM}/{LIB}*
        args (.e:{HEAD}={EM}/{RT}em) \
-({RTS}:.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
-(.p:{TAIL}={EM}/{LIB}pc) (.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
-(.e:{TAIL}={EM}/{LIB}em.rt {EM}/{LIB}mon {EM}/{LIB}em.vend)
-       prop Cm
+({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+               (.p:{TAIL}={EM}/{LIB}pc) \
+               (.b:{TAIL}={EM}/{LIB}bc) \
+               (.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+               (.e:{TAIL}={EM}/{LIB}em.rt {EM}/{LIB}mon {EM}/{LIB}em.vend)
+       prep cond
+       linker
 end

diff --git a/lib/m68k4/descr b/lib/m68k4/descr
index 4aac96d..35105f0 100644 (file)
--- a/lib/m68k4/descr
+++ b/lib/m68k4/descr
@@ -6,30 +6,32 @@ var f=4
 var d=8
 var NAME=m68k4
 var M=m68k4
-var LIBDIR=mach/m68k4/lib
-var LIB=mach/m68k4/lib/tail_
-var RT=mach/m68k4/lib/head_
-var CCP_F=-Dunix
+var LIBDIR=/lib/{M}
+var LIB=lib/{M}/tail_
+var RT=lib/{M}/head_
+var CPP_F=-Dunix
 var INCLUDES=-I{EM}/include -I/usr/include
 name be
-       from .m
+       from .m.g
        to .s
-       program {EM}/lib/{M}_cg
+       program {EM}/lib/{M}/cg
        args <
-       prop >
+       stdout
        need .e
 end
 name asld
        from .s.a
-       to a.out
-       program {EM}/lib/{M}_as
+       to .out
+       outfile a.out
+       program {EM}/lib/{M}/as
        mapflag -l* LNAME={EM}/{LIB}*
        args (.e:{HEAD}={EM}/{RT}em) \
-({RTS}:.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
-(.p.c:{TAIL}={EM}/{LIBDIR}/sys1.s) (.p:{TAIL}={EM}/{LIBDIR}/sys2.s) \
-(.c:{TAIL}={EM}/{LIBDIR}/write.s) \
-(.p:{TAIL}={EM}/{LIB}pc) (.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
-(.c:{TAIL}={EM}/{LIB}mon {EM}/{LIB}fake) \
+({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+(.p.c.b:{TAIL}={EM}/{LIBDIR}/sys1.s) (.p:{TAIL}={EM}/{LIBDIR}/sys2.s) \
+(.c.b:{TAIL}={EM}/{LIBDIR}/write.s) \
+(.p:{TAIL}={EM}/{LIB}pc) (.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+(.c.b:{TAIL}={EM}/{LIB}mon {EM}/{LIB}fake) \
 (.e:{TAIL}={EM}/{LIB}em.rt {EM}/{LIB}em.vend)
-       prop Cm
+       prep cond
+       linker
 end

diff --git a/lib/ns/descr b/lib/ns/descr
index 4e5370c..d41bbd5 100644 (file)
--- a/lib/ns/descr
+++ b/lib/ns/descr
@@ -16,8 +16,11 @@ name asld
        program {EM}/lib/{M}/as
        mapflag -l* LNAME={EM}/{LIB}*
        args (.e:{HEAD}={EM}/{RT}em) \
-({RTS}:.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
-(.p:{TAIL}={EM}/{LIB}pc) (.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
-(.p.c:{TAIL}={EM}/{LIB}mon) (.e:{TAIL}={EM}/{LIB}em {EM}/{LIB}em.vend)
+               ({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+               (.p:{TAIL}={EM}/{LIB}pc) \
+               (.b:{TAIL}={EM}/{LIB}bc) \
+               (.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+               (.b.c.p:{TAIL}={EM}/{LIB}mon) \
+               (.e:{TAIL}={EM}/{LIB}em {EM}/{LIB}em.vend)
        linker
 end

diff --git a/lib/pmds/descr b/lib/pmds/descr
index d595371..8b3205c 100644 (file)
--- a/lib/pmds/descr
+++ b/lib/pmds/descr
@@ -34,9 +34,11 @@ name asld
        mapflag -n*
        mapflag -i*
        args {LFLAG?} (.e:{HEAD}={EM}/{PMDSRT}em) \
-({RTS}:.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
-(.p:{TAIL}={EM}/{LIB}pc) (.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
-(.e:{TAIL}={EM}/{LIB}em.rt {EM}/{PMDSLIB}mon {EM}/{LIB}em.vend)
+               ({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+               (.p:{TAIL}={EM}/{LIB}pc) \
+               (.b:{TAIL}={EM}/{LIB}bc) \
+               (.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+               (.e:{TAIL}={EM}/{LIB}em.rt {EM}/{PMDSLIB}mon {EM}/{LIB}em.vend)
        prep cond
        linker
 end

diff --git a/lib/s2650/descr b/lib/s2650/descr
index 987e65a..9eb8700 100644 (file)
--- a/lib/s2650/descr
+++ b/lib/s2650/descr
@@ -16,8 +16,11 @@ name asld
        program {EM}/lib/{M}/as
        mapflag -l* LNAME={EM}/{LIB}*
        args (.e:{HEAD}={EM}/{RT}em) \
-({RTS}:.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
-(.p:{TAIL}={EM}/{LIB}pc) (.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
-(.p.c:{TAIL}={EM}/{LIB}mon) (.e:{TAIL}={EM}/{LIB}em)
+               ({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+               (.p:{TAIL}={EM}/{LIB}pc) \
+               (.b:{TAIL}={EM}/{LIB}bc) \
+               (.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+               (.b.c.p:{TAIL}={EM}/{LIB}mon) \
+               (.e:{TAIL}={EM}/{LIB}em)
        linker
 end

diff --git a/lib/vax4/descr.src b/lib/vax4/descr.src
index bd5f77d..b83d724 100644 (file)
--- a/lib/vax4/descr.src
+++ b/lib/vax4/descr.src
@@ -6,15 +6,16 @@ var f=4
 var d=8
 var M=vax4
 var NAME=vax4
-var LIB=mach/vax4/lib/tail_
-var RT=mach/vax4/lib/head_
+var LIB=lib/{M}/tail_
+var RT=lib/{M}/head_
+var CPP_F=-Dunix
 var INCLUDES=-I{EM}/include -I/usr/include
 name be
-       from .m
+       from .m.g
        to .s
-       program {EM}/lib/{M}_cg
+       program {EM}/lib/{M}/cg
        args <
-       prop >
+       stdout
        need .e
 end
 name asopt
@@ -22,23 +23,29 @@ name asopt
        to .so
        program /bin/sed
        args -f {EM}/mach/vax4/cg/sedf
-       prop O<>
+       optimizer
+       stdin
+       stdout
 end
 name as
        from .s.so
        to .o
        program /bin/as
        args - -o > <
-       prop m
+       prep cond
 end
 name ld
        from .o.a
-       to a.out
+       to .out
+       outfile a.out
        program /bin/ld
        mapflag -l* LNAME={EM}/{LIB}*
        args (.e:{HEAD}={EM}/{RT}em) \
-({RTS}:.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
-(.p:{TAIL}={EM}/{LIB}pc) (.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
-(.c.p:{TAIL}={EM}/{LIB}mon) (.e:{TAIL}={EM}/{LIB}em)
-       prop C
+               ({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+               (.p:{TAIL}={EM}/{LIB}pc) \
+               (.b:{TAIL}={EM}/{LIB}bc) \
+               (.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+               (.b.c.p:{TAIL}={EM}/{LIB}mon) \
+               (.e:{TAIL}={EM}/{LIB}em)
+       linker
 end

diff --git a/lib/z80/descr b/lib/z80/descr
index 37a362e..af1e8f1 100644 (file)
--- a/lib/z80/descr
+++ b/lib/z80/descr
@@ -6,26 +6,30 @@ var f=4
 var d=8
 var NAME=z80
 var M=z80
-var LIB=mach/z80/lib/tail_
-var RT=mach/z80/lib/head_
+var LIB=lib/{M}/tail_
+var RT=lib/{M}/head_
 var INCLUDES=-I{EM}/include -I/usr/include
 name be
-       from .m
+       from .m.g
        to .s
-       program {EM}/lib/{M}_cg
+       program {EM}/lib/{M}/cg
        args <
-       prop >
+       stdout
        need .e
 end
 name asld
        from .s.a
-       to a.out
-       program {EM}/lib/{M}_as
+       to .out
+       outfile a.out
+       program {EM}/lib/{M}/as
        mapflag -l* LNAME={EM}/{LIB}*
        mapflag -i  IFILE={EM}/{RT}i
        args {IFILE?} (.e:{HEAD}={EM}/{RT}em) \
-({RTS}:.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
-(.p:{TAIL}={EM}/{LIB}pc) (.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
-(.p.c:{TAIL}={EM}/{LIB}mon) (.e:{TAIL}={EM}/{LIB}em)
-       prop C
+               ({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+               (.p:{TAIL}={EM}/{LIB}pc) \
+               (.b:{TAIL}={EM}/{LIB}bc) \
+               (.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+               (.b.c.p:{TAIL}={EM}/{LIB}mon) \
+               (.e:{TAIL}={EM}/{LIB}em)
+       linker
 end

diff --git a/lib/z8000/descr b/lib/z8000/descr
index 823c463..09085ca 100644 (file)
--- a/lib/z8000/descr
+++ b/lib/z8000/descr
@@ -6,26 +6,30 @@ var f=4
 var d=8
 var NAME=z8000
 var M=z8000
-var LIB=mach/z8000/lib/tail_
-var RT=mach/z8000/lib/head_
+var LIB=lib/{M}/tail_
+var RT=lib/{M}/head_
 var INCLUDES=-I{EM}/include -I/usr/include
 name be
-       from .m
+       from .m.g
        to .s
-       program {EM}/lib/{M}_cg
+       program {EM}/lib/{M}/cg
        args <
-       prop >
+       stdout
        need .e
 end
 name asld
        from .s.a
-       to a.out
-       program {EM}/lib/{M}_as
+       to .out
+       outfile a.out
+       program {EM}/lib/{M}/as
        mapflag -l* LNAME={EM}/{LIB}*
        mapflag -i  IFILE={EM}/{RT}i
        args {IFILE?} (.e:{HEAD}={EM}/{RT}em) \
-({RTS}:.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
-(.p:{TAIL}={EM}/{LIB}pc) (.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
-(.p.c:{TAIL}={EM}/{LIB}mon) (.e:{TAIL}={EM}/{LIB}em)
-       prop C
+({RTS}:.b.c={EM}/{RT}cc) ({RTS}:.p={EM}/{RT}pc) -o > < \
+               (.p:{TAIL}={EM}/{LIB}pc) \
+               (.b:{TAIL}={EM}/{LIB}bc) \
+               (.b.c:{TAIL}={EM}/{LIB}cc.1s {EM}/{LIB}cc.2g) \
+               (.b.c.p:{TAIL}={EM}/{LIB}mon) \
+               (.e:{TAIL}={EM}/{LIB}em)
+       linker
 end