mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 00:32:11 +01:00
Let skip_u32_fast take non-constant arguments
This commit is contained in:
1 parent
4e193599ac
commit
31674f9bd2
5 files changed
+67
-24
No files matched your search
@@ -396,9 +396,8 @@ var Funcs = []string{
|
||||
"io_reader.skip_u32?(n: u32)",
|
||||
|
||||
// TODO: this should have explicit pre-conditions "actual <= worst_case"
|
||||
// and "worst_case <= available()". As an implementation restriction, we
|
||||
// also require that worst_case has a constant value. For now, that's all
|
||||
// implicitly checked (i.e. hard coded).
|
||||
// and "worst_case <= available()". For now, that's all implicitly checked
|
||||
// (i.e. hard coded).
|
||||
"io_reader.skip_u32_fast!(actual: u32, worst_case: u32)",
|
||||
|
||||
// ---- io_writer
|
||||
|
||||
+15
-8
@@ -1023,7 +1023,7 @@ func (q *checker) bcheckExprCallSpecialCases(n *a.Expr, depth uint32) (bounds, e
|
||||
}
|
||||
|
||||
} else if recvTyp.IsIOTokenType() {
|
||||
advance, update := (*big.Int)(nil), false
|
||||
advance, advanceExpr, update := (*big.Int)(nil), (*a.Expr)(nil), false
|
||||
|
||||
if method == t.IDUndoByte {
|
||||
if err := q.canUndoByte(recv); err != nil {
|
||||
@@ -1050,10 +1050,11 @@ func (q *checker) bcheckExprCallSpecialCases(n *a.Expr, depth uint32) (bounds, e
|
||||
} else if err != nil {
|
||||
return bounds{}, err
|
||||
}
|
||||
if worstCase.ConstValue() == nil {
|
||||
return bounds{}, fmt.Errorf("check: skip_fast worst_case is not a constant value")
|
||||
if cv := worstCase.ConstValue(); cv != nil {
|
||||
advance, update = cv, true
|
||||
} else {
|
||||
advanceExpr, update = actual, true
|
||||
}
|
||||
advance, update = worstCase.ConstValue(), true
|
||||
|
||||
} else if method == t.IDPeekU64LEAt {
|
||||
args := n.Args()
|
||||
@@ -1074,12 +1075,18 @@ func (q *checker) bcheckExprCallSpecialCases(n *a.Expr, depth uint32) (bounds, e
|
||||
}
|
||||
}
|
||||
|
||||
if advance != nil {
|
||||
if ok, err := q.optimizeIOMethodAdvance(recv, advance, update); err != nil {
|
||||
if (advance != nil) || (advanceExpr != nil) {
|
||||
if ok, err := q.optimizeIOMethodAdvance(recv, advance, advanceExpr, update); err != nil {
|
||||
return bounds{}, err
|
||||
} else if !ok {
|
||||
return bounds{}, fmt.Errorf("check: could not prove %s pre-condition: %s.available() >= %v",
|
||||
method.Str(q.tm), recv.Str(q.tm), advance)
|
||||
adv := ""
|
||||
if advance != nil {
|
||||
adv = advance.String()
|
||||
} else {
|
||||
adv = advanceExpr.Str(q.tm)
|
||||
}
|
||||
return bounds{}, fmt.Errorf("check: could not prove %s pre-condition: %s.available() >= %s",
|
||||
method.Str(q.tm), recv.Str(q.tm), adv)
|
||||
}
|
||||
// TODO: drop other recv-related facts?
|
||||
}
|
||||
|
||||
+48
-2
@@ -44,11 +44,15 @@ func splitReceiverMethodArgs(n *a.Expr) (receiver *a.Expr, method t.ID, args []*
|
||||
return n.LHS().AsExpr(), n.Ident(), args
|
||||
}
|
||||
|
||||
func (q *checker) optimizeIOMethodAdvance(receiver *a.Expr, advance *big.Int, update bool) (retOK bool, retErr error) {
|
||||
func (q *checker) optimizeIOMethodAdvance(receiver *a.Expr, advance *big.Int, advanceExpr *a.Expr, update bool) (retOK bool, retErr error) {
|
||||
// TODO: do two passes? The first one to non-destructively check retOK. The
|
||||
// second one to drop facts if indeed retOK? Otherwise, an advance
|
||||
// precondition failure will lose some of the facts in its error message.
|
||||
|
||||
if advanceExpr != nil {
|
||||
return q.optimizeIOMethodAdvanceExpr(receiver, advanceExpr, update)
|
||||
}
|
||||
|
||||
retErr = q.facts.update(func(x *a.Expr) (*a.Expr, error) {
|
||||
// TODO: update (discard?) any facts that merely mention
|
||||
// receiver.available(), even if they aren't an exact match.
|
||||
@@ -98,7 +102,7 @@ func (q *checker) optimizeIOMethodAdvance(receiver *a.Expr, advance *big.Int, up
|
||||
|
||||
if rcv.Cmp(advance) == 0 {
|
||||
// TODO: delete the (adjusted) fact, as newRCV will be zero, and
|
||||
// "foo.advance() >= 0" is redundant.
|
||||
// "foo.available() >= 0" is redundant.
|
||||
}
|
||||
|
||||
// Create a new a.Expr to hold the adjusted RHS constant value, newRCV.
|
||||
@@ -113,3 +117,45 @@ func (q *checker) optimizeIOMethodAdvance(receiver *a.Expr, advance *big.Int, up
|
||||
})
|
||||
return retOK, retErr
|
||||
}
|
||||
|
||||
func (q *checker) optimizeIOMethodAdvanceExpr(receiver *a.Expr, advanceExpr *a.Expr, update bool) (retOK bool, retErr error) {
|
||||
retErr = q.facts.update(func(x *a.Expr) (*a.Expr, error) {
|
||||
// TODO: update (discard?) any facts that merely mention
|
||||
// receiver.available(), even if they aren't an exact match.
|
||||
|
||||
op := x.Operator()
|
||||
if op != t.IDXBinaryGreaterEq && op != t.IDXBinaryGreaterThan {
|
||||
return x, nil
|
||||
}
|
||||
|
||||
// Check that lhs is "receiver.available()".
|
||||
lhs := x.LHS().AsExpr()
|
||||
if lhs.Operator() != t.IDOpenParen || len(lhs.Args()) != 0 {
|
||||
return x, nil
|
||||
}
|
||||
lhs = lhs.LHS().AsExpr()
|
||||
if lhs.Operator() != t.IDDot || lhs.Ident() != t.IDAvailable {
|
||||
return x, nil
|
||||
}
|
||||
lhs = lhs.LHS().AsExpr()
|
||||
if !lhs.Eq(receiver) {
|
||||
return x, nil
|
||||
}
|
||||
|
||||
// Check that rhs is "advanceExpr as base.u64".
|
||||
rhs := x.RHS().AsExpr()
|
||||
if rhs.Operator() != t.IDXBinaryAs ||
|
||||
!rhs.LHS().AsExpr().Eq(advanceExpr) ||
|
||||
!rhs.RHS().AsTypeExpr().Eq(typeExprU64) {
|
||||
return x, nil
|
||||
}
|
||||
|
||||
retOK = true
|
||||
|
||||
if !update {
|
||||
return x, nil
|
||||
}
|
||||
return nil, nil
|
||||
})
|
||||
return retOK, retErr
|
||||
}
|
||||
@@ -5618,7 +5618,6 @@ struct wuffs_cbor__decoder__struct {
|
||||
uint32_t v_depth;
|
||||
uint32_t v_token_length;
|
||||
uint8_t v_c;
|
||||
uint64_t scratch;
|
||||
} s_decode_tokens[1];
|
||||
} private_data;
|
||||
|
||||
@@ -16436,15 +16435,7 @@ wuffs_cbor__decoder__decode_tokens(
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(3);
|
||||
goto label__outer__continue;
|
||||
}
|
||||
self->private_data.s_decode_tokens[0].scratch = v_token_length;
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
|
||||
if (self->private_data.s_decode_tokens[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
|
||||
self->private_data.s_decode_tokens[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
|
||||
iop_a_src = io2_a_src;
|
||||
status = wuffs_base__make_status(wuffs_base__suspension__short_read);
|
||||
goto suspend;
|
||||
}
|
||||
iop_a_src += self->private_data.s_decode_tokens[0].scratch;
|
||||
(iop_a_src += v_token_length, wuffs_base__make_empty_struct());
|
||||
} else {
|
||||
(iop_a_src += 1, wuffs_base__make_empty_struct());
|
||||
}
|
||||
|
||||
@@ -62,7 +62,7 @@ pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader, wor
|
||||
yield? base."$short read"
|
||||
continue.outer
|
||||
}
|
||||
args.src.skip_u32?(n: token_length)
|
||||
args.src.skip_u32_fast!(actual: token_length, worst_case: token_length)
|
||||
} else {
|
||||
args.src.skip_u32_fast!(actual: 1, worst_case: 1)
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user