prog: refactor target.MakeMmap

Make MakeMmap return more than 1 call.
This is a preparation for future changes.
Also remove addr/size as they are effectively
always the same and can be inferred from the target
(will also conflict with the future changes).
Also rename to MakeDataMmap to better represent
the new purpose: it's just some arbitrary mmap,
but rather mapping of the data segment.

1 files changed, 4 insertions, 11 deletions

diff --git a/prog/rand.go b/prog/rand.go
index 8583fbdcb..c761d0b40 100644
--- a/prog/rand.go
+++ b/prog/rand.go
@@ -589,19 +589,12 @@ func (target *Target) GenerateAllSyzProg(rs rand.Source) *Prog {
 	return p
 }
 
-// GenerateSimpleProg generates the simplest non-empty program for testing
-// (e.g. containing a single mmap).
-func (target *Target) GenerateSimpleProg() *Prog {
+// DataMmapProg creates program that maps data segment.
+// Also used for testing as the simplest program.
+func (target *Target) DataMmapProg() *Prog {
 	return &Prog{
 		Target: target,
-		Calls:  []*Call{target.MakeMmap(0, target.PageSize)},
-	}
-}
-
-func (target *Target) GenerateUberMmapProg() *Prog {
-	return &Prog{
-		Target: target,
-		Calls:  []*Call{target.MakeMmap(0, target.NumPages*target.PageSize)},
+		Calls:  target.MakeDataMmap(),
 	}
 }