all: apply linter auto fixes

./tools/syz-env bin/golangci-lint run ./... --fix

3 files changed, 31 insertions, 22 deletions

diff --git a/pkg/ifuzz/powerpc/pseudo.go b/pkg/ifuzz/powerpc/pseudo.go
index f67a38907..fcc7b0941 100644
--- a/pkg/ifuzz/powerpc/pseudo.go
+++ b/pkg/ifuzz/powerpc/pseudo.go
@@ -96,10 +96,11 @@ func (gen *generator) sc(lev uint) {
 	hcrange := gen.r.Intn(3)
 	offset := 4
 	maxhc := MaxHcall
-	if hcrange == 1 {
+	switch hcrange {
+	case 1:
 		offset = 0xf000
 		maxhc = 0xf810
-	} else if hcrange == 2 {
+	case 2:
 		offset = 0xef00
 		maxhc = 0xef20
 	}
diff --git a/pkg/ifuzz/x86/decode.go b/pkg/ifuzz/x86/decode.go
index 0160e0fd3..dd9418e07 100644
--- a/pkg/ifuzz/x86/decode.go
+++ b/pkg/ifuzz/x86/decode.go
@@ -65,20 +65,22 @@ func (insnset *InsnSet) Decode(mode iset.Mode, text []byte) (int, error) {
 		for len(text) != 0 && prefixes[text[0]] {
 			switch text[0] {
 			case 0x66:
-				if immSize == 4 {
+				switch immSize {
+				case 4:
 					immSize1 = 2
 					operSize1 = 2
-				} else if immSize == 2 {
+				case 2:
 					immSize1 = 4
 					operSize1 = 4
 				}
 			case 0x67:
-				if addrSize == 8 {
+				switch addrSize {
+				case 8:
 					addrSize1 = 4
-				} else if addrSize == 4 {
+				case 4:
 					dispSize1 = 2
 					addrSize1 = 2
-				} else if addrSize == 2 {
+				case 2:
 					dispSize1 = 4
 					addrSize1 = 4
 				}
diff --git a/pkg/ifuzz/x86/encode.go b/pkg/ifuzz/x86/encode.go
index 59b9a294a..b196e81b2 100644
--- a/pkg/ifuzz/x86/encode.go
+++ b/pkg/ifuzz/x86/encode.go
@@ -90,20 +90,22 @@ func (insn *Insn) Encode(cfg *iset.Config, r *rand.Rand) []byte {
 		for _, pref := range code {
 			switch pref {
 			case 0x66:
-				if immSize == 4 {
+				switch immSize {
+				case 4:
 					immSize1 = 2
 					operSize1 = 2
-				} else if immSize == 2 {
+				case 2:
 					immSize1 = 4
 					operSize1 = 4
 				}
 			case 0x67:
-				if addrSize == 8 {
+				switch addrSize {
+				case 8:
 					addrSize1 = 4
-				} else if addrSize == 4 {
+				case 4:
 					dispSize1 = 2
 					addrSize1 = 2
-				} else if addrSize == 2 {
+				case 2:
 					dispSize1 = 4
 					addrSize1 = 4
 				}
@@ -125,15 +127,17 @@ func (insn *Insn) Encode(cfg *iset.Config, r *rand.Rand) []byte {
 		}
 		vexB = byte(r.Intn(2))
 		W := byte(r.Intn(2))
-		if insn.Rexw == 1 {
+		switch insn.Rexw {
+		case 1:
 			W = 1
-		} else if insn.Rexw == -1 {
+		case -1:
 			W = 0
 		}
 		L := byte(r.Intn(2))
-		if insn.VexL == 1 {
+		switch insn.VexL {
+		case 1:
 			L = 1
-		} else if insn.VexL == -1 {
+		case -1:
 			L = 0
 		}
 		pp := byte(r.Intn(4))
@@ -174,11 +178,12 @@ func (insn *Insn) Encode(cfg *iset.Config, r *rand.Rand) []byte {
 		}
 
 		reg := byte(insn.Reg)
-		if insn.Reg == -1 {
+		switch insn.Reg {
+		case -1:
 			reg = byte(r.Intn(8))
-		} else if insn.Reg == -6 {
+		case -6:
 			reg = byte(r.Intn(6)) // segment register
-		} else if insn.Reg == -8 {
+		case -8:
 			if rexR {
 				reg = 0 // CR8
 			} else {
@@ -242,11 +247,12 @@ func (insn *Insn) Encode(cfg *iset.Config, r *rand.Rand) []byte {
 	}
 
 	addImm := func(imm int) {
-		if imm == -1 {
+		switch imm {
+		case -1:
 			imm = immSize
-		} else if imm == -2 {
+		case -2:
 			imm = addrSize
-		} else if imm == -3 {
+		case -3:
 			imm = operSize
 		}
 		if imm != 0 {