feat: yowasp integration, icestick script

Author: sylefeb

bin/silice-make.py

@@ -36,6 +36,33 @@
 def colored(str,clr,attrs=0):
   return str
 
+def prepare_call(args,variant_pin_sets):
+    # prepare additional defines
+    defines = ""
+    if args.pins:
+        for pin_set in args.pins.split(','):
+            if not pin_set in variant_pin_sets:
+                print(colored("pin set '" + pin_set + "' not defined in board variant",'red'))
+                sys.exit(-1)
+            else:
+                if 'define' in variant_pin_sets[pin_set]:
+                    defines = defines + " -D " + variant_pin_sets[pin_set]['define']
+                    key_value = variant_pin_sets[pin_set]['define'].split('=')
+                    if len(key_value) == 2:
+                      os.environ[key_value[0]] = key_value[1]
+                    elif len(key_value) == 1:
+                      os.environ[key_value[0]] = 1
+    # adding command line defines
+    if args.defines:
+        for define in args.defines.split(','):
+            defines = defines + " -D " + define
+    # additional command line parameters
+    add_args = ""
+    if args.args:
+        for arg in args.args.split(','):
+            add_args = add_args + " --" + arg
+    return defines, add_args
+
 def make(cmd_args):
     # command line
     parser = argparse.ArgumentParser(description='silice-make is the Silice build tool')
@@ -254,6 +281,9 @@ def make(cmd_args):
           os.environ["PATH"] += os.pathsep + os.path.realpath(os.path.join(make_dir,"../tools/fpga-binutils/mingw64/bin/"))
           os.environ["PATH"] += os.pathsep + os.path.realpath("c:/intelFPGA_lite/19.1/quartus/bin64/")
 
+    # top module name
+    os.environ["SILICE_TOP"] = args.top
+
     if target_builder['builder'] == 'shell':
 
         # ==== building with a custom script
@@ -263,39 +293,13 @@ def make(cmd_args):
             if not sysconfig.get_platform().startswith("mingw"):
                 print(colored("to build from scripts please run MinGW python from a shell",'red'))
                 sys.exit(-1)
-
         # script check
         script = os.path.join(board_path,target_builder['command'])
         if not os.path.exists(script):
             print(colored("script " + script + " not found", 'red'))
             sys.exit()
-
-        # prepare additional defines
-        defines = ""
-        if args.pins:
-            for pin_set in args.pins.split(','):
-                if not pin_set in variant_pin_sets:
-                    print(colored("pin set '" + pin_set + "' not defined in board variant",'red'))
-                    sys.exit(-1)
-                else:
-                    if 'define' in variant_pin_sets[pin_set]:
-                        defines = defines + " -D " + variant_pin_sets[pin_set]['define']
-                        key_value = variant_pin_sets[pin_set]['define'].split('=')
-                        if len(key_value) == 2:
-                          os.environ[key_value[0]] = key_value[1]
-                        elif len(key_value) == 1:
-                          os.environ[key_value[0]] = 1
-        # adding command line defines
-        if args.defines:
-            for define in args.defines.split(','):
-                defines = defines + " -D " + define
-        # top module name
-        os.environ["SILICE_TOP"] = args.top
-        # additional command line parameters
-        add_args = ""
-        if args.args:
-            for arg in args.args.split(','):
-                add_args = add_args + " --" + arg
+        # prepare call
+        defines, add_args = prepare_call(args, variant_pin_sets)
         # execute
         command = script + " " + source_file
         print('launching command     ', colored(command,'cyan'))
@@ -307,15 +311,20 @@ def make(cmd_args):
 
     elif target_builder['builder'] == 'yowasp':
 
+        # ==== building with yowasp (custom python script)
+
         # script check
         script = os.path.join(board_path,target_builder['command'])
         if not os.path.exists(script):
             print(colored("script " + script + " not found", 'red'))
             sys.exit()
+        # prepare call
+        defines, add_args = prepare_call(args, variant_pin_sets)
         # execute
         import importlib.util
         spec   = importlib.util.spec_from_file_location("module_name", script)
         module = importlib.util.module_from_spec(spec)
+        module.silice_args = (source_file + " " + defines + " " + add_args + " --top " + args.top).strip()
         sys.modules["module_name"] = module
         spec.loader.exec_module(module)
 

frameworks/boards/icestick/icestick.py

@@ -1,10 +1,37 @@
+import os
+import sys
+
 import yowasp_silice
 import yowasp_yosys
 import yowasp_nextpnr_ice40
 
-# test Silice
-yowasp_silice.run_silice(["--help"])
-# test Yosys
-yowasp_yosys.run_yosys(["--help"])
-# test Nextpnr
-yowasp_nextpnr_ice40.run_nextpnr_ice40(["--help"])
+print("+ Silice bin directory       : ",os.getenv("SILICE_DIR",""))
+print("+ Build output directory     : ",os.getenv("BUILD_DIR",""))
+print("+ Silice frameworks directory: ",os.getenv("FRAMEWORKS_DIR",""))
+print("+ Frameworks file            : ",os.getenv("FRAMEWORK_FILE",""))
+print("+ Board directory            : ",os.getenv("BOARD_DIR",""))
+print("+ Board variant              : ",os.getenv("BOARD_VARIANT",""))
+print("+ Top module                 : ",os.getenv("SILICE_TOP",""))
+
+# go inside the build directory
+os.chdir(os.getenv("BUILD_DIR",""))
+
+# call silice
+args = sys.argv[1:]
+yowasp_silice.run_silice(["--frameworks_dir",os.getenv("FRAMEWORKS_DIR",""),
+                          "--framework",os.getenv("FRAMEWORK_FILE",""),
+                          *silice_args.split(" ")])
+# call yosys
+yosys_args = ['-l','yosys.log','-p',"read_verilog -sv out.v",'-p',"synth_ice40 -relut -top top -json build.json"]
+print(yosys_args)
+yowasp_yosys.run_yosys(yosys_args)
+
+# call nextpnr
+nextpnr_args=['--force','--hx1k','--json','build.json','--pcf',os.getenv("BOARD_DIR","") + '/icestick.pcf','--asc','build.asc','--package','tq144','--freq','12']
+yowasp_nextpnr_ice40.run_nextpnr_ice40(nextpnr_args)
+
+# call icepack
+yowasp_nextpnr_ice40.run_icepack(['build.asc','build.bin'])
+
+print("---")
+print("Bitstream produced in " + os.getenv("BUILD_DIR","") + "/build.bin, you can now program your board.")

src/libs/lua/src/ldo.c

@@ -53,10 +53,17 @@
 ** longjmp/setjmp otherwise.
 */
 #if !defined(LUAI_THROW)				/* { */
-
+#include <stdio.h>
 #if defined(__wasi__) /* { */
-
-#define LUAI_THROW(L,c) { abort(); }
+#define LUAI_THROW(L,c) { \
+  char str[4096];\
+  int errline = -1;\
+  const char *errmsg = lua_tostring(L, -1);\
+  snprintf(str, 4049, "[[LUA]exit] %s\n", errmsg);\
+  fprintf(stderr,str);\
+  fprintf(stderr,"preprocessor error\n");\
+  exit(2);\
+}
 #define LUAI_TRY(L,c,a) { a }
 #define luai_jmpbuf		int  /* dummy variable */
 
@@ -809,5 +816,3 @@ int luaD_protectedparser (lua_State *L, ZIO *z, const char *name,
   L->nny--;
   return status;
 }
-
-