Update std/gif's pass-through uncompressed_wi

This commit is contained in:
Nigel Tao committed 2018-05-13 13:09:58 +10:00
1 parent 043ba870f5
commit ed1a8b4057
12 files changed
+69 -5

No files matched your search

+4
View File
@@ -412,6 +412,8 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__set_mark(
static inline wuffs_base__empty_struct wuffs_base__io_writer__set(
wuffs_base__io_writer* o,
wuffs_base__io_buffer* b,
uint8_t** ioptr1_ptr,
uint8_t** ioptr2_ptr,
wuffs_base__slice_u8 s) {
b->ptr = s.ptr;
b->len = s.len;
@@ -421,6 +423,8 @@ static inline wuffs_base__empty_struct wuffs_base__io_writer__set(
o->private_impl.buf = b;
o->private_impl.bounds[0] = s.ptr;
o->private_impl.bounds[1] = s.ptr + s.len;
*ioptr1_ptr = s.ptr;
*ioptr2_ptr = s.ptr + s.len;
return ((wuffs_base__empty_struct){});
}
+1 -1
View File
@@ -97,7 +97,7 @@ const baseImpl = "" +
" by 3 seems best for the std/deflate benchmarks, but that\n // is mostly because 3 is the minimum length for the deflate format. This\n // function implementation shouldn't overfit to that one format. Perhaps the\n // copy_from_history32 Wuffs method should also take an unroll hint argument,\n // and the cgen can look if that argument is the constant expression '3'.\n //\n // See also wuffs_base__io_writer__copy_from_history32__bco below.\n //\n // Alternatively, or additionally, have a sloppy_copy_from_history32 method\n // that copies 8 bytes at a time, possibly writing more than length bytes?\n for (; n >= 3; n -= 3) {\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n }\n for (; n; n--) {\n *ptr++ = *start++;\n }\n *ptr_ptr = ptr;\n return length;\n}\n\n// wuffs_base__io_writer__copy_from_history32__bco is a Bounds Check Optimized\n// version of the wuffs_base__io_writer__copy_from_history32 function above.\n// The caller needs to prove that:\n// - distance > 0\n// - distance <= (*ptr_pt" +
"r - start)\n// - length <= (end - *ptr_ptr)\nstatic inline uint32_t wuffs_base__io_writer__copy_from_history32__bco(\n uint8_t** ptr_ptr,\n uint8_t* start,\n uint8_t* end,\n uint32_t distance,\n uint32_t length) {\n uint8_t* ptr = *ptr_ptr;\n start = ptr - distance;\n uint32_t n = length;\n for (; n >= 3; n -= 3) {\n *ptr++ = *start++;\n *ptr++ = *start++;\n *ptr++ = *start++;\n }\n for (; n; n--) {\n *ptr++ = *start++;\n }\n *ptr_ptr = ptr;\n return length;\n}\n\nstatic inline uint32_t wuffs_base__io_writer__copy_from_reader32(\n uint8_t** ptr_wptr,\n uint8_t* wend,\n uint8_t** ptr_rptr,\n uint8_t* rend,\n uint32_t length) {\n uint8_t* wptr = *ptr_wptr;\n size_t n = length;\n if (n > wend - wptr) {\n n = wend - wptr;\n }\n uint8_t* rptr = *ptr_rptr;\n if (n > rend - rptr) {\n n = rend - rptr;\n }\n if (n > 0) {\n memmove(wptr, rptr, n);\n *ptr_wptr += n;\n *ptr_rptr += n;\n }\n return n;\n}\n\nstatic inline uint64_t wuffs_base__io_writer__copy_from_slice(\n uint8_t** p" +
"tr_wptr,\n uint8_t* wend,\n wuffs_base__slice_u8 src) {\n uint8_t* wptr = *ptr_wptr;\n size_t n = src.len;\n if (n > wend - wptr) {\n n = wend - wptr;\n }\n if (n > 0) {\n memmove(wptr, src.ptr, n);\n *ptr_wptr += n;\n }\n return n;\n}\n\nstatic inline uint32_t wuffs_base__io_writer__copy_from_slice32(\n uint8_t** ptr_wptr,\n uint8_t* wend,\n wuffs_base__slice_u8 src,\n uint32_t length) {\n uint8_t* wptr = *ptr_wptr;\n size_t n = src.len;\n if (n > length) {\n n = length;\n }\n if (n > wend - wptr) {\n n = wend - wptr;\n }\n if (n > 0) {\n memmove(wptr, src.ptr, n);\n *ptr_wptr += n;\n }\n return n;\n}\n\nstatic inline wuffs_base__empty_struct wuffs_base__io_reader__set_limit(\n wuffs_base__io_reader* o,\n uint8_t* rptr,\n uint64_t limit) {\n if (o && ((o->private_impl.bounds[1] - rptr) > limit)) {\n o->private_impl.bounds[1] = rptr + limit;\n }\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct wuffs_base__io_reader__set_mark(\n wuffs_base__io_rea" +
"der* o,\n uint8_t* mark) {\n o->private_impl.bounds[0] = mark;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct wuffs_base__io_writer__set(\n wuffs_base__io_writer* o,\n wuffs_base__io_buffer* b,\n wuffs_base__slice_u8 s) {\n b->ptr = s.ptr;\n b->len = s.len;\n b->wi = 0;\n b->ri = 0;\n b->closed = false;\n o->private_impl.buf = b;\n o->private_impl.bounds[0] = s.ptr;\n o->private_impl.bounds[1] = s.ptr + s.len;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct wuffs_base__io_writer__set_mark(\n wuffs_base__io_writer* o,\n uint8_t* mark) {\n o->private_impl.bounds[0] = mark;\n return ((wuffs_base__empty_struct){});\n}\n" +
"der* o,\n uint8_t* mark) {\n o->private_impl.bounds[0] = mark;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct wuffs_base__io_writer__set(\n wuffs_base__io_writer* o,\n wuffs_base__io_buffer* b,\n uint8_t** ioptr1_ptr,\n uint8_t** ioptr2_ptr,\n wuffs_base__slice_u8 s) {\n b->ptr = s.ptr;\n b->len = s.len;\n b->wi = 0;\n b->ri = 0;\n b->closed = false;\n o->private_impl.buf = b;\n o->private_impl.bounds[0] = s.ptr;\n o->private_impl.bounds[1] = s.ptr + s.len;\n *ioptr1_ptr = s.ptr;\n *ioptr2_ptr = s.ptr + s.len;\n return ((wuffs_base__empty_struct){});\n}\n\nstatic inline wuffs_base__empty_struct wuffs_base__io_writer__set_mark(\n wuffs_base__io_writer* o,\n uint8_t* mark) {\n o->private_impl.bounds[0] = mark;\n return ((wuffs_base__empty_struct){});\n}\n" +
""
type template_args_short_read struct {
+5 -2
View File
@@ -323,6 +323,9 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
case "in.src":
p0 = bPrefix + "rend_src"
p1 = bPrefix + "rptr_src"
case "w":
p0 = bPrefix + "wend_w"
p1 = bPrefix + "wptr_w"
}
}
if p0 == "" {
@@ -381,8 +384,8 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
if len(n.Args()) == 1 {
typ = "writer"
}
// TODO: don't hard-code v_w and u_w.
b.printf("wuffs_base__io_%s__set(&v_w, &u_w", typ)
// TODO: don't hard-code v_w and u_w, and wptr vs rptr.
b.printf("wuffs_base__io_%s__set(&v_w, &u_w, &b_wptr_w, &b_wend_w", typ)
for _, o := range n.Args() {
b.writeb(',')
if err := g.writeExpr(b, o.Arg().Value(), rp, parenthesesOptional, depth); err != nil {
+17
View File
@@ -176,6 +176,17 @@ func (g *gen) writeStatementIOBind(b *buffer, n *a.IOBind, depth uint32) error {
name := e.Ident().Str(g.tm)
b.printf("wuffs_base__io_%s %s%d_%s%s = %s%s;\n",
cTyp, oPrefix, ioBindNum, prefix, name, prefix, name)
// TODO: save / restore all bPrefix vars, not just for local IO vars?
// How does this work if the io_bind body advances these pointers,
// either directly or by calling other funcs?
if e.Operator() == 0 {
// TODO: don't hard-code wptr vs rptr.
b.printf("uint8_t *%s%d_ioptr1_%s%s = %swptr_%s;\n",
oPrefix, ioBindNum, prefix, name, bPrefix, name)
b.printf("uint8_t *%s%d_ioptr2_%s%s = %swend_%s;\n",
oPrefix, ioBindNum, prefix, name, bPrefix, name)
}
}
for _, o := range n.Body() {
@@ -193,6 +204,12 @@ func (g *gen) writeStatementIOBind(b *buffer, n *a.IOBind, depth uint32) error {
name := e.Ident().Str(g.tm)
b.printf("%s%s = %s%d_%s%s;\n",
prefix, name, oPrefix, ioBindNum, prefix, name)
if e.Operator() == 0 {
b.printf("%swptr_%s = %s%d_ioptr1_%s%s;\n",
bPrefix, name, oPrefix, ioBindNum, prefix, name)
b.printf("%swend_%s = %s%d_ioptr2_%s%s;\n",
bPrefix, name, oPrefix, ioBindNum, prefix, name)
}
}
b.writes("}\n")
return nil
+5
View File
@@ -389,7 +389,12 @@ func (g *gen) writeVars(b *buffer, block []*a.Node, skipPointerTypes bool, skipI
b.writes(";\n")
if typ.IsIOType() {
b.printf("wuffs_base__io_buffer %s%s;\n", uPrefix, name)
// TODO: don't hard code wptr instead of rptr.
b.printf("uint8_t* %swptr_%s = NULL;\n", bPrefix, name)
b.printf("uint8_t* %swend_%s = NULL;\n", bPrefix, name)
b.printf("WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(%s%s);\n", uPrefix, name)
b.printf("WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(%swptr_%s);\n", bPrefix, name)
b.printf("WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(%swend_%s);\n", bPrefix, name)
}
return nil
})
+4
View File
@@ -1536,6 +1536,8 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__set_mark(
static inline wuffs_base__empty_struct wuffs_base__io_writer__set(
wuffs_base__io_writer* o,
wuffs_base__io_buffer* b,
uint8_t** ioptr1_ptr,
uint8_t** ioptr2_ptr,
wuffs_base__slice_u8 s) {
b->ptr = s.ptr;
b->len = s.len;
@@ -1545,6 +1547,8 @@ static inline wuffs_base__empty_struct wuffs_base__io_writer__set(
o->private_impl.buf = b;
o->private_impl.bounds[0] = s.ptr;
o->private_impl.bounds[1] = s.ptr + s.len;
*ioptr1_ptr = s.ptr;
*ioptr2_ptr = s.ptr + s.len;
return ((wuffs_base__empty_struct){});
}
+4
View File
@@ -1535,6 +1535,8 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__set_mark(
static inline wuffs_base__empty_struct wuffs_base__io_writer__set(
wuffs_base__io_writer* o,
wuffs_base__io_buffer* b,
uint8_t** ioptr1_ptr,
uint8_t** ioptr2_ptr,
wuffs_base__slice_u8 s) {
b->ptr = s.ptr;
b->len = s.len;
@@ -1544,6 +1546,8 @@ static inline wuffs_base__empty_struct wuffs_base__io_writer__set(
o->private_impl.buf = b;
o->private_impl.bounds[0] = s.ptr;
o->private_impl.bounds[1] = s.ptr + s.len;
*ioptr1_ptr = s.ptr;
*ioptr2_ptr = s.ptr + s.len;
return ((wuffs_base__empty_struct){});
}
+4
View File
@@ -1627,6 +1627,8 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__set_mark(
static inline wuffs_base__empty_struct wuffs_base__io_writer__set(
wuffs_base__io_writer* o,
wuffs_base__io_buffer* b,
uint8_t** ioptr1_ptr,
uint8_t** ioptr2_ptr,
wuffs_base__slice_u8 s) {
b->ptr = s.ptr;
b->len = s.len;
@@ -1636,6 +1638,8 @@ static inline wuffs_base__empty_struct wuffs_base__io_writer__set(
o->private_impl.buf = b;
o->private_impl.bounds[0] = s.ptr;
o->private_impl.bounds[1] = s.ptr + s.len;
*ioptr1_ptr = s.ptr;
*ioptr2_ptr = s.ptr + s.len;
return ((wuffs_base__empty_struct){});
}
+16 -1
View File
@@ -1648,6 +1648,8 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__set_mark(
static inline wuffs_base__empty_struct wuffs_base__io_writer__set(
wuffs_base__io_writer* o,
wuffs_base__io_buffer* b,
uint8_t** ioptr1_ptr,
uint8_t** ioptr2_ptr,
wuffs_base__slice_u8 s) {
b->ptr = s.ptr;
b->len = s.len;
@@ -1657,6 +1659,8 @@ static inline wuffs_base__empty_struct wuffs_base__io_writer__set(
o->private_impl.buf = b;
o->private_impl.bounds[0] = s.ptr;
o->private_impl.bounds[1] = s.ptr + s.len;
*ioptr1_ptr = s.ptr;
*ioptr2_ptr = s.ptr + s.len;
return ((wuffs_base__empty_struct){});
}
@@ -2678,7 +2682,11 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id(
uint64_t v_block_size;
wuffs_base__io_writer v_w;
wuffs_base__io_buffer u_w;
uint8_t* b_wptr_w = NULL;
uint8_t* b_wend_w = NULL;
WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(u_w);
WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wptr_w);
WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(b_wend_w);
wuffs_gif__status v_z;
wuffs_base__slice_u8 v_pass_through;
uint64_t v_n_copied;
@@ -2922,8 +2930,10 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id(
{
wuffs_base__io_reader o_0_a_src = a_src;
wuffs_base__io_writer o_0_v_w = v_w;
uint8_t* o_0_ioptr1_v_w = b_wptr_w;
uint8_t* o_0_ioptr2_v_w = b_wend_w;
wuffs_base__io_writer__set(
&v_w, &u_w,
&v_w, &u_w, &b_wptr_w, &b_wend_w,
wuffs_base__slice_u8__subslice_i(
((wuffs_base__slice_u8){
.ptr = self->private_impl.f_uncompressed, .len = 4096}),
@@ -2951,6 +2961,9 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id(
}
v_z = t_14;
}
self->private_impl.f_uncompressed_wi =
(4096 - ((uint32_t)(wuffs_base__u64__min(
(uint64_t)(b_wend_w - b_wptr_w), 4096))));
wuffs_base__u64__sat_sub_indirect(
&v_block_size,
((uint64_t)(((wuffs_base__slice_u8){
@@ -2960,6 +2973,8 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id(
})
.len)));
v_w = o_0_v_w;
b_wptr_w = o_0_ioptr1_v_w;
b_wend_w = o_0_ioptr2_v_w;
a_src = o_0_a_src;
}
if ((v_z == 0) || (v_z == WUFFS_GIF__SUSPENSION_SHORT_WRITE)) {
+4
View File
@@ -1830,6 +1830,8 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__set_mark(
static inline wuffs_base__empty_struct wuffs_base__io_writer__set(
wuffs_base__io_writer* o,
wuffs_base__io_buffer* b,
uint8_t** ioptr1_ptr,
uint8_t** ioptr2_ptr,
wuffs_base__slice_u8 s) {
b->ptr = s.ptr;
b->len = s.len;
@@ -1839,6 +1841,8 @@ static inline wuffs_base__empty_struct wuffs_base__io_writer__set(
o->private_impl.buf = b;
o->private_impl.bounds[0] = s.ptr;
o->private_impl.bounds[1] = s.ptr + s.len;
*ioptr1_ptr = s.ptr;
*ioptr2_ptr = s.ptr + s.len;
return ((wuffs_base__empty_struct){});
}
+4
View File
@@ -1830,6 +1830,8 @@ static inline wuffs_base__empty_struct wuffs_base__io_reader__set_mark(
static inline wuffs_base__empty_struct wuffs_base__io_writer__set(
wuffs_base__io_writer* o,
wuffs_base__io_buffer* b,
uint8_t** ioptr1_ptr,
uint8_t** ioptr2_ptr,
wuffs_base__slice_u8 s) {
b->ptr = s.ptr;
b->len = s.len;
@@ -1839,6 +1841,8 @@ static inline wuffs_base__empty_struct wuffs_base__io_writer__set(
o->private_impl.buf = b;
o->private_impl.bounds[0] = s.ptr;
o->private_impl.bounds[1] = s.ptr + s.len;
*ioptr1_ptr = s.ptr;
*ioptr2_ptr = s.ptr + s.len;
return ((wuffs_base__empty_struct){});
}
+1 -1
View File
@@ -353,7 +353,7 @@ pri func decoder.decode_id?(dst base.io_writer, src base.io_reader)() {
in.src.set_mark!()
// TODO: in.dst should be w.
var z base.status = try this.lzw.decode?(dst:in.dst, src:in.src)
// TODO: update this.uncompressed_wi.
this.uncompressed_wi = 4096 - (w.available().min(x:4096) as base.u32)
block_size ~sat-= in.src.since_mark().length()
}