Skip to content

Commit d8de1e1

Browse files
6eanut6eanut
committed
pkg, prog: enable ifuzz for riscv64
Signed-off-by: 6eanut <jiakaiPeanut@gmail.com>
1 parent 572effc commit d8de1e1

File tree

14 files changed

+6700
-2
lines changed

14 files changed

+6700
-2
lines changed

‎pkg/compiler/types.go‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ var typeText = &typeDesc{
641641

642642
var typeArgTextType = &typeArg{
643643
Kind: kindIdent,
644-
Names: []string{"target", "x86_real", "x86_16", "x86_32", "x86_64", "arm64", "ppc64"},
644+
Names: []string{"target", "x86_real", "x86_16", "x86_32", "x86_64", "arm64", "ppc64", "riscv64"},
645645
}
646646

647647
func genTextType(t *ast.Type) prog.TextKind {
@@ -660,6 +660,8 @@ func genTextType(t *ast.Type) prog.TextKind {
660660
return prog.TextArm64
661661
case "ppc64":
662662
return prog.TextPpc64
663+
case "riscv64":
664+
return prog.TextRiscv64
663665
default:
664666
panic(fmt.Sprintf("unknown text type %q", t.Ident))
665667
}

‎pkg/ifuzz/ifuzz.go‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"github.com/google/syzkaller/pkg/ifuzz/iset"
1111
_ "github.com/google/syzkaller/pkg/ifuzz/powerpc/generated" // pull in generated instruction descriptions
1212
_ "github.com/google/syzkaller/pkg/ifuzz/x86/generated" // pull in generated instruction descriptions
13+
_ "github.com/google/syzkaller/pkg/ifuzz/riscv64/generated" // pull in generated instruction descriptions
1314
)
1415

1516
type (
@@ -22,6 +23,7 @@ const (
2223
ArchX86 = iset.ArchX86
2324
ArchPowerPC = iset.ArchPowerPC
2425
ArchArm64 = iset.ArchArm64
26+
ArchRiscv64 = iset.ArchRiscv64
2527
ModeLong64 = iset.ModeLong64
2628
ModeProt32 = iset.ModeProt32
2729
ModeProt16 = iset.ModeProt16

‎pkg/ifuzz/ifuzz_test.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/google/syzkaller/pkg/testutil"
1313
)
1414

15-
var allArches = []string{ArchX86, ArchPowerPC, ArchArm64}
15+
var allArches = []string{ArchX86, ArchPowerPC, ArchArm64, ArchRiscv64}
1616

1717
func TestMode(t *testing.T) {
1818
for _, arch := range allArches {
@@ -139,6 +139,10 @@ func testGenerate(t *testing.T, arch string) {
139139
Exec: true,
140140
Len: repeat,
141141
}
142+
if arch == ArchRiscv64 {
143+
cfg.Priv = false
144+
cfg.Exec = false
145+
}
142146
text := Generate(cfg, r)
143147
for len(text) != 0 {
144148
size, err := insnset.Decode(mode, text)

‎pkg/ifuzz/iset/iset.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ const (
1212
ArchX86 = "x86"
1313
ArchPowerPC = "powerpc"
1414
ArchArm64 = "arm64"
15+
ArchRiscv64 = "riscv64"
1516
)
1617

1718
var Arches = make(map[string]InsnSet)

‎pkg/ifuzz/riscv64/gen/gen.go‎

Lines changed: 194 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,194 @@
1+
// Copyright 2026
2+
// SPDX-License-Identifier: Apache-2.0
3+
4+
// gen generates riscv64 instruction tables from riscv-unified-db YAML.
5+
// https://github.com/riscv-software-src/riscv-unified-db/tree/main/spec/std/isa/inst, commit:a4fa3844350bb54dee9a6137c6eba77d0e3bf9c1
6+
package main
7+
8+
import (
9+
"bytes"
10+
"fmt"
11+
"io/fs"
12+
"os"
13+
"path/filepath"
14+
"strings"
15+
16+
"gopkg.in/yaml.v3"
17+
18+
"github.com/google/syzkaller/pkg/ifuzz/riscv64"
19+
"github.com/google/syzkaller/pkg/osutil"
20+
"github.com/google/syzkaller/pkg/serializer"
21+
"github.com/google/syzkaller/pkg/tool"
22+
)
23+
24+
type instYAML struct {
25+
Kind string `yaml:"kind"`
26+
Name string `yaml:"name"`
27+
Encoding struct {
28+
Match string `yaml:"match"`
29+
Variables []struct {
30+
Name string `yaml:"name"`
31+
Location string `yaml:"location"` // e.g. "24-20"
32+
} `yaml:"variables"`
33+
} `yaml:"encoding"`
34+
}
35+
36+
func main() {
37+
if len(os.Args) != 3 {
38+
tool.Failf("usage: go run gen.go <riscv-unified-db/spec/std/isa/inst> <output.go>")
39+
}
40+
root := os.Args[1]
41+
outFile := os.Args[2]
42+
43+
insns := []*riscv64.Insn{}
44+
45+
err := filepath.WalkDir(root, func(path string, d fs.DirEntry, err error) error {
46+
if err != nil {
47+
return err
48+
}
49+
if d.IsDir() || !strings.HasSuffix(path, ".yaml") {
50+
return nil
51+
}
52+
53+
data, err := os.ReadFile(path)
54+
if err != nil {
55+
return nil
56+
}
57+
58+
var inst instYAML
59+
if err := yaml.Unmarshal(data, &inst); err != nil {
60+
return nil
61+
}
62+
if inst.Kind != "instruction" {
63+
return nil
64+
}
65+
66+
match := inst.Encoding.Match
67+
if len(match) != 32 {
68+
// Skip compressed / variable-length / weird encodings
69+
return nil
70+
}
71+
72+
insn, ok := buildInsn(inst)
73+
if ok {
74+
insns = append(insns, insn)
75+
}
76+
return nil
77+
})
78+
if err != nil {
79+
tool.Fail(err)
80+
}
81+
82+
var out bytes.Buffer
83+
fmt.Fprintf(&out, `// Code generated by pkg/ifuzz/riscv64/gen. DO NOT EDIT.
84+
85+
// go:build !codeanalysis
86+
87+
package generated
88+
89+
import (
90+
. "github.com/google/syzkaller/pkg/ifuzz/riscv64"
91+
)
92+
93+
func init() {
94+
Register(insns_riscv64)
95+
}
96+
97+
var insns_riscv64 =
98+
`)
99+
serializer.Write(&out, insns)
100+
101+
if err := osutil.WriteFileAtomically(outFile, out.Bytes()); err != nil {
102+
tool.Fail(err)
103+
}
104+
105+
fmt.Fprintf(os.Stderr, "generated %d instructions\n", len(insns))
106+
}
107+
108+
func buildInsn(inst instYAML) (*riscv64.Insn, bool) {
109+
match := inst.Encoding.Match
110+
111+
var opcode uint32
112+
var mask uint32
113+
114+
for i, ch := range match {
115+
bit := uint(31 - i)
116+
switch ch {
117+
case '0':
118+
mask |= 1 << bit
119+
case '1':
120+
mask |= 1 << bit
121+
opcode |= 1 << bit
122+
case '-':
123+
// variable bit
124+
default:
125+
return nil, false
126+
}
127+
}
128+
129+
fields := []riscv64.InsnField{}
130+
for _, v := range inst.Encoding.Variables {
131+
subFields, ok := parseLocations(v.Name, v.Location)
132+
if !ok {
133+
return nil, false
134+
}
135+
fields = append(fields, subFields...)
136+
}
137+
138+
return &riscv64.Insn{
139+
Name: inst.Name,
140+
OpcodeMask: mask,
141+
Opcode: opcode,
142+
Fields: fields,
143+
AsUInt32: opcode,
144+
Generator: nil,
145+
}, true
146+
}
147+
148+
func parseLocations(name, loc string) ([]riscv64.InsnField, bool) {
149+
// Support multiple ranges separated by '|', e.g.:
150+
// "31-25|11-7"
151+
ranges := strings.Split(loc, "|")
152+
fields := make([]riscv64.InsnField, 0, len(ranges))
153+
154+
for _, r := range ranges {
155+
start, length, hi, lo, ok := parseRange(r)
156+
if !ok {
157+
return nil, false
158+
}
159+
160+
fieldName := name
161+
if len(ranges) > 1 {
162+
fieldName = fmt.Sprintf("%s_%d_%d", name, hi, lo)
163+
}
164+
165+
fields = append(fields, riscv64.InsnField{
166+
Name: fieldName,
167+
Start: start,
168+
Length: length,
169+
})
170+
}
171+
172+
return fields, true
173+
}
174+
175+
func parseRange(r string) (start uint, length uint, hi uint, lo uint, ok bool) {
176+
parts := strings.Split(r, "-")
177+
if len(parts) != 2 {
178+
return 0, 0, 0, 0, false
179+
}
180+
181+
if _, err := fmt.Sscanf(parts[0], "%d", &hi); err != nil {
182+
return 0, 0, 0, 0, false
183+
}
184+
if _, err := fmt.Sscanf(parts[1], "%d", &lo); err != nil {
185+
return 0, 0, 0, 0, false
186+
}
187+
if hi < lo {
188+
return 0, 0, 0, 0, false
189+
}
190+
191+
start = lo
192+
length = hi - lo + 1
193+
return start, length, hi, lo, true
194+
}

‎pkg/ifuzz/riscv64/generated/empty.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// Copyright 2026 syzkaller project authors. All rights reserved.
2+
// Use of this source code is governed by Apache 2 LICENSE that can be found in the LICENSE file.
3+
4+
// To unbreak build with insns.go is excluded by build tags.
5+
6+
package generated

0 commit comments

Comments
 (0)