Merge branch 'master' into graphics

2021-08-02 23:57:53 -07:00
parent 07f6667b66 80f62e8a41
commit 7b921387bc
61 changed files with 723 additions and 860462 deletions
--- a/hw/scripts/scope.py
+++ b/hw/scripts/scope.py
@@ -241,7 +241,7 @@ def expand_text(text, params):

    while True:
        if iter > 65536:
-            raise Exception("Macro recursion!")
+            raise Exception("Macro recursion!")    
        has_func = False
        while True:
            params_updated = False