From e54e9781a4e043b3140b0c908ba4f4e469fd317e Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Sun, 26 Apr 2020 14:14:14 +0200 Subject: prog: remove Dir from Type Having Dir is Type is handy, but forces us to duplicate lots of types. E.g. if a struct is referenced as both in and out, then we need to have 2 copies and 2 copies of structs/types it includes. If also prevents us from having the struct type as struct identity (because we can have up to 3 of them). Revert to the old way we used to do it: propagate Dir as we walk syscall arguments. This moves lots of dir passing from pkg/compiler to prog package. Now Arg contains the dir, so once we build the tree, we can use dirs as before. Reduces size of sys/linux/gen/amd64.go from 6058336 to 5661150 (-6.6%). Update #1580 --- sys/targets/common.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'sys/targets') diff --git a/sys/targets/common.go b/sys/targets/common.go index beac7004d..908be3ff7 100644 --- a/sys/targets/common.go +++ b/sys/targets/common.go @@ -22,19 +22,19 @@ func MakePosixMmap(target *prog.Target, exec, contain bool) func() []*prog.Call const invalidFD = ^uint64(0) makeMmap := func(addr, size, prot uint64) *prog.Call { args := []prog.Arg{ - prog.MakeVmaPointerArg(meta.Args[0], addr, size), - prog.MakeConstArg(meta.Args[1], size), - prog.MakeConstArg(meta.Args[2], prot), - prog.MakeConstArg(meta.Args[3], flags), - prog.MakeResultArg(meta.Args[4], nil, invalidFD), + prog.MakeVmaPointerArg(meta.Args[0], prog.DirIn, addr, size), + prog.MakeConstArg(meta.Args[1], prog.DirIn, size), + prog.MakeConstArg(meta.Args[2], prog.DirIn, prot), + prog.MakeConstArg(meta.Args[3], prog.DirIn, flags), + prog.MakeResultArg(meta.Args[4], prog.DirIn, nil, invalidFD), } i := len(args) // Some targets have a padding argument between fd and offset. if len(meta.Args) > 6 { - args = append(args, prog.MakeConstArg(meta.Args[i], 0)) + args = append(args, prog.MakeConstArg(meta.Args[i], prog.DirIn, 0)) i++ } - args = append(args, prog.MakeConstArg(meta.Args[i], 0)) + args = append(args, prog.MakeConstArg(meta.Args[i], prog.DirIn, 0)) return &prog.Call{ Meta: meta, Args: args, @@ -61,8 +61,8 @@ func MakeSyzMmap(target *prog.Target) func() []*prog.Call { { Meta: meta, Args: []prog.Arg{ - prog.MakeVmaPointerArg(meta.Args[0], 0, size), - prog.MakeConstArg(meta.Args[1], size), + prog.MakeVmaPointerArg(meta.Args[0], prog.DirIn, 0, size), + prog.MakeConstArg(meta.Args[1], prog.DirIn, size), }, Ret: prog.MakeReturnArg(meta.Ret), }, -- cgit mrf-deployment