PenaDevops/delve
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pkg/dwarf/frame/parser: Fix parse augmentation (#1679)

Browse Source 
According to the description of "CIE: length, CIE_id, version, augmentation"
in Page 122 of  http://dwarfstd.org/doc/Dwarf3.pdf ,
`augmentation` should exclude `version`
This commit is contained in:
chainhelen 2019-09-04 11:02:24 -05:00 committed by Derek Parker
parent 8954858ee8
commit 69e6b613d8
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/dwarf/frame/parser.go
View File

@ -90,7 +90,7 @@ func parseCIE(ctx *parseContext) parsefunc {
data := ctx.buf.Next(int(ctx.length))
buf := bytes.NewBuffer(data)
// parse version
ctx.common.Version = data[0]
ctx.common.Version, _ = buf.ReadByte()
// parse augmentation
ctx.common.Augmentation, _ = util.ParseString(buf)

37
pkg/dwarf/frame/parser_test.go
View File

@ -1,15 +1,46 @@
package frame_test
package frame
import (
"bytes"
"encoding/binary"
"io/ioutil"
"os"
"testing"
"github.com/go-delve/delve/pkg/dwarf/frame"
"github.com/pkg/profile"
)
func TestParseCIE(t *testing.T) {
ctx := &parseContext{
buf : bytes.NewBuffer([]byte{3,0,1,124,16,12,7,8,5,16,2,0,36,0,0,0,0,0,0,0,0,16,64,0,0,0,0,0}),
common: &CommonInformationEntry{Length:12},
length: 12,
}
_ = parseCIE(ctx)
common := ctx.common
if common.Version != 3 {
t.Fatalf("Expected Version 3, but get %d", common.Version)
}
if common.Augmentation != "" {
t.Fatalf("Expected Augmentation \"\", but get %s", common.Augmentation)
}
if common.CodeAlignmentFactor != 1 {
t.Fatalf("Expected CodeAlignmentFactor 1, but get %d", common.CodeAlignmentFactor)
}
if common.DataAlignmentFactor != -4 {
t.Fatalf("Expected DataAlignmentFactor -4, but get %d", common.DataAlignmentFactor)
}
if common.ReturnAddressRegister != 16 {
t.Fatalf("Expected ReturnAddressRegister 16, but get %d", common.ReturnAddressRegister)
}
initialInstructions := []byte{12,7,8,5,16,2,0}
if !bytes.Equal(common.InitialInstructions, initialInstructions){
t.Fatalf("Expected InitialInstructions %v, but get %v", initialInstructions, common.InitialInstructions)
}
}
func BenchmarkParse(b *testing.B) {
defer profile.Start(profile.CPUProfile).Stop()
f, err := os.Open("testdata/frame")
@ -25,6 +56,6 @@ func BenchmarkParse(b *testing.B) {
b.ResetTimer()
for i := 0; i < b.N; i++ {
frame.Parse(data, binary.BigEndian, 0)
Parse(data, binary.BigEndian, 0)
}
}