From 9e4e4272d3f686e750a13d2111b0fb7041db2f4a Mon Sep 17 00:00:00 2001 From: Aleksandr Nogikh Date: Tue, 31 Aug 2021 17:21:33 +0000 Subject: all: introduce a prog.Call constructor Create a constructor for the prog.Call type. It allows to reduce the duplication of code now and during further changes. --- tools/syz-trace2syz/proggen/proggen.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'tools') diff --git a/tools/syz-trace2syz/proggen/proggen.go b/tools/syz-trace2syz/proggen/proggen.go index 866dfbba0..553274728 100644 --- a/tools/syz-trace2syz/proggen/proggen.go +++ b/tools/syz-trace2syz/proggen/proggen.go @@ -102,14 +102,13 @@ func genProg(trace *parser.Trace, target *prog.Target) *prog.Prog { func (ctx *context) genCall() *prog.Call { log.Logf(3, "parsing call: %s", ctx.currentStraceCall.CallName) straceCall := ctx.currentStraceCall - ctx.currentSyzCall = new(prog.Call) - ctx.currentSyzCall.Meta = ctx.Select(straceCall) - syzCall := ctx.currentSyzCall - if ctx.currentSyzCall.Meta == nil { + meta := ctx.Select(straceCall) + if meta == nil { log.Logf(2, "skipping call: %s which has no matching description", ctx.currentStraceCall.CallName) return nil } - syzCall.Ret = prog.MakeReturnArg(syzCall.Meta.Ret) + ctx.currentSyzCall = prog.MakeCall(meta, nil) + syzCall := ctx.currentSyzCall for i := range syzCall.Meta.Args { var strArg parser.IrType -- cgit mrf-deployment