From d539c2ec8ff6d9dae25b81fb1408b67877303827 Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Wed, 2 Apr 2025 05:04:00 -0700
Subject: pkg/ifuzz/x86: fix code generator

The generator does not run and generates broken code.
It looks like the generated file was edited manully.
Fix that.
---
 Makefile                         |  2 +-
 pkg/ifuzz/x86/gen/gen.go         | 12 ++++++------
 pkg/ifuzz/x86/generated/insns.go |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index df6535885..e7397105f 100644
--- a/Makefile
+++ b/Makefile
@@ -236,7 +236,7 @@ generate:
 	$(MAKE) format
 
 generate_go: format_cpp
-	$(GO) generate ./executor ./pkg/ifuzz ./pkg/build ./pkg/rpcserver
+	$(GO) generate ./executor ./pkg/ifuzz/x86 ./pkg/ifuzz/arm64 ./pkg/build ./pkg/rpcserver
 	$(GO) run github.com/vektra/mockery/v2@v2.52.1 --log-level="error"
 
 generate_rpc:
diff --git a/pkg/ifuzz/x86/gen/gen.go b/pkg/ifuzz/x86/gen/gen.go
index 01ba8420b..dc77ea497 100644
--- a/pkg/ifuzz/x86/gen/gen.go
+++ b/pkg/ifuzz/x86/gen/gen.go
@@ -169,19 +169,19 @@ nextInsn:
 	insns = deduped
 
 	fmt.Printf(`
-// Code generated by pkg/ifuzz/gen. DO NOT EDIT.
+// Code generated by pkg/ifuzz/x86/gen. DO NOT EDIT.
 
-// +build !codeanalysis
+//go:build !codeanalysis
 
-package x86
+package generated
 
-import "github.com/google/syzkaller/pkg/ifuzz/x86"
+import . "github.com/google/syzkaller/pkg/ifuzz/x86"
 
 func init() {
-	x86.Register(insns_x86)
+	Register(insns)
 }
 
-var insns_x86 = []*Insn{
+var insns =
 `)
 	serializer.Write(os.Stdout, insns)
 
diff --git a/pkg/ifuzz/x86/generated/insns.go b/pkg/ifuzz/x86/generated/insns.go
index 3e990da92..511605e46 100644
--- a/pkg/ifuzz/x86/generated/insns.go
+++ b/pkg/ifuzz/x86/generated/insns.go
@@ -1,16 +1,16 @@
-// Code generated by pkg/ifuzz/gen. DO NOT EDIT.
+// Code generated by pkg/ifuzz/x86/gen. DO NOT EDIT.
 
 //go:build !codeanalysis
 
 package generated
 
-import "github.com/google/syzkaller/pkg/ifuzz/x86"
+import . "github.com/google/syzkaller/pkg/ifuzz/x86"
 
 func init() {
-	x86.Register(insns)
+	Register(insns)
 }
 
-var insns = []*x86.Insn{
+var insns = []*Insn{
 	{Name: "FADD", Extension: "X87", Mode: 15, Opcode: []uint8{216}, Modrm: true, Mod: -3, Rm: -1, Mem32: true, VexP: -1},
 	{Name: "FMUL", Extension: "X87", Mode: 15, Opcode: []uint8{216}, Modrm: true, Mod: -3, Reg: 1, Rm: -1, Mem32: true, VexP: -1},
 	{Name: "FCOMP", Extension: "X87", Mode: 15, Opcode: []uint8{216}, Modrm: true, Mod: -3, Reg: 3, Rm: -1, Mem32: true, VexP: -1},
-- 
cgit mrf-deployment