From 288912d2a84d035730cad405e32a6afa5dd4f9c6 Mon Sep 17 00:00:00 2001
From: Cliff Click <cliffc@acm.org>
Date: Sat, 10 May 2025 10:55:15 -0700
Subject: Move sys.smp to smp directory

---
 .../main/java/com/seaofnodes/simple/Parser.java    |  3 +-
 .../src/main/java/com/seaofnodes/simple/sys.java   | 25 ++++++++++
 .../main/java/com/seaofnodes/simple/sys/sys.java   | 25 ----------
 chapter22/src/main/smp/sys.smp                     | 57 ++++++++++++++++++++++
 4 files changed, 83 insertions(+), 27 deletions(-)
 create mode 100644 chapter22/src/main/java/com/seaofnodes/simple/sys.java
 delete mode 100644 chapter22/src/main/java/com/seaofnodes/simple/sys/sys.java
 create mode 100644 chapter22/src/main/smp/sys.smp

(limited to 'chapter22/src')

diff --git a/chapter22/src/main/java/com/seaofnodes/simple/Parser.java b/chapter22/src/main/java/com/seaofnodes/simple/Parser.java
index 9c22fc43..d0ef5d49 100644
--- a/chapter22/src/main/java/com/seaofnodes/simple/Parser.java
+++ b/chapter22/src/main/java/com/seaofnodes/simple/Parser.java
@@ -141,7 +141,7 @@ public class Parser {
         _scope.mem(new MemMergeNode(false));
 
         // Parse the sys import
-        _lexer = new Lexer(com.seaofnodes.simple.sys.sys.SYS);
+        _lexer = new Lexer(com.seaofnodes.simple.sys.SYS);
         while( !_lexer.isEOF() ) {
             parseStatement();
             _lexer.skipWhiteSpace();
@@ -795,7 +795,6 @@ public class Parser {
         while (!peek('}') && !_lexer.isEOF())
             parseStatement().isKill();
 
-
         // Grab the declarations and build fields and a Struct
         int lexlen = _scope._lexSize.last();
         int varlen = _scope._vars._len;
diff --git a/chapter22/src/main/java/com/seaofnodes/simple/sys.java b/chapter22/src/main/java/com/seaofnodes/simple/sys.java
new file mode 100644
index 00000000..45106770
--- /dev/null
+++ b/chapter22/src/main/java/com/seaofnodes/simple/sys.java
@@ -0,0 +1,25 @@
+package com.seaofnodes.simple;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+
+/** Default included namespaces for Simple.
+
+    You can think of this as {@code #include <stdio.h>} for C or {@code import java.lang.*} for Java.
+ */
+public abstract class sys {
+
+    public static final String SYS;
+
+    static {
+        try {
+            SYS = Files.readString(Path.of("src/main/smp/sys.smp"));
+        }
+        catch( Exception e ) {
+            throw new RuntimeException(e);
+        }
+    }
+
+}
diff --git a/chapter22/src/main/java/com/seaofnodes/simple/sys/sys.java b/chapter22/src/main/java/com/seaofnodes/simple/sys/sys.java
deleted file mode 100644
index 399e7cb7..00000000
--- a/chapter22/src/main/java/com/seaofnodes/simple/sys/sys.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.seaofnodes.simple.sys;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
-
-/** Default included namespaces for Simple.
-
-    You can think of this as {@code #include <stdio.h>} for C or {@code import java.lang.*} for Java.
- */
-public abstract class sys {
-
-    public static final String SYS;
-
-    static {
-        try {
-            SYS = Files.readString(Path.of("src/main/java/com/seaofnodes/simple/sys/sys.smp"));
-        }
-        catch( Exception e ) {
-            throw new RuntimeException(e);
-        }
-    }
-
-}
diff --git a/chapter22/src/main/smp/sys.smp b/chapter22/src/main/smp/sys.smp
new file mode 100644
index 00000000..ede08d63
--- /dev/null
+++ b/chapter22/src/main/smp/sys.smp
@@ -0,0 +1,57 @@
+// -*- mode: java;  -*-
+
+// top-level default import
+struct sys {
+    // libc bindings
+    /** https://www.man7.org/linux/man-pages/man2/<libc call>.2.html */
+    struct libc {
+        i32 errno = "C";
+        // fd  buf len -> len
+        {  i32 i64 u32 -> u32 } write = "C";
+        // fd  buf len -> len
+        {  i32 i64 u32 -> u32 } read = "C";
+        // status
+        {  i32 -> i32 } _exit = "C";
+        // addr len prot flags fd  off -> void*
+        {  i64  i64 i32  i32   i32 i32 -> i64 } mmap = "C";
+        // mmap flags
+        i32 PROT_EXEC = 4;
+        i32 PROT_READ = 1;
+        i32 PROT_WRITE= 2;
+        i32 PROT_NONE = 0;
+        i32 MAP_PRIVATE = 2;
+        i32 MAP_ANON = 32;
+    };
+    struct ary {
+        val copy = { u8[] dst, int doff, u8[~] src, int soff, int len ->
+            for( int i=0; i<len; i++ )
+                dst[i+doff] = src[i+soff];
+            return dst;
+        };
+    };
+    struct io {
+        // Print string to stdout
+        val p = { u8[~] str ->
+            i64 ptr = str;  // cast array base to i64
+            return sys.libc.write(1,ptr,str#);
+        };
+
+        // Return stdin as a u8[]
+        val stdin = { ->
+            var buf = new u8[8*1024];
+            i64 ptr = buf;
+            int len = 0;
+            while( true ) {
+                int rez = sys.libc.read(0,ptr,buf#);
+                if( rez < 0 ) sys.libc._exit(sys.libc.errno);
+                len += rez;
+                if( rez < buf# )
+                    break;
+                sys.libc._exit(-2); // Need to implement
+            }
+            // Compress
+            var dst = new u8[len];
+            return sys.ary.copy(dst,0,buf,0,len);
+        };
+    };
+};
-- 
cgit v1.2.3