Merge.

Author: davidgiven

apps/adm3adrv.S

@@ -12,7 +12,7 @@
 
 ; force clang version and not the asm.com version
 
-#include "../include/cpm65.inc"
+#include "cpm65.inc"
 #include "driver.inc"
 #include "jumptables.inc"
 

apps/build.py

@@ -11,8 +11,8 @@ def asm(self, name, src: Target = None, deps: Targets = []):
         outs=["=out.com"],
         deps=["tools/cpmemu", "apps+asm"] + deps,
         commands=[
-            'chronic sh -c "{deps[0]} {deps[1]} -pA=$(dir {ins[0]}) -pB=$(dir {outs[0]})'
-            + ' a:$(notdir {ins[0]}) b:$(notdir {outs[0]}); test -f {outs[0]}"'
+            'chronic sh -c "$[deps[0]] $[deps[1]] -pA=$(dir $[ins[0]]) -pB=$(dir $[outs[0]])'
+            + ' a:$(notdir $[ins[0]]) b:$(notdir $[outs[0]]); test -f $[outs[0]]"'
         ],
         label="ASM",
     )
@@ -40,7 +40,7 @@ def asm(self, name, src: Target = None, deps: Targets = []):
     asm(
         name=prog,
         src=("./%s.asm" % prog),
-        deps=["./cpm65.inc", "./drivers.inc"],
+        deps=["./cpm65.inc", "./drivers.inc", "third_party/lib6502/6502data.h"],
     )
 
 # Simple C programs.
@@ -59,7 +59,11 @@ def asm(self, name, src: Target = None, deps: Targets = []):
     "submit",
     "sys"
 ]:
-    llvmprogram(name=prog, srcs=["./%s.c" % prog], deps=["lib+cpm65"])
+    llvmprogram(
+        name=prog,
+        srcs=["./%s.c" % prog],
+        deps=["lib+cpm65", "third_party/lib6502/6502data.h"],
+    )
 
 # Source code.
 
@@ -75,3 +79,11 @@ def asm(self, name, src: Target = None, deps: Targets = []):
         "include",
     ],
 )
+
+llvmprogram(
+    name="scrvt100",
+    srcs=["./scrvt100.S"],
+    deps=[
+        "include",
+    ],
+)

src/arch/osi/utils/scrvt100.S apps/scrvt100.Ssrc/arch/osi/utils/scrvt100.S renamed to apps/scrvt100.S

@@ -9,6 +9,9 @@
 ; -------------------------------------------------------------------------
 
 #include "zif.inc"
+
+; force clang version and not the asm.com version
+
 #include "cpm65.inc"
 #include "driver.inc"
 #include "jumptables.inc"

build.py

@@ -55,32 +55,25 @@
         "images/kim-1-sdcard.zip": "src/arch/kim-1+distro-sdcard",
         "images/kim-1-iec.zip": "src/arch/kim-1+distro-iec",
     },
-    deps=[
-        "tests"
-    ],
+    deps=["tests"],
 )
 
 export(
     name="mametest",
     deps=[
         "src/arch/bbcmicro+mametest",
         "src/arch/commodore+c64_mametest",
-        
         # MAME's ROM configuration is for the graphics keyboard, but MAME's
         # hardware emulates the business keyboard, so we can't interact with the
         # system.
-        #"src/arch/commodore+pet4032_mametest",
-
+        # "src/arch/commodore+pet4032_mametest",
         # MAME's ROM configuration is for the business keyboard, but MAME's
         # hardware emulates the graphics keyboard...
-        #"src/arch/commodore+pet8032_mametest",
-
+        # "src/arch/commodore+pet8032_mametest",
         # Works locally, but not on github CI.
-        #"src/arch/apple2e+mametest",
-
+        # "src/arch/apple2e+mametest",
         # Fails everywhere.
-        #"src/arch/atari800+mametest",
-
+        # "src/arch/atari800+mametest",
         "src/arch/oric+mametest",
     ],
 )

build/_sandbox.py

@@ -0,0 +1,44 @@
+#!/usr/bin/python3
+
+from os.path import *
+import argparse
+import os
+import shutil
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("-s", "--sandbox")
+    parser.add_argument("-v", "--verbose", action="store_true")
+    parser.add_argument("-l", "--link", action="store_true")
+    parser.add_argument("-e", "--export", action="store_true")
+    parser.add_argument("files", nargs="*")
+    args = parser.parse_args()
+
+    assert args.sandbox, "You must specify a sandbox directory"
+    assert args.link ^ args.export, "You can't link and export at the same time"
+
+    if args.link:
+        os.makedirs(args.sandbox, exist_ok=True)
+        for f in args.files:
+            sf = join(args.sandbox, f)
+            if args.verbose:
+                print("link", sf)
+            os.makedirs(dirname(sf), exist_ok=True)
+            try:
+                os.link(abspath(f), sf)
+            except PermissionError:
+                shutil.copy(f, sf)
+
+    if args.export:
+        for f in args.files:
+            sf = join(args.sandbox, f)
+            if args.verbose:
+                print("export", sf)
+            df = dirname(f)
+            if df:
+                os.makedirs(df, exist_ok=True)
+            os.rename(sf, f)
+
+
+main()

build/_zip.py

@@ -0,0 +1,25 @@
+#!/usr/bin/python3
+
+from os.path import *
+import argparse
+import os
+from zipfile import ZipFile
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("-z", "--zipfile")
+    parser.add_argument("-v", "--verbose", action="store_true")
+    parser.add_argument("-f", "--file", nargs=2, action="append")
+    args = parser.parse_args()
+
+    assert args.zipfile, "You must specify a zipfile to create"
+
+    with ZipFile(args.zipfile, mode="w") as zf:
+        for zipname, filename in args.file:
+            if args.verbose:
+                print(filename, "->", zipname)
+            zf.write(filename, arcname=zipname)
+
+
+main()

build/ab.mk

@@ -8,16 +8,23 @@ endif
 
 OBJ ?= .obj
 PYTHON ?= python3
-CC ?= gcc
-CXX ?= g++
-AR ?= ar
-CFLAGS ?= -g -Og
-LDFLAGS ?= -g
 PKG_CONFIG ?= pkg-config
 HOST_PKG_CONFIG ?= $(PKG_CONFIG)
 ECHO ?= echo
 CP ?= cp
 
+HOSTCC ?= gcc
+HOSTCXX ?= g++
+HOSTAR ?= ar
+HOSTCFLAGS ?= -g -Og
+HOSTLDFLAGS ?= -g
+
+CC ?= $(HOSTCC)
+CXX ?= $(HOSTCXX)
+AR ?= $(HOSTAR)
+CFLAGS ?= $(HOSTCFLAGS)
+LDFLAGS ?= $(HOSTLDFLAGS)
+
 export PKG_CONFIG
 export HOST_PKG_CONFIG
 
@@ -51,6 +58,8 @@ ifeq ($(OS), Windows_NT)
 endif
 EXT ?=
 
+CWD=$(shell pwd)
+
 ifeq ($(PROGRESSINFO),)
 # The first make invocation here has to have its output discarded or else it
 # produces spurious 'Leaving directory' messages... don't know why.

build/ab.py

@@ -17,6 +17,9 @@
 import string
 import sys
 import hashlib
+import re
+import ast
+from collections import namedtuple
 
 verbose = False
 quiet = False
@@ -26,6 +29,22 @@
 materialisingStack = []
 defaultGlobals = {}
 
+RE_FORMAT_SPEC = re.compile(
+    r"(?:(?P<fill>[\s\S])?(?P<align>[<>=^]))?"
+    r"(?P<sign>[- +])?"
+    r"(?P<pos_zero>z)?"
+    r"(?P<alt>#)?"
+    r"(?P<zero_padding>0)?"
+    r"(?P<width_str>\d+)?"
+    r"(?P<grouping>[_,])?"
+    r"(?:(?P<decimal>\.)(?P<precision_str>\d+))?"
+    r"(?P<type>[bcdeEfFgGnosxX%])?"
+)
+
+CommandFormatSpec = namedtuple(
+    "CommandFormatSpec", RE_FORMAT_SPEC.groupindex.keys()
+)
+
 sys.path += ["."]
 old_import = builtins.__import__
 
@@ -80,6 +99,29 @@ def error(message):
     raise ABException(message)
 
 
+class BracketedFormatter(string.Formatter):
+    def parse(self, format_string):
+        while format_string:
+            left, *right = format_string.split("$[", 1)
+            if not right:
+                yield (left, None, None, None)
+                break
+            right = right[0]
+
+            offset = len(right) + 1
+            try:
+                ast.parse(right)
+            except SyntaxError as e:
+                if not str(e).startswith("unmatched ']'"):
+                    raise e
+                offset = e.offset
+
+            expr = right[0 : offset - 1]
+            format_string = right[offset:]
+
+            yield (left if left else None, expr, None, None)
+
+
 def Rule(func):
     sig = inspect.signature(func)
 
@@ -166,7 +208,7 @@ def __repr__(self):
         return f"Target('{self.name}')"
 
     def templateexpand(selfi, s):
-        class Formatter(string.Formatter):
+        class Formatter(BracketedFormatter):
             def get_field(self, name, a1, a2):
                 return (
                     eval(name, selfi.callback.__globals__, selfi.args),
@@ -358,10 +400,11 @@ def convert(value, target):
 def _removesuffix(self, suffix):
     # suffix='' should not call self[:-0].
     if suffix and self.endswith(suffix):
-        return self[:-len(suffix)]
+        return self[: -len(suffix)]
     else:
         return self[:]
 
+
 def loadbuildfile(filename):
     filename = _removesuffix(filename.replace("/", "."), ".py")
     builtins.__import__(filename)
@@ -413,8 +456,9 @@ def emit(*args, into=None):
         outputFp.write(s)
 
 
-def emit_rule(name, ins, outs, cmds=[], label=None):
-    fins = filenamesof(ins)
+def emit_rule(self, ins, outs, cmds=[], label=None):
+    name = self.name
+    fins = set(filenamesof(ins))
     fouts = filenamesof(outs)
     nonobjs = [f for f in fouts if not f.startswith("$(OBJ)")]
 
@@ -440,8 +484,23 @@ def emit_rule(name, ins, outs, cmds=[], label=None):
 
         if label:
             emit("\t$(hide)", "$(ECHO) $(PROGRESSINFO)", label, into=lines)
+
+        sandbox = join(self.dir, "sandbox")
+        emit("\t$(hide)", f"rm -rf {sandbox}", into=lines)
+        emit(
+            "\t$(hide)",
+            f"$(PYTHON) build/_sandbox.py --link -s {sandbox}",
+            *fins,
+            into=lines,
+        )
         for c in cmds:
-            emit("\t$(hide)", c, into=lines)
+            emit(f"\t$(hide) cd {sandbox} && (", c, ")", into=lines)
+        emit(
+            "\t$(hide)",
+            f"$(PYTHON) build/_sandbox.py --export -s {sandbox}",
+            *fouts,
+            into=lines,
+        )
     else:
         assert len(cmds) == 0, "rules with no outputs cannot have commands"
         emit(name, ":", *fins, into=lines)
@@ -486,10 +545,10 @@ def simplerule(
         cs += [self.templateexpand(c)]
 
     emit_rule(
-        name=self.name,
+        self=self,
         ins=ins + deps,
         outs=outs,
-        label=self.templateexpand("{label} {name}") if label else None,
+        label=self.templateexpand("$[label] $[name]") if label else None,
         cmds=cs,
     )
 
@@ -514,7 +573,7 @@ def export(self, name=None, items: TargetsMap = {}, deps: Targets = []):
             cwd=self.cwd,
             ins=[srcs[0]],
             outs=[destf],
-            commands=["$(CP) %s %s" % (srcs[0], destf)],
+            commands=["$(CP) -H %s %s" % (srcs[0], destf)],
             label="",
         )
         subrule.materialise()
@@ -523,7 +582,7 @@ def export(self, name=None, items: TargetsMap = {}, deps: Targets = []):
         replaces=self,
         ins=outs + deps,
         outs=["=sentinel"],
-        commands=["touch {outs[0]}"],
+        commands=["touch $[outs[0]]"],
         label="EXPORT",
     )