From 7560799c75f65327fe726b5b4b256d23b341709c Mon Sep 17 00:00:00 2001 From: Greg Steuck Date: Mon, 24 Apr 2023 20:27:30 +0100 Subject: sys/targets: introduce HasCallNumber to reduce clutter This centralizes all strings.HasPrefix(callName, "syz_") checks. --- pkg/csource/csource.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'pkg/csource') diff --git a/pkg/csource/csource.go b/pkg/csource/csource.go index aedcf0d19..0c9f78e71 100644 --- a/pkg/csource/csource.go +++ b/pkg/csource/csource.go @@ -214,8 +214,7 @@ func (ctx *context) generateSyscalls(calls []string, hasVars bool) string { func (ctx *context) generateSyscallDefines() string { var calls []string for name, nr := range ctx.calls { - if !ctx.sysTarget.SyscallNumbers || - strings.HasPrefix(name, "syz_") || !ctx.sysTarget.NeedSyscallDefine(nr) { + if !ctx.sysTarget.HasCallNumber(name) || !ctx.sysTarget.NeedSyscallDefine(nr) { continue } calls = append(calls, name) @@ -290,7 +289,7 @@ func (ctx *context) generateCalls(p prog.ExecProg, trace bool) ([]string, []uint func isNative(sysTarget *targets.Target, callName string) bool { _, trampoline := sysTarget.SyscallTrampolines[callName] - return sysTarget.SyscallNumbers && !strings.HasPrefix(callName, "syz_") && !trampoline + return sysTarget.HasCallNumber(callName) && !trampoline } func (ctx *context) emitCall(w *bytes.Buffer, call prog.ExecCall, ci int, haveCopyout, trace bool) { -- cgit mrf-deployment