[src/trunk]: src/sys/dev/microcode/siop Tweak siop scripts assembler for new ...

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

details:   https://anonhg.NetBSD.org/src/rev/809f517777c0
branches:  trunk
changeset: 545284:809f517777c0
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sun Apr 06 09:50:29 2003 +0000

description:
Tweak siop scripts assembler for new oosiop.

diffstat:

 sys/dev/microcode/siop/Makefile    |   4 ++--
 sys/dev/microcode/siop/ncr53cxxx.c |  32 ++++++++++++++++++--------------
 2 files changed, 20 insertions(+), 16 deletions(-)

diffs (113 lines):

diff -r 0bc7c1212d88 -r 809f517777c0 sys/dev/microcode/siop/Makefile
--- a/sys/dev/microcode/siop/Makefile   Sun Apr 06 09:48:41 2003 +0000
+++ b/sys/dev/microcode/siop/Makefile   Sun Apr 06 09:50:29 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/04/21 22:52:06 bouyer Exp $
+# $NetBSD: Makefile,v 1.6 2003/04/06 09:50:29 tsutsui Exp $
 
 all: esiop.out siop.out osiop.out oosiop.out
 
@@ -20,4 +20,4 @@
        ./${PROG} osiop.ss -p osiop.out
 
 oosiop.out: oosiop.ss ${PROG}
-       ./${PROG} oosiop.ss -o oosiop.out
+       ./${PROG} oosiop.ss -p oosiop.out
diff -r 0bc7c1212d88 -r 809f517777c0 sys/dev/microcode/siop/ncr53cxxx.c
--- a/sys/dev/microcode/siop/ncr53cxxx.c        Sun Apr 06 09:48:41 2003 +0000
+++ b/sys/dev/microcode/siop/ncr53cxxx.c        Sun Apr 06 09:50:29 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ncr53cxxx.c,v 1.10 2002/04/21 22:40:10 bouyer Exp $    */
+/*     $NetBSD: ncr53cxxx.c,v 1.11 2003/04/06 09:50:29 tsutsui Exp $   */
 
 /*
  * Copyright (c) 1995,1999 Michael L. Hitch
@@ -188,8 +188,9 @@
        {"temp3",       {0x1f, 0x1f, 0x1f, 0x1f, 0x1f}},
        {"dfifo",       {0x20, 0x20, 0x20, 0x20, 0x20}},
        {"istat",       {0x21, 0x21, 0x14, 0x14, 0x14}},
-       {"ctest8",      {  -1, 0x22,   -1,   -1,   -1}},
+       {"ctest8",      {0x22, 0x22,   -1,   -1,   -1}},
        {"lcrc",        {  -1, 0x23,   -1,   -1,   -1}},
+       {"ctest9",      {0x23,   -1,   -1,   -1,   -1}},
        {"dbc0",        {0x24, 0x24, 0x24, 0x24, 0x24}},
        {"dbc1",        {0x25, 0x25, 0x25, 0x25, 0x25}},
        {"dbc2",        {0x26, 0x26, 0x26, 0x26, 0x26}},
@@ -210,10 +211,10 @@
        {"scratch1",    {  -1, 0x35,   -1,   -1,   -1}},
        {"scratch2",    {  -1, 0x36,   -1,   -1,   -1}},
        {"scratch3",    {  -1, 0x37,   -1,   -1,   -1}},
-       {"scratcha0",   {  -1,   -1, 0x34, 0x34, 0x34}},
-       {"scratcha1",   {  -1,   -1, 0x35, 0x35, 0x35}},
-       {"scratcha2",   {  -1,   -1, 0x36, 0x36, 0x36}},
-       {"scratcha3",   {  -1,   -1, 0x37, 0x37, 0x37}},
+       {"scratcha0",   {0x10,   -1, 0x34, 0x34, 0x34}},
+       {"scratcha1",   {0x11,   -1, 0x35, 0x35, 0x35}},
+       {"scratcha2",   {0x12,   -1, 0x36, 0x36, 0x36}},
+       {"scratcha3",   {0x13,   -1, 0x37, 0x37, 0x37}},
        {"dmode",       {0x34, 0x38, 0x38, 0x38, 0x38}},
        {"dien",        {0x39, 0x39, 0x39, 0x39, 0x39}},
        {"dwt",         {0x3a, 0x3a, 0x3a,   -1,   -1}},
@@ -245,10 +246,10 @@
        {"sodl1",       {  -1,   -1, 0x55,   -1, 0x55}},
        {"sbdl0",       {  -1,   -1, 0x58, 0x58, 0x58}},
        {"sbdl1",       {  -1,   -1, 0x59,   -1, 0x59}},
-       {"scratchb0",   {  -1,   -1, 0x5c, 0x5c, 0x5c}},
-       {"scratchb1",   {  -1,   -1, 0x5d, 0x5d, 0x5d}},
-       {"scratchb2",   {  -1,   -1, 0x5e, 0x5e, 0x5e}},
-       {"scratchb3",   {  -1,   -1, 0x5f, 0x5f, 0x5f}},
+       {"scratchb0",   {0x3c,   -1, 0x5c, 0x5c, 0x5c}},
+       {"scratchb1",   {0x3d,   -1, 0x5d, 0x5d, 0x5d}},
+       {"scratchb2",   {0x3e,   -1, 0x5e, 0x5e, 0x5e}},
+       {"scratchb3",   {0x3f,   -1, 0x5f, 0x5f, 0x5f}},
        {"scratchc0",   {  -1,   -1,   -1,   -1, 0x60}},
        {"scratchc1",   {  -1,   -1,   -1,   -1, 0x61}},
        {"scratchc2",   {  -1,   -1,   -1,   -1, 0x62}},
@@ -414,7 +415,7 @@
        if (outfp) {
                time_t cur_time;
 
-               fprintf(outfp, "/*\t$NetBSD: ncr53cxxx.c,v 1.10 2002/04/21 22:40:10 bouyer Exp $\t*/\n");
+               fprintf(outfp, "/*\t$NetBSD: ncr53cxxx.c,v 1.11 2003/04/06 09:50:29 tsutsui Exp $\t*/\n");
                fprintf(outfp, "/*\n");
                fprintf(outfp, " *\tDO NOT EDIT - this file is automatically generated.\n");
                time(&cur_time);
@@ -1037,10 +1038,11 @@
                        errout ("Expected SELECT or RESELECT");
                ++i;
                if (reserved ("rel", i)) {
+#if 0 /* driver will fix relative dsps to absolute */
                        if (arch < ARCH710) {
                                errout ("Wrong arch for relative dsps");
-                               return;
                        }
+#endif
                        i += 2;
                        inst1 = evaluate (i) - dsps - 8;
                        inst0 |= 0x04000000;
@@ -1148,10 +1150,11 @@
        i = tokenix;
        inst0 = word0;
        if (type == 0 && reserved ("rel", i)) {
+#if 0 /* driver will fix relative dsps to absolute */
                if (arch < ARCH710) {
                        errout ("Wrong arch for relative dsps");
-                       return;
                }
+#endif
                inst1 = evaluate (i + 2) - dsps - 8;
                i += 4;
                inst0 |= 0x00800000;
@@ -1235,10 +1238,11 @@
                inst0 |= (evaluate (t++) & 0xff) << 16;
        if (tokens[t++].type == ',') {
                if (reserved ("rel", t)) {
+#if 0 /* driver will fix relative dsps to absolute */
                        if (arch < ARCH710) {
                                errout ("Wrong arch for relative dsps");
-                               return;
                        }
+#endif
                        inst0 |= 0x04000000;
                        inst1 = evaluate (t + 2) - dsps - 8;
                }