sys: move generate files to separate packages

Move generated files to gen subdir. This allows to:
1. Rebuild init.go without rebuilding generated code.
2. Excluding generated files from gometalinter checking.
This makes faster and consume less memory.

Update #538

21 files changed, 88 insertions, 73 deletions

diff --git a/sys/akaros/amd64.go b/sys/akaros/gen/amd64.go
index d37c2fa8c..641eb07de 100644
--- a/sys/akaros/amd64.go
+++ b/sys/akaros/gen/amd64.go
@@ -1,12 +1,10 @@
 // AUTOGENERATED FILE
 
-package akaros
+package gen
 
 import . "github.com/google/syzkaller/prog"
 
-func init() {
-	RegisterTarget(&Target{OS: "akaros", Arch: "amd64", Revision: revision_amd64, PtrSize: 8, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_amd64, Resources: resources_amd64, Structs: structDescs_amd64, Consts: consts_amd64}, initTarget)
-}
+var Target_amd64 = &Target{OS: "akaros", Arch: "amd64", Revision: revision_amd64, PtrSize: 8, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_amd64, Resources: resources_amd64, Structs: structDescs_amd64, Consts: consts_amd64}
 
 var resources_amd64 = []*ResourceDesc{
 	{Name: "fd", Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", TypeSize: 4}}}, Kind: []string{"fd"}, Values: []uint64{18446744073709551615, 18446744073709551516}},
@@ -286,4 +284,4 @@ var consts_amd64 = []ConstValue{
 	{Name: "__O_TMPFILE", Value: 4259840},
 }
 
-const revision_amd64 = "c744974e88a841048703aae6c95499abb460f41b"
+const revision_amd64 = "b3ec742aa8b8f4d014d4030760d098325dfb1f62"
diff --git a/sys/akaros/init.go b/sys/akaros/init.go
index 3d525f95a..83bb1723c 100644
--- a/sys/akaros/init.go
+++ b/sys/akaros/init.go
@@ -5,8 +5,13 @@ package akaros
 
 import (
 	"github.com/google/syzkaller/prog"
+	"github.com/google/syzkaller/sys/akaros/gen"
 )
 
+func init() {
+	prog.RegisterTarget(gen.Target_amd64, initTarget)
+}
+
 func initTarget(target *prog.Target) {
 	arch := &arch{
 		mmapSyscall:   target.SyscallMap["mmap"],
diff --git a/sys/freebsd/amd64.go b/sys/freebsd/gen/amd64.go
index 9c98e3d4e..5f731958b 100644
--- a/sys/freebsd/amd64.go
+++ b/sys/freebsd/gen/amd64.go
@@ -1,12 +1,10 @@
 // AUTOGENERATED FILE
 
-package freebsd
+package gen
 
 import . "github.com/google/syzkaller/prog"
 
-func init() {
-	RegisterTarget(&Target{OS: "freebsd", Arch: "amd64", Revision: revision_amd64, PtrSize: 8, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_amd64, Resources: resources_amd64, Structs: structDescs_amd64, Consts: consts_amd64}, initTarget)
-}
+var Target_amd64 = &Target{OS: "freebsd", Arch: "amd64", Revision: revision_amd64, PtrSize: 8, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_amd64, Resources: resources_amd64, Structs: structDescs_amd64, Consts: consts_amd64}
 
 var resources_amd64 = []*ResourceDesc{
 	{Name: "fd", Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", TypeSize: 4}}}, Kind: []string{"fd"}, Values: []uint64{18446744073709551615, 18446744073709551516}},
@@ -2441,4 +2439,4 @@ var consts_amd64 = []ConstValue{
 	{Name: "WUNTRACED", Value: 2},
 }
 
-const revision_amd64 = "85698c8d3d37e02c2209d4adb65a775188fa979d"
+const revision_amd64 = "12b2862424799cb250e904a2da79cb45f1b79bbc"
diff --git a/sys/freebsd/init.go b/sys/freebsd/init.go
index 65da1d911..769b18df8 100644
--- a/sys/freebsd/init.go
+++ b/sys/freebsd/init.go
@@ -5,8 +5,13 @@ package freebsd
 
 import (
 	"github.com/google/syzkaller/prog"
+	"github.com/google/syzkaller/sys/freebsd/gen"
 )
 
+func init() {
+	prog.RegisterTarget(gen.Target_amd64, initTarget)
+}
+
 func initTarget(target *prog.Target) {
 	arch := &arch{
 		mmapSyscall: target.SyscallMap["mmap"],
diff --git a/sys/fuchsia/amd64.go b/sys/fuchsia/gen/amd64.go
index f81b0f3c1..d3b206124 100644
--- a/sys/fuchsia/amd64.go
+++ b/sys/fuchsia/gen/amd64.go
@@ -1,12 +1,10 @@
 // AUTOGENERATED FILE
 
-package fuchsia
+package gen
 
 import . "github.com/google/syzkaller/prog"
 
-func init() {
-	RegisterTarget(&Target{OS: "fuchsia", Arch: "amd64", Revision: revision_amd64, PtrSize: 8, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_amd64, Resources: resources_amd64, Structs: structDescs_amd64, Consts: consts_amd64}, initTarget)
-}
+var Target_amd64 = &Target{OS: "fuchsia", Arch: "amd64", Revision: revision_amd64, PtrSize: 8, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_amd64, Resources: resources_amd64, Structs: structDescs_amd64, Consts: consts_amd64}
 
 var resources_amd64 = []*ResourceDesc{
 	{Name: "fd", Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", TypeSize: 4}}}, Kind: []string{"fd"}, Values: []uint64{18446744073709551615, 18446744073709551516}},
@@ -1217,4 +1215,4 @@ var consts_amd64 = []ConstValue{
 	{Name: "ZX_WAIT_ASYNC_REPEATING", Value: 1},
 }
 
-const revision_amd64 = "3dd446fa4ace2ebb500e2a7568889e29d60e9a3b"
+const revision_amd64 = "747de15ad198405e62ce2ef83650f88ad9f3343d"
diff --git a/sys/fuchsia/arm64.go b/sys/fuchsia/gen/arm64.go
index d8967f80d..5d496f033 100644
--- a/sys/fuchsia/arm64.go
+++ b/sys/fuchsia/gen/arm64.go
@@ -1,12 +1,10 @@
 // AUTOGENERATED FILE
 
-package fuchsia
+package gen
 
 import . "github.com/google/syzkaller/prog"
 
-func init() {
-	RegisterTarget(&Target{OS: "fuchsia", Arch: "arm64", Revision: revision_arm64, PtrSize: 8, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_arm64, Resources: resources_arm64, Structs: structDescs_arm64, Consts: consts_arm64}, initTarget)
-}
+var Target_arm64 = &Target{OS: "fuchsia", Arch: "arm64", Revision: revision_arm64, PtrSize: 8, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_arm64, Resources: resources_arm64, Structs: structDescs_arm64, Consts: consts_arm64}
 
 var resources_arm64 = []*ResourceDesc{
 	{Name: "fd", Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", TypeSize: 4}}}, Kind: []string{"fd"}, Values: []uint64{18446744073709551615, 18446744073709551516}},
@@ -1217,4 +1215,4 @@ var consts_arm64 = []ConstValue{
 	{Name: "ZX_WAIT_ASYNC_REPEATING", Value: 1},
 }
 
-const revision_arm64 = "b330dd06bf4ee8dc69069d54cd7c18c28d2de00f"
+const revision_arm64 = "d346095f00a7bf5d98fe5c2a9ac934220eb4b0d5"
diff --git a/sys/fuchsia/init.go b/sys/fuchsia/init.go
index f3299e178..2f7d96d60 100644
--- a/sys/fuchsia/init.go
+++ b/sys/fuchsia/init.go
@@ -5,8 +5,14 @@ package fuchsia
 
 import (
 	"github.com/google/syzkaller/prog"
+	"github.com/google/syzkaller/sys/fuchsia/gen"
 )
 
+func init() {
+	prog.RegisterTarget(gen.Target_amd64, initTarget)
+	prog.RegisterTarget(gen.Target_arm64, initTarget)
+}
+
 func initTarget(target *prog.Target) {
 	arch := &arch{
 		mmapSyscall: target.SyscallMap["syz_mmap"],
diff --git a/sys/linux/386.go b/sys/linux/gen/386.go
index cf22addd3..81cd7e00d 100644
--- a/sys/linux/386.go
+++ b/sys/linux/gen/386.go
@@ -1,12 +1,10 @@
 // AUTOGENERATED FILE
 
-package linux
+package gen
 
 import . "github.com/google/syzkaller/prog"
 
-func init() {
-	RegisterTarget(&Target{OS: "linux", Arch: "386", Revision: revision_386, PtrSize: 4, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_386, Resources: resources_386, Structs: structDescs_386, Consts: consts_386}, initTarget)
-}
+var Target_386 = &Target{OS: "linux", Arch: "386", Revision: revision_386, PtrSize: 4, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_386, Resources: resources_386, Structs: structDescs_386, Consts: consts_386}
 
 var resources_386 = []*ResourceDesc{
 	{Name: "assoc_id", Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", TypeSize: 4}}}, Kind: []string{"assoc_id"}, Values: []uint64{0}},
@@ -29655,4 +29653,4 @@ var consts_386 = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_386 = "9c1e3d88594580bd4b3123526425c29d9753a03a"
+const revision_386 = "4c6d0af70679490e322df745c8fa4dadae283c39"
diff --git a/sys/linux/amd64.go b/sys/linux/gen/amd64.go
index 95a8e45be..172440efa 100644
--- a/sys/linux/amd64.go
+++ b/sys/linux/gen/amd64.go
@@ -1,12 +1,10 @@
 // AUTOGENERATED FILE
 
-package linux
+package gen
 
 import . "github.com/google/syzkaller/prog"
 
-func init() {
-	RegisterTarget(&Target{OS: "linux", Arch: "amd64", Revision: revision_amd64, PtrSize: 8, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_amd64, Resources: resources_amd64, Structs: structDescs_amd64, Consts: consts_amd64}, initTarget)
-}
+var Target_amd64 = &Target{OS: "linux", Arch: "amd64", Revision: revision_amd64, PtrSize: 8, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_amd64, Resources: resources_amd64, Structs: structDescs_amd64, Consts: consts_amd64}
 
 var resources_amd64 = []*ResourceDesc{
 	{Name: "assoc_id", Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", TypeSize: 4}}}, Kind: []string{"assoc_id"}, Values: []uint64{0}},
@@ -30326,4 +30324,4 @@ var consts_amd64 = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_amd64 = "f8acbe0e15423ec80dfcf52662c0f6109ef208bf"
+const revision_amd64 = "277587fb6c542ca7062a505c11fc03ef9904f304"
diff --git a/sys/linux/arm.go b/sys/linux/gen/arm.go
index 34fd81f38..10983675f 100644
--- a/sys/linux/arm.go
+++ b/sys/linux/gen/arm.go
@@ -1,12 +1,10 @@
 // AUTOGENERATED FILE
 
-package linux
+package gen
 
 import . "github.com/google/syzkaller/prog"
 
-func init() {
-	RegisterTarget(&Target{OS: "linux", Arch: "arm", Revision: revision_arm, PtrSize: 4, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_arm, Resources: resources_arm, Structs: structDescs_arm, Consts: consts_arm}, initTarget)
-}
+var Target_arm = &Target{OS: "linux", Arch: "arm", Revision: revision_arm, PtrSize: 4, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_arm, Resources: resources_arm, Structs: structDescs_arm, Consts: consts_arm}
 
 var resources_arm = []*ResourceDesc{
 	{Name: "assoc_id", Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", TypeSize: 4}}}, Kind: []string{"assoc_id"}, Values: []uint64{0}},
@@ -29518,4 +29516,4 @@ var consts_arm = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_arm = "5f20b8c644dfc68c4f871523b4e3377cece897b5"
+const revision_arm = "a34cd0cdc59606f38cb712367c20831f10dc478d"
diff --git a/sys/linux/arm64.go b/sys/linux/gen/arm64.go
index 69f0dd0c3..0f64eac1e 100644
--- a/sys/linux/arm64.go
+++ b/sys/linux/gen/arm64.go
@@ -1,12 +1,10 @@
 // AUTOGENERATED FILE
 
-package linux
+package gen
 
 import . "github.com/google/syzkaller/prog"
 
-func init() {
-	RegisterTarget(&Target{OS: "linux", Arch: "arm64", Revision: revision_arm64, PtrSize: 8, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_arm64, Resources: resources_arm64, Structs: structDescs_arm64, Consts: consts_arm64}, initTarget)
-}
+var Target_arm64 = &Target{OS: "linux", Arch: "arm64", Revision: revision_arm64, PtrSize: 8, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_arm64, Resources: resources_arm64, Structs: structDescs_arm64, Consts: consts_arm64}
 
 var resources_arm64 = []*ResourceDesc{
 	{Name: "assoc_id", Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", TypeSize: 4}}}, Kind: []string{"assoc_id"}, Values: []uint64{0}},
@@ -29708,4 +29706,4 @@ var consts_arm64 = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_arm64 = "1b0779569d22aeee458f1015be6b3831602ed203"
+const revision_arm64 = "7040c6f6b778e74ce07b7286262276f0cb49f7ee"
diff --git a/sys/linux/ppc64le.go b/sys/linux/gen/ppc64le.go
index 236d78ed4..05119b0df 100644
--- a/sys/linux/ppc64le.go
+++ b/sys/linux/gen/ppc64le.go
@@ -1,12 +1,10 @@
 // AUTOGENERATED FILE
 
-package linux
+package gen
 
 import . "github.com/google/syzkaller/prog"
 
-func init() {
-	RegisterTarget(&Target{OS: "linux", Arch: "ppc64le", Revision: revision_ppc64le, PtrSize: 8, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_ppc64le, Resources: resources_ppc64le, Structs: structDescs_ppc64le, Consts: consts_ppc64le}, initTarget)
-}
+var Target_ppc64le = &Target{OS: "linux", Arch: "ppc64le", Revision: revision_ppc64le, PtrSize: 8, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_ppc64le, Resources: resources_ppc64le, Structs: structDescs_ppc64le, Consts: consts_ppc64le}
 
 var resources_ppc64le = []*ResourceDesc{
 	{Name: "assoc_id", Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", TypeSize: 4}}}, Kind: []string{"assoc_id"}, Values: []uint64{0}},
@@ -29470,4 +29468,4 @@ var consts_ppc64le = []ConstValue{
 	{Name: "bpf_insn_load_imm_dw", Value: 24},
 }
 
-const revision_ppc64le = "90526274f947d332127c3e331252c843ecc73b7e"
+const revision_ppc64le = "90d89d7881b95ee12d0c43664882db875068a881"
diff --git a/sys/linux/init.go b/sys/linux/init.go
index e2370baab..86bdb8bde 100644
--- a/sys/linux/init.go
+++ b/sys/linux/init.go
@@ -7,8 +7,17 @@ import (
 	"runtime"
 
 	"github.com/google/syzkaller/prog"
+	"github.com/google/syzkaller/sys/linux/gen"
 )
 
+func init() {
+	prog.RegisterTarget(gen.Target_amd64, initTarget)
+	prog.RegisterTarget(gen.Target_386, initTarget)
+	prog.RegisterTarget(gen.Target_arm64, initTarget)
+	prog.RegisterTarget(gen.Target_arm, initTarget)
+	prog.RegisterTarget(gen.Target_ppc64le, initTarget)
+}
+
 func initTarget(target *prog.Target) {
 	arch := &arch{
 		mmapSyscall:               target.SyscallMap["mmap"],
diff --git a/sys/netbsd/amd64.go b/sys/netbsd/gen/amd64.go
index 2672fcb88..fe4b17bb6 100644
--- a/sys/netbsd/amd64.go
+++ b/sys/netbsd/gen/amd64.go
@@ -1,12 +1,10 @@
 // AUTOGENERATED FILE
 
-package netbsd
+package gen
 
 import . "github.com/google/syzkaller/prog"
 
-func init() {
-	RegisterTarget(&Target{OS: "netbsd", Arch: "amd64", Revision: revision_amd64, PtrSize: 8, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_amd64, Resources: resources_amd64, Structs: structDescs_amd64, Consts: consts_amd64}, initTarget)
-}
+var Target_amd64 = &Target{OS: "netbsd", Arch: "amd64", Revision: revision_amd64, PtrSize: 8, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_amd64, Resources: resources_amd64, Structs: structDescs_amd64, Consts: consts_amd64}
 
 var resources_amd64 = []*ResourceDesc{
 	{Name: "fd", Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", TypeSize: 4}}}, Kind: []string{"fd"}, Values: []uint64{18446744073709551615, 18446744073709551516}},
@@ -1675,4 +1673,4 @@ var consts_amd64 = []ConstValue{
 	{Name: "WUNTRACED", Value: 2},
 }
 
-const revision_amd64 = "b6e061c6909fbe19e2e976506e0c886c2850f3e6"
+const revision_amd64 = "232e11e345d6f9c3ee0bdcedfacc59d22adfcb2b"
diff --git a/sys/netbsd/init.go b/sys/netbsd/init.go
index 2175e29af..de92caf05 100644
--- a/sys/netbsd/init.go
+++ b/sys/netbsd/init.go
@@ -5,8 +5,13 @@ package netbsd
 
 import (
 	"github.com/google/syzkaller/prog"
+	"github.com/google/syzkaller/sys/netbsd/gen"
 )
 
+func init() {
+	prog.RegisterTarget(gen.Target_amd64, initTarget)
+}
+
 func initTarget(target *prog.Target) {
 	arch := &arch{
 		mmapSyscall:   target.SyscallMap["mmap"],
diff --git a/sys/syz-sysgen/sysgen.go b/sys/syz-sysgen/sysgen.go
index 154d6ef9a..cef35ba05 100644
--- a/sys/syz-sysgen/sysgen.go
+++ b/sys/syz-sysgen/sysgen.go
@@ -22,6 +22,7 @@ import (
 	"github.com/google/syzkaller/pkg/ast"
 	"github.com/google/syzkaller/pkg/compiler"
 	"github.com/google/syzkaller/pkg/hash"
+	"github.com/google/syzkaller/pkg/osutil"
 	"github.com/google/syzkaller/pkg/serializer"
 	"github.com/google/syzkaller/prog"
 	"github.com/google/syzkaller/sys/targets"
@@ -39,6 +40,7 @@ func main() {
 		if top == nil {
 			os.Exit(1)
 		}
+		osutil.MkdirAll(filepath.Join("sys", OS, "gen"))
 
 		type Job struct {
 			Target      *targets.Target
@@ -76,7 +78,7 @@ func main() {
 				}
 				job.Unsupported = prog.Unsupported
 
-				sysFile := filepath.Join("sys", OS, job.Target.Arch+".go")
+				sysFile := filepath.Join("sys", OS, "gen", job.Target.Arch+".go")
 				out := new(bytes.Buffer)
 				generate(job.Target, prog, consts, out)
 				rev := hash.String(out.Bytes())
@@ -130,18 +132,16 @@ func main() {
 
 func generate(target *targets.Target, prg *compiler.Prog, consts map[string]uint64, out io.Writer) {
 	fmt.Fprintf(out, "// AUTOGENERATED FILE\n\n")
-	fmt.Fprintf(out, "package %v\n\n", target.OS)
+	fmt.Fprintf(out, "package gen\n\n")
 	fmt.Fprintf(out, "import . \"github.com/google/syzkaller/prog\"\n\n")
 
-	fmt.Fprintf(out, "func init() {\n")
-	fmt.Fprintf(out, "\tRegisterTarget(&Target{OS: %q, Arch: %q, Revision: revision_%v, PtrSize: %v, "+
+	fmt.Fprintf(out, "var Target_%v = &Target{"+
+		"OS: %q, Arch: %q, Revision: revision_%v, PtrSize: %v, "+
 		"PageSize: %v, NumPages: %v, DataOffset: %v, Syscalls: syscalls_%v, "+
-		"Resources: resources_%v, Structs: structDescs_%v, Consts: consts_%v}, "+
-		"initTarget)\n",
-		target.OS, target.Arch, target.Arch, target.PtrSize,
+		"Resources: resources_%v, Structs: structDescs_%v, Consts: consts_%v}\n\n",
+		target.Arch, target.OS, target.Arch, target.Arch, target.PtrSize,
 		target.PageSize, target.NumPages, target.DataOffset,
 		target.Arch, target.Arch, target.Arch, target.Arch)
-	fmt.Fprintf(out, "}\n\n")
 
 	fmt.Fprintf(out, "var resources_%v = ", target.Arch)
 	serializer.Write(out, prg.Resources)
diff --git a/sys/test/32.go b/sys/test/gen/32.go
index db97935e1..28a8fd380 100644
--- a/sys/test/32.go
+++ b/sys/test/gen/32.go
@@ -1,12 +1,10 @@
 // AUTOGENERATED FILE
 
-package test
+package gen
 
 import . "github.com/google/syzkaller/prog"
 
-func init() {
-	RegisterTarget(&Target{OS: "test", Arch: "32", Revision: revision_32, PtrSize: 4, PageSize: 8192, NumPages: 2048, DataOffset: 536870912, Syscalls: syscalls_32, Resources: resources_32, Structs: structDescs_32, Consts: consts_32}, initTarget)
-}
+var Target_32 = &Target{OS: "test", Arch: "32", Revision: revision_32, PtrSize: 4, PageSize: 8192, NumPages: 2048, DataOffset: 536870912, Syscalls: syscalls_32, Resources: resources_32, Structs: structDescs_32, Consts: consts_32}
 
 var resources_32 = []*ResourceDesc{
 	{Name: "anyres32", Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", TypeSize: 4}}}, Kind: []string{"anyres32"}, Values: []uint64{0}},
@@ -824,4 +822,4 @@ var consts_32 = []ConstValue{
 	{Name: "ONLY_32BITS_CONST", Value: 1},
 }
 
-const revision_32 = "328d9ffcbca65ffa7b21b9705dc57aeed48d21e4"
+const revision_32 = "e64e7aa2b83bf3882517a64e4d760868ce7e378f"
diff --git a/sys/test/64.go b/sys/test/gen/64.go
index 5664a1ba7..232927c6d 100644
--- a/sys/test/64.go
+++ b/sys/test/gen/64.go
@@ -1,12 +1,10 @@
 // AUTOGENERATED FILE
 
-package test
+package gen
 
 import . "github.com/google/syzkaller/prog"
 
-func init() {
-	RegisterTarget(&Target{OS: "test", Arch: "64", Revision: revision_64, PtrSize: 8, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_64, Resources: resources_64, Structs: structDescs_64, Consts: consts_64}, initTarget)
-}
+var Target_64 = &Target{OS: "test", Arch: "64", Revision: revision_64, PtrSize: 8, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_64, Resources: resources_64, Structs: structDescs_64, Consts: consts_64}
 
 var resources_64 = []*ResourceDesc{
 	{Name: "anyres32", Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "int32", TypeSize: 4}}}, Kind: []string{"anyres32"}, Values: []uint64{0}},
@@ -822,4 +820,4 @@ var consts_64 = []ConstValue{
 	{Name: "IPPROTO_UDP", Value: 17},
 }
 
-const revision_64 = "379749ecc3394eab3b4d1ae617f394a30fc0a285"
+const revision_64 = "d9251ec1f9c31ffae40648c5410d8d7624136f72"
diff --git a/sys/test/init.go b/sys/test/init.go
index 5df5ba0b4..3bc7cd2e0 100644
--- a/sys/test/init.go
+++ b/sys/test/init.go
@@ -5,8 +5,14 @@ package test
 
 import (
 	"github.com/google/syzkaller/prog"
+	"github.com/google/syzkaller/sys/test/gen"
 )
 
+func init() {
+	prog.RegisterTarget(gen.Target_32, initTarget)
+	prog.RegisterTarget(gen.Target_64, initTarget)
+}
+
 func initTarget(target *prog.Target) {
 	arch := &arch{
 		mmapSyscall: target.SyscallMap["mmap"],
diff --git a/sys/windows/amd64.go b/sys/windows/gen/amd64.go
index 29332168b..67c6b48a0 100644
--- a/sys/windows/amd64.go
+++ b/sys/windows/gen/amd64.go
@@ -1,12 +1,10 @@
 // AUTOGENERATED FILE
 
-package windows
+package gen
 
 import . "github.com/google/syzkaller/prog"
 
-func init() {
-	RegisterTarget(&Target{OS: "windows", Arch: "amd64", Revision: revision_amd64, PtrSize: 8, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_amd64, Resources: resources_amd64, Structs: structDescs_amd64, Consts: consts_amd64}, initTarget)
-}
+var Target_amd64 = &Target{OS: "windows", Arch: "amd64", Revision: revision_amd64, PtrSize: 8, PageSize: 4096, NumPages: 4096, DataOffset: 536870912, Syscalls: syscalls_amd64, Resources: resources_amd64, Structs: structDescs_amd64, Consts: consts_amd64}
 
 var resources_amd64 = []*ResourceDesc{
 	{Name: "HANDLE", Type: &IntType{IntTypeCommon: IntTypeCommon{TypeCommon: TypeCommon{TypeName: "intptr", TypeSize: 8}}}, Kind: []string{"HANDLE"}, Values: []uint64{18446744073709551615}},
@@ -14613,4 +14611,4 @@ var consts_amd64 = []ConstValue{
 	{Name: "WRITE_OWNER", Value: 524288},
 }
 
-const revision_amd64 = "47180614fec67dadb09d1411878a07a5132de548"
+const revision_amd64 = "6285e05d0c2a423477b78cca69c1143794a9b482"
diff --git a/sys/windows/init.go b/sys/windows/init.go
index 7729f3260..f27f89cb0 100644
--- a/sys/windows/init.go
+++ b/sys/windows/init.go
@@ -5,8 +5,13 @@ package windows
 
 import (
 	"github.com/google/syzkaller/prog"
+	"github.com/google/syzkaller/sys/windows/gen"
 )
 
+func init() {
+	prog.RegisterTarget(gen.Target_amd64, initTarget)
+}
+
 func initTarget(target *prog.Target) {
 	arch := &arch{
 		virtualAllocSyscall:    target.SyscallMap["VirtualAlloc"],