From 4fc47026945ebec3fc81d0c897547670034cfb58 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Tue, 5 Sep 2017 10:46:34 +0200 Subject: prog: dot-import sys In preparation for moving sys types to prog to reduce later diffs. --- prog/encodingexec.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'prog/encodingexec.go') diff --git a/prog/encodingexec.go b/prog/encodingexec.go index eff82ff53..d50e4f3be 100644 --- a/prog/encodingexec.go +++ b/prog/encodingexec.go @@ -10,7 +10,7 @@ import ( "fmt" "sort" - "github.com/google/syzkaller/sys" + . "github.com/google/syzkaller/sys" ) const ( @@ -110,7 +110,7 @@ func (p *Prog) SerializeForExec(buffer []byte, pid int) error { if a1, ok := arg1.(*DataArg); ok && len(a1.Data) == 0 { return } - if !sys.IsPad(arg1.Type()) && arg1.Type().Dir() != sys.DirOut { + if !IsPad(arg1.Type()) && arg1.Type().Dir() != DirOut { w.write(ExecInstrCopyin) w.write(physicalAddr(arg) + offset) w.writeArg(arg1, pid, csumMap) @@ -129,7 +129,7 @@ func (p *Prog) SerializeForExec(buffer []byte, pid int) error { sort.Sort(ByPhysicalAddr{Args: csumArgs, Context: w}) for i := len(csumArgs) - 1; i >= 0; i-- { arg := csumArgs[i] - if _, ok := arg.Type().(*sys.CsumType); !ok { + if _, ok := arg.Type().(*CsumType); !ok { panic("csum arg is not csum type") } w.write(ExecInstrCopyin) -- cgit mrf-deployment