From 2acb28ae0cf33c36678c10013520574e7b966e6c Mon Sep 17 00:00:00 2001
From: Slava Pestov <slava@factorcode.org>
Date: Tue, 31 Jan 2006 19:31:31 +0000
Subject: [PATCH] Solaris/x86 support

---
 CHANGES.html                                  |  8 ++++
 Makefile                                      |  1 +
 contrib/random-tester/random-tester.factor    |  2 +-
 library/alien/aliens.factor                   |  4 +-
 library/bootstrap/boot-stage2.factor          |  6 +--
 library/collections/sequences-epilogue.factor |  4 --
 library/kernel.facts                          |  2 +-
 library/unix/load.factor                      | 13 +------
 library/unix/syscalls-freebsd.factor          |  8 +++-
 library/unix/syscalls-linux.factor            |  4 ++
 library/unix/syscalls-macosx.factor           |  4 ++
 library/unix/syscalls-solaris.factor          | 39 +++++++++++++++++++
 library/unix/syscalls.factor                  |  4 --
 native/platform.h                             |  2 +
 14 files changed, 72 insertions(+), 29 deletions(-)
 create mode 100644 library/unix/syscalls-solaris.factor
diff --git a/CHANGES.html b/CHANGES.html
index 8c6cecdb36..d035a16a45 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -4,6 +4,14 @@
 <head><title>Factor change log</title></head>
 <body>
 
+<h1>Factor 0.81:</h1>
+
+<ul>
+
+<li>Solaris/x86 is now supported (Patrick Mauritz)</li>
+
+</ul>
+
 <h1>Factor 0.80:</h1>
 
 <ul>
diff --git a/Makefile b/Makefile
index 9f6356b856..4303c731e7 100644
--- a/Makefile
+++ b/Makefile
@@ -61,6 +61,7 @@ default:
 	@echo "linux-ppc"
 	@echo "macosx"
 	@echo "macosx-sdl -- if you wish to use the Factor GUI on Mac OS X"
+	@echo "solaris"
 	@echo "windows"
 	@echo ""
 	@echo "Also, you might want to set the SITE_CFLAGS environment"
diff --git a/contrib/random-tester/random-tester.factor b/contrib/random-tester/random-tester.factor
index 4985df6c70..77065594e9 100644
--- a/contrib/random-tester/random-tester.factor
+++ b/contrib/random-tester/random-tester.factor
@@ -368,7 +368,7 @@ SYMBOL: first-arg
 
 ! Boolean logic tests
 : logic-0 ( -- seq )
-    { unix? win32? bootstrapping? f t } ;
+    { bootstrapping? f t } ;
 
 : logic-1 ( -- seq )
     {
diff --git a/library/alien/aliens.factor b/library/alien/aliens.factor
index 208cef59da..72de634896 100644
--- a/library/alien/aliens.factor
+++ b/library/alien/aliens.factor
@@ -33,8 +33,8 @@ M: alien = ( obj obj -- ? )
     ] bind ;
 
 : add-simple-library ( name file -- ) 
-    win32? ".dll" ".so" ? append
-    win32? "stdcall" "cdecl" ? add-library ;
+    os "win32" = ".dll" ".so" ? append
+    os "win32" = "stdcall" "cdecl" ? add-library ;
 
 : library-abi ( library -- abi )
     library "abi" swap ?hash [ "cdecl" ] unless* ;
diff --git a/library/bootstrap/boot-stage2.factor b/library/bootstrap/boot-stage2.factor
index d4bdc1a5e3..5a370d4788 100644
--- a/library/bootstrap/boot-stage2.factor
+++ b/library/bootstrap/boot-stage2.factor
@@ -1,12 +1,12 @@
-! Copyright (C) 2004, 2005 Slava Pestov.
-! See http://factor.sf.net/license.txt for BSD license.
+! Copyright (C) 2004, 2006 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
 USING: compiler compiler-backend io io-internals kernel
 kernel-internals lists math memory namespaces optimizer parser
 sequences sequences-internals words ;
 
 "compile" get [
     "native-io" get [
-        unix? [
+        os { "freebsd" "linux" "macosx" "solaris" } member? [
             "/library/unix/load.factor" run-resource
         ] when
 
diff --git a/library/collections/sequences-epilogue.factor b/library/collections/sequences-epilogue.factor
index 25c84472ab..f723626189 100644
--- a/library/collections/sequences-epilogue.factor
+++ b/library/collections/sequences-epilogue.factor
@@ -135,7 +135,3 @@ M: object <=>
 : with-datastack ( stack word -- stack )
     datastack >r >r set-datastack r> execute
     datastack r> [ push ] keep set-datastack 2nip ;
-
-: win32? ( -- ? ) os "win32" = ;
-
-: unix? ( -- ? ) os { "freebsd" "linux" "macosx" } member? ;
diff --git a/library/kernel.facts b/library/kernel.facts
index 51995e6e9a..115eeddfc2 100644
--- a/library/kernel.facts
+++ b/library/kernel.facts
@@ -141,7 +141,7 @@ HELP: os "( -- os )"
 { $values { "os" "a string" } }
 { $description
     "Outputs a string descriptor of the current operating system family. Currently, this set of descriptors is:"
-    { $code "freebsd" "linux" "macosx" "win32" "unix" }
+    { $code "freebsd" "linux" "macosx" "solaris" "win32" "unix" }
 } ;
 
 HELP: call "( quot -- )"
diff --git a/library/unix/load.factor b/library/unix/load.factor
index c416818232..d4f0849440 100644
--- a/library/unix/load.factor
+++ b/library/unix/load.factor
@@ -1,19 +1,8 @@
 USING: io kernel parser sequences ;
 
 "/library/unix/types.factor" run-resource
+"/library/unix/syscalls-" os ".factor" append3 run-resource
 
-os "freebsd" = [
-    "/library/unix/syscalls-freebsd.factor" run-resource 
-] when
-
-os "linux" = [
-    "/library/unix/syscalls-linux.factor" run-resource 
-] when
-
-os "macosx" = [
-    "/library/unix/syscalls-macosx.factor" run-resource 
-] when
-    
 [
     "/library/unix/syscalls.factor"
     "/library/unix/io.factor"
diff --git a/library/unix/syscalls-freebsd.factor b/library/unix/syscalls-freebsd.factor
index fa9e3a7be0..b0fdec84b9 100644
--- a/library/unix/syscalls-freebsd.factor
+++ b/library/unix/syscalls-freebsd.factor
@@ -1,5 +1,5 @@
-! Copyright (C) 2005 Slava Pestov.
-! See http://factor.sf.net/license.txt for BSD license.
+! Copyright (C) 2005, 2006 Slava Pestov.
+! See http://factorcode.org/license.txt for BSD license.
 IN: unix-internals
 USING: alien ;
 
@@ -35,3 +35,7 @@ END-STRUCT
 : EINTR HEX: 4 ;
 : EAGAIN HEX: 23 ;
 : EINPROGRESS HEX: 24 ;
+
+: AF_INET 2 ;
+: PF_INET AF_INET ;
+: SOCK_STREAM 1 ;
diff --git a/library/unix/syscalls-linux.factor b/library/unix/syscalls-linux.factor
index d10fcaeefc..2c8b9252f7 100644
--- a/library/unix/syscalls-linux.factor
+++ b/library/unix/syscalls-linux.factor
@@ -35,3 +35,7 @@ END-STRUCT
 : EINTR HEX: 4 ;
 : EAGAIN HEX: b ;
 : EINPROGRESS HEX: 73 ;
+
+: AF_INET 2 ;
+: PF_INET AF_INET ;
+: SOCK_STREAM 1 ;
diff --git a/library/unix/syscalls-macosx.factor b/library/unix/syscalls-macosx.factor
index 93b28adbe3..fee9127c13 100644
--- a/library/unix/syscalls-macosx.factor
+++ b/library/unix/syscalls-macosx.factor
@@ -35,3 +35,7 @@ END-STRUCT
 : EINTR HEX: 4 ;
 : EAGAIN HEX: 23 ;
 : EINPROGRESS HEX: 24 ;
+
+: AF_INET 2 ;
+: PF_INET AF_INET ;
+: SOCK_STREAM 1 ;
diff --git a/library/unix/syscalls-solaris.factor b/library/unix/syscalls-solaris.factor
new file mode 100644
index 0000000000..7fb40ce1cb
--- /dev/null
+++ b/library/unix/syscalls-solaris.factor
@@ -0,0 +1,39 @@
+! Copyright (C) 2006 Patrick Mauritz.
+! See http://factorcode.org/license.txt for BSD license.
+IN: unix-internals
+USING: alien kernel kernel-internals ;
+
+! Solaris.
+
+: SOCK_STREAM 2 ;
+
+: O_RDONLY  HEX: 0000 ;
+: O_WRONLY  HEX: 0001 ;
+: O_RDWR    HEX: 0002 ;
+: O_CREAT   HEX: 0100 ;
+: O_TRUNC   HEX: 0200 ;
+
+: SOL_SOCKET HEX: ffff ;
+
+: FD_SETSIZE cell 4 = 1024 65536 ? ;
+
+: SO_REUSEADDR 4 ;
+: SO_OOBINLINE HEX: 0100 ;
+: SO_SNDTIMEO HEX: 1005 ;
+: SO_RCVTIMEO HEX: 1006 ;
+
+: INADDR_ANY 0 ;
+
+: F_SETFL 4 ;    ! set file status flags
+: O_NONBLOCK HEX: 80 ; ! no delay
+
+BEGIN-STRUCT: sockaddr-in
+    FIELD: ushort family
+    FIELD: ushort port
+    FIELD: in_addr_t addr
+    FIELD: longlong unused
+END-STRUCT
+
+: EINTR HEX: 4 ;
+: EAGAIN 11 ;
+: EINPROGRESS 150 ;
diff --git a/library/unix/syscalls.factor b/library/unix/syscalls.factor
index 6d9126c549..c859a14f1f 100644
--- a/library/unix/syscalls.factor
+++ b/library/unix/syscalls.factor
@@ -46,10 +46,6 @@ END-STRUCT
 : gethostbyname ( name -- hostent )
     "hostent*" "libc" "gethostbyname" [ "char*" ] alien-invoke ;
 
-: AF_INET 2 ;
-: PF_INET AF_INET ;
-: SOCK_STREAM 1 ;
-
 FUNCTION: int socket ( int domain, int type, int protocol ) ;
 FUNCTION: int setsockopt ( int s, int level, int optname, void* optval, socklen_t optlen ) ;
 FUNCTION: int connect ( int s, sockaddr-in* name, socklen_t namelen ) ;
diff --git a/native/platform.h b/native/platform.h
index dda1ae8476..b351222aef 100644
--- a/native/platform.h
+++ b/native/platform.h
@@ -31,6 +31,8 @@
 	#define FACTOR_OS_STRING "linux"
 #elif defined(__APPLE__)
 	#define FACTOR_OS_STRING "macosx"
+#elif defined(__sun)
+	#define FACTOR_OS_STRING "solaris"
 #else
 	#define FACTOR_OS_STRING "unix"
 #endif
