Primitives no longer take an unused parameter

do_* functions are no longer considered to be "primitives"
flrl · Jul 23, 2009 · b837c5d · b837c5d
1 parent 4516e00
commit b837c5d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/builtin.c b/builtin.c
@@ -12,7 +12,7 @@
 // FIXME I think I may be able to make primitives no longer take a param
 
 // Function signature for a primitive
-#define DECLARE_PRIMITIVE(P)    void P (void *pfa)
+#define DECLARE_PRIMITIVE(P)    void P()
 
 // Define a primitive and add it to the dictionary
 #define PRIMITIVE(NAME, FLAGS, CNAME, LINK)                                         \

diff --git a/genh b/genh
@@ -19,7 +19,7 @@ PREAMBLE
 
 while (<>) {
     if (m/^\s*PRIMITIVE\s*\(\"[^"]+\",\s*[^,]+,\s*([^,]+),\s*[^,]+\s*\)\s*\{/) {
-        print "void $1 (void *);\n";
+        print "void $1 ();\n";
     }
     elsif (m/^\s*VARIABLE\s*\(([^,]+),\s*[^,]+,\s*[^,]+,\s*[^,]+\s*\)\s*;/) {
         print "extern cell * const var_$1;\n";
@@ -28,7 +28,7 @@ while (<>) {
         print "extern const cell * const const_$1;\n";
     }
     elsif (m/^\s*READONLY\s*\(([^,]+),\s*[^,]+,\s*[^,]+,\s*[^,]+\s*\)\s*;/) {
-        print "void readonly_$1 (void *);\n";
+        print "void readonly_$1 ();\n";
     }
 }
 

diff --git a/vm.c b/vm.c
@@ -4,9 +4,10 @@
 
 #include "exception.h"
 #include "vm.h"
+#include "builtin.h"
 
 // Pre-declare a few things
-DictEntry _dict__LIT;
+extern DictEntry _dict__LIT;
 
 /*
  *  +------+-----+------+------+-------+-------+-----+