From 6275ab1693a3cc13966dac53069d4cf9981e6200 Mon Sep 17 00:00:00 2001 From: David Monniaux Date: Mon, 18 Mar 2019 13:01:54 +0100 Subject: some more andn / orn --- mppa_k1c/SelectOp.vp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'mppa_k1c/SelectOp.vp') diff --git a/mppa_k1c/SelectOp.vp b/mppa_k1c/SelectOp.vp index 18234286..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. @@ -224,6 +225,7 @@ Nondetfunction and (e1: expr) (e2: expr) := | 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. @@ -233,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. @@ -255,6 +258,7 @@ Nondetfunction or (e1: expr) (e2: expr) := 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. -- cgit