Generate C code for "x.low_bits(n:y)".

This commit is contained in:
Nigel Tao committed 2017-06-08 15:49:52 +10:00
1 parent afeee0ab4c
commit a81752647c
6 files changed
+82 -9

No files matched your search

+18
View File
@@ -814,6 +814,19 @@ func (g *gen) writeExprOther(n *a.Expr, rp replacementPolicy, depth uint32) erro
case t.KeyOpenParen:
// n is a function call.
// TODO: delete this hack that only matches "foo.low_bits(etc)".
if isLowBits(g.tm, n.LHS().Expr()) && !n.CallImpure() && len(n.Args()) == 1 {
g.printf("PUFFS_LOW_BITS(")
if err := g.writeExpr(n.LHS().Expr().LHS().Expr(), rp, depth); err != nil {
return err
}
g.writes(",")
if err := g.writeExpr(n.Args()[0].Arg().Value(), rp, depth); err != nil {
return err
}
g.writes(")")
return nil
}
// TODO.
case t.KeyOpenBracket:
@@ -851,6 +864,11 @@ func isInSrcReadU8(tm *t.Map, n *a.Expr) bool {
return n.ID0() == 0 && n.ID1().Key() == t.KeyIn
}
func isLowBits(tm *t.Map, n *a.Expr) bool {
// TODO: check that n.Args() is "(n:bar)".
return n.ID0().Key() == t.KeyDot && n.ID1().Key() == t.KeyLowBits
}
func (g *gen) writeExprUnaryOp(n *a.Expr, rp replacementPolicy, depth uint32) error {
// TODO.
return nil
+3 -1
View File
@@ -211,6 +211,7 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self,
uint32_t v_n_bits;
uint32_t v_clear_code;
uint32_t v_width;
uint32_t v_code;
v_bits = 0;
v_n_bits = 0;
@@ -226,9 +227,10 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self,
v_bits |= (((uint32_t)(t_0)) << v_n_bits);
v_n_bits += 8;
}
v_code = PUFFS_LOW_BITS(v_bits, v_width);
v_bits >>= v_width;
v_n_bits -= v_width;
if ((v_bits < v_clear_code)) {
if ((v_code < v_clear_code)) {
goto label_0_break;
}
goto label_0_break;
+23 -4
View File
@@ -24,10 +24,11 @@ var numTypeBounds = [256][2]*big.Int{
}
var (
minusOne = big.NewInt(-1)
zero = big.NewInt(+0)
one = big.NewInt(+1)
ffff = big.NewInt(0xFFFF)
minusOne = big.NewInt(-1)
zero = big.NewInt(+0)
one = big.NewInt(+1)
sixtyFour = big.NewInt(+64)
ffff = big.NewInt(0xFFFF)
maxIntBits = big.NewInt(t.MaxIntBits)
@@ -580,6 +581,24 @@ func (q *checker) bcheckExprOther(n *a.Expr, depth uint32) (*big.Int, *big.Int,
if isInSrcReadU8(q.tm, n.LHS().Expr()) && n.CallSuspendible() && len(n.Args()) == 0 {
break
}
// TODO: delete this hack that only matches "foo.low_bits(etc)".
if isLowBits(q.tm, n.LHS().Expr()) && !n.CallImpure() && len(n.Args()) == 1 {
a := n.Args()[0].Arg().Value()
aMin, aMax, err := q.bcheckExpr(a, depth)
if err != nil {
return nil, nil, err
}
if aMin.Cmp(zero) < 0 {
// TODO: error, but a better check than aMin < 0 is that
// a.MType() is u32. Checking this properly should fall out
// when a *a.TypeExpr can express function types.
}
// TODO: sixtyFour should actually be sizeof(n.LHS().Expr()).
if aMax.Cmp(sixtyFour) > 0 {
return nil, nil, fmt.Errorf("check: low_bits argument %q is possibly too large", a.String(q.tm))
}
return zero, bitMask(int(aMax.Int64())), nil
}
return nil, nil, fmt.Errorf("check: unrecognized token.Key (0x%X) for bcheckExprOther", n.ID0().Key())
case t.KeyOpenBracket:
+30 -1
View File
@@ -219,6 +219,14 @@ func (q *checker) tcheckAssign(n *a.Assign) error {
)
}
func (q *checker) tcheckArg(n *a.Arg, depth uint32) error {
if err := q.tcheckExpr(n.Value(), depth); err != nil {
return err
}
n.Node().SetTypeChecked()
return nil
}
func (q *checker) tcheckExpr(n *a.Expr, depth uint32) error {
if depth > a.MaxExprDepth {
return fmt.Errorf("check: expression recursion depth too large")
@@ -298,7 +306,23 @@ func (q *checker) tcheckExprOther(n *a.Expr, depth uint32) error {
if err := q.tcheckExpr(n.LHS().Expr(), depth); err != nil {
return err
}
n.SetMType(TypeExprU8)
n.SetMType(TypeExprU8) // HACK.
return nil
}
// TODO: delete this hack that only matches "foo.low_bits(etc)".
if isLowBits(q.tm, n.LHS().Expr()) && !n.CallImpure() && len(n.Args()) == 1 {
foo := n.LHS().Expr().LHS().Expr()
if err := q.tcheckExpr(foo, depth); err != nil {
return err
}
n.LHS().SetTypeChecked()
n.LHS().Expr().SetMType(TypeExprU8) // HACK.
for _, o := range n.Args() {
if err := q.tcheckArg(o.Arg(), depth); err != nil {
return err
}
}
n.SetMType(foo.MType())
return nil
}
@@ -328,6 +352,11 @@ func isInSrcReadU8(tm *t.Map, n *a.Expr) bool {
return n.ID0() == 0 && n.ID1().Key() == t.KeyIn
}
func isLowBits(tm *t.Map, n *a.Expr) bool {
// TODO: check that n.Args() is "(n:bar)".
return n.ID0().Key() == t.KeyDot && n.ID1().Key() == t.KeyLowBits
}
func (q *checker) tcheckDot(n *a.Expr, depth uint32) error {
lhs := n.LHS().Expr()
if err := q.tcheckExpr(lhs, depth); err != nil {
+6
View File
@@ -230,6 +230,8 @@ const (
KeyIn = Key(IDIn >> KeyShift)
KeyOut = Key(IDOut >> KeyShift)
KeyLowBits = Key(IDLowBits >> KeyShift)
KeyReadU8 = Key(IDReadU8 >> KeyShift)
KeyReadU16BE = Key(IDReadU16BE >> KeyShift)
KeyReadU16LE = Key(IDReadU16LE >> KeyShift)
@@ -377,6 +379,8 @@ const (
IDIn = ID(0xA2<<KeyShift | FlagsIdent | FlagsImplicitSemicolon)
IDOut = ID(0xA3<<KeyShift | FlagsIdent | FlagsImplicitSemicolon)
IDLowBits = ID(0xA8<<KeyShift | FlagsIdent | FlagsImplicitSemicolon)
IDReadU8 = ID(0xB1<<KeyShift | FlagsIdent | FlagsImplicitSemicolon)
IDReadU16BE = ID(0xB2<<KeyShift | FlagsIdent | FlagsImplicitSemicolon)
IDReadU16LE = ID(0xB3<<KeyShift | FlagsIdent | FlagsImplicitSemicolon)
@@ -546,6 +550,8 @@ var builtInsByKey = [nBuiltInKeys]struct {
KeyIn: {"in", IDIn},
KeyOut: {"out", IDOut},
KeyLowBits: {"low_bits", IDLowBits},
KeyReadU8: {"read_u8", IDReadU8},
KeyReadU16BE: {"read_u16be", IDReadU16BE},
KeyReadU16LE: {"read_u16le", IDReadU16LE},
+2 -3
View File
@@ -26,12 +26,11 @@ pub func lzw_decoder.decode?(dst ptr buf1, src ptr buf1, src_final bool)() {
bits |= (in.src.read_u8?() as u32) << n_bits // TODO: read_u8 should take src_final.
n_bits += 8
}
// TODO: var code u32[..4095] = bits.low_bits(width)
var code u32[..4095] = bits.low_bits(n:width)
bits >>= width
n_bits -= width
// TODO: s/bits/code/
if bits < clear_code {
if code < clear_code {
break
}