Changeset 2340de6 in buchla-68k for misc

Timestamp:

07/10/2017 09:06:56 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

4aa78b2

Parents:

526a993

Message:

Keep macros in external declarations.

Location:

misc

Files:

• gen-x.py (modified) (3 diffs)
• proto.x (modified) (2 diffs)

misc/gen-x.py

@@ -3 +3 @@
 from sys import stdout
 from pycparser import c_ast, parse_file, c_generator
+from re import escape, subn, search
 
 cross_gcc = "/opt/cross-m68k/bin/m68k-none-elf-gcc"
@@ -77 +78 @@
     def get_typs(self):
         return self.typs
+
+def fix(text, path):
+    with open(path, "r") as f:
+        cont = f.read()
+
+    (pat, n) = subn(r"\[[0-9]+\]", "[@]", text[7:])
+
+    if n == 0:
+        return text
+
+    rex = escape(pat). \
+         replace("\@", "([0-9A-Z_]+)"). \
+         replace("\ ", "[\t\n ]+")
+
+    m = search(rex, cont)
+
+    if not m:
+        raise Exception("error while matching {}".format(re))
+
+    pats = pat.split("@")
+    vals = m.groups()
+
+    if len(pats) != len(vals) + 1:
+        raise Exception("length mismatch: {} vs. {}". \
+                        format(len(pats), len(vals)))
+
+    out = pats[0]
+    pats = pats[1:]
+
+    while len(pats) > 0:
+        out += vals[0] + pats[0]
+        vals = vals[1:]
+        pats = pats[1:]
+
+    return "extern " + out
 
 gen = c_generator.CGenerator()
@@ -130 +166 @@
             decl.init = None
 
-            toks = gen.visit(decl).split(" ")
+            text = gen.visit(decl)
+            text = fix(text, decl.coord.file)
+
+            toks = text.split(" ")
             alig = ""
 

misc/proto.x

@@ -11 +11 @@
 #include "slice.h"
 #include "stdint.h"
+#include "timers.h"
 #include "vsdd.h"
 
@@ -42 +43 @@
 extern  void            (*pulse1)(void);
 extern  void            (*pulse2)(void);
-extern  int16_t         timers[8];
+extern  int16_t         timers[NTIMERS];
 extern  int32_t         uldivr;
 extern  uint16_t        vi_sadr;