mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 08:32:11 +01:00
Allow multiple cgen buffers.
This commit is contained in:
1 parent
f839603198
commit
c7fe1fd8c1
4 files changed
+583
-557
No files matched your search
+209
-191
@@ -54,12 +54,13 @@ func Do(args []string) error {
|
||||
checker: c,
|
||||
files: files,
|
||||
}
|
||||
if err := g.generate(); err != nil {
|
||||
unformatted, err := g.generate()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
stdout := &bytes.Buffer{}
|
||||
cmd := exec.Command("clang-format", "-style=Chromium")
|
||||
cmd.Stdin = &g.buffer
|
||||
cmd.Stdin = bytes.NewReader(unformatted)
|
||||
cmd.Stdout = stdout
|
||||
cmd.Stderr = os.Stderr
|
||||
if err := cmd.Run(); err != nil {
|
||||
@@ -141,9 +142,19 @@ type status struct {
|
||||
isError bool
|
||||
}
|
||||
|
||||
type gen struct {
|
||||
buffer bytes.Buffer
|
||||
type buffer []byte
|
||||
|
||||
func (b *buffer) Write(p []byte) (int, error) {
|
||||
*b = append(*b, p...)
|
||||
return len(p), nil
|
||||
}
|
||||
|
||||
func (b *buffer) printf(format string, args ...interface{}) { fmt.Fprintf(b, format, args...) }
|
||||
func (b *buffer) writeb(x byte) { *b = append(*b, x) }
|
||||
func (b *buffer) writes(s string) { *b = append(*b, s...) }
|
||||
func (b *buffer) writex(s []byte) { *b = append(*b, s...) }
|
||||
|
||||
type gen struct {
|
||||
PKGPREFIX string // e.g. "PUFFS_JPEG_"
|
||||
pkgPrefix string // e.g. "puffs_jpeg_"
|
||||
pkgName string // e.g. "jpeg"
|
||||
@@ -156,12 +167,9 @@ type gen struct {
|
||||
structList []*a.Struct
|
||||
structMap map[t.ID]*a.Struct
|
||||
perFunc perFunc
|
||||
funcImpls map[t.QID]buffer
|
||||
}
|
||||
|
||||
func (g *gen) printf(format string, args ...interface{}) { fmt.Fprintf(&g.buffer, format, args...) }
|
||||
func (g *gen) writeb(b byte) { g.buffer.WriteByte(b) }
|
||||
func (g *gen) writes(s string) { g.buffer.WriteString(s) }
|
||||
|
||||
func (g *gen) jumpTarget(n *a.While) (uint32, error) {
|
||||
if g.perFunc.jumpTargets == nil {
|
||||
g.perFunc.jumpTargets = map[*a.While]uint32{}
|
||||
@@ -177,10 +185,12 @@ func (g *gen) jumpTarget(n *a.While) (uint32, error) {
|
||||
return jt, nil
|
||||
}
|
||||
|
||||
func (g *gen) generate() error {
|
||||
func (g *gen) generate() ([]byte, error) {
|
||||
b := new(buffer)
|
||||
|
||||
g.statusMap = map[t.ID]status{}
|
||||
if err := g.forEachStatus(bothPubPri, (*gen).gatherStatuses); err != nil {
|
||||
return err
|
||||
if err := g.forEachStatus(b, bothPubPri, (*gen).gatherStatuses); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Make a topologically sorted list of structs.
|
||||
@@ -195,35 +205,43 @@ func (g *gen) generate() error {
|
||||
var ok bool
|
||||
g.structList, ok = a.TopologicalSortStructs(unsortedStructs)
|
||||
if !ok {
|
||||
return fmt.Errorf("cyclical struct definitions")
|
||||
return nil, fmt.Errorf("cyclical struct definitions")
|
||||
}
|
||||
g.structMap = map[t.ID]*a.Struct{}
|
||||
for _, n := range g.structList {
|
||||
g.structMap[n.Name()] = n
|
||||
}
|
||||
|
||||
if err := g.genHeader(); err != nil {
|
||||
return err
|
||||
g.funcImpls = map[t.QID]buffer{}
|
||||
if err := g.forEachFunc(nil, bothPubPri, (*gen).gatherFuncImpl); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
g.writes("// C HEADER ENDS HERE.\n\n")
|
||||
return g.genImpl()
|
||||
|
||||
if err := g.genHeader(b); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
b.writes("// C HEADER ENDS HERE.\n\n")
|
||||
if err := g.genImpl(b); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return *b, nil
|
||||
}
|
||||
|
||||
func (g *gen) genHeader() error {
|
||||
func (g *gen) genHeader(b *buffer) error {
|
||||
includeGuard := "PUFFS_" + strings.ToUpper(g.pkgName) + "_H"
|
||||
g.printf("#ifndef %s\n#define %s\n\n", includeGuard, includeGuard)
|
||||
b.printf("#ifndef %s\n#define %s\n\n", includeGuard, includeGuard)
|
||||
|
||||
g.printf("// Code generated by puffs-c. DO NOT EDIT.\n\n")
|
||||
g.writes(baseHeader)
|
||||
g.writes("\n#ifdef __cplusplus\nextern \"C\" {\n#endif\n\n")
|
||||
b.printf("// Code generated by puffs-c. DO NOT EDIT.\n\n")
|
||||
b.writes(baseHeader)
|
||||
b.writes("\n#ifdef __cplusplus\nextern \"C\" {\n#endif\n\n")
|
||||
|
||||
g.writes("// ---------------- Status Codes\n\n")
|
||||
g.writes(statusCodeDescription)
|
||||
g.printf("//\n// Do not manipulate these bits directly. Use the API functions such as\n"+
|
||||
b.writes("// ---------------- Status Codes\n\n")
|
||||
b.writes(statusCodeDescription)
|
||||
b.printf("//\n// Do not manipulate these bits directly. Use the API functions such as\n"+
|
||||
"// %sstatus_is_error instead.\n", g.pkgPrefix)
|
||||
g.printf("typedef int32_t %sstatus;\n\n", g.pkgPrefix)
|
||||
b.printf("typedef int32_t %sstatus;\n\n", g.pkgPrefix)
|
||||
pkgID := g.checker.PackageID()
|
||||
g.printf("#define %spackageid %d // %#08x\n\n", g.pkgPrefix, pkgID, pkgID)
|
||||
b.printf("#define %spackageid %d // %#08x\n\n", g.pkgPrefix, pkgID, pkgID)
|
||||
|
||||
for i, s := range builtInStatuses {
|
||||
code := uint32(0)
|
||||
@@ -231,9 +249,9 @@ func (g *gen) genHeader() error {
|
||||
code |= 1 << 31
|
||||
}
|
||||
code |= uint32(i)
|
||||
g.printf("#define %s %d // %#08x\n", strings.ToUpper(g.cName(s)), int32(code), code)
|
||||
b.printf("#define %s %d // %#08x\n", strings.ToUpper(g.cName(s)), int32(code), code)
|
||||
}
|
||||
g.writes("\n")
|
||||
b.writes("\n")
|
||||
|
||||
if len(g.statusList) > maxNamespacedStatusCode {
|
||||
return fmt.Errorf("too many status codes")
|
||||
@@ -244,52 +262,52 @@ func (g *gen) genHeader() error {
|
||||
code |= 1 << 31
|
||||
}
|
||||
code |= uint32(i)
|
||||
g.printf("#define %s %d // %#08x\n", s.name, int32(code), code)
|
||||
b.printf("#define %s %d // %#08x\n", s.name, int32(code), code)
|
||||
}
|
||||
g.writes("\n")
|
||||
b.writes("\n")
|
||||
|
||||
g.printf("bool %sstatus_is_error(%sstatus s);\n\n", g.pkgPrefix, g.pkgPrefix)
|
||||
g.printf("const char* %sstatus_string(%sstatus s);\n\n", g.pkgPrefix, g.pkgPrefix)
|
||||
b.printf("bool %sstatus_is_error(%sstatus s);\n\n", g.pkgPrefix, g.pkgPrefix)
|
||||
b.printf("const char* %sstatus_string(%sstatus s);\n\n", g.pkgPrefix, g.pkgPrefix)
|
||||
|
||||
g.writes("// ---------------- Public Consts\n\n")
|
||||
if err := g.forEachConst(pubOnly, (*gen).writeConst); err != nil {
|
||||
b.writes("// ---------------- Public Consts\n\n")
|
||||
if err := g.forEachConst(b, pubOnly, (*gen).writeConst); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
g.writes("// ---------------- Structs\n\n")
|
||||
b.writes("// ---------------- Structs\n\n")
|
||||
for _, n := range g.structList {
|
||||
if err := g.writeStruct(n); err != nil {
|
||||
if err := g.writeStruct(b, n); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
g.writes("// ---------------- Public Constructor and Destructor Prototypes\n\n")
|
||||
b.writes("// ---------------- Public Constructor and Destructor Prototypes\n\n")
|
||||
for _, n := range g.structList {
|
||||
if n.Public() {
|
||||
if err := g.writeCtorPrototype(n); err != nil {
|
||||
if err := g.writeCtorPrototype(b, n); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
g.writes("// ---------------- Public Function Prototypes\n\n")
|
||||
if err := g.forEachFunc(pubOnly, (*gen).writeFuncPrototype); err != nil {
|
||||
b.writes("// ---------------- Public Function Prototypes\n\n")
|
||||
if err := g.forEachFunc(b, pubOnly, (*gen).writeFuncPrototype); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
g.writes("\n#ifdef __cplusplus\n} // extern \"C\"\n#endif\n\n")
|
||||
g.printf("#endif // %s\n\n", includeGuard)
|
||||
b.writes("\n#ifdef __cplusplus\n} // extern \"C\"\n#endif\n\n")
|
||||
b.printf("#endif // %s\n\n", includeGuard)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g *gen) genImpl() error {
|
||||
g.writes(baseImpl)
|
||||
g.writes("\n")
|
||||
func (g *gen) genImpl(b *buffer) error {
|
||||
b.writes(baseImpl)
|
||||
b.writes("\n")
|
||||
|
||||
g.writes("// ---------------- Status Codes Implementations\n\n")
|
||||
g.printf("bool %sstatus_is_error(%sstatus s) { return s < 0; }\n\n", g.pkgPrefix, g.pkgPrefix)
|
||||
b.writes("// ---------------- Status Codes Implementations\n\n")
|
||||
b.printf("bool %sstatus_is_error(%sstatus s) { return s < 0; }\n\n", g.pkgPrefix, g.pkgPrefix)
|
||||
|
||||
g.printf("const char* %sstatus_strings0[%d] = {\n", g.pkgPrefix, len(builtInStatuses))
|
||||
b.printf("const char* %sstatus_strings0[%d] = {\n", g.pkgPrefix, len(builtInStatuses))
|
||||
for _, s := range builtInStatuses {
|
||||
if strings.HasPrefix(s, "status ") {
|
||||
s = s[len("status "):]
|
||||
@@ -299,77 +317,77 @@ func (g *gen) genImpl() error {
|
||||
s = s[len("error "):]
|
||||
}
|
||||
s = g.pkgName + ": " + s
|
||||
g.printf("%q,", s)
|
||||
b.printf("%q,", s)
|
||||
}
|
||||
g.writes("};\n\n")
|
||||
b.writes("};\n\n")
|
||||
|
||||
g.printf("const char* %sstatus_strings1[%d] = {\n", g.pkgPrefix, len(g.statusList))
|
||||
b.printf("const char* %sstatus_strings1[%d] = {\n", g.pkgPrefix, len(g.statusList))
|
||||
for _, s := range g.statusList {
|
||||
g.printf("%q,", g.pkgName+": "+s.msg)
|
||||
b.printf("%q,", g.pkgName+": "+s.msg)
|
||||
}
|
||||
g.writes("};\n\n")
|
||||
b.writes("};\n\n")
|
||||
|
||||
g.printf("const char* %sstatus_string(%sstatus s) {\n", g.pkgPrefix, g.pkgPrefix)
|
||||
g.printf("const char** a = NULL;\n")
|
||||
g.printf("uint32_t n = 0;\n")
|
||||
g.printf("switch ((s >> %d) & %#x) {\n", statusCodeNamespaceShift, statusCodeNamespaceMask)
|
||||
g.printf("case 0: a = %sstatus_strings0; n = %d; break;\n",
|
||||
b.printf("const char* %sstatus_string(%sstatus s) {\n", g.pkgPrefix, g.pkgPrefix)
|
||||
b.printf("const char** a = NULL;\n")
|
||||
b.printf("uint32_t n = 0;\n")
|
||||
b.printf("switch ((s >> %d) & %#x) {\n", statusCodeNamespaceShift, statusCodeNamespaceMask)
|
||||
b.printf("case 0: a = %sstatus_strings0; n = %d; break;\n",
|
||||
g.pkgPrefix, len(builtInStatuses))
|
||||
g.printf("case %spackageid: a = %sstatus_strings1; n = %d; break;\n",
|
||||
b.printf("case %spackageid: a = %sstatus_strings1; n = %d; break;\n",
|
||||
g.pkgPrefix, g.pkgPrefix, len(g.statusList))
|
||||
// TODO: add cases for other packages used by this one.
|
||||
g.printf("}\n")
|
||||
g.printf("uint32_t i = s & %#0x;\n", 1<<statusCodeCodeBits-1)
|
||||
g.printf("return i < n ? a[i] : \"%s: unknown status\";\n", g.pkgName)
|
||||
g.writes("}\n\n")
|
||||
b.printf("}\n")
|
||||
b.printf("uint32_t i = s & %#0x;\n", 1<<statusCodeCodeBits-1)
|
||||
b.printf("return i < n ? a[i] : \"%s: unknown status\";\n", g.pkgName)
|
||||
b.writes("}\n\n")
|
||||
|
||||
g.writes("// ---------------- Private Consts\n\n")
|
||||
if err := g.forEachConst(priOnly, (*gen).writeConst); err != nil {
|
||||
b.writes("// ---------------- Private Consts\n\n")
|
||||
if err := g.forEachConst(b, priOnly, (*gen).writeConst); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
g.writes("// ---------------- Private Constructor and Destructor Prototypes\n\n")
|
||||
b.writes("// ---------------- Private Constructor and Destructor Prototypes\n\n")
|
||||
for _, n := range g.structList {
|
||||
if !n.Public() {
|
||||
if err := g.writeCtorPrototype(n); err != nil {
|
||||
if err := g.writeCtorPrototype(b, n); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
g.writes("// ---------------- Private Function Prototypes\n\n")
|
||||
if err := g.forEachFunc(priOnly, (*gen).writeFuncPrototype); err != nil {
|
||||
b.writes("// ---------------- Private Function Prototypes\n\n")
|
||||
if err := g.forEachFunc(b, priOnly, (*gen).writeFuncPrototype); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
g.writes("// ---------------- Constructor and Destructor Implementations\n\n")
|
||||
g.writes("// PUFFS_MAGIC is a magic number to check that constructors are called. It's\n")
|
||||
g.writes("// not foolproof, given C doesn't automatically zero memory before use, but it\n")
|
||||
g.writes("// should catch 99.99% of cases.\n")
|
||||
g.writes("//\n")
|
||||
g.writes("// Its (non-zero) value is arbitrary, based on md5sum(\"puffs\").\n")
|
||||
g.writes("#define PUFFS_MAGIC (0xCB3699CCU)\n\n")
|
||||
g.writes("// PUFFS_ALREADY_ZEROED is passed from a container struct's constructor to a\n")
|
||||
g.writes("// containee struct's constructor when the container has already zeroed the\n")
|
||||
g.writes("// containee's memory.\n")
|
||||
g.writes("//\n")
|
||||
g.writes("// Its (non-zero) value is arbitrary, based on md5sum(\"zeroed\").\n")
|
||||
g.writes("#define PUFFS_ALREADY_ZEROED (0x68602EF1U)\n\n")
|
||||
b.writes("// ---------------- Constructor and Destructor Implementations\n\n")
|
||||
b.writes("// PUFFS_MAGIC is a magic number to check that constructors are called. It's\n")
|
||||
b.writes("// not foolproof, given C doesn't automatically zero memory before use, but it\n")
|
||||
b.writes("// should catch 99.99% of cases.\n")
|
||||
b.writes("//\n")
|
||||
b.writes("// Its (non-zero) value is arbitrary, based on md5sum(\"puffs\").\n")
|
||||
b.writes("#define PUFFS_MAGIC (0xCB3699CCU)\n\n")
|
||||
b.writes("// PUFFS_ALREADY_ZEROED is passed from a container struct's constructor to a\n")
|
||||
b.writes("// containee struct's constructor when the container has already zeroed the\n")
|
||||
b.writes("// containee's memory.\n")
|
||||
b.writes("//\n")
|
||||
b.writes("// Its (non-zero) value is arbitrary, based on md5sum(\"zeroed\").\n")
|
||||
b.writes("#define PUFFS_ALREADY_ZEROED (0x68602EF1U)\n\n")
|
||||
for _, n := range g.structList {
|
||||
if err := g.writeCtorImpl(n); err != nil {
|
||||
if err := g.writeCtorImpl(b, n); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
g.writes("// ---------------- Function Implementations\n\n")
|
||||
if err := g.forEachFunc(bothPubPri, (*gen).writeFuncImpl); err != nil {
|
||||
b.writes("// ---------------- Function Implementations\n\n")
|
||||
if err := g.forEachFunc(b, bothPubPri, (*gen).writeFuncImpl); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g *gen) forEachConst(v visibility, f func(*gen, *a.Const) error) error {
|
||||
func (g *gen) forEachConst(b *buffer, v visibility, f func(*gen, *buffer, *a.Const) error) error {
|
||||
for _, file := range g.files {
|
||||
for _, tld := range file.TopLevelDecls() {
|
||||
if tld.Kind() != a.KConst ||
|
||||
@@ -377,7 +395,7 @@ func (g *gen) forEachConst(v visibility, f func(*gen, *a.Const) error) error {
|
||||
(v == priOnly && tld.Raw().Flags()&a.FlagsPublic != 0) {
|
||||
continue
|
||||
}
|
||||
if err := f(g, tld.Const()); err != nil {
|
||||
if err := f(g, b, tld.Const()); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
@@ -385,7 +403,7 @@ func (g *gen) forEachConst(v visibility, f func(*gen, *a.Const) error) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g *gen) forEachFunc(v visibility, f func(*gen, *a.Func) error) error {
|
||||
func (g *gen) forEachFunc(b *buffer, v visibility, f func(*gen, *buffer, *a.Func) error) error {
|
||||
for _, file := range g.files {
|
||||
for _, tld := range file.TopLevelDecls() {
|
||||
if tld.Kind() != a.KFunc ||
|
||||
@@ -393,7 +411,7 @@ func (g *gen) forEachFunc(v visibility, f func(*gen, *a.Func) error) error {
|
||||
(v == priOnly && tld.Raw().Flags()&a.FlagsPublic != 0) {
|
||||
continue
|
||||
}
|
||||
if err := f(g, tld.Func()); err != nil {
|
||||
if err := f(g, b, tld.Func()); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
@@ -401,7 +419,7 @@ func (g *gen) forEachFunc(v visibility, f func(*gen, *a.Func) error) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g *gen) forEachStatus(v visibility, f func(*gen, *a.Status) error) error {
|
||||
func (g *gen) forEachStatus(b *buffer, v visibility, f func(*gen, *buffer, *a.Status) error) error {
|
||||
for _, file := range g.files {
|
||||
for _, tld := range file.TopLevelDecls() {
|
||||
if tld.Kind() != a.KStatus ||
|
||||
@@ -409,7 +427,7 @@ func (g *gen) forEachStatus(v visibility, f func(*gen, *a.Status) error) error {
|
||||
(v == priOnly && tld.Raw().Flags()&a.FlagsPublic != 0) {
|
||||
continue
|
||||
}
|
||||
if err := f(g, tld.Status()); err != nil {
|
||||
if err := f(g, b, tld.Status()); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
@@ -418,27 +436,27 @@ func (g *gen) forEachStatus(v visibility, f func(*gen, *a.Status) error) error {
|
||||
}
|
||||
|
||||
func (g *gen) cName(name string) string {
|
||||
b := []byte(nil)
|
||||
b = append(b, "puffs_"...)
|
||||
b = append(b, g.pkgName...)
|
||||
b = append(b, '_')
|
||||
s := []byte(nil)
|
||||
s = append(s, "puffs_"...)
|
||||
s = append(s, g.pkgName...)
|
||||
s = append(s, '_')
|
||||
underscore := true
|
||||
for _, r := range name {
|
||||
if 'A' <= r && r <= 'Z' {
|
||||
b = append(b, byte(r+'a'-'A'))
|
||||
s = append(s, byte(r+'a'-'A'))
|
||||
underscore = false
|
||||
} else if ('a' <= r && r <= 'z') || ('0' <= r && r <= '9') {
|
||||
b = append(b, byte(r))
|
||||
s = append(s, byte(r))
|
||||
underscore = false
|
||||
} else if !underscore {
|
||||
b = append(b, '_')
|
||||
s = append(s, '_')
|
||||
underscore = true
|
||||
}
|
||||
}
|
||||
if underscore {
|
||||
b = b[:len(b)-1]
|
||||
s = s[:len(s)-1]
|
||||
}
|
||||
return string(b)
|
||||
return string(s)
|
||||
}
|
||||
|
||||
func (g *gen) sizeof(typ *a.TypeExpr) (uint32, error) {
|
||||
@@ -457,7 +475,7 @@ func (g *gen) sizeof(typ *a.TypeExpr) (uint32, error) {
|
||||
return 0, fmt.Errorf("unknown sizeof for %q", typ.String(g.tm))
|
||||
}
|
||||
|
||||
func (g *gen) gatherStatuses(n *a.Status) error {
|
||||
func (g *gen) gatherStatuses(b *buffer, n *a.Status) error {
|
||||
raw := n.Message().String(g.tm)
|
||||
msg, ok := t.Unescape(raw)
|
||||
if !ok {
|
||||
@@ -478,74 +496,74 @@ func (g *gen) gatherStatuses(n *a.Status) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g *gen) writeConst(n *a.Const) error {
|
||||
func (g *gen) writeConst(b *buffer, n *a.Const) error {
|
||||
if !n.Public() {
|
||||
g.writes("static ")
|
||||
b.writes("static ")
|
||||
}
|
||||
g.writes("const ")
|
||||
if err := g.writeCTypeName(n.XType(), g.pkgPrefix, n.Name().String(g.tm)); err != nil {
|
||||
b.writes("const ")
|
||||
if err := g.writeCTypeName(b, n.XType(), g.pkgPrefix, n.Name().String(g.tm)); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes(" = ")
|
||||
if err := g.writeConstList(n.Value()); err != nil {
|
||||
b.writes(" = ")
|
||||
if err := g.writeConstList(b, n.Value()); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes(";\n\n")
|
||||
b.writes(";\n\n")
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g *gen) writeConstList(n *a.Expr) error {
|
||||
func (g *gen) writeConstList(b *buffer, n *a.Expr) error {
|
||||
switch n.ID0().Key() {
|
||||
case 0:
|
||||
g.writes(n.ConstValue().String())
|
||||
b.writes(n.ConstValue().String())
|
||||
case t.KeyDollar:
|
||||
g.writeb('{')
|
||||
b.writeb('{')
|
||||
for _, o := range n.Args() {
|
||||
if err := g.writeConstList(o.Expr()); err != nil {
|
||||
if err := g.writeConstList(b, o.Expr()); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writeb(',')
|
||||
b.writeb(',')
|
||||
}
|
||||
g.writeb('}')
|
||||
b.writeb('}')
|
||||
default:
|
||||
return fmt.Errorf("invalid const value %q", n.String(g.tm))
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g *gen) writeStruct(n *a.Struct) error {
|
||||
func (g *gen) writeStruct(b *buffer, n *a.Struct) error {
|
||||
// For API/ABI compatibility, the very first field in the struct's
|
||||
// private_impl must be the status code. This lets the constructor callee
|
||||
// set "self->private_impl.status = etc_error_bad_puffs_version;"
|
||||
// regardless of the sizeof(*self) struct reserved by the caller and even
|
||||
// if the caller and callee were built with different versions.
|
||||
structName := n.Name().String(g.tm)
|
||||
g.writes("typedef struct {\n")
|
||||
g.writes("// Do not access the private_impl's fields directly. There is no API/ABI\n")
|
||||
g.writes("// compatibility or safety guarantee if you do so. Instead, use the\n")
|
||||
g.printf("// %s%s_etc functions.\n", g.pkgPrefix, structName)
|
||||
g.writes("//\n")
|
||||
g.writes("// In C++, these fields would be \"private\", but C does not support that.\n")
|
||||
g.writes("//\n")
|
||||
g.writes("// It is a struct, not a struct*, so that it can be stack allocated.\n")
|
||||
g.writes("struct {\n")
|
||||
b.writes("typedef struct {\n")
|
||||
b.writes("// Do not access the private_impl's fields directly. There is no API/ABI\n")
|
||||
b.writes("// compatibility or safety guarantee if you do so. Instead, use the\n")
|
||||
b.printf("// %s%s_etc functions.\n", g.pkgPrefix, structName)
|
||||
b.writes("//\n")
|
||||
b.writes("// In C++, these fields would be \"private\", but C does not support that.\n")
|
||||
b.writes("//\n")
|
||||
b.writes("// It is a struct, not a struct*, so that it can be stack allocated.\n")
|
||||
b.writes("struct {\n")
|
||||
if n.Suspendible() {
|
||||
g.printf("%sstatus status;\n", g.pkgPrefix)
|
||||
g.writes("uint32_t magic;\n")
|
||||
g.writes("uint64_t scratch;\n")
|
||||
g.writes("\n")
|
||||
b.printf("%sstatus status;\n", g.pkgPrefix)
|
||||
b.writes("uint32_t magic;\n")
|
||||
b.writes("uint64_t scratch;\n")
|
||||
b.writes("\n")
|
||||
}
|
||||
|
||||
for _, o := range n.Fields() {
|
||||
o := o.Field()
|
||||
if err := g.writeCTypeName(o.XType(), fPrefix, o.Name().String(g.tm)); err != nil {
|
||||
if err := g.writeCTypeName(b, o.XType(), fPrefix, o.Name().String(g.tm)); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes(";\n")
|
||||
b.writes(";\n")
|
||||
}
|
||||
|
||||
if n.Suspendible() {
|
||||
g.writeb('\n')
|
||||
b.writeb('\n')
|
||||
for _, file := range g.files {
|
||||
for _, tld := range file.TopLevelDecls() {
|
||||
if tld.Kind() != a.KFunc {
|
||||
@@ -557,81 +575,81 @@ func (g *gen) writeStruct(n *a.Struct) error {
|
||||
}
|
||||
// TODO: allow max depth > 1 for recursive coroutines.
|
||||
const maxDepth = 1
|
||||
g.writes("struct {\n")
|
||||
g.writes("uint32_t coro_susp_point;\n")
|
||||
if err := g.writeVars(o.Body()); err != nil {
|
||||
b.writes("struct {\n")
|
||||
b.writes("uint32_t coro_susp_point;\n")
|
||||
if err := g.writeVars(b, o.Body()); err != nil {
|
||||
return err
|
||||
}
|
||||
g.printf("} %s%s[%d];\n", cPrefix, o.Name().String(g.tm), maxDepth)
|
||||
b.printf("} %s%s[%d];\n", cPrefix, o.Name().String(g.tm), maxDepth)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
g.printf("} private_impl;\n } %s%s;\n\n", g.pkgPrefix, structName)
|
||||
b.printf("} private_impl;\n } %s%s;\n\n", g.pkgPrefix, structName)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g *gen) writeCtorSignature(n *a.Struct, public bool, ctor bool) error {
|
||||
func (g *gen) writeCtorSignature(b *buffer, n *a.Struct, public bool, ctor bool) error {
|
||||
structName := n.Name().String(g.tm)
|
||||
ctorName := "destructor"
|
||||
if ctor {
|
||||
ctorName = "constructor"
|
||||
if public {
|
||||
g.printf("// %s%s_%s is a constructor function.\n", g.pkgPrefix, structName, ctorName)
|
||||
g.printf("//\n")
|
||||
g.printf("// It should be called before any other %s%s_* function.\n",
|
||||
b.printf("// %s%s_%s is a constructor function.\n", g.pkgPrefix, structName, ctorName)
|
||||
b.printf("//\n")
|
||||
b.printf("// It should be called before any other %s%s_* function.\n",
|
||||
g.pkgPrefix, structName)
|
||||
g.printf("//\n")
|
||||
g.printf("// Pass PUFFS_VERSION and 0 for puffs_version and for_internal_use_only.\n")
|
||||
b.printf("//\n")
|
||||
b.printf("// Pass PUFFS_VERSION and 0 for puffs_version and for_internal_use_only.\n")
|
||||
}
|
||||
}
|
||||
g.printf("void %s%s_%s(%s%s *self", g.pkgPrefix, structName, ctorName, g.pkgPrefix, structName)
|
||||
b.printf("void %s%s_%s(%s%s *self", g.pkgPrefix, structName, ctorName, g.pkgPrefix, structName)
|
||||
if ctor {
|
||||
g.printf(", uint32_t puffs_version, uint32_t for_internal_use_only")
|
||||
b.printf(", uint32_t puffs_version, uint32_t for_internal_use_only")
|
||||
}
|
||||
g.printf(")")
|
||||
b.printf(")")
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g *gen) writeCtorPrototype(n *a.Struct) error {
|
||||
func (g *gen) writeCtorPrototype(b *buffer, n *a.Struct) error {
|
||||
if !n.Suspendible() {
|
||||
return nil
|
||||
}
|
||||
for _, ctor := range []bool{true, false} {
|
||||
if err := g.writeCtorSignature(n, n.Public(), ctor); err != nil {
|
||||
if err := g.writeCtorSignature(b, n, n.Public(), ctor); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes(";\n\n")
|
||||
b.writes(";\n\n")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g *gen) writeCtorImpl(n *a.Struct) error {
|
||||
func (g *gen) writeCtorImpl(b *buffer, n *a.Struct) error {
|
||||
if !n.Suspendible() {
|
||||
return nil
|
||||
}
|
||||
for _, ctor := range []bool{true, false} {
|
||||
if err := g.writeCtorSignature(n, false, ctor); err != nil {
|
||||
if err := g.writeCtorSignature(b, n, false, ctor); err != nil {
|
||||
return err
|
||||
}
|
||||
g.printf("{\n")
|
||||
g.printf("if (!self) { return; }\n")
|
||||
b.printf("{\n")
|
||||
b.printf("if (!self) { return; }\n")
|
||||
|
||||
if ctor {
|
||||
g.printf("if (puffs_version != PUFFS_VERSION) {\n")
|
||||
g.printf("self->private_impl.status = %sERROR_BAD_PUFFS_VERSION;\n", g.PKGPREFIX)
|
||||
g.printf("return;\n")
|
||||
g.printf("}\n")
|
||||
b.printf("if (puffs_version != PUFFS_VERSION) {\n")
|
||||
b.printf("self->private_impl.status = %sERROR_BAD_PUFFS_VERSION;\n", g.PKGPREFIX)
|
||||
b.printf("return;\n")
|
||||
b.printf("}\n")
|
||||
|
||||
g.writes("if (for_internal_use_only != PUFFS_ALREADY_ZEROED) {" +
|
||||
b.writes("if (for_internal_use_only != PUFFS_ALREADY_ZEROED) {" +
|
||||
"memset(self, 0, sizeof(*self)); }\n")
|
||||
g.writes("self->private_impl.magic = PUFFS_MAGIC;\n")
|
||||
b.writes("self->private_impl.magic = PUFFS_MAGIC;\n")
|
||||
|
||||
for _, f := range n.Fields() {
|
||||
f := f.Field()
|
||||
if dv := f.DefaultValue(); dv != nil {
|
||||
// TODO: set default values for array types.
|
||||
g.printf("self->private_impl.%s%s = %d;\n", fPrefix, f.Name().String(g.tm), dv.ConstValue())
|
||||
b.printf("self->private_impl.%s%s = %d;\n", fPrefix, f.Name().String(g.tm), dv.ConstValue())
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -648,82 +666,82 @@ func (g *gen) writeCtorImpl(n *a.Struct) error {
|
||||
continue
|
||||
}
|
||||
if ctor {
|
||||
g.printf("%s%s_constructor(&self->private_impl.%s%s,"+
|
||||
b.printf("%s%s_constructor(&self->private_impl.%s%s,"+
|
||||
"PUFFS_VERSION, PUFFS_ALREADY_ZEROED);\n",
|
||||
g.pkgPrefix, x.Name().String(g.tm), fPrefix, f.Name().String(g.tm))
|
||||
} else {
|
||||
g.printf("%s%s_destructor(&self->private_impl.%s%s);\n",
|
||||
b.printf("%s%s_destructor(&self->private_impl.%s%s);\n",
|
||||
g.pkgPrefix, x.Name().String(g.tm), fPrefix, f.Name().String(g.tm))
|
||||
}
|
||||
}
|
||||
|
||||
g.writes("}\n\n")
|
||||
b.writes("}\n\n")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g *gen) writeExprUnaryOp(n *a.Expr, rp replacementPolicy, depth uint32) error {
|
||||
func (g *gen) writeExprUnaryOp(b *buffer, n *a.Expr, rp replacementPolicy, depth uint32) error {
|
||||
// TODO.
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g *gen) writeExprBinaryOp(n *a.Expr, rp replacementPolicy, pp parenthesesPolicy, depth uint32) error {
|
||||
func (g *gen) writeExprBinaryOp(b *buffer, n *a.Expr, rp replacementPolicy, pp parenthesesPolicy, depth uint32) error {
|
||||
op := n.ID0()
|
||||
if op.Key() == t.KeyXBinaryAs {
|
||||
return g.writeExprAs(n.LHS().Expr(), n.RHS().TypeExpr(), rp, depth)
|
||||
return g.writeExprAs(b, n.LHS().Expr(), n.RHS().TypeExpr(), rp, depth)
|
||||
}
|
||||
if pp == parenthesesMandatory {
|
||||
g.writeb('(')
|
||||
b.writeb('(')
|
||||
}
|
||||
if err := g.writeExpr(n.LHS().Expr(), rp, parenthesesMandatory, depth); err != nil {
|
||||
if err := g.writeExpr(b, n.LHS().Expr(), rp, parenthesesMandatory, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
// TODO: does KeyXBinaryAmpHat need special consideration?
|
||||
g.writes(cOpNames[0xFF&op.Key()])
|
||||
if err := g.writeExpr(n.RHS().Expr(), rp, parenthesesMandatory, depth); err != nil {
|
||||
b.writes(cOpNames[0xFF&op.Key()])
|
||||
if err := g.writeExpr(b, n.RHS().Expr(), rp, parenthesesMandatory, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
if pp == parenthesesMandatory {
|
||||
g.writeb(')')
|
||||
b.writeb(')')
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g *gen) writeExprAs(lhs *a.Expr, rhs *a.TypeExpr, rp replacementPolicy, depth uint32) error {
|
||||
g.writes("((")
|
||||
func (g *gen) writeExprAs(b *buffer, lhs *a.Expr, rhs *a.TypeExpr, rp replacementPolicy, depth uint32) error {
|
||||
b.writes("((")
|
||||
// TODO: watch for passing an array type to writeCTypeName? In C, an array
|
||||
// type can decay into a pointer.
|
||||
if err := g.writeCTypeName(rhs, "", ""); err != nil {
|
||||
if err := g.writeCTypeName(b, rhs, "", ""); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes(")(")
|
||||
if err := g.writeExpr(lhs, rp, parenthesesMandatory, depth); err != nil {
|
||||
b.writes(")(")
|
||||
if err := g.writeExpr(b, lhs, rp, parenthesesMandatory, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes("))")
|
||||
b.writes("))")
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g *gen) writeExprAssociativeOp(n *a.Expr, rp replacementPolicy, pp parenthesesPolicy, depth uint32) error {
|
||||
func (g *gen) writeExprAssociativeOp(b *buffer, n *a.Expr, rp replacementPolicy, pp parenthesesPolicy, depth uint32) error {
|
||||
if pp == parenthesesMandatory {
|
||||
g.writeb('(')
|
||||
b.writeb('(')
|
||||
}
|
||||
opName := cOpNames[0xFF&n.ID0().Key()]
|
||||
for i, o := range n.Args() {
|
||||
if i != 0 {
|
||||
g.writes(opName)
|
||||
b.writes(opName)
|
||||
}
|
||||
if err := g.writeExpr(o.Expr(), rp, parenthesesMandatory, depth); err != nil {
|
||||
if err := g.writeExpr(b, o.Expr(), rp, parenthesesMandatory, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if pp == parenthesesMandatory {
|
||||
g.writeb(')')
|
||||
b.writeb(')')
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g *gen) writeCTypeName(n *a.TypeExpr, varNamePrefix string, varName string) error {
|
||||
func (g *gen) writeCTypeName(b *buffer, n *a.TypeExpr, varNamePrefix string, varName string) error {
|
||||
// It may help to refer to http://unixwiz.net/techtips/reading-cdecl.html
|
||||
|
||||
// maxNumPointers is an arbitrary implementation restriction.
|
||||
@@ -750,27 +768,27 @@ func (g *gen) writeCTypeName(n *a.TypeExpr, varNamePrefix string, varName string
|
||||
fallback := true
|
||||
if k := innermost.Name().Key(); k < t.Key(len(cTypeNames)) {
|
||||
if s := cTypeNames[k]; s != "" {
|
||||
g.writes(s)
|
||||
b.writes(s)
|
||||
fallback = false
|
||||
}
|
||||
}
|
||||
if fallback {
|
||||
g.printf("%s%s", g.pkgPrefix, innermost.Name().String(g.tm))
|
||||
b.printf("%s%s", g.pkgPrefix, innermost.Name().String(g.tm))
|
||||
}
|
||||
|
||||
for i := 0; i < numPointers; i++ {
|
||||
g.writeb('*')
|
||||
b.writeb('*')
|
||||
}
|
||||
|
||||
g.writeb(' ')
|
||||
g.writes(varNamePrefix)
|
||||
g.writes(varName)
|
||||
b.writeb(' ')
|
||||
b.writes(varNamePrefix)
|
||||
b.writes(varName)
|
||||
|
||||
x = n
|
||||
for ; x != nil && x.Decorator().Key() == t.KeyOpenBracket; x = x.Inner() {
|
||||
g.writeb('[')
|
||||
g.writes(x.ArrayLength().ConstValue().String())
|
||||
g.writeb(']')
|
||||
b.writeb('[')
|
||||
b.writes(x.ArrayLength().ConstValue().String())
|
||||
b.writeb(']')
|
||||
}
|
||||
|
||||
return nil
|
||||
|
||||
@@ -21,8 +21,8 @@ type template_args_short_read struct {
|
||||
name string
|
||||
}
|
||||
|
||||
func template_short_read(g *gen, args template_args_short_read) error {
|
||||
g.printf("short_read_%s:\nif (a_%s.limit.ptr_to_len) {\nstatus = %sSUSPENSION_LIMITED_READ;\n} else if (a_%s.buf->closed) {\nstatus = %sERROR_UNEXPECTED_EOF;\ngoto exit;\n} else {\nstatus = %sSUSPENSION_SHORT_READ;\n}\ngoto suspend;\n",
|
||||
func template_short_read(b *buffer, args template_args_short_read) error {
|
||||
b.printf("short_read_%s:\nif (a_%s.limit.ptr_to_len) {\nstatus = %sSUSPENSION_LIMITED_READ;\n} else if (a_%s.buf->closed) {\nstatus = %sERROR_UNEXPECTED_EOF;\ngoto exit;\n} else {\nstatus = %sSUSPENSION_SHORT_READ;\n}\ngoto suspend;\n",
|
||||
args.name,
|
||||
args.name,
|
||||
args.PKGPREFIX,
|
||||
|
||||
+370
-362
@@ -13,6 +13,7 @@ import (
|
||||
)
|
||||
|
||||
type perFunc struct {
|
||||
impl buffer
|
||||
funk *a.Func
|
||||
derivedVars map[t.ID]struct{}
|
||||
jumpTargets map[*a.While]uint32
|
||||
@@ -25,129 +26,136 @@ type perFunc struct {
|
||||
shortReads []string
|
||||
}
|
||||
|
||||
func (g *gen) writeFuncSignature(n *a.Func) error {
|
||||
func (g *gen) writeFuncSignature(b *buffer, n *a.Func) error {
|
||||
// TODO: write n's return values.
|
||||
if n.Suspendible() {
|
||||
g.printf("%sstatus ", g.pkgPrefix)
|
||||
b.printf("%sstatus ", g.pkgPrefix)
|
||||
} else {
|
||||
g.writes("void ")
|
||||
b.writes("void ")
|
||||
}
|
||||
|
||||
g.writes(g.pkgPrefix)
|
||||
b.writes(g.pkgPrefix)
|
||||
if r := n.Receiver(); r != 0 {
|
||||
g.writes(r.String(g.tm))
|
||||
g.writeb('_')
|
||||
b.writes(r.String(g.tm))
|
||||
b.writeb('_')
|
||||
}
|
||||
g.printf("%s(", n.Name().String(g.tm))
|
||||
b.printf("%s(", n.Name().String(g.tm))
|
||||
|
||||
comma := false
|
||||
if r := n.Receiver(); r != 0 {
|
||||
g.printf("%s%s *self", g.pkgPrefix, r.String(g.tm))
|
||||
b.printf("%s%s *self", g.pkgPrefix, r.String(g.tm))
|
||||
comma = true
|
||||
}
|
||||
for _, o := range n.In().Fields() {
|
||||
if comma {
|
||||
g.writeb(',')
|
||||
b.writeb(',')
|
||||
}
|
||||
comma = true
|
||||
o := o.Field()
|
||||
if err := g.writeCTypeName(o.XType(), aPrefix, o.Name().String(g.tm)); err != nil {
|
||||
if err := g.writeCTypeName(b, o.XType(), aPrefix, o.Name().String(g.tm)); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
g.printf(")")
|
||||
b.printf(")")
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g *gen) writeFuncPrototype(n *a.Func) error {
|
||||
if err := g.writeFuncSignature(n); err != nil {
|
||||
func (g *gen) writeFuncPrototype(b *buffer, n *a.Func) error {
|
||||
if err := g.writeFuncSignature(b, n); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes(";\n\n")
|
||||
b.writes(";\n\n")
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g *gen) writeFuncImpl(n *a.Func) error {
|
||||
func (g *gen) writeFuncImpl(b *buffer, n *a.Func) error {
|
||||
if err := g.writeFuncSignature(b, n); err != nil {
|
||||
return err
|
||||
}
|
||||
b.writes("{\n")
|
||||
b.writex(g.funcImpls[n.QID()])
|
||||
b.writes("}\n\n")
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g *gen) gatherFuncImpl(_ *buffer, n *a.Func) error {
|
||||
g.perFunc = perFunc{
|
||||
funk: n,
|
||||
public: n.Public(),
|
||||
suspendible: n.Suspendible(),
|
||||
}
|
||||
if err := g.writeFuncSignature(n); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes("{\n")
|
||||
b := &g.perFunc.impl
|
||||
|
||||
// Check the previous status and the "self" arg.
|
||||
if g.perFunc.public && n.Receiver() != 0 {
|
||||
g.writes("if (!self) {")
|
||||
b.writes("if (!self) {")
|
||||
if g.perFunc.suspendible {
|
||||
g.printf("return %sERROR_BAD_RECEIVER;", g.PKGPREFIX)
|
||||
b.printf("return %sERROR_BAD_RECEIVER;", g.PKGPREFIX)
|
||||
} else {
|
||||
g.printf("return;")
|
||||
b.printf("return;")
|
||||
}
|
||||
g.writes("}")
|
||||
b.writes("}")
|
||||
|
||||
g.printf("if (self->private_impl.magic != PUFFS_MAGIC) {"+
|
||||
b.printf("if (self->private_impl.magic != PUFFS_MAGIC) {"+
|
||||
"self->private_impl.status = %sERROR_CONSTRUCTOR_NOT_CALLED; }", g.PKGPREFIX)
|
||||
|
||||
g.writes("if (self->private_impl.status < 0) {")
|
||||
b.writes("if (self->private_impl.status < 0) {")
|
||||
if g.perFunc.suspendible {
|
||||
g.writes("return self->private_impl.status;")
|
||||
b.writes("return self->private_impl.status;")
|
||||
} else {
|
||||
g.writes("return;")
|
||||
b.writes("return;")
|
||||
}
|
||||
g.writes("}\n")
|
||||
b.writes("}\n")
|
||||
}
|
||||
|
||||
if g.perFunc.suspendible {
|
||||
g.printf("%sstatus status = %sSTATUS_OK;\n", g.pkgPrefix, g.PKGPREFIX)
|
||||
b.printf("%sstatus status = %sSTATUS_OK;\n", g.pkgPrefix, g.PKGPREFIX)
|
||||
}
|
||||
|
||||
// For public functions, check (at runtime) the other args for bounds and
|
||||
// null-ness. For private functions, those checks are done at compile time.
|
||||
if g.perFunc.public {
|
||||
if err := g.writeFuncImplArgChecks(n); err != nil {
|
||||
if err := g.writeFuncImplArgChecks(b, n); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
g.writes("\n")
|
||||
b.writes("\n")
|
||||
|
||||
// Generate the local variables.
|
||||
if err := g.writeVars(n.Body()); err != nil {
|
||||
if err := g.writeVars(b, n.Body()); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes("\n")
|
||||
b.writes("\n")
|
||||
|
||||
if g.perFunc.suspendible {
|
||||
g.findDerivedVars()
|
||||
for _, o := range n.In().Fields() {
|
||||
o := o.Field()
|
||||
if err := g.writeLoadDerivedVar(o.Name(), o.XType(), true); err != nil {
|
||||
if err := g.writeLoadDerivedVar(b, o.Name(), o.XType(), true); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
g.writes("\n")
|
||||
b.writes("\n")
|
||||
|
||||
// TODO: don't hard-code [0], and allow recursive coroutines.
|
||||
g.printf("uint32_t coro_susp_point = self->private_impl.%s%s[0].coro_susp_point;\n",
|
||||
b.printf("uint32_t coro_susp_point = self->private_impl.%s%s[0].coro_susp_point;\n",
|
||||
cPrefix, n.Name().String(g.tm))
|
||||
g.printf("if (coro_susp_point) {\n")
|
||||
if err := g.writeResumeSuspend(n.Body(), false); err != nil {
|
||||
b.printf("if (coro_susp_point) {\n")
|
||||
if err := g.writeResumeSuspend(b, n.Body(), false); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes("}\n")
|
||||
b.writes("}\n")
|
||||
// Generate a coroutine switch similiar to the technique in
|
||||
// https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html
|
||||
//
|
||||
// The matching } is written below. See "Close the coroutine switch".
|
||||
g.writes("switch (coro_susp_point) {\nPUFFS_COROUTINE_SUSPENSION_POINT(0);\n\n")
|
||||
b.writes("switch (coro_susp_point) {\nPUFFS_COROUTINE_SUSPENSION_POINT(0);\n\n")
|
||||
}
|
||||
|
||||
// Generate the function body.
|
||||
for _, o := range n.Body() {
|
||||
if err := g.writeStatement(o, 0); err != nil {
|
||||
if err := g.writeStatement(b, o, 0); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
@@ -156,34 +164,34 @@ func (g *gen) writeFuncImpl(n *a.Func) error {
|
||||
// We've reached the end of the function body. Reset the coroutine
|
||||
// suspension point so that the next call to this function starts at
|
||||
// the top.
|
||||
g.printf("self->private_impl.%s%s[0].coro_susp_point = 0;\n",
|
||||
b.printf("self->private_impl.%s%s[0].coro_susp_point = 0;\n",
|
||||
cPrefix, n.Name().String(g.tm))
|
||||
g.writes("goto exit; }\n\n") // Close the coroutine switch.
|
||||
b.writes("goto exit; }\n\n") // Close the coroutine switch.
|
||||
|
||||
g.writes("goto suspend;\n") // Avoid the "unused label" warning.
|
||||
g.writes("suspend:\n")
|
||||
b.writes("goto suspend;\n") // Avoid the "unused label" warning.
|
||||
b.writes("suspend:\n")
|
||||
|
||||
g.printf("self->private_impl.%s%s[0].coro_susp_point = coro_susp_point;\n",
|
||||
b.printf("self->private_impl.%s%s[0].coro_susp_point = coro_susp_point;\n",
|
||||
cPrefix, n.Name().String(g.tm))
|
||||
if err := g.writeResumeSuspend(n.Body(), true); err != nil {
|
||||
if err := g.writeResumeSuspend(b, n.Body(), true); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes("\n")
|
||||
b.writes("\n")
|
||||
|
||||
g.writes("exit:")
|
||||
b.writes("exit:")
|
||||
|
||||
for _, o := range n.In().Fields() {
|
||||
o := o.Field()
|
||||
if err := g.writeSaveDerivedVar(o.Name(), o.XType()); err != nil {
|
||||
if err := g.writeSaveDerivedVar(b, o.Name(), o.XType()); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
g.writes("\n")
|
||||
b.writes("\n")
|
||||
|
||||
if g.perFunc.public {
|
||||
g.writes("self->private_impl.status = status;\n")
|
||||
b.writes("self->private_impl.status = status;\n")
|
||||
}
|
||||
g.writes("return status;\n\n")
|
||||
b.writes("return status;\n\n")
|
||||
|
||||
shortReadsSeen := map[string]struct{}{}
|
||||
for _, sr := range g.perFunc.shortReads {
|
||||
@@ -191,7 +199,7 @@ func (g *gen) writeFuncImpl(n *a.Func) error {
|
||||
continue
|
||||
}
|
||||
shortReadsSeen[sr] = struct{}{}
|
||||
if err := template_short_read(g, template_args_short_read{
|
||||
if err := template_short_read(b, template_args_short_read{
|
||||
PKGPREFIX: g.PKGPREFIX,
|
||||
name: sr,
|
||||
}); err != nil {
|
||||
@@ -200,14 +208,14 @@ func (g *gen) writeFuncImpl(n *a.Func) error {
|
||||
}
|
||||
}
|
||||
|
||||
g.writes("}\n\n")
|
||||
if g.perFunc.tempW != g.perFunc.tempR {
|
||||
return fmt.Errorf("internal error: temporary variable count out of sync")
|
||||
}
|
||||
g.funcImpls[n.QID()] = g.perFunc.impl
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g *gen) writeFuncImplArgChecks(n *a.Func) error {
|
||||
func (g *gen) writeFuncImplArgChecks(b *buffer, n *a.Func) error {
|
||||
checks := []string(nil)
|
||||
|
||||
for _, o := range n.In().Fields() {
|
||||
@@ -256,22 +264,22 @@ func (g *gen) writeFuncImplArgChecks(n *a.Func) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
g.writes("if (")
|
||||
b.writes("if (")
|
||||
for i, c := range checks {
|
||||
if i != 0 {
|
||||
g.writes(" || ")
|
||||
b.writes(" || ")
|
||||
}
|
||||
g.writes(c)
|
||||
b.writes(c)
|
||||
}
|
||||
g.writes(") {")
|
||||
b.writes(") {")
|
||||
if g.perFunc.suspendible {
|
||||
g.printf("status = %sERROR_BAD_ARGUMENT; goto exit;", g.PKGPREFIX)
|
||||
b.printf("status = %sERROR_BAD_ARGUMENT; goto exit;", g.PKGPREFIX)
|
||||
} else if n.Receiver() != 0 {
|
||||
g.printf("self->private_impl.status = %sERROR_BAD_ARGUMENT; return;", g.PKGPREFIX)
|
||||
b.printf("self->private_impl.status = %sERROR_BAD_ARGUMENT; return;", g.PKGPREFIX)
|
||||
} else {
|
||||
g.printf("return;")
|
||||
b.printf("return;")
|
||||
}
|
||||
g.writes("}\n")
|
||||
b.writes("}\n")
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -329,7 +337,7 @@ func (g *gen) findDerivedVars() {
|
||||
}
|
||||
}
|
||||
|
||||
func (g *gen) writeLoadDerivedVar(name t.ID, typ *a.TypeExpr, decl bool) error {
|
||||
func (g *gen) writeLoadDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, decl bool) error {
|
||||
if g.perFunc.derivedVars == nil {
|
||||
return nil
|
||||
}
|
||||
@@ -340,46 +348,46 @@ func (g *gen) writeLoadDerivedVar(name t.ID, typ *a.TypeExpr, decl bool) error {
|
||||
switch typ.Name().Key() {
|
||||
case t.KeyReader1:
|
||||
if decl {
|
||||
g.printf("uint8_t* %srptr_%s = NULL;", bPrefix, nameStr)
|
||||
g.printf("uint8_t* %srend_%s = NULL;", bPrefix, nameStr)
|
||||
b.printf("uint8_t* %srptr_%s = NULL;", bPrefix, nameStr)
|
||||
b.printf("uint8_t* %srend_%s = NULL;", bPrefix, nameStr)
|
||||
}
|
||||
g.printf("if (%s%s.buf) {", aPrefix, nameStr)
|
||||
b.printf("if (%s%s.buf) {", aPrefix, nameStr)
|
||||
|
||||
g.printf("%srptr_%s = %s%s.buf->ptr + %s%s.buf->ri;",
|
||||
b.printf("%srptr_%s = %s%s.buf->ptr + %s%s.buf->ri;",
|
||||
bPrefix, nameStr, aPrefix, nameStr, aPrefix, nameStr)
|
||||
g.printf("size_t len = %s%s.buf->wi - %s%s.buf->ri;",
|
||||
b.printf("size_t len = %s%s.buf->wi - %s%s.buf->ri;",
|
||||
aPrefix, nameStr, aPrefix, nameStr)
|
||||
g.printf("puffs_base_limit1* lim;")
|
||||
g.printf("for (lim = &%s%s.limit; lim; lim = lim->next) {", aPrefix, nameStr)
|
||||
g.printf("if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { len = *lim->ptr_to_len; }")
|
||||
g.printf("}")
|
||||
g.printf("%srend_%s = %srptr_%s + len;", bPrefix, nameStr, bPrefix, nameStr)
|
||||
b.printf("puffs_base_limit1* lim;")
|
||||
b.printf("for (lim = &%s%s.limit; lim; lim = lim->next) {", aPrefix, nameStr)
|
||||
b.printf("if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { len = *lim->ptr_to_len; }")
|
||||
b.printf("}")
|
||||
b.printf("%srend_%s = %srptr_%s + len;", bPrefix, nameStr, bPrefix, nameStr)
|
||||
|
||||
g.printf("}\n")
|
||||
b.printf("}\n")
|
||||
|
||||
case t.KeyWriter1:
|
||||
if decl {
|
||||
g.printf("uint8_t* %swptr_%s = NULL;", bPrefix, nameStr)
|
||||
g.printf("uint8_t* %swend_%s = NULL;", bPrefix, nameStr)
|
||||
b.printf("uint8_t* %swptr_%s = NULL;", bPrefix, nameStr)
|
||||
b.printf("uint8_t* %swend_%s = NULL;", bPrefix, nameStr)
|
||||
}
|
||||
g.printf("if (%s%s.buf) {", aPrefix, nameStr)
|
||||
b.printf("if (%s%s.buf) {", aPrefix, nameStr)
|
||||
|
||||
g.printf("%swptr_%s = %s%s.buf->ptr + %s%s.buf->wi;",
|
||||
b.printf("%swptr_%s = %s%s.buf->ptr + %s%s.buf->wi;",
|
||||
bPrefix, nameStr, aPrefix, nameStr, aPrefix, nameStr)
|
||||
g.printf("size_t len = %s%s.buf->len - %s%s.buf->wi;",
|
||||
b.printf("size_t len = %s%s.buf->len - %s%s.buf->wi;",
|
||||
aPrefix, nameStr, aPrefix, nameStr)
|
||||
g.printf("puffs_base_limit1* lim;")
|
||||
g.printf("for (lim = &%s%s.limit; lim; lim = lim->next) {", aPrefix, nameStr)
|
||||
g.printf("if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { len = *lim->ptr_to_len; }")
|
||||
g.printf("}")
|
||||
g.printf("%swend_%s = %swptr_%s + len;", bPrefix, nameStr, bPrefix, nameStr)
|
||||
b.printf("puffs_base_limit1* lim;")
|
||||
b.printf("for (lim = &%s%s.limit; lim; lim = lim->next) {", aPrefix, nameStr)
|
||||
b.printf("if (lim->ptr_to_len && (len > *lim->ptr_to_len)) { len = *lim->ptr_to_len; }")
|
||||
b.printf("}")
|
||||
b.printf("%swend_%s = %swptr_%s + len;", bPrefix, nameStr, bPrefix, nameStr)
|
||||
|
||||
g.printf("}\n")
|
||||
b.printf("}\n")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g *gen) writeSaveDerivedVar(name t.ID, typ *a.TypeExpr) error {
|
||||
func (g *gen) writeSaveDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr) error {
|
||||
if g.perFunc.derivedVars == nil {
|
||||
return nil
|
||||
}
|
||||
@@ -389,35 +397,35 @@ func (g *gen) writeSaveDerivedVar(name t.ID, typ *a.TypeExpr) error {
|
||||
nameStr := name.String(g.tm)
|
||||
switch typ.Name().Key() {
|
||||
case t.KeyReader1:
|
||||
g.printf("if (%s%s.buf) {", aPrefix, nameStr)
|
||||
b.printf("if (%s%s.buf) {", aPrefix, nameStr)
|
||||
|
||||
g.printf("size_t n = %srptr_%s - (%s%s.buf->ptr + %s%s.buf->ri);",
|
||||
b.printf("size_t n = %srptr_%s - (%s%s.buf->ptr + %s%s.buf->ri);",
|
||||
bPrefix, nameStr, aPrefix, nameStr, aPrefix, nameStr)
|
||||
g.printf("%s%s.buf->ri += n;", aPrefix, nameStr)
|
||||
g.printf("puffs_base_limit1* lim;")
|
||||
g.printf("for (lim = &%s%s.limit; lim; lim = lim->next) {", aPrefix, nameStr)
|
||||
g.printf("if (lim->ptr_to_len) { *lim->ptr_to_len -= n; }")
|
||||
g.printf("}")
|
||||
b.printf("%s%s.buf->ri += n;", aPrefix, nameStr)
|
||||
b.printf("puffs_base_limit1* lim;")
|
||||
b.printf("for (lim = &%s%s.limit; lim; lim = lim->next) {", aPrefix, nameStr)
|
||||
b.printf("if (lim->ptr_to_len) { *lim->ptr_to_len -= n; }")
|
||||
b.printf("}")
|
||||
|
||||
g.printf("}\n")
|
||||
b.printf("}\n")
|
||||
|
||||
case t.KeyWriter1:
|
||||
g.printf("if (%s%s.buf) {", aPrefix, nameStr)
|
||||
b.printf("if (%s%s.buf) {", aPrefix, nameStr)
|
||||
|
||||
g.printf("size_t n = %swptr_%s - (%s%s.buf->ptr + %s%s.buf->wi);",
|
||||
b.printf("size_t n = %swptr_%s - (%s%s.buf->ptr + %s%s.buf->wi);",
|
||||
bPrefix, nameStr, aPrefix, nameStr, aPrefix, nameStr)
|
||||
g.printf("%s%s.buf->wi += n;", aPrefix, nameStr)
|
||||
g.printf("puffs_base_limit1* lim;")
|
||||
g.printf("for (lim = &%s%s.limit; lim; lim = lim->next) {", aPrefix, nameStr)
|
||||
g.printf("if (lim->ptr_to_len) { *lim->ptr_to_len -= n; }")
|
||||
g.printf("}")
|
||||
b.printf("%s%s.buf->wi += n;", aPrefix, nameStr)
|
||||
b.printf("puffs_base_limit1* lim;")
|
||||
b.printf("for (lim = &%s%s.limit; lim; lim = lim->next) {", aPrefix, nameStr)
|
||||
b.printf("if (lim->ptr_to_len) { *lim->ptr_to_len -= n; }")
|
||||
b.printf("}")
|
||||
|
||||
g.printf("}\n")
|
||||
b.printf("}\n")
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g *gen) writeLoadExprDerivedVars(n *a.Expr) error {
|
||||
func (g *gen) writeLoadExprDerivedVars(b *buffer, n *a.Expr) error {
|
||||
if g.perFunc.derivedVars == nil || n.ID0().Key() != t.KeyOpenParen {
|
||||
return nil
|
||||
}
|
||||
@@ -427,14 +435,14 @@ func (g *gen) writeLoadExprDerivedVars(n *a.Expr) error {
|
||||
if s := o.Value().String(g.tm); s != "in.src" && s != "lzw_src" {
|
||||
continue
|
||||
}
|
||||
if err := g.writeLoadDerivedVar(o.Name(), o.Value().MType(), false); err != nil {
|
||||
if err := g.writeLoadDerivedVar(b, o.Name(), o.Value().MType(), false); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g *gen) writeSaveExprDerivedVars(n *a.Expr) error {
|
||||
func (g *gen) writeSaveExprDerivedVars(b *buffer, n *a.Expr) error {
|
||||
if g.perFunc.derivedVars == nil || n.ID0().Key() != t.KeyOpenParen {
|
||||
return nil
|
||||
}
|
||||
@@ -444,14 +452,14 @@ func (g *gen) writeSaveExprDerivedVars(n *a.Expr) error {
|
||||
if s := o.Value().String(g.tm); s != "in.src" && s != "lzw_src" {
|
||||
continue
|
||||
}
|
||||
if err := g.writeSaveDerivedVar(o.Name(), o.Value().MType()); err != nil {
|
||||
if err := g.writeSaveDerivedVar(b, o.Name(), o.Value().MType()); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g *gen) visitVars(block []*a.Node, depth uint32, f func(*gen, *a.Var) error) error {
|
||||
func (g *gen) visitVars(b *buffer, block []*a.Node, depth uint32, f func(*gen, *buffer, *a.Var) error) error {
|
||||
if depth > a.MaxBodyDepth {
|
||||
return fmt.Errorf("body recursion depth too large")
|
||||
}
|
||||
@@ -461,21 +469,21 @@ func (g *gen) visitVars(block []*a.Node, depth uint32, f func(*gen, *a.Var) erro
|
||||
switch o.Kind() {
|
||||
case a.KIf:
|
||||
for o := o.If(); o != nil; o = o.ElseIf() {
|
||||
if err := g.visitVars(o.BodyIfTrue(), depth, f); err != nil {
|
||||
if err := g.visitVars(b, o.BodyIfTrue(), depth, f); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := g.visitVars(o.BodyIfFalse(), depth, f); err != nil {
|
||||
if err := g.visitVars(b, o.BodyIfFalse(), depth, f); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
case a.KVar:
|
||||
if err := f(g, o.Var()); err != nil {
|
||||
if err := f(g, b, o.Var()); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
case a.KWhile:
|
||||
if err := g.visitVars(o.While().Body(), depth, f); err != nil {
|
||||
if err := g.visitVars(b, o.While().Body(), depth, f); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
@@ -483,7 +491,7 @@ func (g *gen) visitVars(block []*a.Node, depth uint32, f func(*gen, *a.Var) erro
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g *gen) writeResumeSuspend1(n *a.Var, prefix string, suspend bool) error {
|
||||
func (g *gen) writeResumeSuspend1(b *buffer, n *a.Var, prefix string, suspend bool) error {
|
||||
local := fmt.Sprintf("%s%s", prefix, n.Name().String(g.tm))
|
||||
lhs := local
|
||||
// TODO: don't hard-code [0], and allow recursive coroutines.
|
||||
@@ -494,7 +502,7 @@ func (g *gen) writeResumeSuspend1(n *a.Var, prefix string, suspend bool) error {
|
||||
typ := n.XType()
|
||||
switch typ.Decorator().Key() {
|
||||
case 0:
|
||||
g.printf("%s = %s;\n", lhs, rhs)
|
||||
b.printf("%s = %s;\n", lhs, rhs)
|
||||
return nil
|
||||
case t.KeyOpenBracket:
|
||||
inner := typ.Inner()
|
||||
@@ -503,7 +511,7 @@ func (g *gen) writeResumeSuspend1(n *a.Var, prefix string, suspend bool) error {
|
||||
}
|
||||
switch inner.Name().Key() {
|
||||
case t.KeyU8, t.KeyU16, t.KeyU32, t.KeyU64:
|
||||
g.printf("memcpy(%s, %s, sizeof(%s));\n", lhs, rhs, local)
|
||||
b.printf("memcpy(%s, %s, sizeof(%s));\n", lhs, rhs, local)
|
||||
return nil
|
||||
}
|
||||
}
|
||||
@@ -511,31 +519,31 @@ func (g *gen) writeResumeSuspend1(n *a.Var, prefix string, suspend bool) error {
|
||||
n.Name().String(g.tm), n.XType().String(g.tm))
|
||||
}
|
||||
|
||||
func (g *gen) writeResumeSuspend(block []*a.Node, suspend bool) error {
|
||||
return g.visitVars(block, 0, func(g *gen, n *a.Var) error {
|
||||
func (g *gen) writeResumeSuspend(b *buffer, block []*a.Node, suspend bool) error {
|
||||
return g.visitVars(b, block, 0, func(g *gen, b *buffer, n *a.Var) error {
|
||||
if v := n.Value(); v != nil && v.ID0().Key() == t.KeyLimit {
|
||||
if err := g.writeResumeSuspend1(n, lPrefix, suspend); err != nil {
|
||||
if err := g.writeResumeSuspend1(b, n, lPrefix, suspend); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return g.writeResumeSuspend1(n, vPrefix, suspend)
|
||||
return g.writeResumeSuspend1(b, n, vPrefix, suspend)
|
||||
})
|
||||
}
|
||||
|
||||
func (g *gen) writeVars(block []*a.Node) error {
|
||||
return g.visitVars(block, 0, func(g *gen, n *a.Var) error {
|
||||
func (g *gen) writeVars(b *buffer, block []*a.Node) error {
|
||||
return g.visitVars(b, block, 0, func(g *gen, b *buffer, n *a.Var) error {
|
||||
if v := n.Value(); v != nil && v.ID0().Key() == t.KeyLimit {
|
||||
g.printf("uint64_t %s%v;\n", lPrefix, n.Name().String(g.tm))
|
||||
b.printf("uint64_t %s%v;\n", lPrefix, n.Name().String(g.tm))
|
||||
}
|
||||
if err := g.writeCTypeName(n.XType(), vPrefix, n.Name().String(g.tm)); err != nil {
|
||||
if err := g.writeCTypeName(b, n.XType(), vPrefix, n.Name().String(g.tm)); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes(";\n")
|
||||
b.writes(";\n")
|
||||
return nil
|
||||
})
|
||||
}
|
||||
|
||||
func (g *gen) writeStatement(n *a.Node, depth uint32) error {
|
||||
func (g *gen) writeStatement(b *buffer, n *a.Node, depth uint32) error {
|
||||
if depth > a.MaxBodyDepth {
|
||||
return fmt.Errorf("body recursion depth too large")
|
||||
}
|
||||
@@ -548,26 +556,26 @@ func (g *gen) writeStatement(n *a.Node, depth uint32) error {
|
||||
|
||||
case a.KAssign:
|
||||
n := n.Assign()
|
||||
if err := g.writeSuspendibles(n.LHS(), depth); err != nil {
|
||||
if err := g.writeSuspendibles(b, n.LHS(), depth); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := g.writeSuspendibles(n.RHS(), depth); err != nil {
|
||||
if err := g.writeSuspendibles(b, n.RHS(), depth); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := g.writeExpr(n.LHS(), replaceCallSuspendibles, parenthesesMandatory, depth); err != nil {
|
||||
if err := g.writeExpr(b, n.LHS(), replaceCallSuspendibles, parenthesesMandatory, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
// TODO: does KeyAmpHatEq need special consideration?
|
||||
g.writes(cOpNames[0xFF&n.Operator().Key()])
|
||||
if err := g.writeExpr(n.RHS(), replaceCallSuspendibles, parenthesesMandatory, depth); err != nil {
|
||||
b.writes(cOpNames[0xFF&n.Operator().Key()])
|
||||
if err := g.writeExpr(b, n.RHS(), replaceCallSuspendibles, parenthesesMandatory, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes(";\n")
|
||||
b.writes(";\n")
|
||||
return nil
|
||||
|
||||
case a.KExpr:
|
||||
n := n.Expr()
|
||||
if err := g.writeSuspendibles(n, depth); err != nil {
|
||||
if err := g.writeSuspendibles(b, n, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
if n.CallSuspendible() {
|
||||
@@ -575,12 +583,12 @@ func (g *gen) writeStatement(n *a.Node, depth uint32) error {
|
||||
}
|
||||
// TODO: delete this hack that only matches "foo.set_literal_width(etc)".
|
||||
if isSetLiteralWidth(g.tm, n) {
|
||||
g.printf("%slzw_decoder_set_literal_width(&self->private_impl.f_lzw, ", g.pkgPrefix)
|
||||
b.printf("%slzw_decoder_set_literal_width(&self->private_impl.f_lzw, ", g.pkgPrefix)
|
||||
a := n.Args()[0].Arg().Value()
|
||||
if err := g.writeExpr(a, replaceCallSuspendibles, parenthesesMandatory, depth); err != nil {
|
||||
if err := g.writeExpr(b, a, replaceCallSuspendibles, parenthesesMandatory, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes(");\n")
|
||||
b.writes(");\n")
|
||||
return nil
|
||||
}
|
||||
return fmt.Errorf("TODO: generate code for foo() when foo is not a ? call-suspendible")
|
||||
@@ -592,32 +600,32 @@ func (g *gen) writeStatement(n *a.Node, depth uint32) error {
|
||||
for first := true; ; first = false {
|
||||
if n.Condition().Suspendible() {
|
||||
if !first {
|
||||
g.writeb('{')
|
||||
b.writeb('{')
|
||||
const maxCloseCurly = 1000
|
||||
if nCloseCurly == maxCloseCurly {
|
||||
return fmt.Errorf("too many nested if's")
|
||||
}
|
||||
nCloseCurly++
|
||||
}
|
||||
if err := g.writeSuspendibles(n.Condition(), depth); err != nil {
|
||||
if err := g.writeSuspendibles(b, n.Condition(), depth); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
g.writes("if (")
|
||||
if err := g.writeExpr(n.Condition(), replaceCallSuspendibles, parenthesesOptional, 0); err != nil {
|
||||
b.writes("if (")
|
||||
if err := g.writeExpr(b, n.Condition(), replaceCallSuspendibles, parenthesesOptional, 0); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes(") {\n")
|
||||
b.writes(") {\n")
|
||||
for _, o := range n.BodyIfTrue() {
|
||||
if err := g.writeStatement(o, depth); err != nil {
|
||||
if err := g.writeStatement(b, o, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if bif := n.BodyIfFalse(); len(bif) > 0 {
|
||||
g.writes("} else {")
|
||||
b.writes("} else {")
|
||||
for _, o := range bif {
|
||||
if err := g.writeStatement(o, depth); err != nil {
|
||||
if err := g.writeStatement(b, o, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
@@ -627,10 +635,10 @@ func (g *gen) writeStatement(n *a.Node, depth uint32) error {
|
||||
if n == nil {
|
||||
break
|
||||
}
|
||||
g.writes("} else ")
|
||||
b.writes("} else ")
|
||||
}
|
||||
for ; nCloseCurly > 0; nCloseCurly-- {
|
||||
g.writes("}\n")
|
||||
b.writes("}\n")
|
||||
}
|
||||
return nil
|
||||
|
||||
@@ -644,7 +652,7 @@ func (g *gen) writeStatement(n *a.Node, depth uint32) error {
|
||||
if n.Keyword().Key() == t.KeyBreak {
|
||||
keyword = "break"
|
||||
}
|
||||
g.printf("goto label_%d_%s;\n", jt, keyword)
|
||||
b.printf("goto label_%d_%s;\n", jt, keyword)
|
||||
return nil
|
||||
|
||||
case a.KReturn:
|
||||
@@ -656,33 +664,33 @@ func (g *gen) writeStatement(n *a.Node, depth uint32) error {
|
||||
ret = g.statusMap[n.Message()]
|
||||
}
|
||||
if g.perFunc.suspendible {
|
||||
g.printf("status = %s;", ret.name)
|
||||
b.printf("status = %s;", ret.name)
|
||||
if ret.isError {
|
||||
g.writes("goto exit;")
|
||||
b.writes("goto exit;")
|
||||
} else {
|
||||
g.writes("goto suspend;")
|
||||
b.writes("goto suspend;")
|
||||
}
|
||||
} else {
|
||||
// TODO: consider the return values, especially if they involve
|
||||
// suspendible function calls.
|
||||
g.writes("return;\n")
|
||||
b.writes("return;\n")
|
||||
}
|
||||
return nil
|
||||
|
||||
case a.KVar:
|
||||
n := n.Var()
|
||||
if v := n.Value(); v != nil {
|
||||
if err := g.writeSuspendibles(v, depth); err != nil {
|
||||
if err := g.writeSuspendibles(b, v, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
if v.ID0().Key() == t.KeyLimit {
|
||||
g.perFunc.limitVarName = n.Name().String(g.tm)
|
||||
g.printf("%s%s =", lPrefix, g.perFunc.limitVarName)
|
||||
b.printf("%s%s =", lPrefix, g.perFunc.limitVarName)
|
||||
if err := g.writeExpr(
|
||||
v.LHS().Expr(), replaceCallSuspendibles, parenthesesMandatory, depth); err != nil {
|
||||
b, v.LHS().Expr(), replaceCallSuspendibles, parenthesesMandatory, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes(";\n")
|
||||
b.writes(";\n")
|
||||
}
|
||||
}
|
||||
if n.XType().Decorator().Key() == t.KeyOpenBracket {
|
||||
@@ -696,17 +704,17 @@ func (g *gen) writeStatement(n *a.Node, depth uint32) error {
|
||||
}
|
||||
// TODO: arrays of arrays.
|
||||
name := n.Name().String(g.tm)
|
||||
g.printf("memset(%s%s, 0, sizeof(%s%s));\n", vPrefix, name, vPrefix, name)
|
||||
b.printf("memset(%s%s, 0, sizeof(%s%s));\n", vPrefix, name, vPrefix, name)
|
||||
} else {
|
||||
g.printf("%s%s = ", vPrefix, n.Name().String(g.tm))
|
||||
b.printf("%s%s = ", vPrefix, n.Name().String(g.tm))
|
||||
if v := n.Value(); v != nil {
|
||||
if err := g.writeExpr(v, replaceCallSuspendibles, parenthesesMandatory, 0); err != nil {
|
||||
if err := g.writeExpr(b, v, replaceCallSuspendibles, parenthesesMandatory, 0); err != nil {
|
||||
return err
|
||||
}
|
||||
} else {
|
||||
g.writeb('0')
|
||||
b.writeb('0')
|
||||
}
|
||||
g.writes(";\n")
|
||||
b.writes(";\n")
|
||||
}
|
||||
return nil
|
||||
|
||||
@@ -719,25 +727,25 @@ func (g *gen) writeStatement(n *a.Node, depth uint32) error {
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
g.printf("label_%d_continue:;\n", jt)
|
||||
b.printf("label_%d_continue:;\n", jt)
|
||||
}
|
||||
g.writes("while (")
|
||||
if err := g.writeExpr(n.Condition(), replaceCallSuspendibles, parenthesesOptional, 0); err != nil {
|
||||
b.writes("while (")
|
||||
if err := g.writeExpr(b, n.Condition(), replaceCallSuspendibles, parenthesesOptional, 0); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes(") {\n")
|
||||
b.writes(") {\n")
|
||||
for _, o := range n.Body() {
|
||||
if err := g.writeStatement(o, depth); err != nil {
|
||||
if err := g.writeStatement(b, o, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
g.writes("}\n")
|
||||
b.writes("}\n")
|
||||
if n.HasBreak() {
|
||||
jt, err := g.jumpTarget(n)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
g.printf("label_%d_break:;\n", jt)
|
||||
b.printf("label_%d_break:;\n", jt)
|
||||
}
|
||||
return nil
|
||||
|
||||
@@ -745,28 +753,28 @@ func (g *gen) writeStatement(n *a.Node, depth uint32) error {
|
||||
return fmt.Errorf("unrecognized ast.Kind (%s) for writeStatement", n.Kind())
|
||||
}
|
||||
|
||||
func (g *gen) writeCoroSuspPoint() error {
|
||||
func (g *gen) writeCoroSuspPoint(b *buffer) error {
|
||||
const maxCoroSuspPoint = 0xFFFFFFFF
|
||||
g.perFunc.coroSuspPoint++
|
||||
if g.perFunc.coroSuspPoint == maxCoroSuspPoint {
|
||||
return fmt.Errorf("too many coroutine suspension points required")
|
||||
}
|
||||
|
||||
g.printf("PUFFS_COROUTINE_SUSPENSION_POINT(%d);\n", g.perFunc.coroSuspPoint)
|
||||
b.printf("PUFFS_COROUTINE_SUSPENSION_POINT(%d);\n", g.perFunc.coroSuspPoint)
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g *gen) writeSuspendibles(n *a.Expr, depth uint32) error {
|
||||
func (g *gen) writeSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
|
||||
if !n.Suspendible() {
|
||||
return nil
|
||||
}
|
||||
if err := g.writeCoroSuspPoint(); err != nil {
|
||||
if err := g.writeCoroSuspPoint(b); err != nil {
|
||||
return err
|
||||
}
|
||||
return g.writeCallSuspendibles(n, depth)
|
||||
return g.writeCallSuspendibles(b, n, depth)
|
||||
}
|
||||
|
||||
func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error {
|
||||
func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
|
||||
if depth > a.MaxExprDepth {
|
||||
return fmt.Errorf("expression recursion depth too large")
|
||||
}
|
||||
@@ -777,14 +785,14 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error {
|
||||
if !n.CallSuspendible() {
|
||||
for _, o := range n.Node().Raw().SubNodes() {
|
||||
if o != nil && o.Kind() == a.KExpr {
|
||||
if err := g.writeCallSuspendibles(o.Expr(), depth); err != nil {
|
||||
if err := g.writeCallSuspendibles(b, o.Expr(), depth); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
}
|
||||
for _, o := range n.Args() {
|
||||
if o != nil && o.Kind() == a.KExpr {
|
||||
if err := g.writeCallSuspendibles(o.Expr(), depth); err != nil {
|
||||
if err := g.writeCallSuspendibles(b, o.Expr(), depth); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
@@ -792,7 +800,7 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
if err := g.writeSaveExprDerivedVars(n); err != nil {
|
||||
if err := g.writeSaveExprDerivedVars(b, n); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -806,82 +814,82 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error {
|
||||
temp := g.perFunc.tempW
|
||||
g.perFunc.tempW++
|
||||
|
||||
g.printf("if (PUFFS_UNLIKELY(%srptr_src == %srend_src)) { goto short_read_src; }", bPrefix, bPrefix)
|
||||
b.printf("if (PUFFS_UNLIKELY(%srptr_src == %srend_src)) { goto short_read_src; }", bPrefix, bPrefix)
|
||||
g.perFunc.shortReads = append(g.perFunc.shortReads, "src")
|
||||
// TODO: watch for passing an array type to writeCTypeName? In C, an
|
||||
// array type can decay into a pointer.
|
||||
if err := g.writeCTypeName(n.MType(), tPrefix, fmt.Sprint(temp)); err != nil {
|
||||
if err := g.writeCTypeName(b, n.MType(), tPrefix, fmt.Sprint(temp)); err != nil {
|
||||
return err
|
||||
}
|
||||
g.printf(" = *%srptr_src++;\n", bPrefix)
|
||||
b.printf(" = *%srptr_src++;\n", bPrefix)
|
||||
|
||||
} else if isInSrc(g.tm, n, t.KeyReadU16BE, 0) {
|
||||
return g.writeReadUXX(n, "src", 16, "BE")
|
||||
return g.writeReadUXX(b, n, "src", 16, "BE")
|
||||
|
||||
} else if isInSrc(g.tm, n, t.KeyReadU16LE, 0) {
|
||||
return g.writeReadUXX(n, "src", 16, "LE")
|
||||
return g.writeReadUXX(b, n, "src", 16, "LE")
|
||||
|
||||
} else if isInSrc(g.tm, n, t.KeyReadU32BE, 0) {
|
||||
return g.writeReadUXX(n, "src", 32, "BE")
|
||||
return g.writeReadUXX(b, n, "src", 32, "BE")
|
||||
|
||||
} else if isInSrc(g.tm, n, t.KeyReadU32LE, 0) {
|
||||
return g.writeReadUXX(n, "src", 32, "LE")
|
||||
return g.writeReadUXX(b, n, "src", 32, "LE")
|
||||
|
||||
} else if isInSrc(g.tm, n, t.KeySkip32, 1) {
|
||||
// TODO: is the scratch variable safe to use if callers can trap
|
||||
// LIMITED_READ and then go down different code paths?
|
||||
g.writes("self->private_impl.scratch = ")
|
||||
b.writes("self->private_impl.scratch = ")
|
||||
x := n.Args()[0].Arg().Value()
|
||||
if err := g.writeExpr(x, replaceCallSuspendibles, parenthesesMandatory, depth); err != nil {
|
||||
if err := g.writeExpr(b, x, replaceCallSuspendibles, parenthesesMandatory, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes(";\n")
|
||||
b.writes(";\n")
|
||||
|
||||
// TODO: the CSP prior to this is probably unnecessary.
|
||||
if err := g.writeCoroSuspPoint(); err != nil {
|
||||
if err := g.writeCoroSuspPoint(b); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
g.printf("if (self->private_impl.scratch > %srend_src - %srptr_src) {\n", bPrefix, bPrefix)
|
||||
g.printf("self->private_impl.scratch -= %srend_src - %srptr_src;\n", bPrefix, bPrefix)
|
||||
g.printf("%srptr_src = %srend_src;\n", bPrefix, bPrefix)
|
||||
b.printf("if (self->private_impl.scratch > %srend_src - %srptr_src) {\n", bPrefix, bPrefix)
|
||||
b.printf("self->private_impl.scratch -= %srend_src - %srptr_src;\n", bPrefix, bPrefix)
|
||||
b.printf("%srptr_src = %srend_src;\n", bPrefix, bPrefix)
|
||||
|
||||
// TODO: is ptr_to_len the right check?
|
||||
g.printf("if (%ssrc.limit.ptr_to_len) {", aPrefix)
|
||||
g.printf("status = %sSUSPENSION_LIMITED_READ;", g.PKGPREFIX)
|
||||
g.printf("} else if (%ssrc.buf->closed) {", aPrefix)
|
||||
g.printf("status = %sERROR_UNEXPECTED_EOF; goto exit;", g.PKGPREFIX)
|
||||
g.printf("} else { status = %sSUSPENSION_SHORT_READ; } goto suspend;\n", g.PKGPREFIX)
|
||||
b.printf("if (%ssrc.limit.ptr_to_len) {", aPrefix)
|
||||
b.printf("status = %sSUSPENSION_LIMITED_READ;", g.PKGPREFIX)
|
||||
b.printf("} else if (%ssrc.buf->closed) {", aPrefix)
|
||||
b.printf("status = %sERROR_UNEXPECTED_EOF; goto exit;", g.PKGPREFIX)
|
||||
b.printf("} else { status = %sSUSPENSION_SHORT_READ; } goto suspend;\n", g.PKGPREFIX)
|
||||
|
||||
g.writes("}\n")
|
||||
g.printf("%srptr_src += self->private_impl.scratch;\n", bPrefix)
|
||||
b.writes("}\n")
|
||||
b.printf("%srptr_src += self->private_impl.scratch;\n", bPrefix)
|
||||
|
||||
} else if isInDst(g.tm, n, t.KeyWrite, 1) {
|
||||
// TODO: don't assume that the argument is "this.stack[s:]".
|
||||
g.printf("if (%sdst.buf->closed) { status = %sERROR_CLOSED_FOR_WRITES;", aPrefix, g.PKGPREFIX)
|
||||
g.writes("goto exit;")
|
||||
g.writes("}\n")
|
||||
g.printf("if ((%swend_dst - %swptr_dst) < (sizeof(self->private_impl.f_stack) - v_s)) {",
|
||||
b.printf("if (%sdst.buf->closed) { status = %sERROR_CLOSED_FOR_WRITES;", aPrefix, g.PKGPREFIX)
|
||||
b.writes("goto exit;")
|
||||
b.writes("}\n")
|
||||
b.printf("if ((%swend_dst - %swptr_dst) < (sizeof(self->private_impl.f_stack) - v_s)) {",
|
||||
bPrefix, bPrefix)
|
||||
g.printf("status = %sSUSPENSION_SHORT_WRITE;", g.PKGPREFIX)
|
||||
g.writes("goto suspend;")
|
||||
g.writes("}\n")
|
||||
g.printf("memmove(b_wptr_dst," +
|
||||
b.printf("status = %sSUSPENSION_SHORT_WRITE;", g.PKGPREFIX)
|
||||
b.writes("goto suspend;")
|
||||
b.writes("}\n")
|
||||
b.printf("memmove(b_wptr_dst," +
|
||||
"self->private_impl.f_stack + v_s," +
|
||||
"sizeof(self->private_impl.f_stack) - v_s);\n")
|
||||
g.printf("b_wptr_dst += sizeof(self->private_impl.f_stack) - v_s;\n")
|
||||
b.printf("b_wptr_dst += sizeof(self->private_impl.f_stack) - v_s;\n")
|
||||
|
||||
} else if isInDst(g.tm, n, t.KeyWriteU8, 1) {
|
||||
g.printf("if (%swptr_dst == %swend_dst) { status = %sSUSPENSION_SHORT_WRITE;",
|
||||
b.printf("if (%swptr_dst == %swend_dst) { status = %sSUSPENSION_SHORT_WRITE;",
|
||||
bPrefix, bPrefix, g.PKGPREFIX)
|
||||
g.writes("goto suspend;")
|
||||
g.writes("}\n")
|
||||
g.printf("*%swptr_dst++ = ", bPrefix)
|
||||
b.writes("goto suspend;")
|
||||
b.writes("}\n")
|
||||
b.printf("*%swptr_dst++ = ", bPrefix)
|
||||
x := n.Args()[0].Arg().Value()
|
||||
if err := g.writeExpr(x, replaceCallSuspendibles, parenthesesMandatory, depth); err != nil {
|
||||
if err := g.writeExpr(b, x, replaceCallSuspendibles, parenthesesMandatory, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes(";\n")
|
||||
b.writes(";\n")
|
||||
|
||||
} else if isInDst(g.tm, n, t.KeyCopyFrom32, 2) {
|
||||
if g.perFunc.tempW > maxTemp {
|
||||
@@ -891,39 +899,39 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error {
|
||||
g.perFunc.tempW++
|
||||
g.perFunc.tempR++
|
||||
|
||||
g.writes("{\n")
|
||||
b.writes("{\n")
|
||||
|
||||
g.writes("self->private_impl.scratch = ")
|
||||
b.writes("self->private_impl.scratch = ")
|
||||
x := n.Args()[1].Arg().Value()
|
||||
if err := g.writeExpr(x, replaceCallSuspendibles, parenthesesMandatory, depth); err != nil {
|
||||
if err := g.writeExpr(b, x, replaceCallSuspendibles, parenthesesMandatory, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes(";\n")
|
||||
b.writes(";\n")
|
||||
|
||||
if err := g.writeCoroSuspPoint(); err != nil {
|
||||
if err := g.writeCoroSuspPoint(b); err != nil {
|
||||
return err
|
||||
}
|
||||
g.printf("size_t %s%d = self->private_impl.scratch;\n", tPrefix, temp)
|
||||
b.printf("size_t %s%d = self->private_impl.scratch;\n", tPrefix, temp)
|
||||
|
||||
const wName = "dst"
|
||||
g.printf("if (%s%d > %swend_%s - %swptr_%s) {\n", tPrefix, temp, bPrefix, wName, bPrefix, wName)
|
||||
g.printf("%s%d = %swend_%s - %swptr_%s;\n", tPrefix, temp, bPrefix, wName, bPrefix, wName)
|
||||
g.printf("status = %sSUSPENSION_SHORT_WRITE;\n", g.PKGPREFIX)
|
||||
g.writes("}\n")
|
||||
b.printf("if (%s%d > %swend_%s - %swptr_%s) {\n", tPrefix, temp, bPrefix, wName, bPrefix, wName)
|
||||
b.printf("%s%d = %swend_%s - %swptr_%s;\n", tPrefix, temp, bPrefix, wName, bPrefix, wName)
|
||||
b.printf("status = %sSUSPENSION_SHORT_WRITE;\n", g.PKGPREFIX)
|
||||
b.writes("}\n")
|
||||
|
||||
// TODO: don't assume that the first argument is "in.src".
|
||||
const rName = "src"
|
||||
g.printf("if (%s%d > %srend_%s - %srptr_%s) {\n", tPrefix, temp, bPrefix, rName, bPrefix, rName)
|
||||
g.printf("%s%d = %srend_%s - %srptr_%s;\n", tPrefix, temp, bPrefix, rName, bPrefix, rName)
|
||||
g.printf("status = %sSUSPENSION_SHORT_READ;\n", g.PKGPREFIX)
|
||||
g.writes("}\n")
|
||||
b.printf("if (%s%d > %srend_%s - %srptr_%s) {\n", tPrefix, temp, bPrefix, rName, bPrefix, rName)
|
||||
b.printf("%s%d = %srend_%s - %srptr_%s;\n", tPrefix, temp, bPrefix, rName, bPrefix, rName)
|
||||
b.printf("status = %sSUSPENSION_SHORT_READ;\n", g.PKGPREFIX)
|
||||
b.writes("}\n")
|
||||
|
||||
g.printf("memmove(%swptr_%s, %srptr_%s, %s%d);\n", bPrefix, wName, bPrefix, rName, tPrefix, temp)
|
||||
g.printf("%swptr_%s += %s%d;\n", bPrefix, wName, tPrefix, temp)
|
||||
g.printf("%srptr_%s += %s%d;\n", bPrefix, rName, tPrefix, temp)
|
||||
g.printf("if (status) { self->private_impl.scratch -= %s%d; goto suspend; }\n", tPrefix, temp)
|
||||
b.printf("memmove(%swptr_%s, %srptr_%s, %s%d);\n", bPrefix, wName, bPrefix, rName, tPrefix, temp)
|
||||
b.printf("%swptr_%s += %s%d;\n", bPrefix, wName, tPrefix, temp)
|
||||
b.printf("%srptr_%s += %s%d;\n", bPrefix, rName, tPrefix, temp)
|
||||
b.printf("if (status) { self->private_impl.scratch -= %s%d; goto suspend; }\n", tPrefix, temp)
|
||||
|
||||
g.writes("}\n")
|
||||
b.writes("}\n")
|
||||
|
||||
} else if isInDst(g.tm, n, t.KeyCopyHistory32, 2) {
|
||||
if g.perFunc.tempW > maxTemp-2 {
|
||||
@@ -935,155 +943,155 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error {
|
||||
g.perFunc.tempW += 3
|
||||
g.perFunc.tempR += 3
|
||||
|
||||
g.writes("{\n")
|
||||
b.writes("{\n")
|
||||
|
||||
g.writes("self->private_impl.scratch = ((uint64_t)(")
|
||||
b.writes("self->private_impl.scratch = ((uint64_t)(")
|
||||
x0 := n.Args()[0].Arg().Value()
|
||||
if err := g.writeExpr(x0, replaceCallSuspendibles, parenthesesMandatory, depth); err != nil {
|
||||
if err := g.writeExpr(b, x0, replaceCallSuspendibles, parenthesesMandatory, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes(")<<32) | (uint64_t)(")
|
||||
b.writes(")<<32) | (uint64_t)(")
|
||||
x1 := n.Args()[1].Arg().Value()
|
||||
if err := g.writeExpr(x1, replaceCallSuspendibles, parenthesesMandatory, depth); err != nil {
|
||||
if err := g.writeExpr(b, x1, replaceCallSuspendibles, parenthesesMandatory, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes(");\n")
|
||||
if err := g.writeCoroSuspPoint(); err != nil {
|
||||
b.writes(");\n")
|
||||
if err := g.writeCoroSuspPoint(b); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
const wName = "dst"
|
||||
g.printf("size_t %s%d = (size_t)(self->private_impl.scratch >> 32);", tPrefix, temp0)
|
||||
b.printf("size_t %s%d = (size_t)(self->private_impl.scratch >> 32);", tPrefix, temp0)
|
||||
// TODO: it's not a BAD_ARGUMENT if we can copy from the sliding window.
|
||||
g.printf("if (PUFFS_UNLIKELY((%s%d == 0) || (%s%d > (%swptr_%s - %s%s.buf->ptr)))) { "+
|
||||
b.printf("if (PUFFS_UNLIKELY((%s%d == 0) || (%s%d > (%swptr_%s - %s%s.buf->ptr)))) { "+
|
||||
"status = %sERROR_BAD_ARGUMENT; goto exit; }\n",
|
||||
tPrefix, temp0, tPrefix, temp0, bPrefix, wName, aPrefix, wName, g.PKGPREFIX)
|
||||
g.printf("uint8_t* %s%d = %swptr_%s - %s%d;\n", tPrefix, temp1, bPrefix, wName, tPrefix, temp0)
|
||||
g.printf("uint32_t %s%d = (uint32_t)(self->private_impl.scratch);", tPrefix, temp2)
|
||||
b.printf("uint8_t* %s%d = %swptr_%s - %s%d;\n", tPrefix, temp1, bPrefix, wName, tPrefix, temp0)
|
||||
b.printf("uint32_t %s%d = (uint32_t)(self->private_impl.scratch);", tPrefix, temp2)
|
||||
|
||||
g.printf("if (PUFFS_LIKELY((size_t)(%s%d) <= (%swend_%s - %swptr_%s))) {",
|
||||
b.printf("if (PUFFS_LIKELY((size_t)(%s%d) <= (%swend_%s - %swptr_%s))) {",
|
||||
tPrefix, temp2, bPrefix, wName, bPrefix, wName)
|
||||
|
||||
g.printf("for (; %s%d >= 8; %s%d -= 8) {", tPrefix, temp2, tPrefix, temp2)
|
||||
b.printf("for (; %s%d >= 8; %s%d -= 8) {", tPrefix, temp2, tPrefix, temp2)
|
||||
for i := 0; i < 8; i++ {
|
||||
g.printf("*%swptr_%s++ = *%s%d++;\n", bPrefix, wName, tPrefix, temp1)
|
||||
b.printf("*%swptr_%s++ = *%s%d++;\n", bPrefix, wName, tPrefix, temp1)
|
||||
}
|
||||
g.writes("}\n")
|
||||
g.printf("for (; %s%d; %s%d--) { *%swptr_%s++ = *%s%d++; }\n",
|
||||
b.writes("}\n")
|
||||
b.printf("for (; %s%d; %s%d--) { *%swptr_%s++ = *%s%d++; }\n",
|
||||
tPrefix, temp2, tPrefix, temp2, bPrefix, wName, tPrefix, temp1)
|
||||
|
||||
g.writes("} else {\n")
|
||||
b.writes("} else {\n")
|
||||
|
||||
g.printf("%s%d = (uint32_t)(%swend_%s - %swptr_%s);\n",
|
||||
b.printf("%s%d = (uint32_t)(%swend_%s - %swptr_%s);\n",
|
||||
tPrefix, temp2, bPrefix, wName, bPrefix, wName)
|
||||
g.printf("self->private_impl.scratch -= (uint64_t)(%s%d);\n", tPrefix, temp2)
|
||||
g.printf("for (; %s%d; %s%d--) { *%swptr_%s++ = *%s%d++; }\n",
|
||||
b.printf("self->private_impl.scratch -= (uint64_t)(%s%d);\n", tPrefix, temp2)
|
||||
b.printf("for (; %s%d; %s%d--) { *%swptr_%s++ = *%s%d++; }\n",
|
||||
tPrefix, temp2, tPrefix, temp2, bPrefix, wName, tPrefix, temp1)
|
||||
// TODO: SHORT_WRITE vs LIMITED_WRITE?
|
||||
g.printf("status = %sSUSPENSION_SHORT_WRITE; goto suspend;\n", g.PKGPREFIX)
|
||||
b.printf("status = %sSUSPENSION_SHORT_WRITE; goto suspend;\n", g.PKGPREFIX)
|
||||
|
||||
g.writes("}\n")
|
||||
b.writes("}\n")
|
||||
|
||||
g.writes("}\n")
|
||||
b.writes("}\n")
|
||||
|
||||
} else if isThisMethod(g.tm, n, "decode_header", 1) {
|
||||
g.printf("status = %s%s_decode_header(self, %ssrc);\n",
|
||||
b.printf("status = %s%s_decode_header(self, %ssrc);\n",
|
||||
g.pkgPrefix, g.perFunc.funk.Receiver().String(g.tm), aPrefix)
|
||||
if err := g.writeLoadExprDerivedVars(n); err != nil {
|
||||
if err := g.writeLoadExprDerivedVars(b, n); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes("if (status) { goto suspend; }\n")
|
||||
b.writes("if (status) { goto suspend; }\n")
|
||||
|
||||
} else if isThisMethod(g.tm, n, "decode_lsd", 1) {
|
||||
g.printf("status = %s%s_decode_lsd(self, %ssrc);\n",
|
||||
b.printf("status = %s%s_decode_lsd(self, %ssrc);\n",
|
||||
g.pkgPrefix, g.perFunc.funk.Receiver().String(g.tm), aPrefix)
|
||||
if err := g.writeLoadExprDerivedVars(n); err != nil {
|
||||
if err := g.writeLoadExprDerivedVars(b, n); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes("if (status) { goto suspend; }\n")
|
||||
b.writes("if (status) { goto suspend; }\n")
|
||||
|
||||
} else if isThisMethod(g.tm, n, "decode_extension", 1) {
|
||||
g.printf("status = %s%s_decode_extension(self, %ssrc);\n",
|
||||
b.printf("status = %s%s_decode_extension(self, %ssrc);\n",
|
||||
g.pkgPrefix, g.perFunc.funk.Receiver().String(g.tm), aPrefix)
|
||||
if err := g.writeLoadExprDerivedVars(n); err != nil {
|
||||
if err := g.writeLoadExprDerivedVars(b, n); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes("if (status) { goto suspend; }\n")
|
||||
b.writes("if (status) { goto suspend; }\n")
|
||||
|
||||
} else if isThisMethod(g.tm, n, "decode_id", 2) {
|
||||
g.printf("status = %s%s_decode_id(self, %sdst, %ssrc);\n",
|
||||
b.printf("status = %s%s_decode_id(self, %sdst, %ssrc);\n",
|
||||
g.pkgPrefix, g.perFunc.funk.Receiver().String(g.tm), aPrefix, aPrefix)
|
||||
if err := g.writeLoadExprDerivedVars(n); err != nil {
|
||||
if err := g.writeLoadExprDerivedVars(b, n); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes("if (status) { goto suspend; }\n")
|
||||
b.writes("if (status) { goto suspend; }\n")
|
||||
|
||||
} else if isThisMethod(g.tm, n, "decode_uncompressed", 2) {
|
||||
g.printf("status = %s%s_decode_uncompressed(self, %sdst, %ssrc);\n",
|
||||
b.printf("status = %s%s_decode_uncompressed(self, %sdst, %ssrc);\n",
|
||||
g.pkgPrefix, g.perFunc.funk.Receiver().String(g.tm), aPrefix, aPrefix)
|
||||
if err := g.writeLoadExprDerivedVars(n); err != nil {
|
||||
if err := g.writeLoadExprDerivedVars(b, n); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes("if (status) { goto suspend; }\n")
|
||||
b.writes("if (status) { goto suspend; }\n")
|
||||
|
||||
} else if isThisMethod(g.tm, n, "decode_huffman", 2) {
|
||||
g.printf("status = %s%s_decode_huffman(self, %sdst, %ssrc);\n",
|
||||
b.printf("status = %s%s_decode_huffman(self, %sdst, %ssrc);\n",
|
||||
g.pkgPrefix, g.perFunc.funk.Receiver().String(g.tm), aPrefix, aPrefix)
|
||||
if err := g.writeLoadExprDerivedVars(n); err != nil {
|
||||
if err := g.writeLoadExprDerivedVars(b, n); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes("if (status) { goto suspend; }\n")
|
||||
b.writes("if (status) { goto suspend; }\n")
|
||||
|
||||
} else if isThisMethod(g.tm, n, "init_fixed_huffman", 0) {
|
||||
g.printf("status = %s%s_init_fixed_huffman(self);\n",
|
||||
b.printf("status = %s%s_init_fixed_huffman(self);\n",
|
||||
g.pkgPrefix, g.perFunc.funk.Receiver().String(g.tm))
|
||||
if err := g.writeLoadExprDerivedVars(n); err != nil {
|
||||
if err := g.writeLoadExprDerivedVars(b, n); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes("if (status) { goto suspend; }\n")
|
||||
b.writes("if (status) { goto suspend; }\n")
|
||||
|
||||
} else if isThisMethod(g.tm, n, "init_dynamic_huffman", 1) {
|
||||
g.printf("status = %s%s_init_dynamic_huffman(self, %ssrc);\n",
|
||||
b.printf("status = %s%s_init_dynamic_huffman(self, %ssrc);\n",
|
||||
g.pkgPrefix, g.perFunc.funk.Receiver().String(g.tm), aPrefix)
|
||||
if err := g.writeLoadExprDerivedVars(n); err != nil {
|
||||
if err := g.writeLoadExprDerivedVars(b, n); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes("if (status) { goto suspend; }\n")
|
||||
b.writes("if (status) { goto suspend; }\n")
|
||||
|
||||
} else if isThisMethod(g.tm, n, "init_huff", 4) {
|
||||
g.printf("status = %s%s_init_huff(self,",
|
||||
b.printf("status = %s%s_init_huff(self,",
|
||||
g.pkgPrefix, g.perFunc.funk.Receiver().String(g.tm))
|
||||
for i, o := range n.Args() {
|
||||
if i != 0 {
|
||||
g.writes(",")
|
||||
b.writes(",")
|
||||
}
|
||||
if err := g.writeExpr(o.Arg().Value(), replaceNothing, parenthesesMandatory, depth); err != nil {
|
||||
if err := g.writeExpr(b, o.Arg().Value(), replaceNothing, parenthesesMandatory, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
g.writes(");\n")
|
||||
if err := g.writeLoadExprDerivedVars(n); err != nil {
|
||||
b.writes(");\n")
|
||||
if err := g.writeLoadExprDerivedVars(b, n); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes("if (status) { goto suspend; }\n")
|
||||
b.writes("if (status) { goto suspend; }\n")
|
||||
|
||||
} else if isDecode(g.tm, n) {
|
||||
switch g.pkgName {
|
||||
case "flate":
|
||||
g.printf("status = %sdecoder_decode(&self->private_impl.f_dec, %sdst, %ssrc);\n",
|
||||
b.printf("status = %sdecoder_decode(&self->private_impl.f_dec, %sdst, %ssrc);\n",
|
||||
g.pkgPrefix, aPrefix, aPrefix)
|
||||
if err := g.writeLoadExprDerivedVars(n); err != nil {
|
||||
if err := g.writeLoadExprDerivedVars(b, n); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes("if (status) { goto suspend; }\n")
|
||||
b.writes("if (status) { goto suspend; }\n")
|
||||
case "gif":
|
||||
g.printf("status = %slzw_decoder_decode(&self->private_impl.f_lzw, %sdst, %s%s);\n",
|
||||
b.printf("status = %slzw_decoder_decode(&self->private_impl.f_lzw, %sdst, %s%s);\n",
|
||||
g.pkgPrefix, aPrefix, vPrefix, n.Args()[1].Arg().Value().String(g.tm))
|
||||
if err := g.writeLoadExprDerivedVars(n); err != nil {
|
||||
if err := g.writeLoadExprDerivedVars(b, n); err != nil {
|
||||
return err
|
||||
}
|
||||
// TODO: be principled with "if (l_lzw_src && etc)".
|
||||
g.writes("if (l_lzw_src && status) { goto suspend; }\n")
|
||||
b.writes("if (l_lzw_src && status) { goto suspend; }\n")
|
||||
default:
|
||||
return fmt.Errorf("cannot convert Puffs call %q to C", n.String(g.tm))
|
||||
}
|
||||
@@ -1097,7 +1105,7 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g *gen) writeReadUXX(n *a.Expr, name string, size uint32, endianness string) error {
|
||||
func (g *gen) writeReadUXX(b *buffer, n *a.Expr, name string, size uint32, endianness string) error {
|
||||
if size != 16 && size != 32 {
|
||||
return fmt.Errorf("internal error: bad writeReadUXX size %d", size)
|
||||
}
|
||||
@@ -1114,64 +1122,64 @@ func (g *gen) writeReadUXX(n *a.Expr, name string, size uint32, endianness strin
|
||||
g.perFunc.tempW += 2
|
||||
g.perFunc.tempR += 1
|
||||
|
||||
if err := g.writeCTypeName(n.MType(), tPrefix, fmt.Sprint(temp1)); err != nil {
|
||||
if err := g.writeCTypeName(b, n.MType(), tPrefix, fmt.Sprint(temp1)); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes(";")
|
||||
b.writes(";")
|
||||
|
||||
g.printf("if (PUFFS_LIKELY(%srend_src - %srptr_src >= %d)) {", bPrefix, bPrefix, size/8)
|
||||
g.printf("%s%d = PUFFS_U%d%s(%srptr_src);\n", tPrefix, temp1, size, endianness, bPrefix)
|
||||
g.printf("%srptr_src += %d;\n", bPrefix, size/8)
|
||||
g.printf("} else {")
|
||||
g.printf("self->private_impl.scratch = 0;\n")
|
||||
if err := g.writeCoroSuspPoint(); err != nil {
|
||||
b.printf("if (PUFFS_LIKELY(%srend_src - %srptr_src >= %d)) {", bPrefix, bPrefix, size/8)
|
||||
b.printf("%s%d = PUFFS_U%d%s(%srptr_src);\n", tPrefix, temp1, size, endianness, bPrefix)
|
||||
b.printf("%srptr_src += %d;\n", bPrefix, size/8)
|
||||
b.printf("} else {")
|
||||
b.printf("self->private_impl.scratch = 0;\n")
|
||||
if err := g.writeCoroSuspPoint(b); err != nil {
|
||||
return err
|
||||
}
|
||||
g.printf("while (true) {")
|
||||
b.printf("while (true) {")
|
||||
|
||||
g.printf("if (PUFFS_UNLIKELY(%srptr_%s == %srend_%s)) { goto short_read_%s; }",
|
||||
b.printf("if (PUFFS_UNLIKELY(%srptr_%s == %srend_%s)) { goto short_read_%s; }",
|
||||
bPrefix, name, bPrefix, name, name)
|
||||
g.perFunc.shortReads = append(g.perFunc.shortReads, name)
|
||||
|
||||
g.printf("uint32_t %s%d = self->private_impl.scratch", tPrefix, temp0)
|
||||
b.printf("uint32_t %s%d = self->private_impl.scratch", tPrefix, temp0)
|
||||
switch endianness {
|
||||
case "BE":
|
||||
g.printf("& 0xFF;")
|
||||
g.printf("self->private_impl.scratch >>= 8;")
|
||||
g.printf("self->private_impl.scratch <<= 8;")
|
||||
g.printf("self->private_impl.scratch |= ((uint64_t)(*%srptr_%s++)) << (64 - %s%d);",
|
||||
b.printf("& 0xFF;")
|
||||
b.printf("self->private_impl.scratch >>= 8;")
|
||||
b.printf("self->private_impl.scratch <<= 8;")
|
||||
b.printf("self->private_impl.scratch |= ((uint64_t)(*%srptr_%s++)) << (64 - %s%d);",
|
||||
bPrefix, name, tPrefix, temp0)
|
||||
case "LE":
|
||||
g.printf(">> 56;")
|
||||
g.printf("self->private_impl.scratch <<= 8;")
|
||||
g.printf("self->private_impl.scratch >>= 8;")
|
||||
g.printf("self->private_impl.scratch |= ((uint64_t)(*%srptr_%s++)) << %s%d;",
|
||||
b.printf(">> 56;")
|
||||
b.printf("self->private_impl.scratch <<= 8;")
|
||||
b.printf("self->private_impl.scratch >>= 8;")
|
||||
b.printf("self->private_impl.scratch |= ((uint64_t)(*%srptr_%s++)) << %s%d;",
|
||||
bPrefix, name, tPrefix, temp0)
|
||||
}
|
||||
|
||||
g.printf("if (%s%d == %d) {", tPrefix, temp0, size-8)
|
||||
b.printf("if (%s%d == %d) {", tPrefix, temp0, size-8)
|
||||
switch endianness {
|
||||
case "BE":
|
||||
g.printf("%s%d = self->private_impl.scratch >> (64 - %d);", tPrefix, temp1, size)
|
||||
b.printf("%s%d = self->private_impl.scratch >> (64 - %d);", tPrefix, temp1, size)
|
||||
case "LE":
|
||||
g.printf("%s%d = self->private_impl.scratch;", tPrefix, temp1)
|
||||
b.printf("%s%d = self->private_impl.scratch;", tPrefix, temp1)
|
||||
}
|
||||
g.printf("break;")
|
||||
g.printf("}")
|
||||
b.printf("break;")
|
||||
b.printf("}")
|
||||
|
||||
g.printf("%s%d += 8;", tPrefix, temp0)
|
||||
b.printf("%s%d += 8;", tPrefix, temp0)
|
||||
switch endianness {
|
||||
case "BE":
|
||||
g.printf("self->private_impl.scratch |= ((uint64_t)(%s%d));", tPrefix, temp0)
|
||||
b.printf("self->private_impl.scratch |= ((uint64_t)(%s%d));", tPrefix, temp0)
|
||||
case "LE":
|
||||
g.printf("self->private_impl.scratch |= ((uint64_t)(%s%d)) << 56;", tPrefix, temp0)
|
||||
b.printf("self->private_impl.scratch |= ((uint64_t)(%s%d)) << 56;", tPrefix, temp0)
|
||||
}
|
||||
|
||||
g.writes("}}\n")
|
||||
b.writes("}}\n")
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g *gen) writeExpr(n *a.Expr, rp replacementPolicy, pp parenthesesPolicy, depth uint32) error {
|
||||
func (g *gen) writeExpr(b *buffer, n *a.Expr, rp replacementPolicy, pp parenthesesPolicy, depth uint32) error {
|
||||
if depth > a.MaxExprDepth {
|
||||
return fmt.Errorf("expression recursion depth too large")
|
||||
}
|
||||
@@ -1186,18 +1194,18 @@ func (g *gen) writeExpr(n *a.Expr, rp replacementPolicy, pp parenthesesPolicy, d
|
||||
//
|
||||
// Also be aware of evaluation order in the presence of side effects:
|
||||
// in "foo(a?(), b!(), c?())", b should be called between a and c.
|
||||
g.printf("%s%d", tPrefix, g.perFunc.tempR)
|
||||
b.printf("%s%d", tPrefix, g.perFunc.tempR)
|
||||
g.perFunc.tempR++
|
||||
return nil
|
||||
}
|
||||
|
||||
if cv := n.ConstValue(); cv != nil {
|
||||
if !n.MType().IsBool() {
|
||||
g.writes(cv.String())
|
||||
b.writes(cv.String())
|
||||
} else if cv.Cmp(zero) == 0 {
|
||||
g.writes("false")
|
||||
b.writes("false")
|
||||
} else if cv.Cmp(one) == 0 {
|
||||
g.writes("true")
|
||||
b.writes("true")
|
||||
} else {
|
||||
return fmt.Errorf("%v has type bool but constant value %v is neither 0 or 1", n.String(g.tm), cv)
|
||||
}
|
||||
@@ -1206,19 +1214,19 @@ func (g *gen) writeExpr(n *a.Expr, rp replacementPolicy, pp parenthesesPolicy, d
|
||||
|
||||
switch n.ID0().Flags() & (t.FlagsUnaryOp | t.FlagsBinaryOp | t.FlagsAssociativeOp) {
|
||||
case 0:
|
||||
if err := g.writeExprOther(n, rp, depth); err != nil {
|
||||
if err := g.writeExprOther(b, n, rp, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
case t.FlagsUnaryOp:
|
||||
if err := g.writeExprUnaryOp(n, rp, depth); err != nil {
|
||||
if err := g.writeExprUnaryOp(b, n, rp, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
case t.FlagsBinaryOp:
|
||||
if err := g.writeExprBinaryOp(n, rp, pp, depth); err != nil {
|
||||
if err := g.writeExprBinaryOp(b, n, rp, pp, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
case t.FlagsAssociativeOp:
|
||||
if err := g.writeExprAssociativeOp(n, rp, pp, depth); err != nil {
|
||||
if err := g.writeExprAssociativeOp(b, n, rp, pp, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
default:
|
||||
@@ -1228,18 +1236,18 @@ func (g *gen) writeExpr(n *a.Expr, rp replacementPolicy, pp parenthesesPolicy, d
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g *gen) writeExprOther(n *a.Expr, rp replacementPolicy, depth uint32) error {
|
||||
func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, depth uint32) error {
|
||||
switch n.ID0().Key() {
|
||||
case 0:
|
||||
if id1 := n.ID1(); id1.Key() == t.KeyThis {
|
||||
g.writes("self")
|
||||
b.writes("self")
|
||||
} else {
|
||||
if n.GlobalIdent() {
|
||||
g.writes(g.pkgPrefix)
|
||||
b.writes(g.pkgPrefix)
|
||||
} else {
|
||||
g.writes(vPrefix)
|
||||
b.writes(vPrefix)
|
||||
}
|
||||
g.writes(id1.String(g.tm))
|
||||
b.writes(id1.String(g.tm))
|
||||
}
|
||||
return nil
|
||||
|
||||
@@ -1249,49 +1257,49 @@ func (g *gen) writeExprOther(n *a.Expr, rp replacementPolicy, depth uint32) erro
|
||||
if isLowHighBits(g.tm, n, t.KeyLowBits) {
|
||||
// "x.low_bits(n:etc)" in C is "((x) & ((1 << (n)) - 1))".
|
||||
x := n.LHS().Expr().LHS().Expr()
|
||||
g.writes("((")
|
||||
if err := g.writeExpr(x, rp, parenthesesOptional, depth); err != nil {
|
||||
b.writes("((")
|
||||
if err := g.writeExpr(b, x, rp, parenthesesOptional, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes(") & ((1 << (")
|
||||
if err := g.writeExpr(n.Args()[0].Arg().Value(), rp, parenthesesOptional, depth); err != nil {
|
||||
b.writes(") & ((1 << (")
|
||||
if err := g.writeExpr(b, n.Args()[0].Arg().Value(), rp, parenthesesOptional, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes(")) - 1))")
|
||||
b.writes(")) - 1))")
|
||||
return nil
|
||||
}
|
||||
if isLowHighBits(g.tm, n, t.KeyHighBits) {
|
||||
// "x.high_bits(n:etc)" in C is "((x) >> (8*sizeof(x) - (n)))".
|
||||
x := n.LHS().Expr().LHS().Expr()
|
||||
g.writes("((")
|
||||
if err := g.writeExpr(x, rp, parenthesesOptional, depth); err != nil {
|
||||
b.writes("((")
|
||||
if err := g.writeExpr(b, x, rp, parenthesesOptional, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes(") >> (")
|
||||
b.writes(") >> (")
|
||||
if sz, err := g.sizeof(x.MType()); err != nil {
|
||||
return err
|
||||
} else {
|
||||
g.printf("%d", 8*sz)
|
||||
b.printf("%d", 8*sz)
|
||||
}
|
||||
g.writes(" - (")
|
||||
if err := g.writeExpr(n.Args()[0].Arg().Value(), rp, parenthesesOptional, depth); err != nil {
|
||||
b.writes(" - (")
|
||||
if err := g.writeExpr(b, n.Args()[0].Arg().Value(), rp, parenthesesOptional, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writes(")))")
|
||||
b.writes(")))")
|
||||
return nil
|
||||
}
|
||||
// TODO.
|
||||
|
||||
case t.KeyOpenBracket:
|
||||
// n is an index.
|
||||
if err := g.writeExpr(n.LHS().Expr(), rp, parenthesesMandatory, depth); err != nil {
|
||||
if err := g.writeExpr(b, n.LHS().Expr(), rp, parenthesesMandatory, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writeb('[')
|
||||
if err := g.writeExpr(n.RHS().Expr(), rp, parenthesesOptional, depth); err != nil {
|
||||
b.writeb('[')
|
||||
if err := g.writeExpr(b, n.RHS().Expr(), rp, parenthesesOptional, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
g.writeb(']')
|
||||
b.writeb(']')
|
||||
return nil
|
||||
|
||||
case t.KeyColon:
|
||||
@@ -1301,31 +1309,31 @@ func (g *gen) writeExprOther(n *a.Expr, rp replacementPolicy, depth uint32) erro
|
||||
case t.KeyDot:
|
||||
lhs := n.LHS().Expr()
|
||||
if lhs.ID1().Key() == t.KeyIn {
|
||||
g.writes(aPrefix)
|
||||
g.writes(n.ID1().String(g.tm))
|
||||
b.writes(aPrefix)
|
||||
b.writes(n.ID1().String(g.tm))
|
||||
return nil
|
||||
}
|
||||
|
||||
if err := g.writeExpr(lhs, rp, parenthesesMandatory, depth); err != nil {
|
||||
if err := g.writeExpr(b, lhs, rp, parenthesesMandatory, depth); err != nil {
|
||||
return err
|
||||
}
|
||||
if k := lhs.MType().Decorator().Key(); k == t.KeyPtr || k == t.KeyNptr {
|
||||
g.writes("->")
|
||||
b.writes("->")
|
||||
} else {
|
||||
g.writes(".")
|
||||
b.writes(".")
|
||||
}
|
||||
g.writes("private_impl." + fPrefix)
|
||||
g.writes(n.ID1().String(g.tm))
|
||||
b.writes("private_impl." + fPrefix)
|
||||
b.writes(n.ID1().String(g.tm))
|
||||
return nil
|
||||
|
||||
case t.KeyLimit:
|
||||
// TODO: don't hard code so much detail.
|
||||
g.writes("(puffs_base_reader1) {")
|
||||
g.writes(".buf = a_src.buf,")
|
||||
g.writes(".limit = (puffs_base_limit1) {")
|
||||
g.printf(".ptr_to_len = &%s%s,", lPrefix, g.perFunc.limitVarName)
|
||||
g.writes(".next = &a_src.limit,")
|
||||
g.writes("}}")
|
||||
b.writes("(puffs_base_reader1) {")
|
||||
b.writes(".buf = a_src.buf,")
|
||||
b.writes(".limit = (puffs_base_limit1) {")
|
||||
b.printf(".ptr_to_len = &%s%s,", lPrefix, g.perFunc.limitVarName)
|
||||
b.writes(".next = &a_src.limit,")
|
||||
b.writes("}}")
|
||||
g.perFunc.limitVarName = ""
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -115,8 +115,8 @@ func genTemplates(out *bytes.Buffer) error {
|
||||
}
|
||||
}
|
||||
fmt.Fprintf(out, "}\n\n")
|
||||
fmt.Fprintf(out, "func template_%s(g *gen, args template_args_%s) error {\n", t.name, t.name)
|
||||
fmt.Fprintf(out, "g.printf(%q,\n", t.format)
|
||||
fmt.Fprintf(out, "func template_%s(b *buffer, args template_args_%s) error {\n", t.name, t.name)
|
||||
fmt.Fprintf(out, "b.printf(%q,\n", t.format)
|
||||
for _, a := range t.formatArgs {
|
||||
fmt.Fprintf(out, "args.%s,\n", stripq(a))
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user