[Wisp-cvs] wisp/src/native Makefile.am,1.155,1.156 sys_raw.nasm,1.50,1.51 linux_syscall.inc,1.12,NONE

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

Update of /cvsroot/wisp/wisp/src/native
In directory usw-pr-cvs1:/tmp/cvs-serv30157/src/native

Modified Files:
	Makefile.am sys_raw.nasm 
Removed Files:
	linux_syscall.inc 
Log Message:
Merged linux_syscall.inc into sys_raw.nasm .

Index: Makefile.am
===================================================================
RCS file: /cvsroot/wisp/wisp/src/native/Makefile.am,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- Makefile.am	18 Sep 2002 21:02:25 -0000	1.155
+++ Makefile.am	18 Sep 2002 21:05:36 -0000	1.156
@@ -11,7 +11,7 @@
 DEFS = $(filter-out -DHAVE_CONFIG_H,@DEFS@) -I.
 
 libnative_a_SOURCES = native_call.nasm branches.nasm \
-    base.inc linux_syscall.inc sysconst.inc \
+    base.inc sysconst.inc \
     apply.nasm chars.nasm cxr.nasm integers.nasm list.nasm \
     memset.nasm records.nasm ref.nasm resignal.nasm signal.nasm \
     strings.nasm sys_raw.nasm types.nasm valloc.nasm vectors.nasm \

Index: sys_raw.nasm
===================================================================
RCS file: /cvsroot/wisp/wisp/src/native/sys_raw.nasm,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -d -r1.50 -r1.51
--- sys_raw.nasm	18 Sep 2002 20:55:17 -0000	1.50
+++ sys_raw.nasm	18 Sep 2002 21:05:36 -0000	1.51
@@ -4,8 +4,37 @@
 ;; This file is licensed under the GNU GPL v2.  If you
 ;; don't know what that means, please do read the GPL.
 
-%include "linux_syscall.inc"
+%include "base.inc"
+%include "sysconst.inc"
 
 ident '@(#) $Id$'
+
+%macro native_syscall 2-3
+native sys_raw_%1, %2
+%if %2 > 0
+%if %2 > 1
+%if %2 > 2
+%if %2 > 3
+%if %2 > 4
+    pop edi
+%if %2 > 4
+%error Too many arguments for sys_raw_%1
+%endif
+%endif
+    pop esi
+%endif
+    pop edx
+%endif
+    pop ecx
+%endif
+    pop ebx
+%endif
+%if %0 > 2
+    %3
+%endif
+    mov eax, CCC_sysnr_%1
+    int 0x80
+    ret
+%endmacro
 
 native_syscall execve, 3

--- linux_syscall.inc DELETED ---