shithub: mc

Info  •  Files  •  Log  •  Branches

Merge git+ssh://mimir.eigenstate.org/git/qz/mc

--- a/6/main.c

+++ b/6/main.c

@@ -46,7 +46,7 @@

     swapsuffix(objfile, 1024, f, ".s", ".o");

     snprintf(cmd, 1024, Asmcmd, objfile, f);

     if (system(cmd) == -1)

-      die("Couldn't run assembler");

+        die("Couldn't run assembler");

 }

 int main(int argc, char **argv)

--- a/6/ra.c

+++ b/6/ra.c

@@ -51,8 +51,6 @@

     [11]  = {Rnone, R13b, R13w, R13d, R13},

     [12]  = {Rnone, R14b, R14w, R14d, R14},

     [13]  = {Rnone, R15b, R15w, R15d, R15},

-    [14]  = {Rnone, Rnone, Rnone, Resp},

-    [15]  = {Rnone, Rnone, Rnone, Rebp},

 };

 int colourmap[Nreg] = {

@@ -119,9 +117,6 @@

     [R13] = 11,

     [R14] = 12,

     [R15] = 13,

-

-    [Rrsp] = 14,

-    [Rrbp] = 15,

 };

 /* %esp, %ebp are not in the allocatable pool */

--- a/parse/infer.c

+++ b/parse/infer.c

@@ -24,7 +24,7 @@

     /* nodes that need post-inference checking/unification */

     Node **postcheck;

     size_t npostcheck;

-    /* the type parmas bound at the current point */

+    /* the type params bound at the current point */

     Htab **tybindings;

     size_t ntybindings;

     /* generic declarations to be specialized */

--- a/parse/parse.h

+++ b/parse/parse.h

@@ -41,6 +41,7 @@

 #define Ty(t, n) t,

 #include "types.def"

 #undef Ty

+    Ntypes

 } Ty;

 typedef enum {

--- a/parse/types.def

+++ b/parse/types.def

@@ -43,4 +43,3 @@

 Ty(Typaram, NULL)

 Ty(Tyunres, NULL) /* unresolved */

 Ty(Tyname, NULL)

-Ty(Ntypes, NULL)