diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2020-12-12 09:13:58 +0100 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2020-12-13 18:56:36 +0100 |
| commit | 922cca0f7b14bb80909ffeedbd1d1cdee10610ca (patch) | |
| tree | 345663d8630f1e3d6472325a1c8d7be6cb3cf427 /pkg/cover | |
| parent | 3fc0a844bfb8efd6f8fe32585e4fd5d9f2af3fc3 (diff) | |
syz-manager: use ReportGenerator.RestorePC in RPCServer.NewInput
This will allow to support gvisor coverage where PCs
don't need to be rewound to the previous instruction.
Diffstat (limited to 'pkg/cover')
| -rw-r--r-- | pkg/cover/report.go | 5 | ||||
| -rw-r--r-- | pkg/cover/report_test.go | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/pkg/cover/report.go b/pkg/cover/report.go index e50e11d13..234c30823 100644 --- a/pkg/cover/report.go +++ b/pkg/cover/report.go @@ -26,10 +26,7 @@ type Prog struct { PCs []uint64 } -var ( - RestorePC = backend.RestorePC - PreviousInstructionPC = backend.PreviousInstructionPC -) +var RestorePC = backend.RestorePC func MakeReportGenerator(target *targets.Target, vm, objDir, srcDir, buildDir string) (*ReportGenerator, error) { if objDir == "" { diff --git a/pkg/cover/report_test.go b/pkg/cover/report_test.go index afda03203..63f1ff50a 100644 --- a/pkg/cover/report_test.go +++ b/pkg/cover/report_test.go @@ -21,6 +21,7 @@ import ( "testing" "time" + "github.com/google/syzkaller/pkg/cover/backend" "github.com/google/syzkaller/pkg/osutil" "github.com/google/syzkaller/pkg/symbolizer" _ "github.com/google/syzkaller/sys" @@ -190,7 +191,7 @@ func generateReport(t *testing.T, target *targets.Target, test Test) ([]byte, [] if err != nil { t.Fatal(err) } - pcs = append(pcs, PreviousInstructionPC(target, pc)) + pcs = append(pcs, backend.PreviousInstructionPC(target, pc)) t.Logf("using exact coverage PC 0x%x", pcs[0]) } else if target.OS == runtime.GOOS && (target.Arch == runtime.GOARCH || target.VMArch == runtime.GOARCH) { t.Fatal(err) |