From 17f61323521750ce114db864771bffe74eaa7251 Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Tue, 30 Dec 2014 11:57:19 -0800
Subject: [PATCH] alpha: Compiler suggested cleanups

---
 alpha/alpha_cpu.c      | 12 ++++++------
 alpha/alpha_defs.h     |  4 ----
 alpha/alpha_ev5_cons.c |  2 +-
 alpha/alpha_ev5_pal.c  |  3 ++-
 alpha/alpha_fpv.c      |  2 +-
 alpha/alpha_sys.c      |  3 ++-
 6 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/alpha/alpha_cpu.c b/alpha/alpha_cpu.c
index 6cc6544b..7a6d7c1c 100644
--- a/alpha/alpha_cpu.c
+++ b/alpha/alpha_cpu.c
@@ -393,7 +393,7 @@ while (reason == 0) {
         }
 
     if (sim_interval <= 0) {                            /* chk clock queue */
-        if (reason = sim_process_event ()) break;
+        if ((reason = sim_process_event ())) break;
         intr_summ = pal_eval_intr (1);                  /* eval interrupts */
         }
 
@@ -1433,7 +1433,7 @@ while (reason == 0) {
 
         case 0x39:                                      /* MINSW4 */
             if (!(arch_mask & AMASK_MVI)) ABORT (EXC_RSVI);
-            for (i = 0, res = 0; i < 8; i = i++) {
+            for (i = 0, res = 0; i < 8; i++) {
                 s1 = SEXT_W_Q (R[ra] >> (i << 4));
                 s2 = SEXT_W_Q (rbv >> (i << 4));
                 res = res | (((s1 <= s2)? R[ra]: rbv) & word_mask[i]);
@@ -1451,7 +1451,7 @@ while (reason == 0) {
 
         case 0x3B:                                      /* MINUW4 */
             if (!(arch_mask & AMASK_MVI)) ABORT (EXC_RSVI);
-            for (i = 0, res = 0; i < 8; i = i++) {
+            for (i = 0, res = 0; i < 8; i++) {
                 s64 = R[ra] & word_mask[i];
                 t64 = rbv & word_mask[i];
                 res = res | ((s64 <= t64)? s64: t64);
@@ -1469,7 +1469,7 @@ while (reason == 0) {
 
         case 0x3D:                                      /* MAXUW4 */
             if (!(arch_mask & AMASK_MVI)) ABORT (EXC_RSVI);
-            for (i = 0, res = 0; i < 8; i = i++) {
+            for (i = 0, res = 0; i < 8; i++) {
                 s64 = R[ra] & word_mask[i];
                 t64 = rbv & word_mask[i];
                 res = res | ((s64 >= t64)? s64: t64);
@@ -1487,7 +1487,7 @@ while (reason == 0) {
 
         case 0x3F:                                      /* MAXSW4 */
             if (!(arch_mask & AMASK_MVI)) ABORT (EXC_RSVI);
-            for (i = 0, res = 0; i < 8; i = i++) {
+            for (i = 0, res = 0; i < 8; i++) {
                 s1 = SEXT_W_Q (R[ra] >> (i << 4));
                 s2 = SEXT_W_Q (rbv >> (i << 4));
                 res = res | (((s1 >= s2)? R[ra]: rbv) & word_mask[i]);
@@ -1834,7 +1834,7 @@ return SCPE_OK;
 
 t_stat cpu_show_hist (FILE *st, UNIT *uptr, int32 val, void *desc)
 {
-uint32 k, di, lnt;
+int32 k, di, lnt;
 char *cptr = (char *) desc;
 t_stat r;
 InstHistory *h;
diff --git a/alpha/alpha_defs.h b/alpha/alpha_defs.h
index 6f1ee907..7090bc94 100644
--- a/alpha/alpha_defs.h
+++ b/alpha/alpha_defs.h
@@ -34,11 +34,7 @@
 #include "sim_defs.h"
 #include <setjmp.h>
 
-#if defined (__GNUC__)
-#define INLINE inline
-#else
 #define INLINE
-#endif
 
 /* Configuration */
 
diff --git a/alpha/alpha_ev5_cons.c b/alpha/alpha_ev5_cons.c
index fb576705..f7675fb1 100644
--- a/alpha/alpha_ev5_cons.c
+++ b/alpha/alpha_ev5_cons.c
@@ -133,7 +133,7 @@ if ((dtlb_spage & SPEN_43) && (VPN_GETSP43 (vpn) == 2))
     return (va & SP43_MASK);                            /* 43b superpage? */
 if ((dtlb_spage & SPEN_32) && (VPN_GETSP32 (vpn) == 0x1FFE))
     return (va & SP32_MASK);                            /* 32b superpage? */
-if (tlbp = dtlb_lookup (vpn))                           /* try TLB */
+if ((tlbp = dtlb_lookup (vpn)))                         /* try TLB */
     return PHYS_ADDR (tlbp->pfn, va);                   /* found it */
 if (ev5_mcsr & MCSR_NT) exc = cons_find_pte_nt (va, &pte64);
 else exc = cons_find_pte_srm (va, &pte64);
diff --git a/alpha/alpha_ev5_pal.c b/alpha/alpha_ev5_pal.c
index 4910b0ce..124968e4 100644
--- a/alpha/alpha_ev5_pal.c
+++ b/alpha/alpha_ev5_pal.c
@@ -904,7 +904,8 @@ t_stat parse_pal_hwre (char *cptr, t_value *inst)
 {
 uint32 i, d, val = 0;
 int32 reg;
-char *tptr, gbuf[CBUFSIZE];
+const char *tptr;
+char gbuf[CBUFSIZE];
 t_stat r;
 
 cptr = get_glyph (cptr, gbuf, '/');
diff --git a/alpha/alpha_fpv.c b/alpha/alpha_fpv.c
index 67fca723..90513448 100644
--- a/alpha/alpha_fpv.c
+++ b/alpha/alpha_fpv.c
@@ -209,7 +209,7 @@ t_uint64 vax_cvtif (t_uint64 val, uint32 ir, uint32 dp)
 UFP a;
 
 if (val == 0) return 0;                                 /* 0? return +0 */
-if (val < 0) {                                          /* < 0? */
+if ((val & Q_SIGN) != 0) {                              /* < 0? */
     a.sign = 1;                                         /* set sign */
     val = NEG_Q (val);                                  /* |val| */
     }
diff --git a/alpha/alpha_sys.c b/alpha/alpha_sys.c
index 6d84f75a..c3e4c8a4 100644
--- a/alpha/alpha_sys.c
+++ b/alpha/alpha_sys.c
@@ -716,7 +716,8 @@ t_uint64 bra, df, db;
 uint32 i, k, lit8, fl;
 int32 reg;
 t_stat r;
-char *tptr, gbuf[CBUFSIZE];
+const char *tptr;
+char gbuf[CBUFSIZE];
 
 if ((r = parse_pal_hwre (cptr, inst)) < 0) return r;    /* PAL hardware? */
 cptr = get_glyph (cptr, gbuf, 0);                       /* get opcode */