Use the generated temporaries.

This commit is contained in:
Nigel Tao committed 2017-06-03 15:55:04 +10:00
1 parent 4697c95359
commit 98dab70f6c
2 files changed
+42 -32

No files matched your search

+41 -29
View File
@@ -72,10 +72,17 @@ var builtInStatuses = [...]string{
"status_short_buffer", "status_short_buffer",
} }
type replacementPolicy bool
const (
replaceNothing = replacementPolicy(false)
replaceCallSuspendibles = replacementPolicy(true)
)
type visibility uint32 type visibility uint32
const ( const (
bothPubPri visibility = iota bothPubPri = visibility(iota)
pubOnly pubOnly
priOnly priOnly
) )
@@ -576,12 +583,12 @@ func (g *gen) writeStatement(n *a.Node, depth uint32) error {
if err := g.writeSuspendibles(n.RHS()); err != nil { if err := g.writeSuspendibles(n.RHS()); err != nil {
return err return err
} }
if err := g.writeExpr(n.LHS(), depth); err != nil { if err := g.writeExpr(n.LHS(), replaceCallSuspendibles, depth); err != nil {
return err return err
} }
// TODO: does KeyAmpHatEq need special consideration? // TODO: does KeyAmpHatEq need special consideration?
g.writes(cOpNames[0xFF&n.Operator().Key()]) g.writes(cOpNames[0xFF&n.Operator().Key()])
if err := g.writeExpr(n.RHS(), depth); err != nil { if err := g.writeExpr(n.RHS(), replaceCallSuspendibles, depth); err != nil {
return err return err
} }
g.writes(";\n") g.writes(";\n")
@@ -608,7 +615,7 @@ func (g *gen) writeStatement(n *a.Node, depth uint32) error {
// TODO: consider suspendible calls. // TODO: consider suspendible calls.
g.printf("%s%s = ", vPrefix, n.Name().String(g.idMap)) g.printf("%s%s = ", vPrefix, n.Name().String(g.idMap))
if v := n.Value(); v != nil { if v := n.Value(); v != nil {
if err := g.writeExpr(v, 0); err != nil { if err := g.writeExpr(v, replaceCallSuspendibles, 0); err != nil {
return err return err
} }
} else { } else {
@@ -629,7 +636,7 @@ func (g *gen) writeStatement(n *a.Node, depth uint32) error {
g.printf("label_%d_continue:;\n", jt) g.printf("label_%d_continue:;\n", jt)
} }
g.writes("while (") g.writes("while (")
if err := g.writeExpr(n.Condition(), 0); err != nil { if err := g.writeExpr(n.Condition(), replaceCallSuspendibles, 0); err != nil {
return err return err
} }
g.writes(") {\n") g.writes(") {\n")
@@ -695,22 +702,32 @@ func (g *gen) writeCallSuspendibles(n *a.Expr) error {
return err return err
} }
g.printf(" %s%d = %ssrc->ptr[%ssrc->ri++];\n", tPrefix, temp, aPrefix, aPrefix) g.printf(" %s%d = %ssrc->ptr[%ssrc->ri++];\n", tPrefix, temp, aPrefix, aPrefix)
// TODO: have writeExpr substitute in t_0 for suspendible calls. For
// now, generate a no-op to suppress an "unused variable" warning.
g.printf("if (%s%d) {}\n", tPrefix, temp)
} else { } else {
// TODO: fix this. // TODO: fix this.
//
// This might involve calling g.writeExpr with replaceNothing??
return fmt.Errorf("cannot convert Puffs call %q to C", n.String(g.idMap)) return fmt.Errorf("cannot convert Puffs call %q to C", n.String(g.idMap))
} }
return nil return nil
} }
func (g *gen) writeExpr(n *a.Expr, depth uint32) error { func (g *gen) writeExpr(n *a.Expr, rp replacementPolicy, depth uint32) error {
if depth > a.MaxExprDepth { if depth > a.MaxExprDepth {
return fmt.Errorf("expression recursion depth too large") return fmt.Errorf("expression recursion depth too large")
} }
depth++ depth++
if rp == replaceCallSuspendibles && n.CallSuspendible() {
if g.perFunc.tempR >= g.perFunc.tempW {
return fmt.Errorf("internal error: temporary variable count out of sync")
}
// TODO: check that this works with nested call-suspendibles:
// "foo?().bar().qux?()(p?(), q?())".
g.printf("%s%d", tPrefix, g.perFunc.tempR)
g.perFunc.tempR++
return nil
}
if cv := n.ConstValue(); cv != nil { if cv := n.ConstValue(); cv != nil {
// TODO: write false/true instead of 0/1 if n.MType() is bool? // TODO: write false/true instead of 0/1 if n.MType() is bool?
g.writes(cv.String()) g.writes(cv.String())
@@ -719,19 +736,19 @@ func (g *gen) writeExpr(n *a.Expr, depth uint32) error {
switch n.ID0().Flags() & (t.FlagsUnaryOp | t.FlagsBinaryOp | t.FlagsAssociativeOp) { switch n.ID0().Flags() & (t.FlagsUnaryOp | t.FlagsBinaryOp | t.FlagsAssociativeOp) {
case 0: case 0:
if err := g.writeExprOther(n, depth); err != nil { if err := g.writeExprOther(n, rp, depth); err != nil {
return err return err
} }
case t.FlagsUnaryOp: case t.FlagsUnaryOp:
if err := g.writeExprUnaryOp(n, depth); err != nil { if err := g.writeExprUnaryOp(n, rp, depth); err != nil {
return err return err
} }
case t.FlagsBinaryOp: case t.FlagsBinaryOp:
if err := g.writeExprBinaryOp(n, depth); err != nil { if err := g.writeExprBinaryOp(n, rp, depth); err != nil {
return err return err
} }
case t.FlagsAssociativeOp: case t.FlagsAssociativeOp:
if err := g.writeExprAssociativeOp(n, depth); err != nil { if err := g.writeExprAssociativeOp(n, rp, depth); err != nil {
return err return err
} }
default: default:
@@ -741,7 +758,7 @@ func (g *gen) writeExpr(n *a.Expr, depth uint32) error {
return nil return nil
} }
func (g *gen) writeExprOther(n *a.Expr, depth uint32) error { func (g *gen) writeExprOther(n *a.Expr, rp replacementPolicy, depth uint32) error {
switch n.ID0().Key() { switch n.ID0().Key() {
case 0: case 0:
if id1 := n.ID1(); id1.Key() == t.KeyThis { if id1 := n.ID1(); id1.Key() == t.KeyThis {
@@ -755,12 +772,7 @@ func (g *gen) writeExprOther(n *a.Expr, depth uint32) error {
case t.KeyOpenParen: case t.KeyOpenParen:
// n is a function call. // n is a function call.
// TODO: delete this hack that only matches "in.src.read_u8?()". // TODO.
if isInSrcReadU8(g.idMap, n.LHS().Expr()) && n.CallSuspendible() && len(n.Args()) == 0 {
// TODO.
g.writes("42")
return nil
}
case t.KeyOpenBracket: case t.KeyOpenBracket:
// n is an index. // n is an index.
@@ -771,7 +783,7 @@ func (g *gen) writeExprOther(n *a.Expr, depth uint32) error {
// TODO. // TODO.
case t.KeyDot: case t.KeyDot:
if err := g.writeExpr(n.LHS().Expr(), depth); err != nil { if err := g.writeExpr(n.LHS().Expr(), rp, depth); err != nil {
return err return err
} }
// TODO: choose between . vs -> operators. // TODO: choose between . vs -> operators.
@@ -797,43 +809,43 @@ func isInSrcReadU8(m *t.IDMap, n *a.Expr) bool {
return n.ID0() == 0 && n.ID1().Key() == t.KeyIn return n.ID0() == 0 && n.ID1().Key() == t.KeyIn
} }
func (g *gen) writeExprUnaryOp(n *a.Expr, depth uint32) error { func (g *gen) writeExprUnaryOp(n *a.Expr, rp replacementPolicy, depth uint32) error {
// TODO. // TODO.
return nil return nil
} }
func (g *gen) writeExprBinaryOp(n *a.Expr, depth uint32) error { func (g *gen) writeExprBinaryOp(n *a.Expr, rp replacementPolicy, depth uint32) error {
op := n.ID0() op := n.ID0()
if op.Key() == t.KeyXBinaryAs { if op.Key() == t.KeyXBinaryAs {
return g.writeExprAs(n.LHS().Expr(), n.RHS().TypeExpr(), depth) return g.writeExprAs(n.LHS().Expr(), n.RHS().TypeExpr(), rp, depth)
} }
g.writeb('(') g.writeb('(')
if err := g.writeExpr(n.LHS().Expr(), depth); err != nil { if err := g.writeExpr(n.LHS().Expr(), rp, depth); err != nil {
return err return err
} }
// TODO: does KeyXBinaryAmpHat need special consideration? // TODO: does KeyXBinaryAmpHat need special consideration?
g.writes(cOpNames[0xFF&op.Key()]) g.writes(cOpNames[0xFF&op.Key()])
if err := g.writeExpr(n.RHS().Expr(), depth); err != nil { if err := g.writeExpr(n.RHS().Expr(), rp, depth); err != nil {
return err return err
} }
g.writeb(')') g.writeb(')')
return nil return nil
} }
func (g *gen) writeExprAs(lhs *a.Expr, rhs *a.TypeExpr, depth uint32) error { func (g *gen) writeExprAs(lhs *a.Expr, rhs *a.TypeExpr, rp replacementPolicy, depth uint32) error {
g.writes("((") g.writes("((")
if err := g.writeCTypeName(rhs); err != nil { if err := g.writeCTypeName(rhs); err != nil {
return err return err
} }
g.writes(")(") g.writes(")(")
if err := g.writeExpr(lhs, depth); err != nil { if err := g.writeExpr(lhs, rp, depth); err != nil {
return err return err
} }
g.writes("))") g.writes("))")
return nil return nil
} }
func (g *gen) writeExprAssociativeOp(n *a.Expr, depth uint32) error { func (g *gen) writeExprAssociativeOp(n *a.Expr, rp replacementPolicy, depth uint32) error {
// TODO. // TODO.
return nil return nil
} }
+1 -3
View File
@@ -220,9 +220,7 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self,
return puffs_gif_status_short_src; return puffs_gif_status_short_src;
} }
uint8_t t_0 = a_src->ptr[a_src->ri++]; uint8_t t_0 = a_src->ptr[a_src->ri++];
if (t_0) { v_bits |= ((uint32_t)(t_0));
}
v_bits |= ((uint32_t)(42));
v_n_bits += 8; v_n_bits += 8;
} }
v_bits >>= v_width; v_bits >>= v_width;