[Wisp-cvs] wisp/modules linux.wrti,1.9,1.10 universal.wrti,1.11,1.12 wisptyp.wrti,1.7,1.8

[<di...@us...>]

Update of /cvsroot/wisp/wisp/modules
In directory usw-pr-cvs1:/tmp/cvs-serv28473/modules

Modified Files:
	linux.wrti universal.wrti wisptyp.wrti 
Log Message:
Converted sys.nasm to sys.wth and death.c to death.wth .

Index: linux.wrti
===================================================================
RCS file: /cvsroot/wisp/wisp/modules/linux.wrti,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- linux.wrti	8 Aug 2002 17:16:29 -0000	1.9
+++ linux.wrti	4 Sep 2002 14:26:24 -0000	1.10
@@ -10,19 +10,18 @@
 
 (ifndef _linux.wrti_ (define _linux.wrti_)
 
-  (macro sys.exit
-    (->reg 0 %ebx)
-    ,(mov %eax 1)
-    ,(int #x80)
-    ,(\skip))
+  (macro \sys ,(mov %eax ,0) drop ,(int #x80))
+  (macro \skt (stack=! 1) ,(mov %ebx ,0) drop
+    (flush) ,(mov %ecx %esp) 102 \sys)
+
+  (macro sys.exit (->reg 0 %ebx) 1 \sys ,(\skip))
 
   (macro sys.write
     (->reg 0 %edx)
     (->reg 1 %ecx)
     (->reg 2 %ebx)
     (register %eax)
-    ,(mov %eax 4)
-    ,(int #x80)
+    4 \sys
     nip nip nip)
 
   (macro sys.write-char
@@ -32,17 +31,103 @@
     ,(mov %edx 1)
     ,(push %ecx)
     ,(mov %ecx %esp)
-    ,(mov %eax 4)
-    ,(int #x80)
+    4 \sys
     ,(add %esp 4)
     (believe %eax))
 
-  (macro sys.time
-    (register %ebx)
-    (register %eax)
-    ,(mov %eax 13)
-    ,(mov %ebx 0)
-    ,(int #x80)
-    nip))
+  (macro sys.fork (conform) 2 \sys (believe %eax))
+  (macro sys.close (conform %ebx) 6 \sys (believe %eax))
+  (macro sys.creat (conform %ebx %ecx) 8 \sys (believe %eax))
+  (macro sys.chdir (conform %ebx) 12 \sys (believe %eax))
+  ; |sys.time| takes no argument and returns the time
+  (macro sys.time (conform) ,(mov %ebx 0) 13 \sys (believe %eax))
+  (macro sys.chmod (conform %ebx %ecx) 15 \sys (believe %eax))
+  (macro sys.getpid (conform) 20 \sys (believe %eax))
+  (macro sys.setuid (conform %ebx) 23 \sys (believe %eax))
+  (macro sys.getuid (conform) 24 \sys (believe %eax))
+  (macro sys.stime (conform %ebx) 25 \sys (believe %eax))
+  (macro sys.alarm (conform %ebx) 27 \sys (believe %eax))
+  (macro sys.pause (conform) 29 \sys (believe %eax))
+  (macro sys.access (conform %ebx %ecx) 33 \sys (believe %eax))
+  (macro sys.nice (conform %ebx) 34 \sys (believe %eax))
+  ; since sync(2) never fails, |sys.sync| returns nothing
+  (macro sys.sync (conform) 36 \sys (believe))
+  (macro sys.kill (conform %ebx %ecx) 37 \sys (believe %eax))
+  (macro sys.rename (conform %ebx %ecx) 38 \sys (believe %eax))
+  (macro sys.mkdir (conform %ebx %ecx) 39 \sys (believe %eax))
+  (macro sys.rmdir (conform %ebx) 40 \sys (believe %eax))
+  (macro sys.dup (conform %ebx) 41 \sys (believe %eax))
+  (macro sys.brk (conform %ebx) 45 \sys (believe %eax))
+  (macro sys.setgid (conform %ebx) 46 \sys (believe %eax))
+  (macro sys.getgid (conform) 47 \sys (believe %eax))
+  (macro sys.geteuid (conform) 49 \sys (believe %eax))
+  (macro sys.getegid (conform) 50 \sys (believe %eax))
+  (macro sys.setpgid (conform %ebx %ecx) 57 \sys (believe %eax))
+  (macro sys.umask (conform %ebx) 60 \sys (believe %eax))
+  (macro sys.chroot (conform %ebx) 61 \sys (believe %eax))
+  (macro sys.dup2 (conform %ebx %ecx) 63 \sys (believe %eax))
+  (macro sys.getppid (conform) 64 \sys (believe %eax))
+  (macro sys.getpgrp (conform) 65 \sys (believe %eax))
+  (macro sys.setsid (conform) 66 \sys (believe %eax))
+  (macro sys.setreuid (conform %ebx %ecx) 70 \sys (believe %eax))
+  (macro sys.setregid (conform %ebx %ecx) 71 \sys (believe %eax))
+  (macro sys.symlink (conform %ebx %ecx) 83 \sys (believe %eax))
+  (macro sys.swapon (conform %ebx %ecx) 87 \sys (believe %eax))
+  (macro sys.truncate (conform %ebx %ecx) 92 \sys (believe %eax))
+  (macro sys.ftruncate (conform %ebx %ecx) 93 \sys (believe %eax))
+  (macro sys.fchmod (conform %ebx %ecx) 94 \sys (believe %eax))
+  (macro sys.stat (conform %ebx %ecx) 106 \sys (believe %eax))
+  (macro sys.lstat (conform %ebx %ecx) 107 \sys (believe %eax))
+  (macro sys.fstat (conform %ebx %ecx) 108 \sys (believe %eax))
+  (macro sys.vhangup (conform) 111 \sys (believe %eax))
+  (macro sys.swapoff (conform %ebx) 115 \sys (believe %eax))
+  (macro sys.fsync (conform %ebx) 118 \sys (believe %eax))
+  (macro sys.getpgid (conform %ebx) 132 \sys (believe %eax))
+  (macro sys.fchdir (conform %ebx) 133 \sys (believe %eax))
+  (macro sys.flock (conform %ebx %ecx) 143 \sys (believe %eax))
+  (macro sys.getsid (conform %ebx) 147 \sys (believe %eax))
+  (macro sys.fdatasync (conform %ebx) 148 \sys (believe %eax))
+  (macro sys.mlock (conform %ebx %ecx) 150 \sys (believe %eax))
+  (macro sys.munlock (conform %ebx %ecx) 151 \sys (believe %eax))
+  (macro sys.mlockall (conform %ebx) 152 \sys (believe %eax))
+  (macro sys.munlockall (conform) 153 \sys (believe %eax))
 
-; vim:ft=worth
+  (macro sys.socket swap rot 1 \skt (believe %eax) nip nip nip)
+  (macro sys.bind swap rot 2 \skt (believe %eax) nip nip nip)
+  (macro sys.connect swap rot 3 \skt (believe %eax) nip nip nip)
+  (macro sys.listen swap 4 \skt (believe %eax) nip nip)
+  (macro sys.accept swap rot 5 \skt (believe %eax) nip nip nip)
+  (macro sys.getsockname swap rot 6 \skt (believe %eax) nip nip nip)
+  (macro sys.getpeername swap rot 7 \skt (believe %eax) nip nip nip)
+  (macro sys.shutdown swap 13 \skt (believe %eax) nip nip)
+
+  ; <linux/socket.h>
+  (macro AF_UNSPEC 0)     (macro PF_UNSPEC 0)
+  (macro AF_UNIX 1)       (macro PF_UNIX 1)
+  (macro AF_INET 2)       (macro PF_INET 2)
+  (macro AF_AX25 3)       (macro PF_AX25 3)
+  (macro AF_IPX 4)        (macro PF_IPX 4)
+  (macro AF_APPLETALK 5)  (macro PF_APPLETALK 5)
+  (macro AF_NETROM 6)     (macro PF_NETROM 6)
+  (macro AF_BRIDGE 7)     (macro PF_BRIDGE 7)
+  (macro AF_ATMPVC 8)     (macro PF_ATMPVC 8)
+  (macro AF_X25 9)        (macro PF_X25 9)
+  (macro AF_INET6 10)     (macro PF_INET6 10)
+  (macro AF_ROSE 11)      (macro PF_ROSE 11)
+  (macro AF_DECnet 12)    (macro PF_DECnet 12)
+  (macro AF_NETBEUI 13)   (macro PF_NETBEUI 13)
+  (macro AF_SECURITY 14)  (macro PF_SECURITY 14)
+  (macro AF_KEY 15)       (macro PF_KEY 15)
+  (macro AF_NETLINK 16)   (macro PF_NETLINK 16)
+  (macro AF_PACKET 17)    (macro PF_PACKET 17)
+  (macro AF_ASH 18)       (macro PF_ASH 18)
+  (macro AF_ECONET 19)    (macro PF_ECONET 19)
+  (macro AF_ATMSVC 20)    (macro PF_ATMSVC 20)
+  (macro AF_SNA 22)       (macro PF_SNA 22)
+  (macro AF_IRDA 23)      (macro PF_IRDA 23)
+  (macro AF_PPPOX 24)     (macro PF_PPPOX 24)
+  (macro AF_WANPIPE 25)   (macro PF_WANPIPE 25)
+  (macro AF_LLC 26)       (macro PF_LLC 26)
+  (macro AF_BLUETOOTH 31) (macro PF_BLUETOOTH 31))
+
+; vim: ft=worth

Index: universal.wrti
===================================================================
RCS file: /cvsroot/wisp/wisp/modules/universal.wrti,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- universal.wrti	31 Aug 2002 14:29:22 -0000	1.11
+++ universal.wrti	4 Sep 2002 14:26:24 -0000	1.12
@@ -156,22 +156,22 @@
   (macro \0<?j
     (->reg 1)
     ,(test ,1 ,1)
-    ,(jmp %?l))
+    ,(jmp %?l ,0))
 
   (macro \0<=?j
     (->reg 1)
     ,(test ,1 ,1)
-    ,(jmp %?le))
+    ,(jmp %?le ,0))
 
   (macro \0>?j
     (->reg 1)
     ,(test ,1 ,1)
-    ,(jmp %?g))
+    ,(jmp %?g ,0))
 
   (macro \0>=?j
     (->reg 1)
     ,(test ,1 ,1)
-    ,(jmp %?ge))
+    ,(jmp %?ge ,0))
 
   ;; Conditional value hooks.  Stack: ( arg ... -- value ).
 

Index: wisptyp.wrti
===================================================================
RCS file: /cvsroot/wisp/wisp/modules/wisptyp.wrti,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- wisptyp.wrti	31 Aug 2002 14:29:11 -0000	1.7
+++ wisptyp.wrti	4 Sep 2002 14:26:24 -0000	1.8
@@ -47,6 +47,8 @@
   (macro VOID 27)
   (macro UNDEF 35) ; not a real value--used only in boxes
 
+  (macro ZERO 7)
+
   (macro null?
     NULL =)