[src/netbsd-1-5]: src/sys/dev/microcode/siop Pull up revisions 1.3-1.5 (reque...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a08379447ba3
branches:  netbsd-1-5
changeset: 490380:a08379447ba3
user:      he <he%NetBSD.org@localhost>
date:      Fri Dec 15 04:36:29 2000 +0000

description:
Pull up revisions 1.3-1.5 (requested by bouyer):
  Allow conditional branch like "JUMP foo, IF FALSE" (that the
  driver can later patch).  Bug fixes and syntax checking improvement.

diffstat:

 sys/dev/microcode/siop/ncr53cxxx.c |  20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diffs (60 lines):

diff -r 6defaede48f1 -r a08379447ba3 sys/dev/microcode/siop/ncr53cxxx.c
--- a/sys/dev/microcode/siop/ncr53cxxx.c        Fri Dec 15 04:32:43 2000 +0000
+++ b/sys/dev/microcode/siop/ncr53cxxx.c        Fri Dec 15 04:36:29 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ncr53cxxx.c,v 1.2 2000/04/25 16:01:16 bouyer Exp $     */
+/*     $NetBSD: ncr53cxxx.c,v 1.2.4.1 2000/12/15 04:36:29 he Exp $     */
 
 /*
  * Copyright (c) 1995,1999 Michael L. Hitch
@@ -415,7 +415,7 @@
        if (outfp) {
                time_t cur_time;
 
-               fprintf(outfp, "/*\t$NetBSD: ncr53cxxx.c,v 1.2 2000/04/25 16:01:16 bouyer Exp $\t*/\n");
+               fprintf(outfp, "/*\t$NetBSD: ncr53cxxx.c,v 1.2.4.1 2000/12/15 04:36:29 he Exp $\t*/\n");
                fprintf(outfp, "/*\n");
                fprintf(outfp, " *\tDO NOT EDIT - this file is automatically generated.\n");
                time(&cur_time);
@@ -492,6 +492,11 @@
 
        for (i = 0; i < nsymbols; ++i) {
                char    *code;
+               if ((symbols[i].flags & F_DEFINED) == 0 &&
+                   symbols[i].type != S_EXTERNAL) {
+                       fprintf(stderr, "warning: symbol %s undefined\n",
+                           symbols[i].name);
+               }
                if (symbols[i].type == S_ABSOLUTE)
                        code = "A_";
                else if (symbols[i].type == S_RELATIVE)
@@ -1106,13 +1111,13 @@
        inst0 = word0;
        if (type == 0 && reserved ("rel", i)) {
                inst1 = evaluate (i + 2) - dsps - 8;
-               i += 3;
+               i += 4;
                inst0 |= 0x00800000;
        }
        else if (type != 1) {
                inst1 = evaluate (i);
+               ++i;
        }
-       ++i;
        if (i >= ntokens) {
                inst0 |= 0x00080000;
                store_inst ();
@@ -1129,7 +1134,12 @@
                store_inst ();
                return;
        }
-       if (reserved ("not", ++i))
+       i++;
+       if (reserved("false", i)) {
+               store_inst ();
+               return;
+       }
+       if (reserved ("not", i))
                ++i;
        else
                inst0 |= 0x00080000;