1 files changed, 7 insertions, 1 deletions
diff --git a/mppa_k1c/SelectOp.vp b/mppa_k1c/SelectOp.vp
index a45e3403..7ec694e2 100644
--- a/mppa_k1c/SelectOp.vp
+++ b/mppa_k1c/SelectOp.vp
@@ -216,6 +216,7 @@ Nondetfunction andimm (n1: int) (e2: expr) :=
   else match e2 with
   | Eop (Ointconst n2) Enil => Eop (Ointconst (Int.and n1 n2)) Enil
   | Eop (Oandimm n2) (t2:::Enil) => Eop (Oandimm (Int.and n1 n2)) (t2:::Enil)
+  | Eop Onot (t2:::Enil) => Eop (Oandnimm n1) (t2:::Enil)
   | _ => Eop (Oandimm n1) (e2:::Enil)
   end.
 
@@ -223,6 +224,8 @@ Nondetfunction and (e1: expr) (e2: expr) :=
   match e1, e2 with
   | Eop (Ointconst n1) Enil, t2 => andimm n1 t2
   | t1, Eop (Ointconst n2) Enil => andimm n2 t1
+  | (Eop Onot (t1:::Enil)), t2 => Eop Oandn (t1:::t2:::Enil) 
+  | t1, (Eop Onot (t2:::Enil)) => Eop Oandn (t2:::t1:::Enil) 
   | _, _ => Eop Oand (e1:::e2:::Enil)
   end.
 
@@ -232,6 +235,7 @@ Nondetfunction orimm (n1: int) (e2: expr) :=
   else match e2 with
        | Eop (Ointconst n2) Enil => Eop (Ointconst (Int.or n1 n2)) Enil
        | Eop (Oorimm n2) (t2:::Enil) => Eop (Oorimm (Int.or n1 n2)) (t2:::Enil)
+       | Eop Onot (t2:::Enil) => Eop (Oornimm n1) (t2:::Enil)
        | _ => Eop (Oorimm n1) (e2:::Enil)
   end.
 
@@ -253,6 +257,8 @@ Nondetfunction or (e1: expr) (e2: expr) :=
       if Int.eq (Int.add n1 n2) Int.iwordsize && same_expr_pure t1 t2
       then Eop (Ororimm n2) (t1:::Enil)
       else Eop Oor (e1:::e2:::Enil)
+  | (Eop Onot (t1:::Enil)), t2 => Eop Oorn (t1:::t2:::Enil) 
+  | t1, (Eop Onot (t2:::Enil))  => Eop Oorn (t2:::t1:::Enil) 
   | _, _ => Eop Oor (e1:::e2:::Enil)
   end.
 
@@ -283,7 +289,7 @@ Nondetfunction notint (e: expr) :=
   | Eop (Oorimm n) (e1:::Enil) => Eop (Onorimm n) (e1:::Enil)
   | Eop Oxor (e1:::e2:::Enil) => Eop Onxor (e1:::e2:::Enil)
   | Eop (Oxorimm n) (e1:::Enil) => Eop (Onxorimm n) (e1:::Enil)
-  | _ => xorimm Int.mone e
+  | _ => Eop Onot (e:::Enil)
   end.
 
 (** ** Integer division and modulus *)