Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
94 changes: 48 additions & 46 deletions pkg/ifuzz/powerpc/pseudo.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,58 +16,60 @@ const (
SprnSrr1 = 0x01B // msr for rfid (SPRN_SRR1)
)

// nolint:dupl
func (insnset *InsnSet) initPseudo() {
insnset.Insns = append(insnset.Insns, &Insn{
Name: "PSEUDO_hypercall",
Priv: true,
Pseudo: true,
generator: func(cfg *iset.Config, r *rand.Rand) []byte {
gen := makeGen(insnset, cfg, r)
gen.sc(1)
return gen.text
type pseudoInsn struct {
Name string
generator func(cfg *iset.Config, r *rand.Rand) []byte
}
for _, insn := range []pseudoInsn{
{
Name: "PSEUDO_hypercall",
generator: func(cfg *iset.Config, r *rand.Rand) []byte {
gen := makeGen(insnset, cfg, r)
gen.sc(1)
return gen.text
},
},
})
insnset.Insns = append(insnset.Insns, &Insn{
Name: "PSEUDO_syscall",
Priv: true,
Pseudo: true,
generator: func(cfg *iset.Config, r *rand.Rand) []byte {
gen := makeGen(insnset, cfg, r)
gen.sc(0)
return gen.text
{
Name: "PSEUDO_syscall",
generator: func(cfg *iset.Config, r *rand.Rand) []byte {
gen := makeGen(insnset, cfg, r)
gen.sc(0)
return gen.text
},
},
})
insnset.Insns = append(insnset.Insns, &Insn{
Name: "PSEUDO_ultracall",
Priv: true,
Pseudo: true,
generator: func(cfg *iset.Config, r *rand.Rand) []byte {
gen := makeGen(insnset, cfg, r)
gen.sc(2)
return gen.text
{
Name: "PSEUDO_ultracall",
generator: func(cfg *iset.Config, r *rand.Rand) []byte {
gen := makeGen(insnset, cfg, r)
gen.sc(2)
return gen.text
},
},
})
insnset.Insns = append(insnset.Insns, &Insn{
Name: "PSEUDO_rtas",
Priv: true,
Pseudo: true,
generator: func(cfg *iset.Config, r *rand.Rand) []byte {
gen := makeGen(insnset, cfg, r)
gen.rtas()
return gen.text
{
Name: "PSEUDO_rtas",
generator: func(cfg *iset.Config, r *rand.Rand) []byte {
gen := makeGen(insnset, cfg, r)
gen.rtas()
return gen.text
},
},
})
insnset.Insns = append(insnset.Insns, &Insn{
Name: "PSEUDO_rfid",
Priv: true,
Pseudo: true,
generator: func(cfg *iset.Config, r *rand.Rand) []byte {
gen := makeGen(insnset, cfg, r)
gen.rfid()
return gen.text
{
Name: "PSEUDO_rfid",
generator: func(cfg *iset.Config, r *rand.Rand) []byte {
gen := makeGen(insnset, cfg, r)
gen.rfid()
return gen.text
},
},
})
} {
insnset.Insns = append(insnset.Insns, &Insn{
Name: insn.Name,
Priv: true,
Pseudo: true,
generator: insn.generator,
})
}
}

type generator struct {
Expand Down
5 changes: 3 additions & 2 deletions pkg/report/linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,9 @@ func ctorLinux(cfg *config) (reporterImpl, []string, error) {
vmlinux: vmlinux,
symbols: symbols,
}
// nolint: lll
ctx.consoleOutputRe = regexp.MustCompile(`^(?:\*\* [0-9]+ printk messages dropped \*\* )?(?:.* login: )?(?:\<[0-9]+\>)?\[ *[0-9]+\.[0-9]+\](\[ *(?:C|T)[0-9]+\])? `)
ctx.consoleOutputRe = regexp.MustCompile(
`^(?:\*\* [0-9]+ printk messages dropped \*\* )?` +
`(?:.* login: )?(?:\<[0-9]+\>)?\[ *[0-9]+\.[0-9]+\](\[ *(?:C|T)[0-9]+\])? `)
ctx.taskContext = regexp.MustCompile(`\[ *T[0-9]+\]`)
ctx.cpuContext = regexp.MustCompile(`\[ *C[0-9]+\]`)
ctx.questionableFrame = regexp.MustCompile(`(\[\<[0-9a-f]+\>\])? \? `)
Expand Down
Loading