Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding bigendian support #11

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
11 changes: 9 additions & 2 deletions backends/golang/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,25 @@ package golang

import (
"flag"
"fmt"
"go/format"

"github.com/andyleap/gencode/schema"
)

type GolangBackend struct {
Package string
Unsafe bool
Package string
Unsafe bool
BigEndian bool
}

func (gb *GolangBackend) Generate(s *schema.Schema) (string, error) {
w := &Walker{}
w.Unsafe = gb.Unsafe
w.BigEndian = gb.BigEndian
if w.Unsafe && w.BigEndian {
return "", fmt.Errorf("Unsafe and BigEndian incompatible")
}
def, err := w.WalkSchema(s, gb.Package)
if err != nil {
return "", err
Expand All @@ -30,6 +36,7 @@ func (gb *GolangBackend) Flags() *flag.FlagSet {
flags := flag.NewFlagSet("Go", flag.ExitOnError)
flags.StringVar(&gb.Package, "package", "main", "package to build the gencode system for")
flags.BoolVar(&gb.Unsafe, "unsafe", false, "Generate faster, but unsafe code")
flags.BoolVar(&gb.BigEndian, "bigendian", false, "Generate bigendian code, incompatible with unsafe.")
return flags
}

Expand Down
5 changes: 3 additions & 2 deletions backends/golang/schema.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,19 @@ type Walker struct {
Offset int
IAdjusted bool
Unsafe bool
BigEndian bool
}

func (w *Walker) WalkSchema(s *schema.Schema, Package string) (parts *StringBuilder, err error) {
parts = &StringBuilder{}
parts.Append(fmt.Sprintf(`package %s

import (
"unsafe"
"io"
"time"
)

var (
_ = unsafe.Sizeof(0)
_ = io.ReadFull
Expand Down
18 changes: 10 additions & 8 deletions backends/golang/type_float.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package golang

import (
"sort"
"text/template"

"github.com/andyleap/gencode/schema"
Expand All @@ -12,11 +13,12 @@ var (

func init() {
FloatTemps = template.New("FloatTemps").Funcs(template.FuncMap{
"Bytes": func(bits int) int {
return bits / 8
},
"BitRange": func(bits int) []int {
return []int{0, 8, 16, 24, 32, 40, 48, 56, 64}[0:(bits / 8)]
"BitRange": func(bits int, bigEndian bool) []int {
ar := []int{0, 8, 16, 24, 32, 40, 48, 56, 64}[0:(bits / 8)]
if bigEndian {
sort.Sort(sort.Reverse(sort.IntSlice(ar)))
}
return ar
},
})

Expand All @@ -26,8 +28,8 @@ func init() {
*(*float{{.Bits}})(unsafe.Pointer(&buf[{{if .W.IAdjusted}}i + {{end}}{{.W.Offset}}])) = {{.Target}}
{{else}}
v := *(*uint{{.Bits}})(unsafe.Pointer(&({{.Target}})))
{{range BitRange .Bits}}
buf[{{if $.W.IAdjusted}}i + {{end}}{{Bytes .}} + {{$.W.Offset}}] = byte(v >> {{.}})
{{range $pos, $bits := BitRange .Bits .W.BigEndian}}
buf[{{if $.W.IAdjusted}}i + {{end}}{{$pos}} + {{$.W.Offset}}] = byte(v >> {{$bits}})
{{end}}
{{end}}
}`))
Expand All @@ -36,7 +38,7 @@ func init() {
{{if .W.Unsafe}}
{{.Target}} = *(*float{{.Bits}})(unsafe.Pointer(&buf[{{if .W.IAdjusted}}i + {{end}}{{.W.Offset}}]))
{{else}}
v := 0{{range BitRange .Bits}} | (uint{{$.Bits}}(buf[{{if $.W.IAdjusted}}i + {{end}}{{Bytes .}} + {{$.W.Offset}}]) << {{.}}){{end}}
v := 0{{range $pos, $bits := BitRange .Bits .W.BigEndian}} | (uint{{$.Bits}}(buf[{{if $.W.IAdjusted}}i + {{end}}{{$pos}} + {{$.W.Offset}}]) << {{$bits}}){{end}}
{{.Target}} = *(*float{{.Bits}})(unsafe.Pointer(&v))
{{end}}
}`))
Expand Down
32 changes: 17 additions & 15 deletions backends/golang/type_int.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package golang

import (
"sort"
"text/template"

"github.com/andyleap/gencode/schema"
Expand All @@ -12,18 +13,19 @@ var (

func init() {
IntTemps = template.New("IntTemps").Funcs(template.FuncMap{
"Bytes": func(bits int) int {
return bits / 8
},
"BitRange": func(bits int) []int {
return []int{0, 8, 16, 24, 32, 40, 48, 56, 64}[0:(bits / 8)]
"BitRange": func(bits int, bigEndian bool) []int {
ar := []int{0, 8, 16, 24, 32, 40, 48, 56, 64}[0:(bits / 8)]
if bigEndian {
sort.Sort(sort.Reverse(sort.IntSlice(ar)))
}
return ar
},
})

template.Must(IntTemps.New("marshal").Parse(`
{
{{if .VarInt }}

t := uint{{.Bits}}({{.Target}})
{{if .Signed}}
t <<= 1
Expand All @@ -38,17 +40,17 @@ func init() {
}
buf[i + {{.W.Offset}}] = byte(t)
i++

{{else}}

{{if .W.Unsafe}}
*(*{{if not .Signed}}u{{end}}int{{.Bits}})(unsafe.Pointer(&buf[{{if $.W.IAdjusted}}i + {{end}}{{$.W.Offset}}])) = {{.Target}}
{{else}}
{{range BitRange .Bits}}
buf[{{if $.W.IAdjusted}}i + {{end}}{{Bytes .}} + {{$.W.Offset}}] = byte({{$.Target}} >> {{.}})
{{range $pos, $bits := BitRange .Bits .W.BigEndian}}
buf[{{if $.W.IAdjusted}}i + {{end}}{{$pos}} + {{$.W.Offset}}] = byte({{$.Target}} >> {{$bits}})
{{end}}
{{end}}

{{end}}
}`))
template.Must(IntTemps.New("unmarshal").Parse(`
Expand All @@ -70,15 +72,15 @@ func init() {
{{else}}
{{.Target}} = t
{{end}}

{{else}}

{{if .W.Unsafe}}
{{.Target}} = *(*{{if not .Signed}}u{{end}}int{{.Bits}})(unsafe.Pointer(&buf[{{if $.W.IAdjusted}}i + {{end}}{{$.W.Offset}}]))
{{else}}
{{$.Target}} = 0{{range BitRange .Bits}} | ({{if not $.Signed}}u{{end}}int{{$.Bits}}(buf[{{if $.W.IAdjusted}}i + {{end}}{{Bytes .}} + {{$.W.Offset}}]) << {{.}}){{end}}
{{$.Target}} = 0{{range $pos, $bits := BitRange .Bits .W.BigEndian}} | ({{if not $.Signed}}u{{end}}int{{$.Bits}}(buf[{{if $.W.IAdjusted}}i + {{end}}{{$pos}} + {{$.W.Offset}}]) << {{$bits}}){{end}}
{{end}}

{{end}}
}`))
template.Must(IntTemps.New("field").Parse(`{{if not .Signed}}u{{end}}int{{.Bits}}`))
Expand Down