<p>Martin Roth <strong>merged</strong> this change.</p><p><a href="https://review.coreboot.org/28293">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  build bot (Jenkins): Verified
  Martin Roth: Looks good to me, approved

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">util/romcc: Fix typos<br><br>Change-Id: Ia9f0f1f527476900e6c54c60508600e16bea786f<br>Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr><br>Reviewed-on: https://review.coreboot.org/28293<br>Tested-by: build bot (Jenkins) <no-reply@coreboot.org><br>Reviewed-by: Martin Roth <martinroth@google.com><br>---<br>M util/romcc/romcc.c<br>M util/romcc/tests/linux_test2.c<br>M util/romcc/tests/raminit_test.c<br>M util/romcc/tests/raminit_test1.c<br>M util/romcc/tests/raminit_test2.c<br>M util/romcc/tests/simple_test30.c<br>6 files changed, 182 insertions(+), 182 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/util/romcc/romcc.c b/util/romcc/romcc.c</span><br><span>index ebea26f..307fcf8 100644</span><br><span>--- a/util/romcc/romcc.c</span><br><span>+++ b/util/romcc/romcc.c</span><br><span>@@ -446,14 +446,14 @@</span><br><span> </span><br><span> #define OP_UEXTRACT  34</span><br><span> /* OP_UEXTRACT extracts an unsigned bitfield from a pseudo register</span><br><span style="color: hsl(0, 100%, 40%);">- * RHS(0) holds the psuedo register to extract from</span><br><span style="color: hsl(120, 100%, 40%);">+ * RHS(0) holds the pseudo register to extract from</span><br><span>  * ->type holds the size of the bitfield.</span><br><span>  * ->u.bitfield.size holds the size of the bitfield.</span><br><span>  * ->u.bitfield.offset holds the offset to extract from</span><br><span>  */</span><br><span> #define OP_SEXTRACT  35</span><br><span> /* OP_SEXTRACT extracts a signed bitfield from a pseudo register</span><br><span style="color: hsl(0, 100%, 40%);">- * RHS(0) holds the psuedo register to extract from</span><br><span style="color: hsl(120, 100%, 40%);">+ * RHS(0) holds the pseudo register to extract from</span><br><span>  * ->type holds the size of the bitfield.</span><br><span>  * ->u.bitfield.size holds the size of the bitfield.</span><br><span>  * ->u.bitfield.offset holds the offset to extract from</span><br><span>@@ -495,7 +495,7 @@</span><br><span> #define OP_WRITE     60</span><br><span> /* OP_WRITE moves one pseudo register to another.</span><br><span>  * MISC(0) holds the destination pseudo register, which must be an OP_DECL.</span><br><span style="color: hsl(0, 100%, 40%);">- * RHS(0) holds the psuedo to move.</span><br><span style="color: hsl(120, 100%, 40%);">+ * RHS(0) holds the pseudo to move.</span><br><span>  */</span><br><span> </span><br><span> #define OP_READ      61</span><br><span>@@ -926,13 +926,13 @@</span><br><span> #define MAX_MISC 3</span><br><span> #define MAX_TARG 1</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct occurance {</span><br><span style="color: hsl(120, 100%, 40%);">+struct occurrence {</span><br><span>     int count;</span><br><span>   const char *filename;</span><br><span>        const char *function;</span><br><span>        int line;</span><br><span>    int col;</span><br><span style="color: hsl(0, 100%, 40%);">-        struct occurance *parent;</span><br><span style="color: hsl(120, 100%, 40%);">+     struct occurrence *parent;</span><br><span> };</span><br><span> struct bitfield {</span><br><span>        ulong_t size : 8;</span><br><span>@@ -967,7 +967,7 @@</span><br><span> #define TRIPLE_FLAG_LOCAL    (1 << 26)</span><br><span> </span><br><span> #define TRIPLE_FLAG_COPY TRIPLE_FLAG_VOLATILE</span><br><span style="color: hsl(0, 100%, 40%);">-    struct occurance *occurance;</span><br><span style="color: hsl(120, 100%, 40%);">+  struct occurrence *occurrence;</span><br><span>       union {</span><br><span>              ulong_t cval;</span><br><span>                struct bitfield bitfield;</span><br><span>@@ -1081,7 +1081,7 @@</span><br><span>    FILE *errout;</span><br><span>        FILE *dbgout;</span><br><span>        struct file_state *file;</span><br><span style="color: hsl(0, 100%, 40%);">-        struct occurance *last_occurance;</span><br><span style="color: hsl(120, 100%, 40%);">+     struct occurrence *last_occurrence;</span><br><span>  const char *function;</span><br><span>        int    token_base;</span><br><span>   struct token token[6];</span><br><span>@@ -1765,9 +1765,9 @@</span><br><span> static void loc(FILE *fp, struct compile_state *state, struct triple *triple)</span><br><span> {</span><br><span>         int col;</span><br><span style="color: hsl(0, 100%, 40%);">-        if (triple && triple->occurance) {</span><br><span style="color: hsl(0, 100%, 40%);">-           struct occurance *spot;</span><br><span style="color: hsl(0, 100%, 40%);">-         for(spot = triple->occurance; spot; spot = spot->parent) {</span><br><span style="color: hsl(120, 100%, 40%);">+      if (triple && triple->occurrence) {</span><br><span style="color: hsl(120, 100%, 40%);">+                struct occurrence *spot;</span><br><span style="color: hsl(120, 100%, 40%);">+              for(spot = triple->occurrence; spot; spot = spot->parent) {</span><br><span>                    fprintf(fp, "%s:%d.%d: ",</span><br><span>                          spot->filename, spot->line, spot->col);</span><br><span>             }</span><br><span>@@ -1944,30 +1944,30 @@</span><br><span>  }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void put_occurance(struct occurance *occurance)</span><br><span style="color: hsl(120, 100%, 40%);">+static void put_occurrence(struct occurrence *occurrence)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-        if (occurance) {</span><br><span style="color: hsl(0, 100%, 40%);">-                occurance->count -= 1;</span><br><span style="color: hsl(0, 100%, 40%);">-               if (occurance->count <= 0) {</span><br><span style="color: hsl(0, 100%, 40%);">-                      if (occurance->parent) {</span><br><span style="color: hsl(0, 100%, 40%);">-                             put_occurance(occurance->parent);</span><br><span style="color: hsl(120, 100%, 40%);">+  if (occurrence) {</span><br><span style="color: hsl(120, 100%, 40%);">+             occurrence->count -= 1;</span><br><span style="color: hsl(120, 100%, 40%);">+            if (occurrence->count <= 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+                   if (occurrence->parent) {</span><br><span style="color: hsl(120, 100%, 40%);">+                          put_occurrence(occurrence->parent);</span><br><span>                       }</span><br><span style="color: hsl(0, 100%, 40%);">-                       xfree(occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+                     xfree(occurrence);</span><br><span>           }</span><br><span>    }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void get_occurance(struct occurance *occurance)</span><br><span style="color: hsl(120, 100%, 40%);">+static void get_occurrence(struct occurrence *occurrence)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-        if (occurance) {</span><br><span style="color: hsl(0, 100%, 40%);">-                occurance->count += 1;</span><br><span style="color: hsl(120, 100%, 40%);">+     if (occurrence) {</span><br><span style="color: hsl(120, 100%, 40%);">+             occurrence->count += 1;</span><br><span>   }</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct occurance *new_occurance(struct compile_state *state)</span><br><span style="color: hsl(120, 100%, 40%);">+static struct occurrence *new_occurrence(struct compile_state *state)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-   struct occurance *result, *last;</span><br><span style="color: hsl(120, 100%, 40%);">+      struct occurrence *result, *last;</span><br><span>    const char *filename;</span><br><span>        const char *function;</span><br><span>        int line, col;</span><br><span>@@ -1984,7 +1984,7 @@</span><br><span>       if (state->function) {</span><br><span>            function = state->function;</span><br><span>       }</span><br><span style="color: hsl(0, 100%, 40%);">-       last = state->last_occurance;</span><br><span style="color: hsl(120, 100%, 40%);">+      last = state->last_occurrence;</span><br><span>    if (last &&</span><br><span>          (last->col == col) &&</span><br><span>             (last->line == line) &&</span><br><span>@@ -1992,28 +1992,28 @@</span><br><span>                 ((last->filename == filename) ||</span><br><span>                  (strcmp(last->filename, filename) == 0)))</span><br><span>         {</span><br><span style="color: hsl(0, 100%, 40%);">-               get_occurance(last);</span><br><span style="color: hsl(120, 100%, 40%);">+          get_occurrence(last);</span><br><span>                return last;</span><br><span>         }</span><br><span>    if (last) {</span><br><span style="color: hsl(0, 100%, 40%);">-             state->last_occurance = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-           put_occurance(last);</span><br><span style="color: hsl(120, 100%, 40%);">+          state->last_occurrence = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+                put_occurrence(last);</span><br><span>        }</span><br><span style="color: hsl(0, 100%, 40%);">-       result = xmalloc(sizeof(*result), "occurance");</span><br><span style="color: hsl(120, 100%, 40%);">+     result = xmalloc(sizeof(*result), "occurrence");</span><br><span>   result->count    = 2;</span><br><span>     result->filename = filename;</span><br><span>      result->function = function;</span><br><span>      result->line     = line;</span><br><span>  result->col      = col;</span><br><span>   result->parent   = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-        state->last_occurance = result;</span><br><span style="color: hsl(120, 100%, 40%);">+    state->last_occurrence = result;</span><br><span>  return result;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct occurance *inline_occurance(struct compile_state *state,</span><br><span style="color: hsl(0, 100%, 40%);">-   struct occurance *base, struct occurance *top)</span><br><span style="color: hsl(120, 100%, 40%);">+static struct occurrence *inline_occurrence(struct compile_state *state,</span><br><span style="color: hsl(120, 100%, 40%);">+      struct occurrence *base, struct occurrence *top)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-   struct occurance *result, *last;</span><br><span style="color: hsl(120, 100%, 40%);">+      struct occurrence *result, *last;</span><br><span>    if (top->parent) {</span><br><span>                internal_error(state, 0, "inlining an already inlined function?");</span><br><span>         }</span><br><span>@@ -2025,36 +2025,36 @@</span><br><span>          (base->filename[0] == '\0')) {</span><br><span>            base = 0;</span><br><span>    }</span><br><span style="color: hsl(0, 100%, 40%);">-       /* See if I can reuse the last occurance I had */</span><br><span style="color: hsl(0, 100%, 40%);">-       last = state->last_occurance;</span><br><span style="color: hsl(120, 100%, 40%);">+      /* See if I can reuse the last occurrence I had */</span><br><span style="color: hsl(120, 100%, 40%);">+    last = state->last_occurrence;</span><br><span>    if (last &&</span><br><span>          (last->parent   == base) &&</span><br><span>               (last->col      == top->col) &&</span><br><span>                (last->line     == top->line) &&</span><br><span>               (last->function == top->function) &&</span><br><span>           (last->filename == top->filename)) {</span><br><span style="color: hsl(0, 100%, 40%);">-              get_occurance(last);</span><br><span style="color: hsl(120, 100%, 40%);">+          get_occurrence(last);</span><br><span>                return last;</span><br><span>         }</span><br><span style="color: hsl(0, 100%, 40%);">-       /* I can't reuse the last occurance so free it */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* I can't reuse the last occurrence so free it */</span><br><span>       if (last) {</span><br><span style="color: hsl(0, 100%, 40%);">-             state->last_occurance = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-           put_occurance(last);</span><br><span style="color: hsl(120, 100%, 40%);">+          state->last_occurrence = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+                put_occurrence(last);</span><br><span>        }</span><br><span style="color: hsl(0, 100%, 40%);">-       /* Generate a new occurance structure */</span><br><span style="color: hsl(0, 100%, 40%);">-        get_occurance(base);</span><br><span style="color: hsl(0, 100%, 40%);">-    result = xmalloc(sizeof(*result), "occurance");</span><br><span style="color: hsl(120, 100%, 40%);">+     /* Generate a new occurrence structure */</span><br><span style="color: hsl(120, 100%, 40%);">+     get_occurrence(base);</span><br><span style="color: hsl(120, 100%, 40%);">+ result = xmalloc(sizeof(*result), "occurrence");</span><br><span>   result->count    = 2;</span><br><span>     result->filename = top->filename;</span><br><span>      result->function = top->function;</span><br><span>      result->line     = top->line;</span><br><span>  result->col      = top->col;</span><br><span>   result->parent   = base;</span><br><span style="color: hsl(0, 100%, 40%);">-     state->last_occurance = result;</span><br><span style="color: hsl(120, 100%, 40%);">+    state->last_occurrence = result;</span><br><span>  return result;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct occurance dummy_occurance = {</span><br><span style="color: hsl(120, 100%, 40%);">+static struct occurrence dummy_occurrence = {</span><br><span>    .count    = 2,</span><br><span>       .filename = __FILE__,</span><br><span>        .function = "",</span><br><span>@@ -2079,7 +2079,7 @@</span><br><span>    .type      = &unknown_type,</span><br><span>      .id        = -1, /* An invalid id */</span><br><span>         .u = { .cval = 0, },</span><br><span style="color: hsl(0, 100%, 40%);">-    .occurance = &dummy_occurance,</span><br><span style="color: hsl(120, 100%, 40%);">+    .occurrence = &dummy_occurrence,</span><br><span>         .param = { [0] = 0, [1] = 0, },</span><br><span> };</span><br><span> </span><br><span>@@ -2088,13 +2088,13 @@</span><br><span> </span><br><span> static struct triple *alloc_triple(struct compile_state *state,</span><br><span>   int op, struct type *type, int lhs_wanted, int rhs_wanted,</span><br><span style="color: hsl(0, 100%, 40%);">-      struct occurance *occurance)</span><br><span style="color: hsl(120, 100%, 40%);">+  struct occurrence *occurrence)</span><br><span> {</span><br><span>  size_t size, extra_count, min_count;</span><br><span>         int lhs, rhs, misc, targ;</span><br><span>    struct triple *ret, dummy;</span><br><span>   dummy.op = op;</span><br><span style="color: hsl(0, 100%, 40%);">-  dummy.occurance = occurance;</span><br><span style="color: hsl(120, 100%, 40%);">+  dummy.occurrence = occurrence;</span><br><span>       valid_op(state, op);</span><br><span>         lhs = table_ops[op].lhs;</span><br><span>     rhs = table_ops[op].rhs;</span><br><span>@@ -2146,7 +2146,7 @@</span><br><span>     ret->type      = type;</span><br><span>    ret->next      = ret;</span><br><span>     ret->prev      = ret;</span><br><span style="color: hsl(0, 100%, 40%);">-        ret->occurance = occurance;</span><br><span style="color: hsl(120, 100%, 40%);">+        ret->occurrence = occurrence;</span><br><span>     /* A simple sanity check */</span><br><span>  if ((ret->op != op) ||</span><br><span>            (ret->lhs != lhs) ||</span><br><span>@@ -2156,7 +2156,7 @@</span><br><span>              (ret->type != type) ||</span><br><span>            (ret->next != ret) ||</span><br><span>             (ret->prev != ret) ||</span><br><span style="color: hsl(0, 100%, 40%);">-                (ret->occurance != occurance)) {</span><br><span style="color: hsl(120, 100%, 40%);">+           (ret->occurrence != occurrence)) {</span><br><span>                internal_error(state, ret, "huh?");</span><br><span>        }</span><br><span>    return ret;</span><br><span>@@ -2169,9 +2169,9 @@</span><br><span>  src_lhs = src->lhs;</span><br><span>       src_rhs = src->rhs;</span><br><span>       src_size = TRIPLE_SIZE(src);</span><br><span style="color: hsl(0, 100%, 40%);">-    get_occurance(src->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+     get_occurrence(src->occurrence);</span><br><span>  dup = alloc_triple(state, src->op, src->type, src_lhs, src_rhs,</span><br><span style="color: hsl(0, 100%, 40%);">-           src->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+           src->occurrence);</span><br><span>         memcpy(dup, src, sizeof(*src));</span><br><span>      memcpy(dup->param, src->param, src_size * sizeof(src->param[0]));</span><br><span>   return dup;</span><br><span>@@ -2190,19 +2190,19 @@</span><br><span>        int op, struct type *type, int lhs, int rhs)</span><br><span> {</span><br><span>    struct triple *ret;</span><br><span style="color: hsl(0, 100%, 40%);">-     struct occurance *occurance;</span><br><span style="color: hsl(0, 100%, 40%);">-    occurance = new_occurance(state);</span><br><span style="color: hsl(0, 100%, 40%);">-       ret = alloc_triple(state, op, type, lhs, rhs, occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+     struct occurrence *occurrence;</span><br><span style="color: hsl(120, 100%, 40%);">+        occurrence = new_occurrence(state);</span><br><span style="color: hsl(120, 100%, 40%);">+   ret = alloc_triple(state, op, type, lhs, rhs, occurrence);</span><br><span>   return ret;</span><br><span> }</span><br><span> </span><br><span> static struct triple *build_triple(struct compile_state *state,</span><br><span>      int op, struct type *type, struct triple *left, struct triple *right,</span><br><span style="color: hsl(0, 100%, 40%);">-   struct occurance *occurance)</span><br><span style="color: hsl(120, 100%, 40%);">+  struct occurrence *occurrence)</span><br><span> {</span><br><span>  struct triple *ret;</span><br><span>  size_t count;</span><br><span style="color: hsl(0, 100%, 40%);">-   ret = alloc_triple(state, op, type, -1, -1, occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+       ret = alloc_triple(state, op, type, -1, -1, occurrence);</span><br><span>     count = TRIPLE_SIZE(ret);</span><br><span>    if (count > 0) {</span><br><span>          ret->param[0] = left;</span><br><span>@@ -2314,8 +2314,8 @@</span><br><span>             base = MISC(base, 0);</span><br><span>        }</span><br><span>    block = block_of_triple(state, base);</span><br><span style="color: hsl(0, 100%, 40%);">-   get_occurance(base->occurance);</span><br><span style="color: hsl(0, 100%, 40%);">-      ret = build_triple(state, op, type, left, right, base->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ get_occurrence(base->occurrence);</span><br><span style="color: hsl(120, 100%, 40%);">+  ret = build_triple(state, op, type, left, right, base->occurrence);</span><br><span>       generate_lhs_pieces(state, ret);</span><br><span>     if (triple_stores_block(state, ret)) {</span><br><span>               ret->u.block = block;</span><br><span>@@ -2352,8 +2352,8 @@</span><br><span>     }</span><br><span> </span><br><span>        block = block_of_triple(state, base);</span><br><span style="color: hsl(0, 100%, 40%);">-   get_occurance(base->occurance);</span><br><span style="color: hsl(0, 100%, 40%);">-      ret = build_triple(state, op, type, left, right, base->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ get_occurrence(base->occurrence);</span><br><span style="color: hsl(120, 100%, 40%);">+  ret = build_triple(state, op, type, left, right, base->occurrence);</span><br><span>       generate_lhs_pieces(state, ret);</span><br><span>     if (triple_stores_block(state, ret)) {</span><br><span>               ret->u.block = block;</span><br><span>@@ -2385,7 +2385,7 @@</span><br><span> {</span><br><span>        struct type *piece_type;</span><br><span>     struct triple *piece;</span><br><span style="color: hsl(0, 100%, 40%);">-   get_occurance(ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+     get_occurrence(ins->occurrence);</span><br><span>  piece_type = reg_type(state, ins->type, index * REG_SIZEOF_REG);</span><br><span> </span><br><span>      if ((piece_type->type & TYPE_MASK) == TYPE_BITFIELD) {</span><br><span>@@ -2400,7 +2400,7 @@</span><br><span>        fprintf(fp, "\n");</span><br><span> }</span><br><span> #endif</span><br><span style="color: hsl(0, 100%, 40%);">-     piece = alloc_triple(state, OP_PIECE, piece_type, -1, -1, ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ piece = alloc_triple(state, OP_PIECE, piece_type, -1, -1, ins->occurrence);</span><br><span>       piece->u.cval  = index;</span><br><span>   LHS(ins, piece->u.cval) = piece;</span><br><span>  MISC(piece, 0) = ins;</span><br><span>@@ -2447,7 +2447,7 @@</span><br><span> static void name_of(FILE *fp, struct type *type);</span><br><span> static void display_triple(FILE *fp, struct triple *ins)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">-     struct occurance *ptr;</span><br><span style="color: hsl(120, 100%, 40%);">+        struct occurrence *ptr;</span><br><span>      const char *reg;</span><br><span>     char pre, post, vol;</span><br><span>         pre = post = vol = ' ';</span><br><span>@@ -2519,7 +2519,7 @@</span><br><span>              fprintf(fp, " ]");</span><br><span> #endif</span><br><span>               fprintf(fp, " @");</span><br><span style="color: hsl(0, 100%, 40%);">-            for(ptr = ins->occurance; ptr; ptr = ptr->parent) {</span><br><span style="color: hsl(120, 100%, 40%);">+             for(ptr = ins->occurrence; ptr; ptr = ptr->parent) {</span><br><span>                   fprintf(fp, " %s,%s:%d.%d",</span><br><span>                                ptr->function,</span><br><span>                            ptr->filename,</span><br><span>@@ -2548,7 +2548,7 @@</span><br><span>                    orig_count * sizeof(orig->param[0])) != 0) ||</span><br><span>             (memcmp(&orig->u, &new->u, sizeof(orig->u)) != 0))</span><br><span>  {</span><br><span style="color: hsl(0, 100%, 40%);">-               struct occurance *ptr;</span><br><span style="color: hsl(120, 100%, 40%);">+                struct occurrence *ptr;</span><br><span>              int i, min_count, indent;</span><br><span>            fprintf(fp, "(%p %p)", new, orig);</span><br><span>                 if (orig->op == new->op) {</span><br><span>@@ -2602,7 +2602,7 @@</span><br><span> #endif</span><br><span> </span><br><span>               fprintf(fp, " @");</span><br><span style="color: hsl(0, 100%, 40%);">-            for(ptr = orig->occurance; ptr; ptr = ptr->parent) {</span><br><span style="color: hsl(120, 100%, 40%);">+            for(ptr = orig->occurrence; ptr; ptr = ptr->parent) {</span><br><span>                  fprintf(fp, " %s,%s:%d.%d",</span><br><span>                                ptr->function,</span><br><span>                            ptr->filename,</span><br><span>@@ -2980,7 +2980,7 @@</span><br><span>    if (ptr->use) {</span><br><span>           internal_error(state, ptr, "ptr->use != 0");</span><br><span>    }</span><br><span style="color: hsl(0, 100%, 40%);">-       put_occurance(ptr->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+     put_occurrence(ptr->occurrence);</span><br><span>  memset(ptr, -1, size);</span><br><span>       xfree(ptr);</span><br><span> }</span><br><span>@@ -5534,7 +5534,7 @@</span><br><span>             break;</span><br><span>       }</span><br><span>    case TOK_EOL:</span><br><span style="color: hsl(0, 100%, 40%);">-           /* Ignore # without a follwing ident */</span><br><span style="color: hsl(120, 100%, 40%);">+               /* Ignore # without a following ident */</span><br><span>             break;</span><br><span>       default:</span><br><span>     {</span><br><span>@@ -8145,7 +8145,7 @@</span><br><span>    }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void propogate_use(struct compile_state *state,</span><br><span style="color: hsl(120, 100%, 40%);">+static void propagate_use(struct compile_state *state,</span><br><span>     struct triple *orig, struct triple *new)</span><br><span> {</span><br><span>        struct triple_set *user, *next;</span><br><span>@@ -8158,7 +8158,7 @@</span><br><span>              replace_use(state, orig, new, user->member);</span><br><span>      }</span><br><span>    if (orig->use) {</span><br><span style="color: hsl(0, 100%, 40%);">-             internal_error(state, orig, "used after propogate_use");</span><br><span style="color: hsl(120, 100%, 40%);">+            internal_error(state, orig, "used after propagate_use");</span><br><span>   }</span><br><span> }</span><br><span> </span><br><span>@@ -8786,7 +8786,7 @@</span><br><span>           tuple = tmp;</span><br><span>         }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-   propogate_use(state, ins, tuple);</span><br><span style="color: hsl(120, 100%, 40%);">+     propagate_use(state, ins, tuple);</span><br><span>    release_triple(state, ins);</span><br><span> </span><br><span>      return next;</span><br><span>@@ -8805,18 +8805,18 @@</span><br><span>       fprintf(fp, "\n");</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      get_occurance(ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+     get_occurrence(ins->occurrence);</span><br><span>  tuple = alloc_triple(state, OP_TUPLE, ins->type, -1, -1,</span><br><span style="color: hsl(0, 100%, 40%);">-             ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+           ins->occurrence);</span><br><span> </span><br><span>     for(i = 0; i < tuple->lhs; i++) {</span><br><span>              struct type *piece_type;</span><br><span>             struct triple *unknown;</span><br><span> </span><br><span>          piece_type = reg_type(state, ins->type, i * REG_SIZEOF_REG);</span><br><span style="color: hsl(0, 100%, 40%);">-         get_occurance(tuple->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+           get_occurrence(tuple->occurrence);</span><br><span>                unknown = alloc_triple(state, OP_UNKNOWNVAL, piece_type, 0, 0,</span><br><span style="color: hsl(0, 100%, 40%);">-                  tuple->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+                 tuple->occurrence);</span><br><span>               LHS(tuple, i) = unknown;</span><br><span>     }</span><br><span>    return decompose_with_tuple(state, ins, tuple);</span><br><span>@@ -8834,9 +8834,9 @@</span><br><span>      if (lval->op == OP_PIECE) {</span><br><span>               return ins->next;</span><br><span>         }</span><br><span style="color: hsl(0, 100%, 40%);">-       get_occurance(ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+     get_occurrence(ins->occurrence);</span><br><span>  tuple = alloc_triple(state, OP_TUPLE, lval->type, -1, -1,</span><br><span style="color: hsl(0, 100%, 40%);">-            ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+           ins->occurrence);</span><br><span> </span><br><span>     if ((tuple->lhs != lval->lhs) &&</span><br><span>               (!triple_is_def(state, lval) || (tuple->lhs != 1)))</span><br><span>@@ -8858,9 +8858,9 @@</span><br><span>                       piece = RHS(bitref, 0);</span><br><span>              }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-           get_occurance(tuple->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+           get_occurrence(tuple->occurrence);</span><br><span>                read = alloc_triple(state, OP_READ, piece->type, -1, -1,</span><br><span style="color: hsl(0, 100%, 40%);">-                     tuple->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+                 tuple->occurrence);</span><br><span>               RHS(read, 0) = piece;</span><br><span> </span><br><span>            if (bitref) {</span><br><span>@@ -8871,9 +8871,9 @@</span><br><span>                        } else {</span><br><span>                             op = OP_UEXTRACT;</span><br><span>                    }</span><br><span style="color: hsl(0, 100%, 40%);">-                       get_occurance(tuple->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+                   get_occurrence(tuple->occurrence);</span><br><span>                        extract = alloc_triple(state, op, bitref->type, -1, -1,</span><br><span style="color: hsl(0, 100%, 40%);">-                              tuple->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+                         tuple->occurrence);</span><br><span>                       RHS(extract, 0) = read;</span><br><span>                      extract->u.bitfield.size   = bitref->u.bitfield.size;</span><br><span>                  extract->u.bitfield.offset = bitref->u.bitfield.offset;</span><br><span>@@ -8894,9 +8894,9 @@</span><br><span> </span><br><span>    lval = MISC(ins, 0);</span><br><span>         val = RHS(ins, 0);</span><br><span style="color: hsl(0, 100%, 40%);">-      get_occurance(ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+     get_occurrence(ins->occurrence);</span><br><span>  tuple = alloc_triple(state, OP_TUPLE, ins->type, -1, -1,</span><br><span style="color: hsl(0, 100%, 40%);">-             ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+           ins->occurrence);</span><br><span> </span><br><span>     if ((tuple->lhs != lval->lhs) &&</span><br><span>               (!triple_is_def(state, lval) || tuple->lhs != 1))</span><br><span>@@ -8928,15 +8928,15 @@</span><br><span>                       piece = RHS(bitref, 0);</span><br><span> </span><br><span>                  /* Read the destination register */</span><br><span style="color: hsl(0, 100%, 40%);">-                     get_occurance(tuple->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+                   get_occurrence(tuple->occurrence);</span><br><span>                        read = alloc_triple(state, OP_READ, piece->type, -1, -1,</span><br><span style="color: hsl(0, 100%, 40%);">-                             tuple->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+                         tuple->occurrence);</span><br><span>                       RHS(read, 0) = piece;</span><br><span> </span><br><span>                    /* Deposit the new bitfield value */</span><br><span style="color: hsl(0, 100%, 40%);">-                    get_occurance(tuple->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+                   get_occurrence(tuple->occurrence);</span><br><span>                        deposit = alloc_triple(state, OP_DEPOSIT, piece->type, -1, -1,</span><br><span style="color: hsl(0, 100%, 40%);">-                               tuple->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+                         tuple->occurrence);</span><br><span>                       RHS(deposit, 0) = read;</span><br><span>                      RHS(deposit, 1) = pval;</span><br><span>                      deposit->u.bitfield.size   = bitref->u.bitfield.size;</span><br><span>@@ -8946,9 +8946,9 @@</span><br><span>                  pval = deposit;</span><br><span>              }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-           get_occurance(tuple->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+           get_occurrence(tuple->occurrence);</span><br><span>                write = alloc_triple(state, OP_WRITE, piece->type, -1, -1,</span><br><span style="color: hsl(0, 100%, 40%);">-                   tuple->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+                 tuple->occurrence);</span><br><span>               MISC(write, 0) = piece;</span><br><span>              RHS(write, 0) = pval;</span><br><span>                LHS(tuple, i) = write;</span><br><span>@@ -8957,7 +8957,7 @@</span><br><span> }</span><br><span> </span><br><span> struct decompose_load_info {</span><br><span style="color: hsl(0, 100%, 40%);">- struct occurance *occurance;</span><br><span style="color: hsl(120, 100%, 40%);">+  struct occurrence *occurrence;</span><br><span>       struct triple *lval;</span><br><span>         struct triple *tuple;</span><br><span> };</span><br><span>@@ -8970,8 +8970,8 @@</span><br><span>  if (reg_offset > info->tuple->lhs) {</span><br><span>                internal_error(state, info->tuple, "lhs to small?");</span><br><span>    }</span><br><span style="color: hsl(0, 100%, 40%);">-       get_occurance(info->occurance);</span><br><span style="color: hsl(0, 100%, 40%);">-      load = alloc_triple(state, OP_LOAD, type, -1, -1, info->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+        get_occurrence(info->occurrence);</span><br><span style="color: hsl(120, 100%, 40%);">+  load = alloc_triple(state, OP_LOAD, type, -1, -1, info->occurrence);</span><br><span>      RHS(load, 0) = mk_addr_expr(state, info->lval, mem_offset);</span><br><span>       LHS(info->tuple, reg_offset/REG_SIZEOF_REG) = load;</span><br><span> }</span><br><span>@@ -8985,11 +8985,11 @@</span><br><span>        if (!is_compound_type(ins->type)) {</span><br><span>               return ins->next;</span><br><span>         }</span><br><span style="color: hsl(0, 100%, 40%);">-       get_occurance(ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+     get_occurrence(ins->occurrence);</span><br><span>  tuple = alloc_triple(state, OP_TUPLE, ins->type, -1, -1,</span><br><span style="color: hsl(0, 100%, 40%);">-             ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+           ins->occurrence);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        info.occurance = ins->occurance;</span><br><span style="color: hsl(120, 100%, 40%);">+   info.occurrence = ins->occurrence;</span><br><span>        info.lval      = RHS(ins, 0);</span><br><span>        info.tuple     = tuple;</span><br><span>      walk_type_fields(state, ins->type, 0, 0, decompose_load_cb, &info);</span><br><span>@@ -8999,7 +8999,7 @@</span><br><span> </span><br><span> </span><br><span> struct decompose_store_info {</span><br><span style="color: hsl(0, 100%, 40%);">-     struct occurance *occurance;</span><br><span style="color: hsl(120, 100%, 40%);">+  struct occurrence *occurrence;</span><br><span>       struct triple *lval;</span><br><span>         struct triple *val;</span><br><span>  struct triple *tuple;</span><br><span>@@ -9013,8 +9013,8 @@</span><br><span>        if (reg_offset > info->tuple->lhs) {</span><br><span>                internal_error(state, info->tuple, "lhs to small?");</span><br><span>    }</span><br><span style="color: hsl(0, 100%, 40%);">-       get_occurance(info->occurance);</span><br><span style="color: hsl(0, 100%, 40%);">-      store = alloc_triple(state, OP_STORE, type, -1, -1, info->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+      get_occurrence(info->occurrence);</span><br><span style="color: hsl(120, 100%, 40%);">+  store = alloc_triple(state, OP_STORE, type, -1, -1, info->occurrence);</span><br><span>    RHS(store, 0) = mk_addr_expr(state, info->lval, mem_offset);</span><br><span>      RHS(store, 1) = LHS(info->val, reg_offset);</span><br><span>       LHS(info->tuple, reg_offset/REG_SIZEOF_REG) = store;</span><br><span>@@ -9029,11 +9029,11 @@</span><br><span>    if (!is_compound_type(ins->type)) {</span><br><span>               return ins->next;</span><br><span>         }</span><br><span style="color: hsl(0, 100%, 40%);">-       get_occurance(ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+     get_occurrence(ins->occurrence);</span><br><span>  tuple = alloc_triple(state, OP_TUPLE, ins->type, -1, -1,</span><br><span style="color: hsl(0, 100%, 40%);">-             ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+           ins->occurrence);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        info.occurance = ins->occurance;</span><br><span style="color: hsl(120, 100%, 40%);">+   info.occurrence = ins->occurrence;</span><br><span>        info.lval      = RHS(ins, 0);</span><br><span>        info.val       = RHS(ins, 1);</span><br><span>        info.tuple     = tuple;</span><br><span>@@ -9063,9 +9063,9 @@</span><br><span>      }</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- get_occurance(ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+     get_occurrence(ins->occurrence);</span><br><span>  tuple = alloc_triple(state, OP_TUPLE, type, -1, -1,</span><br><span style="color: hsl(0, 100%, 40%);">-             ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+           ins->occurrence);</span><br><span> </span><br><span>     if (((ins->type->type & TYPE_MASK) == TYPE_BITFIELD) &&</span><br><span>            (tuple->lhs != 1))</span><br><span>@@ -9092,9 +9092,9 @@</span><br><span> </span><br><span>            /* Remember the offset of the bitfield */</span><br><span>            if ((type->type & TYPE_MASK) == TYPE_BITFIELD) {</span><br><span style="color: hsl(0, 100%, 40%);">-                 get_occurance(ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+                     get_occurrence(ins->occurrence);</span><br><span>                  piece = build_triple(state, OP_BITREF, type, piece, 0,</span><br><span style="color: hsl(0, 100%, 40%);">-                          ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+                           ins->occurrence);</span><br><span>                         piece->u.bitfield.size   = size_of(state, type);</span><br><span>                  piece->u.bitfield.offset = reg_offset % REG_SIZEOF_REG;</span><br><span>           }</span><br><span>@@ -9128,9 +9128,9 @@</span><br><span> }</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-    get_occurance(ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+     get_occurrence(ins->occurrence);</span><br><span>  tuple = alloc_triple(state, OP_TUPLE, type, -1, -1,</span><br><span style="color: hsl(0, 100%, 40%);">-             ins->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+           ins->occurrence);</span><br><span> </span><br><span>     for(i = 0; i < tuple->lhs; i++, idx++) {</span><br><span>               struct triple *piece;</span><br><span>@@ -11907,8 +11907,8 @@</span><br><span>      ident = eat(state, TOK_IDENT)->ident;</span><br><span>     if (ident->sym_label && ident->sym_label->def) {</span><br><span>            ins = ident->sym_label->def;</span><br><span style="color: hsl(0, 100%, 40%);">-              put_occurance(ins->occurance);</span><br><span style="color: hsl(0, 100%, 40%);">-               ins->occurance = new_occurance(state);</span><br><span style="color: hsl(120, 100%, 40%);">+             put_occurrence(ins->occurrence);</span><br><span style="color: hsl(120, 100%, 40%);">+           ins->occurrence = new_occurrence(state);</span><br><span>  }</span><br><span>    else {</span><br><span>               ins = label(state);</span><br><span>@@ -12029,8 +12029,8 @@</span><br><span>        dest = label(state);</span><br><span> </span><br><span>     /* Blame the branch on the default statement */</span><br><span style="color: hsl(0, 100%, 40%);">- put_occurance(dbranch->occurance);</span><br><span style="color: hsl(0, 100%, 40%);">-   dbranch->occurance = new_occurance(state);</span><br><span style="color: hsl(120, 100%, 40%);">+ put_occurrence(dbranch->occurrence);</span><br><span style="color: hsl(120, 100%, 40%);">+       dbranch->occurrence = new_occurrence(state);</span><br><span> </span><br><span>  /* Thread the pieces together */</span><br><span>     TARG(dbranch, 0) = dest;</span><br><span>@@ -13329,7 +13329,7 @@</span><br><span>   }</span><br><span>    i++;</span><br><span>         if (((param->type & TYPE_MASK) != TYPE_VOID) && !param->field_ident) {</span><br><span style="color: hsl(0, 100%, 40%);">-                error(state, 0, "No identifier for paramter %d\n", i);</span><br><span style="color: hsl(120, 100%, 40%);">+              error(state, 0, "No identifier for parameter %d\n", i);</span><br><span>    }</span><br><span> </span><br><span>        /* Get a list of statements for this function. */</span><br><span>@@ -13694,7 +13694,7 @@</span><br><span> }</span><br><span> </span><br><span> struct triple *copy_func(struct compile_state *state, struct triple *ofunc,</span><br><span style="color: hsl(0, 100%, 40%);">-     struct occurance *base_occurance)</span><br><span style="color: hsl(120, 100%, 40%);">+     struct occurrence *base_occurrence)</span><br><span> {</span><br><span>     struct triple *nfunc;</span><br><span>        struct triple *nfirst, *ofirst;</span><br><span>@@ -13715,16 +13715,16 @@</span><br><span>  ofirst = old = RHS(ofunc, 0);</span><br><span>        do {</span><br><span>                 struct triple *new;</span><br><span style="color: hsl(0, 100%, 40%);">-             struct occurance *occurance;</span><br><span style="color: hsl(120, 100%, 40%);">+          struct occurrence *occurrence;</span><br><span>               int old_lhs, old_rhs;</span><br><span>                old_lhs = old->lhs;</span><br><span>               old_rhs = old->rhs;</span><br><span style="color: hsl(0, 100%, 40%);">-          occurance = inline_occurance(state, base_occurance, old->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+               occurrence = inline_occurrence(state, base_occurrence, old->occurrence);</span><br><span>          if (ofunc->u.cval && (old->op == OP_FCALL)) {</span><br><span>                  MISC(old, 0)->u.cval += 1;</span><br><span>                }</span><br><span>            new = alloc_triple(state, old->op, old->type, old_lhs, old_rhs,</span><br><span style="color: hsl(0, 100%, 40%);">-                   occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+                   occurrence);</span><br><span>                 if (!triple_stores_block(state, new)) {</span><br><span>                      memcpy(&new->u, &old->u, sizeof(new->u));</span><br><span>           }</span><br><span>@@ -13803,7 +13803,7 @@</span><br><span>  if (ofunc->op != OP_LIST) {</span><br><span>               internal_error(state, 0, "improper function");</span><br><span>     }</span><br><span style="color: hsl(0, 100%, 40%);">-       nfunc = copy_func(state, ofunc, fcall->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+ nfunc = copy_func(state, ofunc, fcall->occurrence);</span><br><span>       /* Prepend the parameter reading into the new function list */</span><br><span>       ptype = nfunc->type->right;</span><br><span>    pvals = fcall->rhs;</span><br><span>@@ -13842,7 +13842,7 @@</span><br><span>     /* Remove the read of the return address */</span><br><span>  ins = RHS(nfunc, 0)->prev->prev;</span><br><span>       if ((ins->op != OP_READ) || (RHS(ins, 0) != fretaddr(state, nfunc))) {</span><br><span style="color: hsl(0, 100%, 40%);">-               internal_error(state, ins, "Not return addres read?");</span><br><span style="color: hsl(120, 100%, 40%);">+              internal_error(state, ins, "Not return address read?");</span><br><span>    }</span><br><span>    release_triple(state, ins);</span><br><span>  /* Remove the return instruction */</span><br><span>@@ -13884,7 +13884,7 @@</span><br><span>        /* Now the result reading code */</span><br><span>    if (result) {</span><br><span>                result = flatten(state, fcall, result);</span><br><span style="color: hsl(0, 100%, 40%);">-         propogate_use(state, fcall, result);</span><br><span style="color: hsl(120, 100%, 40%);">+          propagate_use(state, fcall, result);</span><br><span>         }</span><br><span> </span><br><span>        /* Release the original fcall instruction */</span><br><span>@@ -13971,7 +13971,7 @@</span><br><span>       }</span><br><span> </span><br><span>        /* Point everyone at the new variable */</span><br><span style="color: hsl(0, 100%, 40%);">-        propogate_use(state, var, new_var);</span><br><span style="color: hsl(120, 100%, 40%);">+   propagate_use(state, var, new_var);</span><br><span> </span><br><span>      /* Release the original variable */</span><br><span>  for(i = 0; i < var->lhs; i++) {</span><br><span>@@ -14156,7 +14156,7 @@</span><br><span>              ins = ins->next;</span><br><span>  } while(ins != first);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      /* Allocate some memory to temorary hold the id info */</span><br><span style="color: hsl(120, 100%, 40%);">+       /* Allocate some memory to temporary hold the id info */</span><br><span>     info = xcmalloc(sizeof(*info) * (count +1), "info");</span><br><span> </span><br><span>   /* Mark the local function */</span><br><span>@@ -14434,7 +14434,7 @@</span><br><span>                      read_expr(state,</span><br><span>                             deref_index(state, fresult(state, func), 1)));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-              propogate_use(state, fcall, result);</span><br><span style="color: hsl(120, 100%, 40%);">+          propagate_use(state, fcall, result);</span><br><span>         }</span><br><span> </span><br><span>        /* Release the original fcall instruction */</span><br><span>@@ -15501,7 +15501,7 @@</span><br><span>               return vertex;</span><br><span>       }</span><br><span>    vertex += 1;</span><br><span style="color: hsl(0, 100%, 40%);">-    /* Renumber the blocks in a convinient fashion */</span><br><span style="color: hsl(120, 100%, 40%);">+     /* Renumber the blocks in a convenient fashion */</span><br><span>    block->vertex = vertex;</span><br><span>   sd[vertex].block    = block;</span><br><span>         sd[vertex].sdom     = &sd[vertex];</span><br><span>@@ -15524,7 +15524,7 @@</span><br><span>             return vertex;</span><br><span>       }</span><br><span>    vertex += 1;</span><br><span style="color: hsl(0, 100%, 40%);">-    /* Renumber the blocks in a convinient fashion */</span><br><span style="color: hsl(120, 100%, 40%);">+     /* Renumber the blocks in a convenient fashion */</span><br><span>    block->vertex = vertex;</span><br><span>   sd[vertex].block    = block;</span><br><span>         sd[vertex].sdom     = &sd[vertex];</span><br><span>@@ -15743,7 +15743,7 @@</span><br><span>      */</span><br><span>  /* Theorem 3:</span><br><span>         *   Let w != r and let u be a vertex for which sdom(u) is</span><br><span style="color: hsl(0, 100%, 40%);">-       *   minimum amoung vertices u satisfying sdom(w) -> u -> w.</span><br><span style="color: hsl(120, 100%, 40%);">+     *   minimum among vertices u satisfying sdom(w) -> u -> w.</span><br><span>     *   Then sdom(u) <= sdom(w) and idom(u) = idom(w).</span><br><span>        */</span><br><span>  /* Lemma 5:  Let vertices v,w satisfy v -> w.</span><br><span>@@ -15765,7 +15765,7 @@</span><br><span>    */</span><br><span>  /* Corollary 1:</span><br><span>       *   Let w != r and let u be a vertex for which sdom(u) is</span><br><span style="color: hsl(0, 100%, 40%);">-       *   minimum amoung vertices u satisfying sdom(w) -> u -> w.</span><br><span style="color: hsl(120, 100%, 40%);">+     *   minimum among vertices u satisfying sdom(w) -> u -> w.</span><br><span>     *   Then:</span><br><span>    *                   { sdom(w) if sdom(w) = sdom(u),</span><br><span>          *        idom(w) = {</span><br><span>@@ -15905,7 +15905,7 @@</span><br><span> {</span><br><span>         struct block_set *user;</span><br><span>      struct triple *ins;</span><br><span style="color: hsl(0, 100%, 40%);">-     struct occurance *ptr, *ptr2;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct occurrence *ptr, *ptr2;</span><br><span>       const char *filename1, *filename2;</span><br><span>   int equal_filenames;</span><br><span>         int i;</span><br><span>@@ -15915,11 +15915,11 @@</span><br><span>   fprintf(fp, "%3d: %p (%p - %p) @",</span><br><span>                 block->vertex, block, block->first, block->last);</span><br><span>   ins = block->first;</span><br><span style="color: hsl(0, 100%, 40%);">-  while(ins != block->last && (ins->occurance->line == 0)) {</span><br><span style="color: hsl(120, 100%, 40%);">+   while(ins != block->last && (ins->occurrence->line == 0)) {</span><br><span>                 ins = ins->next;</span><br><span>  }</span><br><span style="color: hsl(0, 100%, 40%);">-       ptr = ins->occurance;</span><br><span style="color: hsl(0, 100%, 40%);">-        ptr2 = block->last->occurance;</span><br><span style="color: hsl(120, 100%, 40%);">+  ptr = ins->occurrence;</span><br><span style="color: hsl(120, 100%, 40%);">+     ptr2 = block->last->occurrence;</span><br><span>        filename1 = ptr->filename? ptr->filename : "";</span><br><span>       filename2 = ptr2->filename? ptr2->filename : "";</span><br><span>     equal_filenames = (strcmp(filename1, filename2) == 0);</span><br><span>@@ -16166,10 +16166,10 @@</span><br><span>                           /* Count how many edges flow into this block */</span><br><span>                              in_edges = front->users;</span><br><span>                          /* Insert a phi function for this variable */</span><br><span style="color: hsl(0, 100%, 40%);">-                           get_occurance(var->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+                             get_occurrence(var->occurrence);</span><br><span>                          phi = alloc_triple(</span><br><span>                                  state, OP_PHI, var->type, -1, in_edges,</span><br><span style="color: hsl(0, 100%, 40%);">-                                      var->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+                                   var->occurrence);</span><br><span>                                 phi->u.block = front;</span><br><span>                             MISC(phi, 0) = var;</span><br><span>                          use_triple(var, phi);</span><br><span>@@ -16285,7 +16285,7 @@</span><br><span>              if (set->member == oldval) {</span><br><span>                      *ptr = set->next;</span><br><span>                         xfree(set);</span><br><span style="color: hsl(0, 100%, 40%);">-                     /* Only free one occurance from the stack */</span><br><span style="color: hsl(120, 100%, 40%);">+                  /* Only free one occurrence from the stack */</span><br><span>                        return;</span><br><span>              }</span><br><span>            else {</span><br><span>@@ -16389,7 +16389,7 @@</span><br><span>                     if ((val->op == OP_WRITE) || (val->op == OP_READ)) {</span><br><span>                           internal_error(state, val, "bad value in read");</span><br><span>                   }</span><br><span style="color: hsl(0, 100%, 40%);">-                       propogate_use(state, ptr, val);</span><br><span style="color: hsl(120, 100%, 40%);">+                       propagate_use(state, ptr, val);</span><br><span>                      release_triple(state, ptr);</span><br><span>                  continue;</span><br><span>            }</span><br><span>@@ -16420,7 +16420,7 @@</span><br><span>                          RHS(ptr, 0) = tval;</span><br><span>                          use_triple(tval, ptr);</span><br><span>                       }</span><br><span style="color: hsl(0, 100%, 40%);">-                       propogate_use(state, ptr, tval);</span><br><span style="color: hsl(120, 100%, 40%);">+                      propagate_use(state, ptr, tval);</span><br><span>                     unuse_triple(var, ptr);</span><br><span>                      /* Push OP_WRITE ptr->right onto a stack of variable uses */</span><br><span>                      push_triple(stacks, var, tval);</span><br><span>@@ -16622,10 +16622,10 @@</span><br><span>          for(j = 0; j < zrhs; j++) {</span><br><span>                       if(!slot[j]) {</span><br><span>                               struct triple *unknown;</span><br><span style="color: hsl(0, 100%, 40%);">-                         get_occurance(phi->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+                             get_occurrence(phi->occurrence);</span><br><span>                          unknown = flatten(state, state->global_pool,</span><br><span>                                      alloc_triple(state, OP_UNKNOWNVAL,</span><br><span style="color: hsl(0, 100%, 40%);">-                                              phi->type, 0, 0, phi->occurance));</span><br><span style="color: hsl(120, 100%, 40%);">+                                              phi->type, 0, 0, phi->occurrence));</span><br><span>                            slot[j] = unknown;</span><br><span>                           use_triple(unknown, phi);</span><br><span>                            transform_to_arch_instruction(state, unknown);</span><br><span>@@ -16765,7 +16765,7 @@</span><br><span>             var = var->next; /* point at the var */</span><br><span> </span><br><span>               /* Replaces use of phi with var */</span><br><span style="color: hsl(0, 100%, 40%);">-              propogate_use(state, phi, var);</span><br><span style="color: hsl(120, 100%, 40%);">+               propagate_use(state, phi, var);</span><br><span> </span><br><span>          /* Count the readers */</span><br><span>              readers = 0;</span><br><span>@@ -17268,9 +17268,9 @@</span><br><span>                               continue;</span><br><span>                    }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-                   get_occurance(val->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+                     get_occurrence(val->occurrence);</span><br><span>                  move = build_triple(state, OP_COPY, val->type, val, 0,</span><br><span style="color: hsl(0, 100%, 40%);">-                               val->occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+                           val->occurrence);</span><br><span>                         move->u.block = eblock;</span><br><span>                   move->id |= TRIPLE_FLAG_PRE_SPLIT;</span><br><span>                        use_triple(val, move);</span><br><span>@@ -17400,7 +17400,7 @@</span><br><span>             return vertex;</span><br><span>       }</span><br><span>    vertex += 1;</span><br><span style="color: hsl(0, 100%, 40%);">-    /* Renumber the blocks in a convinient fashion */</span><br><span style="color: hsl(120, 100%, 40%);">+     /* Renumber the blocks in a convenient fashion */</span><br><span>    block->vertex = vertex;</span><br><span>   blocks[vertex].block    = block;</span><br><span>     blocks[vertex].vertex   = vertex;</span><br><span>@@ -18750,7 +18750,7 @@</span><br><span>  lr1->color   = color;</span><br><span>     lr1->classes = classes;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-  /* Keep the graph in sync by transfering the edges from lr2 to lr1 */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Keep the graph in sync by transferring the edges from lr2 to lr1 */</span><br><span>       transfer_live_edges(rstate, lr1, lr2);</span><br><span> </span><br><span>   return lr1;</span><br><span>@@ -18835,7 +18835,7 @@</span><br><span>                        rstate->lrd[j].lr = &rstate->lr[0];</span><br><span>                }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-           /* Initalize the live_range_def */</span><br><span style="color: hsl(120, 100%, 40%);">+            /* Initialize the live_range_def */</span><br><span>          rstate->lrd[j].next    = &rstate->lrd[j];</span><br><span>          rstate->lrd[j].prev    = &rstate->lrd[j];</span><br><span>          rstate->lrd[j].def     = ins;</span><br><span>@@ -18847,7 +18847,7 @@</span><br><span>   } while(ins != first);</span><br><span>       rstate->ranges = i;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-      /* Make a second pass to handle achitecture specific register</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Make a second pass to handle architecture specific register</span><br><span>        * constraints.</span><br><span>       */</span><br><span>  ins = first;</span><br><span>@@ -19541,7 +19541,7 @@</span><br><span>        *</span><br><span>    * So far I don't have a test case for this, the resolving</span><br><span>        * of mandatory constraints has solved all of my</span><br><span style="color: hsl(0, 100%, 40%);">-         * know issues.  So I have choosen not to write any</span><br><span style="color: hsl(120, 100%, 40%);">+    * know issues.  So I have chosen not to write any</span><br><span>    * code until I cat get a better feel for cases where</span><br><span>         * it would be useful to have.</span><br><span>        *</span><br><span>@@ -20749,7 +20749,7 @@</span><br><span>                 lnode->val = lnode->def;</span><br><span>       }</span><br><span>    /* Only allow lattice high when all of my inputs</span><br><span style="color: hsl(0, 100%, 40%);">-         * are also lattice high.  Occassionally I can</span><br><span style="color: hsl(120, 100%, 40%);">+         * are also lattice high.  Occasionally I can</span><br><span>         * have constants with a lattice low input, so</span><br><span>        * I do not need to check that case.</span><br><span>          */</span><br><span>@@ -20779,7 +20779,7 @@</span><br><span>                        !triple_is_cbranch(state, lnode->def)) ||</span><br><span>                         (lnode->def->op == OP_PIECE))) {</span><br><span> #if DEBUG_ROMCC_WARNINGS</span><br><span style="color: hsl(0, 100%, 40%);">-#warning "FIXME constant propogate through expressions with multiple left hand sides"</span><br><span style="color: hsl(120, 100%, 40%);">+#warning "FIXME constant propagate through expressions with multiple left hand sides"</span><br><span> #endif</span><br><span>                 if (changed) {</span><br><span>                       internal_warning(state, lnode->def, "non def changes value?");</span><br><span>@@ -21471,17 +21471,17 @@</span><br><span>              (unknown_triple.template_id != 0) ||</span><br><span>                 (unknown_triple.id != -1) ||</span><br><span>                 (unknown_triple.type != &unknown_type) ||</span><br><span style="color: hsl(0, 100%, 40%);">-           (unknown_triple.occurance != &dummy_occurance) ||</span><br><span style="color: hsl(120, 100%, 40%);">+         (unknown_triple.occurrence != &dummy_occurrence) ||</span><br><span>              (unknown_triple.param[0] != 0) ||</span><br><span>            (unknown_triple.param[1] != 0)) {</span><br><span>            internal_error(state, &unknown_triple, "unknown_triple corrupted!");</span><br><span>   }</span><br><span style="color: hsl(0, 100%, 40%);">-       if (    (dummy_occurance.count != 2) ||</span><br><span style="color: hsl(0, 100%, 40%);">-         (strcmp(dummy_occurance.filename, __FILE__) != 0) ||</span><br><span style="color: hsl(0, 100%, 40%);">-            (strcmp(dummy_occurance.function, "") != 0) ||</span><br><span style="color: hsl(0, 100%, 40%);">-                (dummy_occurance.col != 0) ||</span><br><span style="color: hsl(0, 100%, 40%);">-           (dummy_occurance.parent != 0)) {</span><br><span style="color: hsl(0, 100%, 40%);">-                internal_error(state, &unknown_triple, "dummy_occurance corrupted!");</span><br><span style="color: hsl(120, 100%, 40%);">+   if (    (dummy_occurrence.count != 2) ||</span><br><span style="color: hsl(120, 100%, 40%);">+              (strcmp(dummy_occurrence.filename, __FILE__) != 0) ||</span><br><span style="color: hsl(120, 100%, 40%);">+         (strcmp(dummy_occurrence.function, "") != 0) ||</span><br><span style="color: hsl(120, 100%, 40%);">+             (dummy_occurrence.col != 0) ||</span><br><span style="color: hsl(120, 100%, 40%);">+                (dummy_occurrence.parent != 0)) {</span><br><span style="color: hsl(120, 100%, 40%);">+             internal_error(state, &unknown_triple, "dummy_occurrence corrupted!");</span><br><span>         }</span><br><span>    if (    (unknown_type.type != TYPE_UNKNOWN)) {</span><br><span>               internal_error(state, &unknown_triple, "unknown_type corrupted!");</span><br><span>@@ -21604,7 +21604,7 @@</span><br><span>   /* Do strength reduction and simple constant optimizations */</span><br><span>        simplify_all(state);</span><br><span>         verify_consistency(state);</span><br><span style="color: hsl(0, 100%, 40%);">-      /* Propogate constants throughout the code */</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Propagate constants throughout the code */</span><br><span>        scc_transform(state);</span><br><span>        verify_consistency(state);</span><br><span> #if DEBUG_ROMCC_WARNINGS</span><br><span>@@ -23181,7 +23181,7 @@</span><br><span>     use_triple(LHS(div, 1), div);</span><br><span> </span><br><span>    /* Replate uses of ins with the appropriate piece of the div */</span><br><span style="color: hsl(0, 100%, 40%);">- propogate_use(state, ins, LHS(div, index));</span><br><span style="color: hsl(120, 100%, 40%);">+   propagate_use(state, ins, LHS(div, index));</span><br><span>  release_triple(state, ins);</span><br><span> </span><br><span>      /* Return the address of the next instruction */</span><br><span>@@ -23258,7 +23258,7 @@</span><br><span>   use_triple(val_mask, new);</span><br><span> </span><br><span>       /* Move all of the users over to the new expression */</span><br><span style="color: hsl(0, 100%, 40%);">-  propogate_use(state, ins, new);</span><br><span style="color: hsl(120, 100%, 40%);">+       propagate_use(state, ins, new);</span><br><span> </span><br><span>  /* Delete the original triple */</span><br><span>     release_triple(state, ins);</span><br><span>@@ -23306,7 +23306,7 @@</span><br><span>        use_triple(mask,      val_mask);</span><br><span> </span><br><span>         /* Move all of the users over to the new expression */</span><br><span style="color: hsl(0, 100%, 40%);">-  propogate_use(state, ins, val_mask);</span><br><span style="color: hsl(120, 100%, 40%);">+  propagate_use(state, ins, val_mask);</span><br><span> </span><br><span>     /* Release the original instruction */</span><br><span>       release_triple(state, ins);</span><br><span>@@ -24796,12 +24796,12 @@</span><br><span> {</span><br><span>         struct triple *first, *ins;</span><br><span>  int print_location;</span><br><span style="color: hsl(0, 100%, 40%);">-     struct occurance *last_occurance;</span><br><span style="color: hsl(120, 100%, 40%);">+     struct occurrence *last_occurrence;</span><br><span>  FILE *fp;</span><br><span>    int max_inline_depth;</span><br><span>        max_inline_depth = 0;</span><br><span>        print_location = 1;</span><br><span style="color: hsl(0, 100%, 40%);">-     last_occurance = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+   last_occurrence = 0;</span><br><span>         fp = state->output;</span><br><span>       /* Masks for common sizes */</span><br><span>         fprintf(fp, ".section \"" DATA_SECTION "\"\n");</span><br><span>@@ -24815,20 +24815,20 @@</span><br><span>    ins = first;</span><br><span>         do {</span><br><span>                 if (print_location &&</span><br><span style="color: hsl(0, 100%, 40%);">-                   last_occurance != ins->occurance) {</span><br><span style="color: hsl(0, 100%, 40%);">-                  if (!ins->occurance->parent) {</span><br><span style="color: hsl(120, 100%, 40%);">+                  last_occurrence != ins->occurrence) {</span><br><span style="color: hsl(120, 100%, 40%);">+                      if (!ins->occurrence->parent) {</span><br><span>                                fprintf(fp, "\t/* %s,%s:%d.%d */\n",</span><br><span style="color: hsl(0, 100%, 40%);">-                                  ins->occurance->function?ins->occurance->function:"(null)",</span><br><span style="color: hsl(0, 100%, 40%);">-                                       ins->occurance->filename?ins->occurance->filename:"(null)",</span><br><span style="color: hsl(0, 100%, 40%);">-                                       ins->occurance->line,</span><br><span style="color: hsl(0, 100%, 40%);">-                                     ins->occurance->col);</span><br><span style="color: hsl(120, 100%, 40%);">+                                   ins->occurrence->function?ins->occurrence->function:"(null)",</span><br><span style="color: hsl(120, 100%, 40%);">+                                   ins->occurrence->filename?ins->occurrence->filename:"(null)",</span><br><span style="color: hsl(120, 100%, 40%);">+                                   ins->occurrence->line,</span><br><span style="color: hsl(120, 100%, 40%);">+                                  ins->occurrence->col);</span><br><span>                         }</span><br><span>                    else {</span><br><span style="color: hsl(0, 100%, 40%);">-                          struct occurance *ptr;</span><br><span style="color: hsl(120, 100%, 40%);">+                                struct occurrence *ptr;</span><br><span>                              int inline_depth;</span><br><span>                            fprintf(fp, "\t/*\n");</span><br><span>                             inline_depth = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-                               for(ptr = ins->occurance; ptr; ptr = ptr->parent) {</span><br><span style="color: hsl(120, 100%, 40%);">+                             for(ptr = ins->occurrence; ptr; ptr = ptr->parent) {</span><br><span>                                   inline_depth++;</span><br><span>                                      fprintf(fp, "\t * %s,%s:%d.%d\n",</span><br><span>                                          ptr->function,</span><br><span>@@ -24841,11 +24841,11 @@</span><br><span>                                        max_inline_depth = inline_depth;</span><br><span>                             }</span><br><span>                    }</span><br><span style="color: hsl(0, 100%, 40%);">-                       if (last_occurance) {</span><br><span style="color: hsl(0, 100%, 40%);">-                           put_occurance(last_occurance);</span><br><span style="color: hsl(120, 100%, 40%);">+                        if (last_occurrence) {</span><br><span style="color: hsl(120, 100%, 40%);">+                                put_occurrence(last_occurrence);</span><br><span>                     }</span><br><span style="color: hsl(0, 100%, 40%);">-                       get_occurance(ins->occurance);</span><br><span style="color: hsl(0, 100%, 40%);">-                       last_occurance = ins->occurance;</span><br><span style="color: hsl(120, 100%, 40%);">+                   get_occurrence(ins->occurrence);</span><br><span style="color: hsl(120, 100%, 40%);">+                   last_occurrence = ins->occurrence;</span><br><span>                }</span><br><span> </span><br><span>                print_instruction(state, ins, fp);</span><br><span>diff --git a/util/romcc/tests/linux_test2.c b/util/romcc/tests/linux_test2.c</span><br><span>index 577e0c3..c4fbf0a 100644</span><br><span>--- a/util/romcc/tests/linux_test2.c</span><br><span>+++ b/util/romcc/tests/linux_test2.c</span><br><span>@@ -155,8 +155,8 @@</span><br><span>         *         0 = No coherent HT configuration space restrictions</span><br><span>        *         1 = Limit coherent HT configuration space based on node count</span><br><span>      * [16:16] Local Interrupt Conversion Enable.</span><br><span style="color: hsl(0, 100%, 40%);">-    *         0 = ExtInt/NMI interrups unaffected.</span><br><span style="color: hsl(0, 100%, 40%);">-  *         1 = ExtInt/NMI broadcat interrupts converted to LINT0/1</span><br><span style="color: hsl(120, 100%, 40%);">+     *         0 = ExtInt/NMI interrupts unaffected.</span><br><span style="color: hsl(120, 100%, 40%);">+       *         1 = ExtInt/NMI broadcast interrupts converted to LINT0/1</span><br><span>   * [17:17] APIC Extended Broadcast Enable.</span><br><span>    *         0 = APIC broadcast is 0F</span><br><span>   *         1 = APIC broadcast is FF</span><br><span>@@ -484,7 +484,7 @@</span><br><span>     *         0 = CPU writes may be posted</span><br><span>       *         1 = CPU writes must be non-posted</span><br><span>          * [31: 8] Memory-Mapped I/O Limit Address i (39-16)</span><br><span style="color: hsl(0, 100%, 40%);">-     *         This field defines the upp adddress bits of a 40-bit address that</span><br><span style="color: hsl(120, 100%, 40%);">+   *         This field defines the upp address bits of a 40-bit address that</span><br><span>   *         defines the end of a memory-mapped I/O region n</span><br><span>    */</span><br><span>  PCI_ADDR(0, 0x18, 1, 0x84), 0x00000048, 0x00e1ff00,</span><br><span>diff --git a/util/romcc/tests/raminit_test.c b/util/romcc/tests/raminit_test.c</span><br><span>index b1baf7e..564786b 100644</span><br><span>--- a/util/romcc/tests/raminit_test.c</span><br><span>+++ b/util/romcc/tests/raminit_test.c</span><br><span>@@ -754,7 +754,7 @@</span><br><span> {</span><br><span>      /*</span><br><span>    * Effects:     Uses serial presence detect to set the</span><br><span style="color: hsl(0, 100%, 40%);">-   *              DRAMC register, which records if ram is registerd or not,</span><br><span style="color: hsl(120, 100%, 40%);">+      *              DRAMC register, which records if ram is registered or not,</span><br><span>    *              and controls the refresh rate.</span><br><span>        *              The refresh rate is not set here, as memory refresh</span><br><span>   *              cannot be enbaled until after memory is initialized.</span><br><span>@@ -997,7 +997,7 @@</span><br><span>   }</span><br><span>    pcibios_write_config_byte(I440GX_BUS, I440GX_DEVFN, 0x53, reg);</span><br><span>      /* Now see if reg is 0xff.  If it is we are done.  If not,</span><br><span style="color: hsl(0, 100%, 40%);">-       * we need to set 0x18 into regster 0x50.l</span><br><span style="color: hsl(120, 100%, 40%);">+     * we need to set 0x18 into register 0x50.l</span><br><span>   * we will do this in two steps, first or in 0x80 to 0x50.b,</span><br><span>          * then or in 0x1 to 0x51.b</span><br><span>   */</span><br><span>diff --git a/util/romcc/tests/raminit_test1.c b/util/romcc/tests/raminit_test1.c</span><br><span>index b1baf7e..564786b 100644</span><br><span>--- a/util/romcc/tests/raminit_test1.c</span><br><span>+++ b/util/romcc/tests/raminit_test1.c</span><br><span>@@ -754,7 +754,7 @@</span><br><span> {</span><br><span>  /*</span><br><span>    * Effects:     Uses serial presence detect to set the</span><br><span style="color: hsl(0, 100%, 40%);">-   *              DRAMC register, which records if ram is registerd or not,</span><br><span style="color: hsl(120, 100%, 40%);">+      *              DRAMC register, which records if ram is registered or not,</span><br><span>    *              and controls the refresh rate.</span><br><span>        *              The refresh rate is not set here, as memory refresh</span><br><span>   *              cannot be enbaled until after memory is initialized.</span><br><span>@@ -997,7 +997,7 @@</span><br><span>   }</span><br><span>    pcibios_write_config_byte(I440GX_BUS, I440GX_DEVFN, 0x53, reg);</span><br><span>      /* Now see if reg is 0xff.  If it is we are done.  If not,</span><br><span style="color: hsl(0, 100%, 40%);">-       * we need to set 0x18 into regster 0x50.l</span><br><span style="color: hsl(120, 100%, 40%);">+     * we need to set 0x18 into register 0x50.l</span><br><span>   * we will do this in two steps, first or in 0x80 to 0x50.b,</span><br><span>          * then or in 0x1 to 0x51.b</span><br><span>   */</span><br><span>diff --git a/util/romcc/tests/raminit_test2.c b/util/romcc/tests/raminit_test2.c</span><br><span>index c5b366f..af6eaae 100644</span><br><span>--- a/util/romcc/tests/raminit_test2.c</span><br><span>+++ b/util/romcc/tests/raminit_test2.c</span><br><span>@@ -754,7 +754,7 @@</span><br><span> {</span><br><span>  /*</span><br><span>    * Effects:     Uses serial presence detect to set the</span><br><span style="color: hsl(0, 100%, 40%);">-   *              DRAMC register, which records if ram is registerd or not,</span><br><span style="color: hsl(120, 100%, 40%);">+      *              DRAMC register, which records if ram is registered or not,</span><br><span>    *              and controls the refresh rate.</span><br><span>        *              The refresh rate is not set here, as memory refresh</span><br><span>   *              cannot be enbaled until after memory is initialized.</span><br><span>@@ -997,7 +997,7 @@</span><br><span>   }</span><br><span>    pcibios_write_config_byte(I440GX_BUS, I440GX_DEVFN, 0x53, reg);</span><br><span>      /* Now see if reg is 0xff.  If it is we are done.  If not,</span><br><span style="color: hsl(0, 100%, 40%);">-       * we need to set 0x18 into regster 0x50.l</span><br><span style="color: hsl(120, 100%, 40%);">+     * we need to set 0x18 into register 0x50.l</span><br><span>   * we will do this in two steps, first or in 0x80 to 0x50.b,</span><br><span>          * then or in 0x1 to 0x51.b</span><br><span>   */</span><br><span>diff --git a/util/romcc/tests/simple_test30.c b/util/romcc/tests/simple_test30.c</span><br><span>index ede2091..6130ca7 100644</span><br><span>--- a/util/romcc/tests/simple_test30.c</span><br><span>+++ b/util/romcc/tests/simple_test30.c</span><br><span>@@ -569,8 +569,8 @@</span><br><span>        *         0 = No coherent HT configuration space restrictions</span><br><span>        *         1 = Limit coherent HT configuration space based on node count</span><br><span>      * [16:16] Local Interrupt Conversion Enable.</span><br><span style="color: hsl(0, 100%, 40%);">-    *         0 = ExtInt/NMI interrups unaffected.</span><br><span style="color: hsl(0, 100%, 40%);">-  *         1 = ExtInt/NMI broadcat interrupts converted to LINT0/1</span><br><span style="color: hsl(120, 100%, 40%);">+     *         0 = ExtInt/NMI interrupts unaffected.</span><br><span style="color: hsl(120, 100%, 40%);">+       *         1 = ExtInt/NMI broadcast interrupts converted to LINT0/1</span><br><span>   * [17:17] APIC Extended Broadcast Enable.</span><br><span>    *         0 = APIC broadcast is 0F</span><br><span>   *         1 = APIC broadcast is FF</span><br><span>@@ -898,7 +898,7 @@</span><br><span>     *         0 = CPU writes may be posted</span><br><span>       *         1 = CPU writes must be non-posted</span><br><span>          * [31: 8] Memory-Mapped I/O Limit Address i (39-16)</span><br><span style="color: hsl(0, 100%, 40%);">-     *         This field defines the upp adddress bits of a 40-bit address that</span><br><span style="color: hsl(120, 100%, 40%);">+   *         This field defines the upp address bits of a 40-bit address that</span><br><span>   *         defines the end of a memory-mapped I/O region n</span><br><span>    */</span><br><span>  PCI_ADDR(0, 0x18, 1, 0x84), 0x00000048, 0x00e1ff00,</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/28293">change 28293</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/28293"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Ia9f0f1f527476900e6c54c60508600e16bea786f </div>
<div style="display:none"> Gerrit-Change-Number: 28293 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Elyes HAOUAS <ehaouas@noos.fr> </div>
<div style="display:none"> Gerrit-Reviewer: Martin Roth <martinroth@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> </div>