code review 4176042: peep: more bugs

src/cmd/5g/peep.c

 // Inferno utils/5c/peep.c
 // http://code.google.com/p/inferno-os/source/browse/utils/5g/peep.c
 //
 //      Copyright © 1994-1999 Lucent Technologies Inc.  All rights reserved.
 //      Portions Copyright © 1995-1997 C H Forsyth (forsyth@terzarima.net)
 //      Portions Copyright © 1997-1999 Vita Nuova Limited
 //      Portions Copyright © 2000-2007 Vita Nuova Holdings Limited (www.vitanuova.com)
 //      Portions Copyright © 2004,2006 Bruce Ellis
 //      Portions Copyright © 2005-2007 C H Forsyth (forsyth@terzarima.net)
 //      Revisions Copyright © 2000-2007 Lucent Technologies Inc. and others
@@ skipping 321 matching lines @@
         for(r=uniqp(r0); r!=R; r=uniqp(r)) {
                 if(uniqs(r) == R)
                         break;
                 p = r->prog;
                 switch(p->as) {
                 case ABL:
                         return 0;
 
                 case AMULLU:
                 case AMULA:
-//              case AMVN:
+                case AMVN:
+                        return 0;
 
                 case ACMN:
                 case AADD:
                 case ASUB:
                 case ASBC:
                 case ARSB:
                 case ASLL:
                 case ASRL:
                 case ASRA:
                 case AORR:
@@ skipping 625 matching lines @@
                 return 0;
 
         case ANOP:      /* read,, write */
         case AMOVW:
         case AMOVF:
         case AMOVD:
         case AMOVH:
         case AMOVHU:
         case AMOVB:
         case AMOVBU:
+        case AMOVFW:
+        case AMOVWF:
         case AMOVDW:
         case AMOVWD:
         case AMOVFD:
         case AMOVDF:
                 if(p->scond&(C_WBIT|C_PBIT))
                 if(v->type == D_REG) {
                         if(p->from.type == D_OREG || p->from.type == D_SHIFT) {
                                 if(p->from.reg == v->reg)
                                         return 2;
                         } else {
@@ skipping 15 matching lines @@
                         return 3;
                 }
                 if(copyau(&p->from, v))
                         return 1;
                 if(copyau(&p->to, v))
                         return 1;
                 return 0;
 
         case AMULLU:    /* read, read, write, write */
         case AMULA:
-//      case AMVN:
+        case AMVN:
                 return 2;
 
         case AADD:      /* read, read, write */
         case AADC:
         case ASUB:
         case ASBC:
         case ARSB:
         case ASLL:
         case ASRL:
         case ASRA:
@@ skipping 151 matching lines @@
  * either direct or indirect
  */
 int
 copyau(Adr *a, Adr *v)
 {
 
         if(copyas(a, v))
                 return 1;
         if(v->type == D_REG) {
                 if(a->type == D_CONST && a->reg != NREG) {
-                        if(v->reg == a->reg)
+                        if(a->reg == v->reg)
                                 return 1;
                 } else
                 if(a->type == D_OREG) {
-                        if(v->reg == a->reg)
+                        if(a->reg == v->reg)
                                 return 1;
                 } else
                 if(a->type == D_REGREG) {
-                        if(v->reg == a->reg)
+                        if(a->reg == v->reg)
                                 return 1;
                         if(a->offset == v->reg)
                                 return 1;
                 } else
                 if(a->type == D_SHIFT) {
                         if((a->offset&0xf) == v->reg)
                                 return 1;
                         if((a->offset&(1<<4)) && (a->offset>>8) == v->reg)
                                 return 1;
                 }
@@ skipping 292 matching lines @@
         }
 }
 
 int
 isdconst(Addr *a)
 {
         if(a->type == D_CONST && a->reg == NREG)
                 return 1;
         return 0;
 }