ref: 57b18110b46e055acaccd274479c9e73b54b43c5
parent: f143320b261f68c3fe03eb42ba5fc4dbc93ecba5
parent: 94f384355a0ee391c02b90d9d72b9bea936bb3a3
author: Ori Bernstein <[email protected]>
date: Fri Jun 15 08:08:10 EDT 2012
Merge branch 'master' of git+ssh://mimir.eigenstate.org/git/ori/mc2
--- a/8/ra.c
+++ b/8/ra.c
@@ -210,7 +210,7 @@
return i->args[0]->type == Locreg && i->args[1]->type == Locreg;
}
-/* static */ int gbhasedge(Isel *s, size_t u, size_t v)
+static int gbhasedge(Isel *s, size_t u, size_t v)
{size_t i;
i = (maxregid * v) + u;
@@ -244,7 +244,7 @@
}
}
-void setup(Isel *s)
+static void setup(Isel *s)
{Bitset **gadj;
size_t gchunks;
@@ -330,7 +330,7 @@
}
}
-Bitset *adjacent(Isel *s, regid n)
+static Bitset *adjacent(Isel *s, regid n)
{Bitset *r;
size_t i;
@@ -342,7 +342,7 @@
return r;
}
-size_t nodemoves(Isel *s, regid n, Insn ***pil)
+static size_t nodemoves(Isel *s, regid n, Insn ***pil)
{size_t i, j;
size_t count;
@@ -375,7 +375,7 @@
return nodemoves(s, n, NULL) != 0;
}
-/* static */ void mkworklist(Isel *s)
+static void mkworklist(Isel *s)
{size_t i;
@@ -391,7 +391,7 @@
}
}
-void enablemove(Isel *s, regid n)
+static void enablemove(Isel *s, regid n)
{size_t i, j;
Insn **il;
@@ -408,7 +408,7 @@
}
}
-void decdegree(Isel *s, regid n)
+static void decdegree(Isel *s, regid n)
{int d;
regid m;
@@ -426,7 +426,7 @@
}
}
-void simp(Isel *s)
+static void simp(Isel *s)
{Loc *l;
Bitset *adj;
@@ -440,7 +440,7 @@
bsfree(adj);
}
-regid getalias(Isel *s, regid id)
+static regid getalias(Isel *s, regid id)
{ while (1) {if (!s->aliasmap[id])
@@ -450,7 +450,7 @@
return id;
}
-void wladd(Isel *s, regid u)
+static void wladd(Isel *s, regid u)
{size_t i;
@@ -466,7 +466,7 @@
lappend(&s->wlsimp, &s->nwlsimp, locmap[u]);
}
-int conservative(Isel *s, regid u, regid v)
+static int conservative(Isel *s, regid u, regid v)
{int k;
regid n;
@@ -489,7 +489,7 @@
}
/* FIXME: is this actually correct? */
-int ok(Isel *s, regid t, regid r)
+static int ok(Isel *s, regid t, regid r)
{if (s->degree[t] >= K)
return 0;
@@ -500,7 +500,7 @@
return 1;
}
-int combinable(Isel *s, regid u, regid v)
+static int combinable(Isel *s, regid u, regid v)
{regid t;
Bitset *adj;
@@ -518,7 +518,7 @@
return 1;
}
-int wlhas(Loc **wl, size_t nwl, regid v, size_t *idx)
+static int wlhas(Loc **wl, size_t nwl, regid v, size_t *idx)
{size_t i;
@@ -531,7 +531,7 @@
return 0;
}
-void combine(Isel *s, regid u, regid v)
+static void combine(Isel *s, regid u, regid v)
{Bitset *adj;
regid t;
@@ -578,7 +578,7 @@
}
-void coalesce(Isel *s)
+static void coalesce(Isel *s)
{Insn *m;
regid u, v, tmp;
@@ -611,7 +611,7 @@
}
}
-int mldel(Insn ***ml, size_t *nml, Insn *m)
+static int mldel(Insn ***ml, size_t *nml, Insn *m)
{size_t i;
for (i = 0; i < *nml; i++) {@@ -623,7 +623,7 @@
return 0;
}
-void freezemoves(Isel *s, Loc *u)
+static void freezemoves(Isel *s, Loc *u)
{size_t i;
Insn **ml;
@@ -656,7 +656,7 @@
lfree(&ml, &nml);
}
-void freeze(Isel *s)
+static void freeze(Isel *s)
{Loc *l;
@@ -665,7 +665,7 @@
freezemoves(s, l);
}
-void selspill(Isel *s)
+static void selspill(Isel *s)
{size_t i;
Loc *m;
@@ -683,7 +683,7 @@
freezemoves(s, m);
}
-int paint(Isel *s)
+static int paint(Isel *s)
{int taken[K + 2]; /* esp, ebp aren't "real colours" */
Bitset *adj;
@@ -732,7 +732,7 @@
return spilled;
}
-void rewrite(Isel *s)
+static void rewrite(Isel *s)
{ die("Rewrite spills!");}
--- a/8/reduce.c
+++ b/8/reduce.c
@@ -88,7 +88,7 @@
return s;
}
-size_t tysize(Type *t)
+static size_t tysize(Type *t)
{size_t sz;
size_t i;
@@ -641,6 +641,7 @@
genasm(fd, &fn, globls);
}
+void blobdump(Blob *b, FILE *fd); /* shut up compiler warnings */
void blobdump(Blob *b, FILE *fd)
{size_t i;