New installation mechanism

diff --git a/mach/ns/.distr b/mach/ns/.distr
index 5dcdb05..8d2e3f0 100644 (file)
--- a/mach/ns/.distr
+++ b/mach/ns/.distr
@@ -1,10 +1,7 @@
 Action
 as
 ncg
-libbc
-libcc
-libpc
 libem
-libsys
-liboc
-libm2
+libend
+libmon
+mach_params

diff --git a/mach/ns/Action b/mach/ns/Action
index fd9654a..e6842e0 100644 (file)
--- a/mach/ns/Action
+++ b/mach/ns/Action
@@ -7,21 +7,9 @@ end
 name "NS16032 EM library"
 dir libem
 end
-name "NS16032 system call library"
-dir libsys
-end
-name "NS16032 C libraries"
-dir libcc
-end
-name "NS16032 Pascal library"
-dir libpc
+name "NS16032 etext,edata,end library"
+dir libend
 end
-name "NS16032 Basic library"
-dir libbc
-end
-name "NS16032 Occam library"
-dir liboc
-end
-name "NS16032 Modula-2 library"
-dir libm2
+name "NS16032 system call library"
+dir libmon
 end

diff --git a/mach/ns/libem/.distr b/mach/ns/libem/.distr
index e862ca9..d2b4f28 100644 (file)
--- a/mach/ns/libem/.distr
+++ b/mach/ns/libem/.distr
@@ -1,5 +1,2 @@
 LIST
-Makefile
-compmodule
-end.s
 libem_s.a

diff --git a/mach/ns/libem/LIST b/mach/ns/libem/LIST
index c5a5ebc..6869744 100644 (file)
--- a/mach/ns/libem/LIST
+++ b/mach/ns/libem/LIST
@@ -12,7 +12,6 @@ sts.s
 gto.s
 cii.s
 cms.s
-mon.s
 cmu.s
 dvu.s
 rmu.s

diff --git a/mach/ns/libem/putchar.s b/mach/ns/libem/putchar.s
index 2d985de..9cdd0f8 100644 (file)
--- a/mach/ns/libem/putchar.s
+++ b/mach/ns/libem/putchar.s
@@ -14,7 +14,7 @@
        movqd   1,tos
        addr    8(fp),tos
        movqd   1,tos
-       bsr     _write
+       bsr     __write
        adjspb  -12
        exit    []
        ret     0

diff --git a/mach/ns/libem/strhp.s b/mach/ns/libem/strhp.s
index 4ace7d4..e0dcd7a 100644 (file)
--- a/mach/ns/libem/strhp.s
+++ b/mach/ns/libem/strhp.s
@@ -10,16 +10,16 @@
        movd    tos,r0
        movd    r7,tos
        movd    r0,@.reghp
-       cmpd    r0,@.limhp
-       blo     I2
-       addd    02000,r0
-       bicd    0777,r0
-       movd    r0,tos
-       jsr     @_brk
-       adjspd  -4
-       cmpqd   0,r0
-       beq     I2
-       movd    EHEAP,tos
-       jsr     @.trp
-I2:
+!      cmpd    r0,@.limhp
+!      blo     I2
+!      addd    02000,r0
+!      bicd    0777,r0
+!      movd    r0,tos
+!      jsr     @__brk
+!      adjspd  -4
+!      cmpqd   0,r0
+!      beq     I2
+!      movd    EHEAP,tos
+!      jsr     @.trp
+!I2:
        ret     0

diff --git a/mach/ns/mach_params b/mach/ns/mach_params
new file mode 100644 (file)
index 0000000..0403538
--- /dev/null
+++ b/mach/ns/mach_params
@@ -0,0 +1,4 @@
+MACH=ns
+SUF=o
+ASAR=aal
+RANLIB=: