More programs, more libraries. src/modules build files are now saner.

modules/src/alloc/build.lua

@@ -0,0 +1,10 @@
+clibrary {
+	name = "lib",
+	srcs = { "./*.c" },
+	hdrs = { "./alloc.h" },
+	deps = {
+		"modules+headers",
+		"modules/src/system+lib"
+	},
+}
+

modules/src/em_code/build.lua

@@ -0,0 +1,88 @@
+normalrule {
+	name = "em_code_ek_h",
+	ins = {
+		"./make.em.gen",
+		"./em.nogen",
+		"h/em_table"
+	},
+	outleaves = { "em_codeEK.h" },
+	commands = {
+		"%{ins[1]} %{ins[3]} > %{outs}",
+		"cat %{ins[2]} >> %{outs}"
+	}
+}
+
+local function build_variant(code, cflags)
+	clibrary {
+		name = "lib_"..code,
+		srcs = {
+			"./C_out.c",
+			"./bhcst.c",
+			"./bhdlb.c",
+			"./bhdnam.c",
+			"./bhfcon.c",
+			"./bhicon.c",
+			"./bhilb.c",
+			"./bhpnam.c",
+			"./bhucon.c",
+			"./crcst.c",
+			"./crdlb.c",
+			"./crdnam.c",
+			"./crilb.c",
+			"./crpnam.c",
+			"./crscon.c",
+			"./crxcon.c",
+			"./cst.c",
+			"./dfdlb.c",
+			"./dfdnam.c",
+			"./dfilb.c",
+			"./dlb.c",
+			"./dnam.c",
+			"./em.c",
+			"./end.c",
+			"./endarg.c",
+			"./exc.c",
+			"./failed.c",
+			"./fcon.c",
+			"./getid.c",
+			"./icon.c",
+			"./ilb.c",
+			"./insert.c",
+			"./internerr.c",
+			"./msend.c",
+			"./msstart.c",
+			"./op.c",
+			"./opcst.c",
+			"./opdlb.c",
+			"./opdnam.c",
+			"./opilb.c",
+			"./opnarg.c",
+			"./oppnam.c",
+			"./pnam.c",
+			"./pro.c",
+			"./pronarg.c",
+			"./psdlb.c",
+			"./psdnam.c",
+			"./pspnam.c",
+			"./scon.c",
+			"./ucon.c",
+		},
+		hdrs = {
+			"+em_code_ek_h"
+		},
+		deps = {
+			"+em_code_ek_h",
+			"h+emheaders",
+			"h+local",
+			"modules+headers",
+			"modules/src/alloc+lib",
+			"modules/src/system+lib",
+			"util/data+em_data",
+		},
+		cflags = { cflags }
+	}
+end
+
+build_variant("e", "-DREADABLE_EM")
+build_variant("k", "")
+

modules/src/flt_arith/build.lua

@@ -0,0 +1,10 @@
+clibrary {
+	name = "lib",
+	srcs = { "./*.c" },
+	hdrs = { "./flt_arith.h" },
+	deps = {
+		"modules+headers"
+	}
+}
+
+

modules/src/idf/build.lua

@@ -0,0 +1,7 @@
+clibrary {
+	name = "lib",
+	srcs = {},
+	hdrs = { "./idf_pkg.*" },
+}
+
+

modules/src/input/build.lua

@@ -0,0 +1,9 @@
+clibrary {
+	name = "lib",
+	srcs = {
+		"./*.c"
+	},
+	hdrs = { "./inp_pkg.*" }
+}
+
+

modules/src/object/build.lua

@@ -0,0 +1,11 @@
+clibrary {
+	name = "lib",
+	srcs = { "./*.c" },
+	deps = {
+		"modules+headers",
+		"h+local",
+		"h+emheaders",
+	},
+}
+
+

modules/src/print/build.lua

@@ -0,0 +1,11 @@
+clibrary {
+	name = "lib",
+	srcs = { "./*.c" },
+	hdrs = { "./print.h" },
+	deps = {
+		"modules+headers",
+		"modules/src/system+lib"
+	}
+}
+
+

modules/src/read_em/build.lua

@@ -0,0 +1,56 @@
+
+normalrule {
+	name = "c_mnem_narg_h",
+	ins = {
+		"./m_C_mnem_na",
+		"h/em_table",
+		"./argtype"
+	},
+	outleaves = "C_mnem_narg.h",
+	commands = {
+		"%{ins} > %{outs}"
+	}
+}
+	
+normalrule {
+	name = "c_mnem_h",
+	ins = {
+		"./m_C_mnem",
+		"h/em_table",
+		"./argtype"
+	},
+	outleaves = "C_mnem.h",
+	commands = {
+		"%{ins} > %{outs}"
+	}
+}
+	
+clibrary {
+	name = "lib_ev",
+	cflags = {
+		"-DPRIVATE=static",
+		"-DEXPORT=",
+		"-DNDEBUG",
+		"-DCHECKING"
+	},
+	srcs = {
+		"./EM_vars.c",
+		"./read_em.c",
+		"./mkcalls.c",
+	},
+	hdrs = {
+		"./em_comp.h",
+	},
+	deps = {
+		"+c_mnem_h",
+		"+c_mnem_narg_h",
+		"h+emheaders",
+		"modules+headers",
+		"modules/src/alloc+lib",
+		"modules/src/em_code+em_code_ek_h",
+		"modules/src/system+lib",
+		"util/data+em_data",
+	}
+}
+
+

modules/src/read_em/m_C_mnem

@@ -1,10 +1,11 @@
 #!/bin/sh
 
 EM_TABLE=$1
+ARGTYPE=$2
 echo "switch(p->em_opcode) {"
 for i in - cdflnorswz p b
 do
-	list=`./argtype $i $EM_TABLE`
+	list=`$ARGTYPE $i $EM_TABLE`
 	case $i in
 	-)	args='()'
 		echo "	/* no arguments */"
@@ -34,7 +35,7 @@ do
 EOF
 	done
 done
-list=`./argtype g $EM_TABLE`
+list=`$ARGTYPE g $EM_TABLE`
 cat << 'EOF'
 	default:
 /* a "g" argument */

modules/src/read_em/m_C_mnem_na

@@ -1,5 +1,6 @@
 EM_TABLE=$1
-list=`./argtype w $EM_TABLE`
+ARGTYPE=$2
+list=`$ARGTYPE w $EM_TABLE`
 echo "switch(p->em_opcode) {"
 for i in $list
 do

modules/src/string/build.lua

@@ -0,0 +1,7 @@
+clibrary {
+	name = "lib",
+	srcs = { "./*.c" },
+	deps = { "modules+headers" },
+}
+
+

modules/src/system/build.lua

@@ -0,0 +1,8 @@
+clibrary {
+	name = "lib",
+	srcs = { "./*.c" },
+	hdrs = { "./system.h" },
+	deps = { "modules+headers" },
+}
+
+