diff --git a/cmd/wuffs-c/internal/cgen/statement.go b/cmd/wuffs-c/internal/cgen/statement.go index fcd73657..4bbdde30 100644 --- a/cmd/wuffs-c/internal/cgen/statement.go +++ b/cmd/wuffs-c/internal/cgen/statement.go @@ -218,82 +218,7 @@ func (g *gen) writeStatement(b *buffer, n *a.Node, depth uint32) error { return nil case a.KIterate: - n := n.Iterate() - vars := n.Variables() - if len(vars) == 0 { - return nil - } - if len(vars) != 1 { - return fmt.Errorf("TODO: iterate over more than one variable") - } - v := vars[0].Var() - name := v.Name().Str(g.tm) - b.writes("{\n") - - // TODO: don't assume that the slice is a slice of base.u8. In - // particular, the code gen can be subtle if the slice element type has - // zero size, such as the empty struct. - b.printf("wuffs_base__slice_u8 %sslice_%s =", iPrefix, name) - if err := g.writeExpr(b, v.Value(), replaceCallSuspendibles, parenthesesOptional, 0); err != nil { - return err - } - b.writes(";\n") - b.printf("wuffs_base__slice_u8 %s%s = %sslice_%s;\n", vPrefix, name, iPrefix, name) - // TODO: look at n.HasContinue() and n.HasBreak(). - - unroll := n.Unroll().SmallPowerOf2Value() - step := n.Step().SmallPowerOf2Value() - - if unroll > 1 || step > 1 { - b.printf("%s%s.len = %d;\n", vPrefix, name, step) - b.printf("uint8_t* %send0_%s = %sslice_%s.ptr + (%sslice_%s.len / %d) * %d;\n", - iPrefix, name, iPrefix, name, iPrefix, name, unroll*step, unroll*step) - b.printf("while (%s%s.ptr < %send0_%s) {\n", vPrefix, name, iPrefix, name) - for i := 0; i < unroll; i++ { - for _, o := range n.Body() { - if err := g.writeStatement(b, o, depth); err != nil { - return err - } - } - b.printf("%s%s.ptr += %d;\n", vPrefix, name, step) - } - b.writes("}\n") - } - - if unroll > 1 && step > 1 { - b.printf("%s%s.len = %d;\n", vPrefix, name, step) - b.printf("uint8_t* %send1_%s = %sslice_%s.ptr + (%sslice_%s.len / %d) * %d;\n", - iPrefix, name, iPrefix, name, iPrefix, name, step, step) - b.printf("while (%s%s.ptr < %send1_%s) {\n", vPrefix, name, iPrefix, name) - for _, o := range n.Body() { - if err := g.writeStatement(b, o, depth); err != nil { - return err - } - } - b.printf("%s%s.ptr += %d;\n", vPrefix, name, step) - b.writes("}\n") - } - - { - b.printf("%s%s.len = %d;\n", vPrefix, name, 1) - b.printf("uint8_t* %send2_%s = %sslice_%s.ptr + %sslice_%s.len;\n", - iPrefix, name, iPrefix, name, iPrefix, name) - b.printf("while (%s%s.ptr < %send2_%s) {\n", vPrefix, name, iPrefix, name) - tail := n.Tail() - if step == 1 { - tail = n.Body() - } - for _, o := range tail { - if err := g.writeStatement(b, o, depth); err != nil { - return err - } - } - b.printf("%s%s.ptr += 1;\n", vPrefix, name) - b.writes("}\n") - } - - b.writes("}\n") - return nil + return g.writeIterate(b, n.Iterate(), depth) case a.KJump: n := n.Jump() @@ -428,6 +353,84 @@ func (g *gen) writeStatement(b *buffer, n *a.Node, depth uint32) error { return fmt.Errorf("unrecognized ast.Kind (%s) for writeStatement", n.Kind()) } +func (g *gen) writeIterate(b *buffer, n *a.Iterate, depth uint32) error { + vars := n.Variables() + if len(vars) == 0 { + return nil + } + if len(vars) != 1 { + return fmt.Errorf("TODO: iterate over more than one variable") + } + v := vars[0].Var() + name := v.Name().Str(g.tm) + b.writes("{\n") + + // TODO: don't assume that the slice is a slice of base.u8. In + // particular, the code gen can be subtle if the slice element type has + // zero size, such as the empty struct. + b.printf("wuffs_base__slice_u8 %sslice_%s =", iPrefix, name) + if err := g.writeExpr(b, v.Value(), replaceCallSuspendibles, parenthesesOptional, 0); err != nil { + return err + } + b.writes(";\n") + b.printf("wuffs_base__slice_u8 %s%s = %sslice_%s;\n", vPrefix, name, iPrefix, name) + // TODO: look at n.HasContinue() and n.HasBreak(). + + unroll := n.Unroll().SmallPowerOf2Value() + step := n.Step().SmallPowerOf2Value() + + if unroll > 1 || step > 1 { + b.printf("%s%s.len = %d;\n", vPrefix, name, step) + b.printf("uint8_t* %send0_%s = %sslice_%s.ptr + (%sslice_%s.len / %d) * %d;\n", + iPrefix, name, iPrefix, name, iPrefix, name, unroll*step, unroll*step) + b.printf("while (%s%s.ptr < %send0_%s) {\n", vPrefix, name, iPrefix, name) + for i := 0; i < unroll; i++ { + for _, o := range n.Body() { + if err := g.writeStatement(b, o, depth); err != nil { + return err + } + } + b.printf("%s%s.ptr += %d;\n", vPrefix, name, step) + } + b.writes("}\n") + } + + if unroll > 1 && step > 1 { + b.printf("%s%s.len = %d;\n", vPrefix, name, step) + b.printf("uint8_t* %send1_%s = %sslice_%s.ptr + (%sslice_%s.len / %d) * %d;\n", + iPrefix, name, iPrefix, name, iPrefix, name, step, step) + b.printf("while (%s%s.ptr < %send1_%s) {\n", vPrefix, name, iPrefix, name) + for _, o := range n.Body() { + if err := g.writeStatement(b, o, depth); err != nil { + return err + } + } + b.printf("%s%s.ptr += %d;\n", vPrefix, name, step) + b.writes("}\n") + } + + { + b.printf("%s%s.len = %d;\n", vPrefix, name, 1) + b.printf("uint8_t* %send2_%s = %sslice_%s.ptr + %sslice_%s.len;\n", + iPrefix, name, iPrefix, name, iPrefix, name) + b.printf("while (%s%s.ptr < %send2_%s) {\n", vPrefix, name, iPrefix, name) + tail := n.Tail() + if step == 1 { + tail = n.Body() + } + for _, o := range tail { + if err := g.writeStatement(b, o, depth); err != nil { + return err + } + } + b.printf("%s%s.ptr += 1;\n", vPrefix, name) + b.writes("}\n") + } + + b.writes("}\n") + return nil +} + func (g *gen) writeCoroSuspPoint(b *buffer, maybeSuspend bool) error { const maxCoroSuspPoint = 0xFFFFFFFF g.currFunk.coroSuspPoint++