X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=tools-for-build%2Fgrovel-headers.c;h=ebf144949992d95d535d3555c7ad6e2397524789;hb=HEAD;hp=a529fcbd8113521fdcb14b2c0e5e2453afaa9b8c;hpb=dcd86042bba514f5dfc39246de9cdbb030648569;p=sbcl.git

diff --git a/tools-for-build/grovel-headers.c b/tools-for-build/grovel-headers.c
index a529fcb..ebf1449 100644
--- a/tools-for-build/grovel-headers.c
+++ b/tools-for-build/grovel-headers.c
@@ -18,25 +18,31 @@
  * more information.
  */
 
+#include "genesis/config.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #ifdef _WIN32
+  /* KLUDGE: From src/runtime/runtime.h, avoid double definition of
+     boolean.  We really should clean up our act on this one. */
+  #define boolean rpcndr_boolean
   #define WIN32_LEAN_AND_MEAN
   #include <windows.h>
   #include <shlobj.h>
+  #include <wincrypt.h>
+  #include <winsock2.h>
+  #undef boolean
 #else
+  #include <poll.h>
+  #include <sys/select.h>
   #include <sys/times.h>
   #include <sys/wait.h>
   #include <sys/ioctl.h>
   #include <sys/termios.h>
-  #ifdef __APPLE_CC__
-    #include "../src/runtime/darwin-dlshim.h"
-    #include "../src/runtime/darwin-langinfo.h"
-  #else
-    #include <dlfcn.h>
-    #include <langinfo.h>
-  #endif
+  #include <sys/time.h>
+  #include <langinfo.h>
+  #include <dlfcn.h>
 #endif
 
 #include <sys/stat.h>
@@ -44,18 +50,37 @@
 #include <unistd.h>
 #include <signal.h>
 #include <errno.h>
-
-#include "genesis/config.h"
+#include <time.h>
 
 #ifdef LISP_FEATURE_HPUX
 #include <sys/bsdtty.h> /* for TIOCGPGRP */
 #endif
 
+#ifdef LISP_FEATURE_BSD
+  #include <sys/param.h>
+  #include <sys/sysctl.h>
+#endif
+
+#ifdef _WIN32
+  #include "pthreads_win32.h"
+#endif
+
 #include "wrap.h"
+#include "gc.h"
 
 #define DEFTYPE(lispname,cname) { cname foo; \
     printf("(define-alien-type " lispname " (%s %d))\n", (((foo=-1)<0) ? "sb!alien:signed" : "unsigned"), (8 * (sizeof foo))); }
 
+#define DEFSTRUCT(lispname,cname,body) { cname bar; \
+    printf("(define-alien-type nil\n  (struct %s", #lispname); \
+    body; \
+    printf("))\n"); }
+#define DEFSLOT(lispname,cname) \
+    printf("\n          (%s (%s %d))", \
+           #lispname, \
+           (((bar.cname=-1)<0) ? "sb!alien:signed" : "unsigned"), \
+           (8 * (sizeof bar.cname)))
+
 void
 defconstant(char* lisp_name, unsigned long unix_number)
 {
@@ -179,12 +204,20 @@ main(int argc, char *argv[])
 
     printf(";;; FormatMessage\n");
 
-    defconstant ("FORMAT_MESSAGE_ALLOCATE_BUFFER", FORMAT_MESSAGE_ALLOCATE_BUFFER);
-    defconstant ("FORMAT_MESSAGE_FROM_SYSTEM", FORMAT_MESSAGE_FROM_SYSTEM);
+    defconstant("format-message-allocate-buffer", FORMAT_MESSAGE_ALLOCATE_BUFFER);
+    defconstant("format-message-from-system", FORMAT_MESSAGE_FROM_SYSTEM);
+    defconstant("format-message-max-width-mask", FORMAT_MESSAGE_MAX_WIDTH_MASK);
+    defconstant("format-message-ignore-inserts", FORMAT_MESSAGE_IGNORE_INSERTS);
 
     printf(";;; Errors\n");
 
-    defconstant ("ERROR_ENVVAR_NOT_FOUND", ERROR_ENVVAR_NOT_FOUND);
+    printf(";;; Errors\n");
+
+    defconstant("ERROR_ENVVAR_NOT_FOUND", ERROR_ENVVAR_NOT_FOUND);
+    defconstant("ERROR_ALREADY_EXISTS", ERROR_ALREADY_EXISTS);
+    defconstant("ERROR_FILE_EXISTS", ERROR_FILE_EXISTS);
+    defconstant("ERROR_FILE_NOT_FOUND", ERROR_FILE_NOT_FOUND);
+    defconstant("ERROR_ACCESS_DENIED", ERROR_ACCESS_DENIED);
 
     printf(";;; GetComputerName\n");
 
@@ -198,6 +231,43 @@ main(int argc, char *argv[])
     DEFTYPE("uint",    UINT);
     DEFTYPE("ulong",   ULONG);
 
+    printf(";;; File Desired Access\n");
+    defconstant ("FILE_GENERIC_READ", FILE_GENERIC_READ);
+    defconstant ("FILE_GENERIC_WRITE", FILE_GENERIC_WRITE);
+    defconstant ("FILE_GENERIC_EXECUTE", FILE_GENERIC_EXECUTE);
+    defconstant ("FILE_SHARE_READ", FILE_SHARE_READ);
+    defconstant ("FILE_SHARE_WRITE", FILE_SHARE_WRITE);
+    defconstant ("FILE_SHARE_DELETE", FILE_SHARE_DELETE);
+
+    printf(";;; File Creation Dispositions\n");
+    defconstant("CREATE_NEW", CREATE_NEW);
+    defconstant("CREATE_ALWAYS", CREATE_ALWAYS);
+    defconstant("OPEN_EXISTING", OPEN_EXISTING);
+    defconstant("OPEN_ALWAYS", OPEN_ALWAYS);
+    defconstant("TRUNCATE_EXISTING", TRUNCATE_EXISTING);
+
+    printf(";;; Desired Access\n");
+    defconstant("ACCESS_GENERIC_READ", GENERIC_READ);
+    defconstant("ACCESS_GENERIC_WRITE", GENERIC_WRITE);
+    defconstant("ACCESS_GENERIC_EXECUTE", GENERIC_EXECUTE);
+    defconstant("ACCESS_GENERIC_ALL", GENERIC_ALL);
+    defconstant("ACCESS_FILE_APPEND_DATA", FILE_APPEND_DATA);
+    defconstant("ACCESS_DELETE", DELETE);
+
+    printf(";;; Handle Information Flags\n");
+    defconstant("HANDLE_FLAG_INHERIT", HANDLE_FLAG_INHERIT);
+    defconstant("HANDLE_FLAG_PROTECT_FROM_CLOSE", HANDLE_FLAG_PROTECT_FROM_CLOSE);
+
+    printf(";;; Standard Handle Keys\n");
+    defconstant("STD_INPUT_HANDLE", STD_INPUT_HANDLE);
+    defconstant("STD_OUTPUT_HANDLE", STD_OUTPUT_HANDLE);
+    defconstant("STD_ERROR_HANDLE", STD_ERROR_HANDLE);
+
+    printf(";;; WinCrypt\n");
+    defconstant("crypt-verifycontext", CRYPT_VERIFYCONTEXT);
+    defconstant("crypt-silent", CRYPT_SILENT);
+    defconstant("prov-rsa-full", PROV_RSA_FULL);
+
     /* FIXME: SB-UNIX and SB-WIN32 really need to be untangled. */
     printf("(in-package \"SB!UNIX\")\n\n");
     printf(";;; Unix-like constants and types on Windows\n");
@@ -209,11 +279,13 @@ main(int argc, char *argv[])
     defconstant("o_append", _O_APPEND);
     defconstant("o_excl",   _O_EXCL);
     defconstant("o_binary", _O_BINARY);
+    defconstant("o_noinherit", _O_NOINHERIT);
 
     defconstant("enoent", ENOENT);
     defconstant("eexist", EEXIST);
     defconstant("eintr", EINTR);
     defconstant("eagain", EAGAIN);
+    defconstant("ebadf", EBADF);
 
     defconstant("s-ifmt",  S_IFMT);
     defconstant("s-ifdir", S_IFDIR);
@@ -232,6 +304,9 @@ main(int argc, char *argv[])
     DEFTYPE("wst-nlink-t", wst_nlink_t);
     DEFTYPE("wst-uid-t", wst_uid_t);
     DEFTYPE("wst-gid-t", wst_gid_t);
+
+    /* KLUDGE */
+    defconstant("fd-setsize", 1024);
     printf("\n");
 #else
     printf("(in-package \"SB!ALIEN\")\n\n");
@@ -244,6 +319,16 @@ main(int argc, char *argv[])
 
     printf("(in-package \"SB!UNIX\")\n\n");
 
+    printf(";;; select()\n");
+    defconstant("fd-setsize", FD_SETSIZE);
+
+    printf(";;; poll()\n");
+    defconstant("pollin", POLLIN);
+    defconstant("pollout", POLLOUT);
+    defconstant("pollpri", POLLPRI);
+    defconstant("pollhup", POLLHUP);
+    DEFTYPE("nfds-t", nfds_t);
+
     printf(";;; langinfo\n");
     defconstant("codeset", CODESET);
 
@@ -432,5 +517,40 @@ main(int argc, char *argv[])
     defconstant("fpe-fltsub", -1);
 #endif
 #endif // !WIN32
+    printf("\n");
+
+    printf(";;; structures\n");
+    DEFSTRUCT(timeval, struct timeval,
+        DEFSLOT(tv-sec, tv_sec);
+        DEFSLOT(tv-usec, tv_usec));
+    DEFSTRUCT(timespec, struct timespec,
+        DEFSLOT(tv-sec, tv_sec);
+        DEFSLOT(tv-nsec, tv_nsec));
+    printf("\n");
+
+#ifdef LISP_FEATURE_BSD
+    printf(";;; sysctl(3) names\n");
+    printf("(in-package \"SB!IMPL\")\n");
+    defconstant("ctl-kern", CTL_KERN);
+    defconstant("ctl-hw", CTL_HW);
+    defconstant("ctl-maxname", CTL_MAXNAME);
+    defconstant("kern-ostype", KERN_OSTYPE);
+    defconstant("kern-osrelease", KERN_OSRELEASE);
+    defconstant("hw-model", HW_MODEL);
+    defconstant("hw-pagesize", HW_PAGESIZE);
+    printf("\n");
+#endif
+
+    printf("(in-package \"SB!KERNEL\")\n\n");
+#ifdef LISP_FEATURE_GENCGC
+    printf(";;; GENCGC related\n");
+    DEFTYPE("page-index-t", page_index_t);
+    DEFTYPE("generation-index-t", generation_index_t);
+    printf("\n");
+#endif
+
+    printf(";;; Our runtime types\n");
+    DEFTYPE("os-vm-size-t", os_vm_size_t);
+
     return 0;
 }