golang/delve
1
0
Fork 0
mirror of https://github.com/go-delve/delve.git synced 2025-10-29 17:56:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

pkg/config: add disassemble-flavor option for config

Browse Source 
Allow user to specify output syntax flavor of assembly in the
disassemble command.

Close #415
This commit is contained in:
chainhelen
2020-03-29 16:51:01 +08:00
committed by Derek Parker
parent 9c24b56f62
commit 37bee98a88
4 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/config/config.go
View File

@ -45,6 +45,9 @@ type Config struct {
// MaxVariableRecurse is output evaluation depth of nested struct members, array and
// slice items and dereference pointers
MaxVariableRecurse *int `yaml:"max-variable-recurse,omitempty"`
// DisassembleFlavor allow user to specify output syntax flavor of assembly, one of
// this list "intel"(default), "gnu", "go"
DisassembleFlavor *string `yaml:"disassemble-flavor,omitempty"`
// If ShowLocationExpr is true whatis will print the DWARF location
// expression for its argument.
@ -225,6 +228,9 @@ substitute-path:
# Uncomment the following line to make the whatis command also print the DWARF location expression of its argument.
# show-location-expr: true
# Allow user to specify output syntax flavor of assembly, one of this list "intel"(default), "gnu", "go".
# disassemble-flavor: intel
# List of directories to use when searching for separate debug info files.
debug-info-directories: ["/usr/lib/debug/.build-id"]
`)

18
pkg/terminal/command.go
View File

@ -1914,6 +1914,18 @@ func disassCommand(t *Term, ctx callContext, args string) error {
rest = argv[1]
}
flavor := api.IntelFlavour
if t.conf != nil && t.conf.DisassembleFlavor != nil {
switch *t.conf.DisassembleFlavor {
case "go":
flavor = api.GoFlavour
case "gnu":
flavor = api.GNUFlavour
default:
flavor = api.IntelFlavour
}
}
var disasm api.AsmInstructions
var disasmErr error
@ -1923,7 +1935,7 @@ func disassCommand(t *Term, ctx callContext, args string) error {
if err != nil {
return err
}
disasm, disasmErr = t.client.DisassemblePC(ctx.Scope, locs[0].PC, api.IntelFlavour)
disasm, disasmErr = t.client.DisassemblePC(ctx.Scope, locs[0].PC, flavor)
case "-a":
v := split2PartsBySpace(rest)
if len(v) != 2 {
@ -1937,7 +1949,7 @@ func disassCommand(t *Term, ctx callContext, args string) error {
if err != nil {
return fmt.Errorf("wrong argument: %q is not a number", v[1])
}
disasm, disasmErr = t.client.DisassembleRange(ctx.Scope, uint64(startpc), uint64(endpc), api.IntelFlavour)
disasm, disasmErr = t.client.DisassembleRange(ctx.Scope, uint64(startpc), uint64(endpc), flavor)
case "-l":
locs, err := t.client.FindLocation(ctx.Scope, rest, true)
if err != nil {
@ -1946,7 +1958,7 @@ func disassCommand(t *Term, ctx callContext, args string) error {
if len(locs) != 1 {
return errors.New("expression specifies multiple locations")
}
disasm, disasmErr = t.client.DisassemblePC(ctx.Scope, locs[0].PC, api.IntelFlavour)
disasm, disasmErr = t.client.DisassemblePC(ctx.Scope, locs[0].PC, flavor)
default:
return disasmUsageError
}

2
pkg/terminal/config.go
View File

@ -130,6 +130,8 @@ func configureSet(t *Term, args string) error {
case reflect.Bool:
v := rest == "true"
return reflect.ValueOf(&v), nil
case reflect.String:
return reflect.ValueOf(&rest), nil
default:
return reflect.ValueOf(nil), fmt.Errorf("unsupported type for configuration key %q", cfgname)
}

2
service/api/types.go
View File

@ -408,6 +408,8 @@ const (
GNUFlavour = AssemblyFlavour(proc.GNUFlavour)
// IntelFlavour will disassemble using Intel assembly syntax.
IntelFlavour = AssemblyFlavour(proc.IntelFlavour)
// GoFlavour will disassemble using Go assembly syntax.
GoFlavour = AssemblyFlavour(proc.GoFlavour)
)
// AsmInstruction represents one assembly instruction at some address