code/avo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ast,build: add Attributes fields to Function and Global

Browse Source 
Updates #2
This commit is contained in:
Michael McLoughlin
2018-12-30 23:35:49 -08:00
parent 5d270d8d76
commit e364d6398e
17 changed files with 86 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ast.go
View File

@@ -117,10 +117,11 @@ func (f *File) Functions() []*Function {
// Function represents an assembly function. // Function represents an assembly function.
type Function struct { type Function struct {
Name string Name string
Doc []string Attributes Attribute
Signature *gotypes.Signature Doc []string
LocalSize int Signature *gotypes.Signature
LocalSize int
Nodes []Node Nodes []Node
@@ -213,14 +214,16 @@ func (d Datum) Overlaps(other Datum) bool {
} }
type Global struct { type Global struct {
Symbol operand.Symbol Symbol operand.Symbol
Data []Datum Attributes Attribute
Size int Data []Datum
Size int
} }
func NewGlobal(sym operand.Symbol) *Global { func NewGlobal(sym operand.Symbol) *Global {
return &Global{ return &Global{
Symbol: sym, Symbol: sym,
Attributes: RODATA,
} }
} }

4
build/context.go
View File

@@ -55,6 +55,10 @@ func (c *Context) Doc(lines ...string) {
c.activefunc().Doc = lines c.activefunc().Doc = lines
} }
func (c *Context) Attributes(a avo.Attribute) {
c.activefunc().Attributes = a
}
func (c *Context) Signature(s *gotypes.Signature) { func (c *Context) Signature(s *gotypes.Signature) {
c.activefunc().SetSignature(s) c.activefunc().SetSignature(s)
} }

3
build/global.go
View File

@@ -58,7 +58,8 @@ func ReturnIndex(i int) gotypes.Component { return ctx.ReturnIndex(i) }
func Load(src gotypes.Component, dst reg.Register) reg.Register { return ctx.Load(src, dst) } func Load(src gotypes.Component, dst reg.Register) reg.Register { return ctx.Load(src, dst) }
func Store(src reg.Register, dst gotypes.Component) { ctx.Store(src, dst) } func Store(src reg.Register, dst gotypes.Component) { ctx.Store(src, dst) }
func Doc(lines ...string) { ctx.Doc(lines...) } func Doc(lines ...string) { ctx.Doc(lines...) }
func Attributes(a avo.Attribute) { ctx.Attributes(a) }
func AllocLocal(size int) operand.Mem { return ctx.AllocLocal(size) } func AllocLocal(size int) operand.Mem { return ctx.AllocLocal(size) }

2
examples/add/add.s
View File

@@ -3,7 +3,7 @@
#include "textflag.h" #include "textflag.h"
// func Add(x uint64, y uint64) uint64 // func Add(x uint64, y uint64) uint64
TEXT ·Add(SB), 0, $0-24 TEXT ·Add(SB), $0-24
MOVQ x(FP), AX MOVQ x(FP), AX
MOVQ y+8(FP), CX MOVQ y+8(FP), CX
ADDQ AX, CX ADDQ AX, CX

34
examples/args/args.s
View File

@@ -3,103 +3,103 @@
#include "textflag.h" #include "textflag.h"
// func StringLen(s string) int // func StringLen(s string) int
TEXT ·StringLen(SB), 0, $0-24 TEXT ·StringLen(SB), $0-24
MOVQ s_len+8(FP), AX MOVQ s_len+8(FP), AX
MOVQ AX, ret+16(FP) MOVQ AX, ret+16(FP)
RET RET
// func SliceLen(s []int) int // func SliceLen(s []int) int
TEXT ·SliceLen(SB), 0, $0-32 TEXT ·SliceLen(SB), $0-32
MOVQ s_len+8(FP), AX MOVQ s_len+8(FP), AX
MOVQ AX, ret+24(FP) MOVQ AX, ret+24(FP)
RET RET
// func SliceCap(s []int) int // func SliceCap(s []int) int
TEXT ·SliceCap(SB), 0, $0-32 TEXT ·SliceCap(SB), $0-32
MOVQ s_cap+16(FP), AX MOVQ s_cap+16(FP), AX
MOVQ AX, ret+24(FP) MOVQ AX, ret+24(FP)
RET RET
// func ArrayThree(a [7]uint64) uint64 // func ArrayThree(a [7]uint64) uint64
TEXT ·ArrayThree(SB), 0, $0-64 TEXT ·ArrayThree(SB), $0-64
MOVQ a_3+24(FP), AX MOVQ a_3+24(FP), AX
MOVQ AX, ret+56(FP) MOVQ AX, ret+56(FP)
RET RET
// func FieldByte(s Struct) byte // func FieldByte(s Struct) byte
TEXT ·FieldByte(SB), 0, $0-177 TEXT ·FieldByte(SB), $0-177
MOVB s_Byte(FP), AL MOVB s_Byte(FP), AL
MOVB AL, ret+176(FP) MOVB AL, ret+176(FP)
RET RET
// func FieldInt8(s Struct) int8 // func FieldInt8(s Struct) int8
TEXT ·FieldInt8(SB), 0, $0-177 TEXT ·FieldInt8(SB), $0-177
MOVB s_Int8+1(FP), AL MOVB s_Int8+1(FP), AL
MOVB AL, ret+176(FP) MOVB AL, ret+176(FP)
RET RET
// func FieldUint16(s Struct) uint16 // func FieldUint16(s Struct) uint16
TEXT ·FieldUint16(SB), 0, $0-178 TEXT ·FieldUint16(SB), $0-178
MOVW s_Uint16+2(FP), AX MOVW s_Uint16+2(FP), AX
MOVW AX, ret+176(FP) MOVW AX, ret+176(FP)
RET RET
// func FieldInt32(s Struct) int32 // func FieldInt32(s Struct) int32
TEXT ·FieldInt32(SB), 0, $0-180 TEXT ·FieldInt32(SB), $0-180
MOVL s_Int32+4(FP), AX MOVL s_Int32+4(FP), AX
MOVL AX, ret+176(FP) MOVL AX, ret+176(FP)
RET RET
// func FieldUint64(s Struct) uint64 // func FieldUint64(s Struct) uint64
TEXT ·FieldUint64(SB), 0, $0-184 TEXT ·FieldUint64(SB), $0-184
MOVQ s_Uint64+8(FP), AX MOVQ s_Uint64+8(FP), AX
MOVQ AX, ret+176(FP) MOVQ AX, ret+176(FP)
RET RET
// func FieldFloat32(s Struct) float32 // func FieldFloat32(s Struct) float32
TEXT ·FieldFloat32(SB), 0, $0-180 TEXT ·FieldFloat32(SB), $0-180
MOVSS s_Float32+16(FP), X0 MOVSS s_Float32+16(FP), X0
MOVSS X0, ret+176(FP) MOVSS X0, ret+176(FP)
RET RET
// func FieldFloat64(s Struct) float64 // func FieldFloat64(s Struct) float64
TEXT ·FieldFloat64(SB), 0, $0-184 TEXT ·FieldFloat64(SB), $0-184
MOVSD s_Float64+24(FP), X0 MOVSD s_Float64+24(FP), X0
MOVSD X0, ret+176(FP) MOVSD X0, ret+176(FP)
RET RET
// func FieldStringLen(s Struct) int // func FieldStringLen(s Struct) int
TEXT ·FieldStringLen(SB), 0, $0-184 TEXT ·FieldStringLen(SB), $0-184
MOVQ s_String_len+40(FP), AX MOVQ s_String_len+40(FP), AX
MOVQ AX, ret+176(FP) MOVQ AX, ret+176(FP)
RET RET
// func FieldSliceCap(s Struct) int // func FieldSliceCap(s Struct) int
TEXT ·FieldSliceCap(SB), 0, $0-184 TEXT ·FieldSliceCap(SB), $0-184
MOVQ s_Slice_cap+64(FP), AX MOVQ s_Slice_cap+64(FP), AX
MOVQ AX, ret+176(FP) MOVQ AX, ret+176(FP)
RET RET
// func FieldArrayTwoBTwo(s Struct) byte // func FieldArrayTwoBTwo(s Struct) byte
TEXT ·FieldArrayTwoBTwo(SB), 0, $0-177 TEXT ·FieldArrayTwoBTwo(SB), $0-177
MOVB s_Array_2_B_2+114(FP), AL MOVB s_Array_2_B_2+114(FP), AL
MOVB AL, ret+176(FP) MOVB AL, ret+176(FP)
RET RET
// func FieldArrayOneC(s Struct) uint16 // func FieldArrayOneC(s Struct) uint16
TEXT ·FieldArrayOneC(SB), 0, $0-178 TEXT ·FieldArrayOneC(SB), $0-178
MOVW s_Array_1_C+100(FP), AX MOVW s_Array_1_C+100(FP), AX
MOVW AX, ret+176(FP) MOVW AX, ret+176(FP)
RET RET
// func FieldComplex64Imag(s Struct) float32 // func FieldComplex64Imag(s Struct) float32
TEXT ·FieldComplex64Imag(SB), 0, $0-180 TEXT ·FieldComplex64Imag(SB), $0-180
MOVSS s_Complex64_imag+156(FP), X0 MOVSS s_Complex64_imag+156(FP), X0
MOVSS X0, ret+176(FP) MOVSS X0, ret+176(FP)
RET RET
// func FieldComplex128Real(s Struct) float64 // func FieldComplex128Real(s Struct) float64
TEXT ·FieldComplex128Real(SB), 0, $0-184 TEXT ·FieldComplex128Real(SB), $0-184
MOVSD s_Complex128_real+160(FP), X0 MOVSD s_Complex128_real+160(FP), X0
MOVSD X0, ret+176(FP) MOVSD X0, ret+176(FP)
RET RET

6
examples/complex/complex.s
View File

@@ -3,19 +3,19 @@
#include "textflag.h" #include "textflag.h"
// func Real(z complex128) float64 // func Real(z complex128) float64
TEXT ·Real(SB), 0, $0-24 TEXT ·Real(SB), $0-24
MOVSD z_real(FP), X0 MOVSD z_real(FP), X0
MOVSD X0, ret+16(FP) MOVSD X0, ret+16(FP)
RET RET
// func Imag(z complex128) float64 // func Imag(z complex128) float64
TEXT ·Imag(SB), 0, $0-24 TEXT ·Imag(SB), $0-24
MOVSD z_imag+8(FP), X0 MOVSD z_imag+8(FP), X0
MOVSD X0, ret+16(FP) MOVSD X0, ret+16(FP)
RET RET
// func Norm(z complex128) float64 // func Norm(z complex128) float64
TEXT ·Norm(SB), 0, $0-24 TEXT ·Norm(SB), $0-24
MOVSD z_real(FP), X0 MOVSD z_real(FP), X0
MOVSD z_imag+8(FP), X1 MOVSD z_imag+8(FP), X1
MULSD X0, X0 MULSD X0, X0

2
examples/data/data.s
View File

@@ -13,7 +13,7 @@ DATA bytes<>+39(SB)/1, $0x77
GLOBL bytes<>(SB), RODATA, $40 GLOBL bytes<>(SB), RODATA, $40
// func DataAt(i int) byte // func DataAt(i int) byte
TEXT ·DataAt(SB), 0, $0-9 TEXT ·DataAt(SB), $0-9
MOVQ i(FP), AX MOVQ i(FP), AX
LEAQ bytes<>(SB), CX LEAQ bytes<>(SB), CX
MOVB (CX)(AX*1), AL MOVB (CX)(AX*1), AL

2
examples/dot/dot.s
View File

@@ -3,7 +3,7 @@
#include "textflag.h" #include "textflag.h"
// func Dot(x []float32, y []float32) float32 // func Dot(x []float32, y []float32) float32
TEXT ·Dot(SB), 0, $0-52 TEXT ·Dot(SB), $0-52
MOVQ x_base(FP), AX MOVQ x_base(FP), AX
MOVQ y_base+24(FP), CX MOVQ y_base+24(FP), CX
MOVQ x_len+8(FP), DX MOVQ x_len+8(FP), DX

2
examples/fnv1a/fnv1a.s
View File

@@ -3,7 +3,7 @@
#include "textflag.h" #include "textflag.h"
// func Hash64(data []byte) uint64 // func Hash64(data []byte) uint64
TEXT ·Hash64(SB), 0, $0-32 TEXT ·Hash64(SB), $0-32
MOVQ data_base(FP), CX MOVQ data_base(FP), CX
MOVQ data_len+8(FP), BX MOVQ data_len+8(FP), BX
MOVQ $0xcbf29ce484222325, AX MOVQ $0xcbf29ce484222325, AX

2
examples/geohash/geohash.s
View File

@@ -3,7 +3,7 @@
#include "textflag.h" #include "textflag.h"
// func EncodeInt(lat float64, lng float64) uint64 // func EncodeInt(lat float64, lng float64) uint64
TEXT ·EncodeInt(SB), 0, $0-24 TEXT ·EncodeInt(SB), $0-24
MOVSD lat(FP), X0 MOVSD lat(FP), X0
MOVSD lng+8(FP), X1 MOVSD lng+8(FP), X1
MULSD reciprocal180<>(SB), X0 MULSD reciprocal180<>(SB), X0

10
examples/returns/returns.s
View File

@@ -3,7 +3,7 @@
#include "textflag.h" #include "textflag.h"
// func Interval(start uint64, size uint64) (uint64, uint64) // func Interval(start uint64, size uint64) (uint64, uint64)
TEXT ·Interval(SB), 0, $0-32 TEXT ·Interval(SB), $0-32
MOVQ start(FP), AX MOVQ start(FP), AX
MOVQ size+8(FP), CX MOVQ size+8(FP), CX
ADDQ AX, CX ADDQ AX, CX
@@ -12,7 +12,7 @@ TEXT ·Interval(SB), 0, $0-32
RET RET
// func Butterfly(x0 float64, x1 float64) (y0 float64, y1 float64) // func Butterfly(x0 float64, x1 float64) (y0 float64, y1 float64)
TEXT ·Butterfly(SB), 0, $0-32 TEXT ·Butterfly(SB), $0-32
MOVSD x0(FP), X0 MOVSD x0(FP), X0
MOVSD x1+8(FP), X1 MOVSD x1+8(FP), X1
MOVSD X0, X2 MOVSD X0, X2
@@ -24,7 +24,7 @@ TEXT ·Butterfly(SB), 0, $0-32
RET RET
// func Septuple(byte) [7]byte // func Septuple(byte) [7]byte
TEXT ·Septuple(SB), 0, $0-15 TEXT ·Septuple(SB), $0-15
MOVB arg(FP), AL MOVB arg(FP), AL
MOVB AL, ret_0+8(FP) MOVB AL, ret_0+8(FP)
MOVB AL, ret_1+9(FP) MOVB AL, ret_1+9(FP)
@@ -36,7 +36,7 @@ TEXT ·Septuple(SB), 0, $0-15
RET RET
// func CriticalLine(t float64) complex128 // func CriticalLine(t float64) complex128
TEXT ·CriticalLine(SB), 0, $0-24 TEXT ·CriticalLine(SB), $0-24
MOVSD t(FP), X0 MOVSD t(FP), X0
MOVSD half<>(SB), X1 MOVSD half<>(SB), X1
MOVSD X1, ret_real+8(FP) MOVSD X1, ret_real+8(FP)
@@ -47,7 +47,7 @@ DATA half<>(SB)/8, $(0.5)
GLOBL half<>(SB), RODATA, $8 GLOBL half<>(SB), RODATA, $8
// func NewStruct(w uint16, p [2]float64, q uint64) Struct // func NewStruct(w uint16, p [2]float64, q uint64) Struct
TEXT ·NewStruct(SB), 0, $0-64 TEXT ·NewStruct(SB), $0-64
MOVW w(FP), AX MOVW w(FP), AX
MOVSD p_0+8(FP), X0 MOVSD p_0+8(FP), X0
MOVSD p_1+16(FP), X1 MOVSD p_1+16(FP), X1

2
examples/sha1/sha1.s
View File

@@ -3,7 +3,7 @@
#include "textflag.h" #include "textflag.h"
// func block(h *[5]uint32, m []byte) // func block(h *[5]uint32, m []byte)
TEXT ·block(SB), 0, $64-32 TEXT ·block(SB), $64-32
MOVQ h(FP), AX MOVQ h(FP), AX
MOVQ m_base+8(FP), CX MOVQ m_base+8(FP), CX
MOVL (AX), DX MOVL (AX), DX

2
examples/stadtx/stadtx.s
View File

@@ -3,7 +3,7 @@
#include "textflag.h" #include "textflag.h"
// func Hash(state *State, key []byte) uint64 // func Hash(state *State, key []byte) uint64
TEXT ·Hash(SB), 0, $0-40 TEXT ·Hash(SB), $0-40
MOVQ state(FP), AX MOVQ state(FP), AX
MOVQ key_base+8(FP), CX MOVQ key_base+8(FP), CX
MOVQ key_len+16(FP), DX MOVQ key_len+16(FP), DX

2
examples/sum/sum.s
View File

@@ -3,7 +3,7 @@
#include "textflag.h" #include "textflag.h"
// func Sum(xs []uint64) uint64 // func Sum(xs []uint64) uint64
TEXT ·Sum(SB), 0, $0-32 TEXT ·Sum(SB), $0-32
MOVQ xs_base(FP), AX MOVQ xs_base(FP), AX
MOVQ xs_len+8(FP), CX MOVQ xs_len+8(FP), CX
XORQ DX, DX XORQ DX, DX

24
printer/goasm.go
View File

@@ -49,7 +49,26 @@ func (p *goasm) include(path string) {
func (p *goasm) function(f *avo.Function) { func (p *goasm) function(f *avo.Function) {
p.NL() p.NL()
p.Comment(f.Stub()) p.Comment(f.Stub())
p.Printf("TEXT %s%s(SB), 0, %s\n", dot, f.Name, textsize(f))
// Reference: https://github.com/golang/go/blob/b115207baf6c2decc3820ada4574ef4e5ad940ec/src/cmd/internal/obj/util.go#L166-L176
//
// if p.As == ATEXT {
// // If there are attributes, print them. Otherwise, skip the comma.
// // In short, print one of these two:
// // TEXT foo(SB), DUPOK|NOSPLIT, $0
// // TEXT foo(SB), $0
// s := p.From.Sym.Attribute.TextAttrString()
// if s != "" {
// fmt.Fprintf(&buf, "%s%s", sep, s)
// sep = ", "
// }
// }
//
p.Printf("TEXT %s%s(SB)", dot, f.Name)
if f.Attributes != 0 {
p.Printf(", %s", f.Attributes.Asm())
}
p.Printf(", %s\n", textsize(f))
for _, node := range f.Nodes { for _, node := range f.Nodes {
switch n := node.(type) { switch n := node.(type) {
@@ -73,8 +92,7 @@ func (p *goasm) global(g *avo.Global) {
a := operand.NewDataAddr(g.Symbol, d.Offset) a := operand.NewDataAddr(g.Symbol, d.Offset)
p.Printf("DATA %s/%d, %s\n", a.Asm(), d.Value.Bytes(), d.Value.Asm()) p.Printf("DATA %s/%d, %s\n", a.Asm(), d.Value.Bytes(), d.Value.Asm())
} }
// TODO(mbm): replace hardcoded RODATA with an attributes list p.Printf("GLOBL %s(SB), %s, $%d\n", g.Symbol, g.Attributes.Asm(), g.Size)
p.Printf("GLOBL %s(SB), RODATA, $%d\n", g.Symbol, g.Size)
} }
func textsize(f *avo.Function) string { func textsize(f *avo.Function) string {

18
printer/goasm_test.go
View File

@@ -3,6 +3,7 @@ package printer_test
import ( import (
"testing" "testing"
"github.com/mmcloughlin/avo"
"github.com/mmcloughlin/avo/build" "github.com/mmcloughlin/avo/build"
"github.com/mmcloughlin/avo/printer" "github.com/mmcloughlin/avo/printer"
"github.com/mmcloughlin/avo/reg" "github.com/mmcloughlin/avo/reg"
@@ -24,7 +25,7 @@ func TestBasic(t *testing.T) {
"#include \"textflag.h\"", "#include \"textflag.h\"",
"", "",
"// func add(x uint64, y uint64) uint64", "// func add(x uint64, y uint64) uint64",
"TEXT ·add(SB), 0, $0-24", "TEXT ·add(SB), $0-24",
"\tMOVQ\tx(FP), AX", "\tMOVQ\tx(FP), AX",
"\tMOVQ\ty+8(FP), R9", "\tMOVQ\ty+8(FP), R9",
"\tADDQ\tAX, R9", "\tADDQ\tAX, R9",
@@ -34,7 +35,7 @@ func TestBasic(t *testing.T) {
}) })
} }
func TestTextSize(t *testing.T) { func TestTextDecl(t *testing.T) {
ctx := build.NewContext() ctx := build.NewContext()
ctx.Function("noargs") ctx.Function("noargs")
@@ -46,17 +47,26 @@ func TestTextSize(t *testing.T) {
ctx.SignatureExpr("func(x, y uint64) uint64") ctx.SignatureExpr("func(x, y uint64) uint64")
ctx.RET() ctx.RET()
ctx.Function("withattr")
ctx.SignatureExpr("func()")
ctx.Attributes(avo.NOSPLIT | avo.TLSBSS)
ctx.RET()
AssertPrintsLines(t, ctx, printer.NewGoAsm, []string{ AssertPrintsLines(t, ctx, printer.NewGoAsm, []string{
"// Code generated by avo. DO NOT EDIT.", "// Code generated by avo. DO NOT EDIT.",
"", "",
"#include \"textflag.h\"", "#include \"textflag.h\"",
"", "",
"// func noargs()", "// func noargs()",
"TEXT ·noargs(SB), 0, $16", // expect only the frame size "TEXT ·noargs(SB), $16", // expect only the frame size
"\tRET", "\tRET",
"", "",
"// func withargs(x uint64, y uint64) uint64", "// func withargs(x uint64, y uint64) uint64",
"TEXT ·withargs(SB), 0, $0-24", // expect both frame size and argument size "TEXT ·withargs(SB), $0-24", // expect both frame size and argument size
"\tRET",
"",
"// func withattr()",
"TEXT ·withattr(SB), NOSPLIT|TLSBSS, $0", // expect to see attributes
"\tRET", "\tRET",
"", "",
}) })

2
tests/cast/cast.s
View File

@@ -3,7 +3,7 @@
#include "textflag.h" #include "textflag.h"
// func Split(x uint64) (q uint64, l uint32, w uint16, b uint8) // func Split(x uint64) (q uint64, l uint32, w uint16, b uint8)
TEXT ·Split(SB), 0, $0-23 TEXT ·Split(SB), $0-23
MOVQ x(FP), AX MOVQ x(FP), AX
MOVQ AX, q+8(FP) MOVQ AX, q+8(FP)
MOVL AX, l+16(FP) MOVL AX, l+16(FP)