add spiffs support!

- configured as required
- add SPIFFS directory
- add lisp.hlp file
- moved process_file
- temporary disable *TR stuff, as symbol is required
- "docs" function that types lisp.hlp
- load works on ESP!

Author: yesco

Makefile

@@ -1,4 +1,17 @@
 # Simple makefile for eps-lisp
 PROGRAM=esp-lisp
+CFLAGS += -std=gnu99
+
+# spiffs configuration   
+EXTRA_COMPONENTS=extras/spiffs
+FLASH_SIZE=32
+SPIFFS_SINGLETON=1
+
+SPIFFS_BASE_ADDR=0x200000
+
+#SPIFFS_SIZE=0x100000 # 1MB
+SPIFFS_SIZE=0x10000 # 128K
+
 include ../esp-open-rtos/common.mk
 
+$(eval $(call make_spiffs_image,SPIFFS))

SPIFFS/lisp.hlp

@@ -0,0 +1,6 @@
+        * ESP-LISP HELP *
+        =================
+
+help file for 
+  esp8266 lisp
+x

common.c

@@ -1,9 +1,16 @@
+/* Distributed under Mozilla Public Licence 2.0   */
+/* https://www.mozilla.org/en-US/MPL/2.0/         */
+/* 2016-08-16 (C) Jonas S Karlsson, [email protected] */
+/*         common code for all platforms          */
+
 #include <string.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <netdb.h>
 #include <unistd.h>
+#include <ctype.h>
 
 #ifndef UNIX
  #include "FreeRTOS.h"
@@ -317,3 +324,59 @@ int wget(wget_data* data, char* url, char* server) {
     return 0;
 }
 
+int iscomment(char* s) {
+    while (s && *s && isspace(*s++));
+    return (s && *s == ';');
+}
+
+// line is increased in increments of this
+#define MAXLINE 1024
+
+int process_file(char* filename, process_input process) {
+    FILE *file = fopen(filename, "r");
+    if (!file) {
+        perror(filename);
+        return -1;
+    }
+
+    char* input = calloc(MAXLINE, 1);
+    int sz = 0;
+    int len = 0;
+
+    char line[MAXLINE] = {0};
+    int lineno = 0;
+    int startno = 0;
+
+    int end = 0;
+    do {
+        // printf("%s.%d: %s", filename, lineno, line);
+
+	// chunk finished (non-empty line with some input)
+	if (end || !isspace(line[0])) {
+            process(input, filename, startno, lineno - 1);
+	    input[0] = 0;
+            len = 0;
+	    startno = lineno; 
+        }
+
+	if (end) break;
+
+        // append line
+	// TODO: move comment handling to reader!!!
+	if (line[0] && !iscomment(line)) {
+            if (sz < len + strlen(line) + 1) {
+                sz += MAXLINE; 
+                input = realloc(input, sz);
+	    }
+            strcat(input+len, line); // safe!
+            len += strlen(line);
+        }
+
+	end = !fgets(line, sizeof(line) - 1, file);
+        lineno++;
+    } while(1);
+
+    free(input);
+    fclose(file);
+    return 0;
+}

esplisp.c

@@ -26,8 +26,12 @@
 
 #include <esp/uart.h>
 
+#include "esp_spiffs.h"
+#include "spiffs.h"
+
 #include "lisp.h"
 
+
 int startTask, afterInit;
 
 #include "compat.h"
@@ -249,6 +253,11 @@ void user_init(void) {
 
     sdk_uart_div_modify(0, UART_CLK_FREQ / 115200);
 
+    // enable file system
+    esp_spiffs_init();
+    esp_spiffs_mount();
+
+    // disable buffering
     setbuf(stdin, NULL);
     setbuf(stdout, NULL);
 
@@ -276,11 +285,6 @@ int closedir(DIR* dp) {
     return 0;
 }
 
-int process_file(char* filename, process_input process) {
-    error("process_file: not implemented!");
-    return -1;
-}
-
 void exit(int e) {
     printf("\n\n=============== EXIT=%d ===============\n", e);
     while(1);

init.lsp

@@ -1,6 +1,12 @@
+(princ "--- LOADING init.lsp FOR STARTUP ---")
+(terpri)
+
 ;; init.lsp is loaded at startup, add stuff here
-(load "env.lsp")
+;; TODO: at the moment this is very important to load for the *TR?
+;(load "env.lsp")
 
 ;; enable to use "long words"
 ;(load "scheme.lsp")
+(princ "--- SUCCESSFULLY LOADED init.lsp ---")
+(terpri)
 

lisp.c

@@ -1333,7 +1333,7 @@ inline lisp getBind(lisp* envp, lisp name, int create) {
 
     // if we're at top level create a global binding and entry in the hashtable
     if (create && envp == global_envp) return hashsym(name, NULL, 0, create);
-    //    if (create) return nil;
+    if (create) return nil;
 
     // first search local lexical env
     lisp bind = assoc(name, *envp);
@@ -1356,6 +1356,7 @@ lisp getBind(lisp* envp, lisp name, int create);
 // - if function return 0 directly still 5% overhead
 // ==> other sourced of changes that slowed down... (like evallist)
 static inline int tracep(lisp f) {
+    return 0;
     static lisp vb = 0;
     if (!vb && global_envp) vb = getBind(global_envp, symbol("*TR"), 0);
     lisp x = cdr(vb);
@@ -2560,9 +2561,27 @@ PRIM load(lisp* envp, lisp name, lisp verbosity) {
     }
 
     int r = process_file(filename, evalIt);
-    return mkint(r);
+    return r ? nil : name;
 }
 
+PRIM docs() {
+    FILE* f = fopen("lisp.hlp", "r");
+    if (!f) {
+        perror("lisp.hlp");
+        return nil;
+    }
+
+    char line[257];
+    do {
+        if (!fgets(line, sizeof(line)-1, f)) break;
+        puts(line);
+    } while (1);
+
+    fclose(f);
+    return t;
+}
+
+
 PRIM directory(lisp name) {
     DIR *dp;
     struct dirent *ep;
@@ -3290,6 +3309,7 @@ lisp lisp_init() {
 
     DEFPRIM(load, -3, load);
     DEFPRIM(directory, 1, directory);
+    DEFPRIM(docs, 0, docs);
 
     // debugging - http://www.gnu.org/software/mit-scheme/documentation/mit-scheme-user/Debugging-Aids.html 
     // http://www.gnu.org/software/mit-scheme/documentation/mit-scheme-user/Command_002dLine-Debugger.html#Command_002dLine-Debugger

lisp.h

@@ -55,6 +55,8 @@ lisp quote(lisp x);
 lisp nil;
 lisp t;
 lisp LAMBDA;
+
+// TODO: move out
 lisp _FREE_;
 lisp ATSYMBOL;
 

tlisp.ccc

@@ -1,8 +1,8 @@
 /* Distributed under Mozilla Public Licence 2.0   */
 /* https://www.mozilla.org/en-US/MPL/2.0/         */
 /* 2016-08-14 (C) Jonas S Karlsson, [email protected] */
-/* "test" driver for "unix"                       */
-/* provides alt implementations to esplisp.c      */
+/*            "test" driver for "unix"            */
+/*    provides alt implementations to esplisp.c   */
 
 #include <stdio.h>
 #include <time.h>
@@ -136,62 +136,6 @@ int nonblock_getch() {
     return r;
 }
 
-#define MAXLINE 1024
-
-int iscomment(char* s) {
-    while (s && *s && isspace(*s++));
-    return (s && *s == ';');
-}
-
-int process_file(char* filename, process_input process) {
-    FILE *file = fopen(filename, "r");
-    if (!file) {
-        perror(filename);
-        return -1;
-    }
-
-    char* input = calloc(MAXLINE, 1);
-    int sz = 0;
-    int len = 0;
-
-    char line[MAXLINE] = {0};
-    int lineno = 0;
-    int startno = 0;
-
-    int end = 0;
-    do {
-        // printf("%s.%d: %s", filename, lineno, line);
-
-	// chunk finished (non-empty line with some input)
-	if (end || !isspace(line[0])) {
-            process(input, filename, startno, lineno - 1);
-	    input[0] = 0;
-            len = 0;
-	    startno = lineno; 
-        }
-
-	if (end) break;
-
-        // append line
-	// TODO: move comment handling to reader!!!
-	if (line[0] && !iscomment(line)) {
-            if (sz < len + strlen(line) + 1) {
-                sz += 1024; 
-                input = realloc(input, sz);
-	    }
-            strcat(input+len, line); // safe!
-            len += strlen(line);
-        }
-
-	end = !fgets(line, sizeof(line) - 1, file);
-        lineno++;
-    } while(1);
-
-    free(input);
-    fclose(file);
-    return 0;
-}
-
 //////////////////////////////////////////////////////////////////////
 // simulate flash in RAM! (including EOR flash overwrite)
 // TODO: verify "correctness" compared to esp8266 truth, but works othewise