5c, 5g: another attempt at silencing gcc

R=ken2
CC=golang-dev
https://golang.org/cl/4535074

diff --git a/src/cmd/5c/gc.h b/src/cmd/5c/gc.h
index 9e9d1bd7d5a25597bdca16edb91c42ddf415dc44..549e0c88a2d92a69bd8a02ceaf7c4f98c43ace4d 100644 (file)
--- a/src/cmd/5c/gc.h
+++ b/src/cmd/5c/gc.h
@@ -69,7 +69,7 @@ struct        Adr
 
        Sym*    sym;
        char    type;
-       char    reg;
+       uchar   reg;
        char    name;
        char    etype;
 };
@@ -83,7 +83,7 @@ struct        Prog
        Prog*   link;
        int32   lineno;
        char    as;
-       char    reg;
+       uchar   reg;
        uchar   scond;
 };
 #define        P       ((Prog*)0)

diff --git a/src/cmd/5c/peep.c b/src/cmd/5c/peep.c
index 8945ee73214d7ad7be698fb471a69ab27eb8b976..c15bf0fc4cd499180a48ca13ffcebb47e5b3a8c7 100644 (file)
--- a/src/cmd/5c/peep.c
+++ b/src/cmd/5c/peep.c
@@ -1100,7 +1100,7 @@ copyu(Prog *p, Adr *v, Adr *s)
                if(v->type == D_REG) {
                        if(v->reg <= REGEXT && v->reg > exregoffset)
                                return 2;
-                       if(v->reg == REGARG)
+                       if(v->reg == (uchar)REGARG)
                                return 2;
                }
                if(v->type == D_FREG)
@@ -1118,7 +1118,7 @@ copyu(Prog *p, Adr *v, Adr *s)
 
        case ATEXT:     /* funny */
                if(v->type == D_REG)
-                       if(v->reg == REGARG)
+                       if(v->reg == (uchar)REGARG)
                                return 3;
                return 0;
        }

diff --git a/src/cmd/5g/gg.h b/src/cmd/5g/gg.h
index 78e6833b2ae9270829124ef9717aac1b59d027b1..fe404ed79edb87e94fa7aa21d64d6300d3707246 100644 (file)
--- a/src/cmd/5g/gg.h
+++ b/src/cmd/5g/gg.h
@@ -26,7 +26,7 @@ struct        Addr
        int     width;
        uchar   type;
        char    name;
-       char    reg;
+       uchar   reg;
        char pun;
        uchar   etype;
 };
@@ -41,7 +41,7 @@ struct        Prog
        Addr    to;             // dst address
        Prog*   link;           // next instruction in this func
        void*   regp;           // points to enclosing Reg struct
-       char    reg;            // doubles as width in DATA op
+       uchar   reg;            // doubles as width in DATA op
        uchar   scond;
 };
 

diff --git a/src/cmd/5g/peep.c b/src/cmd/5g/peep.c
index ca12d70f263c40fb09957eca9a232757586c5f65..6f36e12d42ee4f4495857d6eae626cf3d83e683e 100644 (file)
--- a/src/cmd/5g/peep.c
+++ b/src/cmd/5g/peep.c
@@ -1134,7 +1134,7 @@ copyu(Prog *p, Adr *v, Adr *s)
                if(v->type == D_REG) {
                        if(v->reg <= REGEXT && v->reg > exregoffset)
                                return 2;
-                       if(v->reg == REGARG)
+                       if(v->reg == (uchar)REGARG)
                                return 2;
                }
                if(v->type == D_FREG)
@@ -1152,7 +1152,7 @@ copyu(Prog *p, Adr *v, Adr *s)
 
        case ATEXT:     /* funny */
                if(v->type == D_REG)
-                       if(v->reg == REGARG)
+                       if(v->reg == (uchar)REGARG)
                                return 3;
                return 0;
        }