Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Experimental power number generator for uints #892

Merged
merged 9 commits into from
Apr 11, 2023
Merged

Experimental power number generator for uints #892

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3687402
added experimental power number generator for uints
ggrieco-tob Jan 5, 2023
4fcf45f
fix
ggrieco-tob Jan 5, 2023
2a2a90d
fix
ggrieco-tob Jan 5, 2023
364f0e6
fix
ggrieco-tob Jan 6, 2023
ba6ca8e
use the power generator number half of time we need a large number
ggrieco-tob Jan 24, 2023
4ab9b8a
merge
ggrieco-tob Mar 29, 2023
ef0e737
Merge remote-tracking branch 'origin/master' into dev-power-gen
ggrieco-tob Mar 29, 2023
a2357fd
Merge remote-tracking branch 'origin/master' into dev-power-gen
ggrieco-tob Apr 11, 2023
3c4dd1c
Tweaked probabilities for uint generation
ggrieco-tob Apr 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions lib/Echidna/ABI.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
module Echidna.ABI where

import Control.Monad (liftM2, liftM3, foldM, replicateM)
import Control.Monad.Random.Strict (MonadRandom, getRandom, getRandoms, getRandomR)
import Control.Monad.Random.Strict (MonadRandom, join, getRandom, getRandoms, getRandomR)
import Control.Monad.Random.Strict qualified as Random
import Data.Binary.Put (runPut, putWord32be)
import Data.BinaryWord (unsignedWord)
Expand Down Expand Up @@ -155,12 +155,19 @@ mkDictValues =

-- Generation (synthesis)

getRandomPow :: (MonadRandom m) => Int -> m Integer
getRandomPow n = if n <= 0 then return 0 else
do
mexp <- getRandomR (20, n)
getRandomR (2 ^ (mexp `div` 2), 2 ^ mexp)

getRandomUint :: MonadRandom m => Int -> m Integer
getRandomUint n =
getRandomR =<< Random.weighted
[ ((0, 1023), 1)
, ((0, 2 ^ n - 5), 8)
, ((2 ^ n - 5, 2 ^ n - 1), 1)
join $ Random.weighted
[ (getRandomR (0, 1023), 2)
, (getRandomR (0, 2 ^ n - 5), 16)
, (getRandomR (2 ^ n - 5, 2 ^ n - 1), 2)
, (getRandomPow (n - 5), 1)
]

getRandomInt :: MonadRandom m => Int -> m Integer
Expand Down