diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2024-06-02 11:58:29 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2024-06-04 09:50:32 +0000 |
| commit | 06bf8101debe879447d0ef3a7a5b84cb11fa5acf (patch) | |
| tree | d36506158005ab053b33b46559d48ba5e54b4a9e /sys/syz-sysgen | |
| parent | 3f1713c975c911f9ca5d27d0292f7505b176c873 (diff) | |
executor: remove noshmem mode
All OSes we have now support shmem.
Support for Fuchia/Starnix/Windows wasn't implemented,
but generally they support shared memory.
Remove all of the complexity and code associated with noshmem mode.
If/when we revive these OSes, it's easier to properly
implement shmem mode for them.
Diffstat (limited to 'sys/syz-sysgen')
| -rw-r--r-- | sys/syz-sysgen/sysgen.go | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/syz-sysgen/sysgen.go b/sys/syz-sysgen/sysgen.go index f170ad410..0022cea12 100644 --- a/sys/syz-sysgen/sysgen.go +++ b/sys/syz-sysgen/sysgen.go @@ -42,7 +42,6 @@ type Define struct { type ArchData struct { Revision string ForkServer int - Shmem int GOARCH string PageSize uint64 NumPages uint64 @@ -252,11 +251,11 @@ func generate(target *targets.Target, prg *compiler.Prog, consts map[string]uint fmt.Fprintf(out, "func init() {\n") fmt.Fprintf(out, "\tRegisterTarget(&Target{"+ "OS: %q, Arch: %q, Revision: revision_%v, PtrSize: %v, PageSize: %v, "+ - "NumPages: %v, DataOffset: %v, LittleEndian: %v, ExecutorUsesShmem: %v, "+ + "NumPages: %v, DataOffset: %v, LittleEndian: %v, "+ "Syscalls: syscalls_%v, Resources: resources_%v, Consts: consts_%v,"+ "Flags: flags_%v}, types_%v, InitTarget)\n}\n\n", target.OS, target.Arch, target.Arch, target.PtrSize, target.PageSize, - target.NumPages, target.DataOffset, target.LittleEndian, target.ExecutorUsesShmem, + target.NumPages, target.DataOffset, target.LittleEndian, target.Arch, target.Arch, target.Arch, target.Arch, target.Arch) fmt.Fprintf(out, "var resources_%v = ", target.Arch) @@ -298,9 +297,6 @@ func generateExecutorSyscalls(target *targets.Target, syscalls []*prog.Syscall, if target.ExecutorUsesForkServer { data.ForkServer = 1 } - if target.ExecutorUsesShmem { - data.Shmem = 1 - } defines := make(map[string]string) for _, c := range syscalls { var attrVals []uint64 @@ -417,7 +413,6 @@ struct call_props_t { {{range $attr := $.CallProps}} #define GOARCH "{{.GOARCH}}" #define SYZ_REVISION "{{.Revision}}" #define SYZ_EXECUTOR_USES_FORK_SERVER {{.ForkServer}} -#define SYZ_EXECUTOR_USES_SHMEM {{.Shmem}} #define SYZ_PAGE_SIZE {{.PageSize}} #define SYZ_NUM_PAGES {{.NumPages}} #define SYZ_DATA_OFFSET {{.DataOffset}} |