diff --git a/lang/check/axioms.md b/lang/check/axioms.md index 26efcd5f..47b40c4e 100644 --- a/lang/check/axioms.md +++ b/lang/check/axioms.md @@ -46,3 +46,7 @@ editing this list. --- - `"(a + b) <= c: a <= (c - b)"` + +--- + +- `"(a - b) < c: a < c; 0 <= b"` diff --git a/lang/check/data.go b/lang/check/data.go index b1cc71d9..81499280 100644 --- a/lang/check/data.go +++ b/lang/check/data.go @@ -364,4 +364,27 @@ var reasons = [...]struct { _ = xc return nil }}, + + {`"(a - b) < c: a < c; 0 <= b"`, func(q *checker, n *a.Assert) error { + op, t0, xc := parseBinaryOp(n.Condition()) + if op != t.IDXBinaryLessThan { + return errFailed + } + op, xa, xb := parseBinaryOp(t0) + if op != t.IDXBinaryMinus { + return errFailed + } + // a < c + if err := proveReasonRequirement(q, t.IDXBinaryLessThan, xa, xc); err != nil { + return err + } + // 0 <= b + if err := proveReasonRequirement(q, t.IDXBinaryLessEq, zeroExpr, xb); err != nil { + return err + } + _ = xa + _ = xb + _ = xc + return nil + }}, } diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index 109a1e32..f7845534 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -30052,9 +30052,7 @@ wuffs_png__decoder__filter_3( v_i = 0; while (v_i < v_n) { if (v_i >= v_filter_distance) { - if ((v_i - v_filter_distance) < ((uint64_t)(a_curr.len))) { - a_curr.ptr[v_i] += ((uint8_t)(((((uint32_t)(a_curr.ptr[(v_i - v_filter_distance)])) + ((uint32_t)(a_prev.ptr[v_i]))) / 2))); - } + a_curr.ptr[v_i] += ((uint8_t)(((((uint32_t)(a_curr.ptr[(v_i - v_filter_distance)])) + ((uint32_t)(a_prev.ptr[v_i]))) / 2))); } else { a_curr.ptr[v_i] += (a_prev.ptr[v_i] / 2); } @@ -30089,30 +30087,28 @@ wuffs_png__decoder__filter_4( if (v_i < v_filter_distance) { a_curr.ptr[v_i] += a_prev.ptr[v_i]; } else { - if (((v_i - v_filter_distance) < ((uint64_t)(a_curr.len))) && ((v_i - v_filter_distance) < ((uint64_t)(a_prev.len)))) { - v_fa = ((uint32_t)(a_curr.ptr[(v_i - v_filter_distance)])); - v_fb = ((uint32_t)(a_prev.ptr[v_i])); - v_fc = ((uint32_t)(a_prev.ptr[(v_i - v_filter_distance)])); - v_pp = ((v_fa + v_fb) - v_fc); - v_pa = (v_pp - v_fa); - if (v_pa >= 2147483648) { - v_pa = (0 - v_pa); - } - v_pb = (v_pp - v_fb); - if (v_pb >= 2147483648) { - v_pb = (0 - v_pb); - } - v_pc = (v_pp - v_fc); - if (v_pc >= 2147483648) { - v_pc = (0 - v_pc); - } - if ((v_pa <= v_pb) && (v_pa <= v_pc)) { - a_curr.ptr[v_i] += ((uint8_t)((v_fa & 255))); - } else if (v_pb <= v_pc) { - a_curr.ptr[v_i] += ((uint8_t)((v_fb & 255))); - } else { - a_curr.ptr[v_i] += ((uint8_t)((v_fc & 255))); - } + v_fa = ((uint32_t)(a_curr.ptr[(v_i - v_filter_distance)])); + v_fb = ((uint32_t)(a_prev.ptr[v_i])); + v_fc = ((uint32_t)(a_prev.ptr[(v_i - v_filter_distance)])); + v_pp = ((v_fa + v_fb) - v_fc); + v_pa = (v_pp - v_fa); + if (v_pa >= 2147483648) { + v_pa = (0 - v_pa); + } + v_pb = (v_pp - v_fb); + if (v_pb >= 2147483648) { + v_pb = (0 - v_pb); + } + v_pc = (v_pp - v_fc); + if (v_pc >= 2147483648) { + v_pc = (0 - v_pc); + } + if ((v_pa <= v_pb) && (v_pa <= v_pc)) { + a_curr.ptr[v_i] += ((uint8_t)((v_fa & 255))); + } else if (v_pb <= v_pc) { + a_curr.ptr[v_i] += ((uint8_t)((v_fb & 255))); + } else { + a_curr.ptr[v_i] += ((uint8_t)((v_fc & 255))); } } v_i += 1; diff --git a/std/png/decode_filter_fallback.wuffs b/std/png/decode_filter_fallback.wuffs index 52d735cf..2eeaf369 100644 --- a/std/png/decode_filter_fallback.wuffs +++ b/std/png/decode_filter_fallback.wuffs @@ -81,11 +81,10 @@ pri func decoder.filter_3!(curr: slice base.u8, prev: slice base.u8) { assert i < args.curr.length() via "a < b: a < c; c <= b"(c: n) assert i < args.prev.length() via "a < b: a < c; c <= b"(c: n) if i >= filter_distance { - if (i - filter_distance) < args.curr.length() { - args.curr[i] ~mod+= (( - (args.curr[i - filter_distance] as base.u32) + - (args.prev[i] as base.u32)) / 2) as base.u8 - } + assert (i - filter_distance) < args.curr.length() via "(a - b) < c: a < c; 0 <= b"() + args.curr[i] ~mod+= (( + (args.curr[i - filter_distance] as base.u32) + + (args.prev[i] as base.u32)) / 2) as base.u8 } else { args.curr[i] ~mod+= args.prev[i] / 2 } @@ -120,31 +119,30 @@ pri func decoder.filter_4!(curr: slice base.u8, prev: slice base.u8) { if i < filter_distance { args.curr[i] ~mod+= args.prev[i] } else { - if ((i - filter_distance) < args.curr.length()) and - ((i - filter_distance) < args.prev.length()) { - fa = args.curr[i - filter_distance] as base.u32 - fb = args.prev[i] as base.u32 - fc = args.prev[i - filter_distance] as base.u32 - pp = (fa ~mod+ fb) ~mod- fc - pa = pp ~mod- fa - if pa >= 0x8000_0000 { - pa = 0 ~mod- pa - } - pb = pp ~mod- fb - if pb >= 0x8000_0000 { - pb = 0 ~mod- pb - } - pc = pp ~mod- fc - if pc >= 0x8000_0000 { - pc = 0 ~mod- pc - } - if (pa <= pb) and (pa <= pc) { - args.curr[i] ~mod+= (fa & 0xFF) as base.u8 - } else if pb <= pc { - args.curr[i] ~mod+= (fb & 0xFF) as base.u8 - } else { - args.curr[i] ~mod+= (fc & 0xFF) as base.u8 - } + assert (i - filter_distance) < args.curr.length() via "(a - b) < c: a < c; 0 <= b"() + assert (i - filter_distance) < args.prev.length() via "(a - b) < c: a < c; 0 <= b"() + fa = args.curr[i - filter_distance] as base.u32 + fb = args.prev[i] as base.u32 + fc = args.prev[i - filter_distance] as base.u32 + pp = (fa ~mod+ fb) ~mod- fc + pa = pp ~mod- fa + if pa >= 0x8000_0000 { + pa = 0 ~mod- pa + } + pb = pp ~mod- fb + if pb >= 0x8000_0000 { + pb = 0 ~mod- pb + } + pc = pp ~mod- fc + if pc >= 0x8000_0000 { + pc = 0 ~mod- pc + } + if (pa <= pb) and (pa <= pc) { + args.curr[i] ~mod+= (fa & 0xFF) as base.u8 + } else if pb <= pc { + args.curr[i] ~mod+= (fb & 0xFF) as base.u8 + } else { + args.curr[i] ~mod+= (fc & 0xFF) as base.u8 } } i += 1