netbsd-alpha-more-patches-20020118

get closer to server working

diff --git a/src/cf/osconf.m4 b/src/cf/osconf.m4
index 91cd836..bbf0408 100644 (file)
--- a/src/cf/osconf.m4
+++ b/src/cf/osconf.m4
@@ -128,7 +128,7 @@ case $AFS_SYSNAME in
                YACC="bison -y"
                ;;
 
-       i386_nbsd15)
+       *nbsd15)
                LEX="flex -l"
                MT_CFLAGS='${XCFLAGS}'
                MT_LIBS=""

diff --git a/src/config/.cvsignore b/src/config/.cvsignore
index 57fc970..1532084 100644 (file)
--- a/src/config/.cvsignore
+++ b/src/config/.cvsignore
@@ -13,3 +13,5 @@ Makefile.i386_linux22
 Makefile.i386_linux24
 Makefile.sun4x_56
 Makefile.sun4x_57
+param.h.new
+Makefile.config

diff --git a/src/config/Makefile.in b/src/config/Makefile.in
index d8e88b2..b378f3a 100644 (file)
--- a/src/config/Makefile.in
+++ b/src/config/Makefile.in
@@ -138,7 +138,7 @@ ukinstall: \
        ${UKERNELDIR}/afs/AFS_component_version_number.c
 
 clean:
-       $(RM) -f *.o config mkvers core xprt AFS_component_version_number.c
+       $(RM) -f *.o config mkvers core xprt AFS_component_version_number.c param.h.new
 
 dest: ${DEST}/include/afs/param.h \
        ${DEST}/include/afs/stds.h \

diff --git a/src/config/param.alpha_nbsd15.h b/src/config/param.alpha_nbsd15.h
index 6dab433..918a4f2 100644 (file)
--- a/src/config/param.alpha_nbsd15.h
+++ b/src/config/param.alpha_nbsd15.h
@@ -1,13 +1,12 @@
 #ifndef        AFS_PARAM_H
 #define        AFS_PARAM_H
 
+#define __alpha 1
 #define        AFS_ALPHA_ENV   1
 #define AFS_ALPHA_XBSD_ENV 1
 
 #define AFS_ALPHA_ENV 1
 
-#define AFS_MOUNT_AFS  "afs"
-
 #define SYS_NAME       "alpha_nbsd15"
 #define SYS_NAME_ID    SYS_NAME_ID_alpha_nbsd15
 

diff --git a/src/config/param.alpha_nbsd15_usr.h b/src/config/param.alpha_nbsd15_usr.h
new file mode 100644 (file)
index 0000000..be39420
--- /dev/null
+++ b/src/config/param.alpha_nbsd15_usr.h
@@ -0,0 +1,57 @@
+#ifndef AFS_PARAM_H
+#define AFS_PARAM_H
+
+
+#define UKERNEL                        1       /* user space kernel */
+#define AFS_ENV                        1
+#define AFS_VFSINCL_ENV         1
+#define AFS_NBSD_ENV           1
+#define AFS_NBSD15_ENV         1
+#define AFS_NONFSTRANS 1
+#define AFS_KERBEROS_ENV
+
+#define AFS_MOUNT_AFS "afs"    /* The name of the filesystem type. */
+#define AFS_SYSCALL 210
+#define AFS_NAMEI_ENV         1   /* User space interface to file system */
+#define AFS_64BIT_IOPS_ENV    1   /* Needed for NAMEI */
+#include <afs/afs_sysnames.h>
+
+#define AFS_USERSPACE_IP_ADDR 1
+#define RXK_LISTENER_ENV      1
+#define AFS_GCPAGS           0       /* if nonzero, garbage collect PAGs */
+
+/* Machine / Operating system information */
+#define SYS_NAME       "i386_nbsd15"
+#define SYS_NAME_ID    SYS_NAME_ID_i386_nbsd15
+#define AFSLITTLE_ENDIAN    1
+#define AFS_HAVE_FFS        1       /* Use system's ffs. */
+#define AFS_HAVE_STATVFS    0  /* System doesn't support statvfs */
+#define AFS_VM_RDWR_ENV            1   /* read/write implemented via VM */
+
+#define        afsio_iov       uio_iov
+#define        afsio_iovcnt    uio_iovcnt
+#define        afsio_offset    uio_offset
+#define        afsio_seg       uio_segflg
+#define        afsio_fmode     uio_fmode
+#define        afsio_resid     uio_resid
+#define        AFS_UIOSYS      1
+#define        AFS_UIOUSER     UIO_USERSPACE
+#define        AFS_CLBYTES     MCLBYTES
+#define        AFS_MINCHANGE   2
+#define        VATTR_NULL      usr_vattr_null
+
+#define AFS_DIRENT
+#ifndef CMSERVERPREF
+#define CMSERVERPREF
+#endif
+
+#include <limits.h>
+#include <sys/param.h>
+#include <sys/types.h>
+#include <sys/mount.h>
+#include <sys/fcntl.h>
+#include <netinet/in.h>
+#include <sys/uio.h>
+#include <sys/socket.h>
+
+#endif /* AFS_PARAM_H */

diff --git a/src/config/param.i386_nbsd15.h b/src/config/param.i386_nbsd15.h
index 0096ec8..27d4c54 100644 (file)
--- a/src/config/param.i386_nbsd15.h
+++ b/src/config/param.i386_nbsd15.h
@@ -7,8 +7,6 @@
 
 #define AFS_X86_ENV 1
 
-#define AFS_MOUNT_AFS  "afs"
-
 #define SYS_NAME       "i386_nbsd15"
 #define SYS_NAME_ID    SYS_NAME_ID_i386_nbsd15
 

diff --git a/src/config/param.nbsd15.h b/src/config/param.nbsd15.h
index f49c282..15a26cb 100644 (file)
--- a/src/config/param.nbsd15.h
+++ b/src/config/param.nbsd15.h
@@ -2,7 +2,9 @@
 #ifndef        AFS_PARAM_COMMON_H
 #define        AFS_PARAM_COMMON_H
 
+#ifndef ASSEMBLER
 #include <sys/param.h>
+#endif
 
 #define AFS_XBSD_ENV 1             /* {Free,Open,Net}BSD */
 
@@ -33,6 +35,8 @@
 #define AFS_ENV        1
 
 #define AFS_MOUNT_AFS  "afs"
+#define AFS_SYSCALL 210
+
 
 #ifndef MOUNT_UFS
 #define MOUNT_UFS "ufs"

diff --git a/src/lwp/Makefile.in b/src/lwp/Makefile.in
index 89eb1c6..e10b69d 100644 (file)
--- a/src/lwp/Makefile.in
+++ b/src/lwp/Makefile.in
@@ -54,6 +54,10 @@ process.o    : process.s process.c
                /usr/bin/cpp -P ${srcdir}/process.fbsd.s > process.ss; \
                ${AS} -o process.o process.ss; \
                $(RM) process.ss ;; \
+       alpha_nbsd* ) \
+               /usr/bin/cpp -DASSEMBLER -P -I${TOP_INCDIR} ${srcdir}/process.s > process.ss; \
+               ${AS} -o process.o process.ss; \
+               $(RM) process.ss ;; \
        hp* | *_linux* | sgi_64 | sgi_65 ) \
                ${CC} ${CFLAGS} -c ${srcdir}/process.c;; \
        ncrx86_*) \

diff --git a/src/lwp/process.s b/src/lwp/process.s
index f6f38a1..5df491e 100644 (file)
--- a/src/lwp/process.s
+++ b/src/lwp/process.s
@@ -1074,7 +1074,9 @@ returnto:
 #define        fs5     $f7
 #define        fs6     $f8
 #define        fs7     $f9
-#else  /* OSF */
+#elif defined(AFS_XBSD_ENV)
+#include <machine/asm.h>
+#else  /* !OSF && !XBSD */
 #include <mach/alpha/asm.h>
 #endif /* OSF */
 
@@ -1084,7 +1086,9 @@ returnto:
 #define returnaddr (FRAMESIZE-8)
 #define topstack 0
 
+#ifdef AFS_OSF_ENV
 IMPORT(PRE_Block,4)
+#endif
 .align 4
 #ifdef AFS_OSF_ENV
 NESTED(savecontext,FRAMESIZE,ra)
@@ -1161,7 +1165,7 @@ LEAF(returnto,1)
        END(returnto)
 #endif
 
-#if defined(AFS_NCR_ENV) || defined(AFS_X86_ENV) || defined(AFS_DJGPP_ENV) || defined(AFS_XBSD_ENV)
+#if defined(AFS_NCR_ENV) || defined(AFS_X86_ENV) || defined(AFS_DJGPP_ENV)
 /* Sun 386i... I hope this does the right thing!!!
  * 
  * Written by Derek Atkins <warlord@MIT.EDU>

diff --git a/src/sys/Makefile.in b/src/sys/Makefile.in
index ff820a3..71631f7 100644 (file)
--- a/src/sys/Makefile.in
+++ b/src/sys/Makefile.in
@@ -51,7 +51,7 @@ syscall.o: syscall.s
                $(RM) -f syscall.ss syscall.i;; \
         hp_ux11? ) \
                touch syscall.o;; \
-       i386_*bsd* ) \
+       i386_*bsd*|*nbsd*) \
                touch syscall.o;; \
         *) \
                /lib/cpp  ${SFLAGS} ${srcdir}/syscall.s syscall.ss; \