From 80a39bfccb1ef5e9daed2a0f9f53170511a845e0 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Fri, 2 Jun 2017 11:39:51 +1000 Subject: [PATCH] Use "x < y" when bounds checking "x - y". --- gen/c/gif.c | 1 + lang/check/bounds.go | 30 ++++++++++++++++++++++++++---- std/gif/decode_lzw.puffs | 1 + 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/gen/c/gif.c b/gen/c/gif.c index 71f13c5b..459b371b 100644 --- a/gen/c/gif.c +++ b/gen/c/gif.c @@ -168,6 +168,7 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self) { v_n_bits += 8; } v_bits >>= v_width; + v_n_bits -= v_width; goto label_0_break; v_n_bits = 0; } diff --git a/lang/check/bounds.go b/lang/check/bounds.go index 64cea473..9c007a67 100644 --- a/lang/check/bounds.go +++ b/lang/check/bounds.go @@ -24,9 +24,10 @@ var numTypeBounds = [256][2]*big.Int{ } var ( - zero = big.NewInt(0) - one = big.NewInt(1) - ffff = big.NewInt(0xFFFF) + minusOne = big.NewInt(-1) + zero = big.NewInt(+0) + one = big.NewInt(+1) + ffff = big.NewInt(0xFFFF) maxIntBits = big.NewInt(t.MaxIntBits) @@ -414,6 +415,7 @@ func (q *checker) bcheckExpr(n *a.Expr, depth uint32) (*big.Int, *big.Int, error if cv := n.ConstValue(); cv != nil { return cv, cv, nil } + // TODO: look in q.facts for "n == constantValue". switch n.ID0().Flags() & (t.FlagsUnaryOp | t.FlagsBinaryOp | t.FlagsAssociativeOp) { case 0: @@ -502,8 +504,28 @@ func (q *checker) bcheckExprBinaryOp(lhs *a.Expr, op t.Key, rhs *a.Expr, depth u switch op { case t.KeyXBinaryPlus: return big.NewInt(0).Add(lMin, rMin), big.NewInt(0).Add(lMax, rMax), nil + case t.KeyXBinaryMinus: - return big.NewInt(0).Sub(lMin, rMax), big.NewInt(0).Sub(lMax, rMin), nil + nMin := big.NewInt(0).Sub(lMin, rMax) + nMax := big.NewInt(0).Sub(lMax, rMin) + for _, x := range q.facts { + xOp, xLHS, xRHS := parseBinaryOp(x) + if !lhs.Eq(xLHS) || !rhs.Eq(xRHS) { + continue + } + switch xOp.Key() { + case t.KeyXBinaryLessThan: + nMax = min(nMax, minusOne) + case t.KeyXBinaryLessEq: + nMax = min(nMax, zero) + case t.KeyXBinaryGreaterEq: + nMin = max(nMin, zero) + case t.KeyXBinaryGreaterThan: + nMin = max(nMin, one) + } + } + return nMin, nMax, nil + case t.KeyXBinaryStar: // TODO. if cv := lhs.ConstValue(); cv != nil && cv.Cmp(zero) == 0 { diff --git a/std/gif/decode_lzw.puffs b/std/gif/decode_lzw.puffs index e387b286..757cb47b 100644 --- a/std/gif/decode_lzw.puffs +++ b/std/gif/decode_lzw.puffs @@ -31,6 +31,7 @@ pub func lzw_decoder.decode?(dst ptr io.buf1, src ptr io.buf1, src_final bool)() } // TODO: var code u32[..4095] = bits.low_bits(width) bits >>= width + n_bits -= width // TODO: implement. break