From 0c782d20418ec1d43629cd340893786039e45123 Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Mon, 19 Oct 2020 12:29:39 -0700
Subject: [PATCH] sigma: Compiler warning cleanup

- Fix static structure initialization
- Fix inconsistent statement indentations.
- Avoid potential out of array indexing due to theoretical array
  reference via signed char index.  Likely non functional change.
---
 sigma/sigma_cis.c | 2 +-
 sigma/sigma_cpu.c | 4 ++--
 sigma/sigma_sys.c | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sigma/sigma_cis.c b/sigma/sigma_cis.c
index 623e163b..12f255bb 100644
--- a/sigma/sigma_cis.c
+++ b/sigma/sigma_cis.c
@@ -68,7 +68,7 @@ typedef struct {
 #define ReadDecA(src)   for (i = 0; i < DSTRLNT; i++) \
                             src.val[DSTRLNT - 1 - i] = R[DECA + i];
 
-static dstr_t Dstr_zero = { 0, 0, 0, 0, 0 };
+static dstr_t Dstr_zero = { 0, { 0, 0, 0, 0 } };
 
 extern uint32 *R;
 extern uint32 CC;
diff --git a/sigma/sigma_cpu.c b/sigma/sigma_cpu.c
index be5779eb..71825163 100644
--- a/sigma/sigma_cpu.c
+++ b/sigma/sigma_cpu.c
@@ -1798,7 +1798,7 @@ if ((acc || QCPU_S567)?                                 /* virt or S5-7? */
     (EaP20 (IR, &bva, lnt) != 0))                       /* get real addr */
     return TR_NESTED;
 
-    switch (lnt) {
+switch (lnt) {
     case BY:
         if (ReadB (bva, &wd, acc) != 0)                 /* read byte */
             return TR_NESTED;
@@ -1820,7 +1820,7 @@ if ((acc || QCPU_S567)?                                 /* virt or S5-7? */
         if (rn && (WriteW (bva, wd, acc) != 0))         /* if mod, rewrite */
             return TR_NESTED;
         break;
-        }
+    }
 
 *res = wd;
 return 0;
diff --git a/sigma/sigma_sys.c b/sigma/sigma_sys.c
index 5a8ac96e..1d92f030 100644
--- a/sigma/sigma_sys.c
+++ b/sigma/sigma_sys.c
@@ -495,7 +495,7 @@ if ((sw & SWMASK ('C')) || ((*cptr == '"') && cptr++)) { /* chars? */
         sc = 24 - (i * 8);
         c = (sw & SWMASK ('A'))?
              cptr[i] & 0x7F:
-             ascii_to_ebcdic[cptr[i]];
+             ascii_to_ebcdic[cptr[i] & 0177];
         val[0] = (val[0] & ~(BMASK << sc)) | (c << sc);
         }
     return 0;
@@ -511,7 +511,7 @@ if ((sw & SWMASK ('E')) || ((*cptr == '\'') && cptr++)) { /* EBCDIC char? */
     if (cptr[0] == 0)                                   /* must have 1 char */
         return SCPE_ARG;
     sc = 24 - (addr & 0x3) * 8;                         /* shift count */
-    val[0] = (val[0] & ~(BMASK << sc)) | (ascii_to_ebcdic[cptr[0]] << sc);
+    val[0] = (val[0] & ~(BMASK << sc)) | (ascii_to_ebcdic[cptr[0] & 0177] << sc);
     return 0;
     }
 if (sw & SWMASK ('B')) {                                /* byte? */