From 0b227d990f56b3ea059d13584ff9102ee5039a0b Mon Sep 17 00:00:00 2001 From: Mel Date: Mon, 22 Aug 2022 23:55:57 +0000 Subject: Add flag to generate PCs markers when decompiling --- pkg/lang/vm/text/decompiler.go | 16 +++++++++++++--- pkg/lang/vm/text/decompiler_test.go | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) (limited to 'pkg/lang/vm/text') diff --git a/pkg/lang/vm/text/decompiler.go b/pkg/lang/vm/text/decompiler.go index df9e1ed..ed48412 100644 --- a/pkg/lang/vm/text/decompiler.go +++ b/pkg/lang/vm/text/decompiler.go @@ -14,12 +14,15 @@ type Decompiler struct { c code.Code pcToLine rangemap.RangeMap[int] + + generatePCs bool } -func NewDecompiler(c code.Code) *Decompiler { +func NewDecompiler(c code.Code, generatePCs bool) *Decompiler { return &Decompiler{ - c: c, - pcToLine: rangemap.New[int](), + c: c, + pcToLine: rangemap.New[int](), + generatePCs: generatePCs, } } @@ -27,12 +30,19 @@ func (d *Decompiler) Decompile() string { lines := make([]string, 0) bc := d.c.Code() + longestPcStringLen := len(strconv.FormatInt(int64(len(bc)), 10)) + for len(bc) != 0 { + startingPc := len(d.c.Code()) - len(bc) + line, rest := d.decompileInstruction(bc) bc = rest d.pcToLine.AppendToLast(d.c.Len()-len(bc), len(lines)) + if d.generatePCs { + line = fmt.Sprintf("%*d: %s", longestPcStringLen, startingPc, line) + } lines = append(lines, line) } diff --git a/pkg/lang/vm/text/decompiler_test.go b/pkg/lang/vm/text/decompiler_test.go index 01e49b0..5b9a0d7 100644 --- a/pkg/lang/vm/text/decompiler_test.go +++ b/pkg/lang/vm/text/decompiler_test.go @@ -69,7 +69,7 @@ func test(t *testing.T, code string, expected string) { resCompiled, err := comp.Compile() require.NoError(t, err) - decomp := text.NewDecompiler(resCompiled) + decomp := text.NewDecompiler(resCompiled, false) resDecompiled := decomp.Decompile() require.Equal(t, trimmedExpected, resDecompiled) } -- cgit 1.4.1