GaloisInc/macaw
1
1
Fork 0
mirror of https://github.com/GaloisInc/macaw.git synced 2024-12-29 00:59:09 +03:00
Code Issues Projects Releases Wiki Activity

more rewrite rules for <= and <

Browse Source
This commit is contained in:
Daniel Wagner 2018-05-30 15:27:36 -04:00
parent 38aeecba21
commit 024e393e8e
1 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
base/src/Data/Macaw/CFG/Rewriter.hs
View File

@ -200,6 +200,27 @@ rewriteApp app = do
else else
pure (BoolValue False) pure (BoolValue False)
AndApp x y@BoolValue{} -> rewriteApp (AndApp y x) AndApp x y@BoolValue{} -> rewriteApp (AndApp y x)
-- x < y && x <= y = x < y
AndApp (valueAsApp -> Just (BVUnsignedLe x y ))
v@(valueAsApp -> Just (BVUnsignedLt x' y'))
| Just Refl <- testEquality (typeWidth x) (typeWidth x')
, (x,y) == (x',y')
-> pure v
AndApp v@(valueAsApp -> Just (BVUnsignedLt x' y'))
(valueAsApp -> Just (BVUnsignedLe x y ))
| Just Refl <- testEquality (typeWidth x) (typeWidth x')
, (x,y) == (x',y')
-> pure v
AndApp (valueAsApp -> Just (BVSignedLe x y ))
v@(valueAsApp -> Just (BVSignedLt x' y'))
| Just Refl <- testEquality (typeWidth x) (typeWidth x')
, (x,y) == (x',y')
-> pure v
AndApp v@(valueAsApp -> Just (BVSignedLt x' y'))
(valueAsApp -> Just (BVSignedLe x y ))
| Just Refl <- testEquality (typeWidth x) (typeWidth x')
, (x,y) == (x',y')
-> pure v
OrApp (BoolValue xc) y -> do OrApp (BoolValue xc) y -> do
if xc then if xc then
@ -207,10 +228,20 @@ rewriteApp app = do
else else
pure y pure y
OrApp x y@BoolValue{} -> rewriteApp (OrApp y x) OrApp x y@BoolValue{} -> rewriteApp (OrApp y x)
NotApp (BoolValue b) -> NotApp (BoolValue b) ->
pure $! boolLitValue (not b) pure $! boolLitValue (not b)
NotApp (valueAsApp -> Just (NotApp c)) -> NotApp (valueAsApp -> Just (NotApp c)) ->
pure $! c pure $! c
NotApp (valueAsApp -> Just (BVUnsignedLe x y)) ->
rewriteApp (BVUnsignedLt y x)
NotApp (valueAsApp -> Just (BVUnsignedLt x y)) ->
rewriteApp (BVUnsignedLe y x)
NotApp (valueAsApp -> Just (BVSignedLe x y)) ->
rewriteApp (BVSignedLt y x)
NotApp (valueAsApp -> Just (BVSignedLt x y)) ->
rewriteApp (BVSignedLe y x)
XorApp (BoolValue b) x -> XorApp (BoolValue b) x ->
if b then if b then
rewriteApp (NotApp x) rewriteApp (NotApp x)
@ -248,20 +279,16 @@ rewriteApp app = do
BVSub w x (BVValue _ yc) -> do BVSub w x (BVValue _ yc) -> do
rewriteApp (BVAdd w x (BVValue w (toUnsigned w (negate yc)))) rewriteApp (BVAdd w x (BVValue w (toUnsigned w (negate yc))))
-- x < y => x -> not (y <= x)
BVUnsignedLt x y -> do
r <- rewriteApp (BVUnsignedLe y x)
rewriteApp (NotApp r)
BVUnsignedLe (BVValue w x) (BVValue _ y) -> do BVUnsignedLe (BVValue w x) (BVValue _ y) -> do
pure $ boolLitValue $ toUnsigned w x <= toUnsigned w y pure $ boolLitValue $ toUnsigned w x <= toUnsigned w y
BVUnsignedLt (BVValue w x) (BVValue _ y) -> do
pure $ boolLitValue $ toUnsigned w x < toUnsigned w y
-- x < y => x -> not (y <= x)
BVSignedLt x y -> do
r <- rewriteApp (BVSignedLe y x)
rewriteApp (NotApp r)
BVSignedLe (BVValue w x) (BVValue _ y) -> do BVSignedLe (BVValue w x) (BVValue _ y) -> do
pure $ boolLitValue $ toSigned w x <= toSigned w y pure $ boolLitValue $ toSigned w x <= toSigned w y
BVSignedLt (BVValue w x) (BVValue _ y) -> do
pure $ boolLitValue $ toSigned w x < toSigned w y
BVTestBit (BVValue xw xc) (BVValue _ ic) | ic < min (natValue xw) (toInteger (maxBound :: Int)) -> do BVTestBit (BVValue xw xc) (BVValue _ ic) | ic < min (natValue xw) (toInteger (maxBound :: Int)) -> do
let v = xc `testBit` fromInteger ic let v = xc `testBit` fromInteger ic
pure $! boolLitValue v pure $! boolLitValue v