Make the scratch field per-func, not per-struct.

This commit is contained in:
Nigel Tao committed 2017-09-01 14:10:47 +10:00
1 parent 209178a2c6
commit 363dcbe714
6 files changed
+107 -72

No files matched your search

+10 -5
View File
@@ -535,7 +535,6 @@ func (g *gen) writeStruct(b *buffer, n *a.Struct) error {
if n.Suspendible() {
b.printf("%sstatus status;\n", g.pkgPrefix)
b.writes("uint32_t magic;\n")
b.writes("uint64_t scratch;\n")
b.writes("\n")
}
@@ -558,15 +557,21 @@ func (g *gen) writeStruct(b *buffer, n *a.Struct) error {
if o.Receiver() != n.Name() || !o.Suspendible() {
continue
}
if k := g.funks[o.QID()]; k.coroSuspPoint == 0 {
k := g.funks[o.QID()]
if k.coroSuspPoint == 0 && !k.usesScratch {
continue
}
// TODO: allow max depth > 1 for recursive coroutines.
const maxDepth = 1
b.writes("struct {\n")
b.writes("uint32_t coro_susp_point;\n")
if err := g.writeVars(b, o.Body()); err != nil {
return err
if k.coroSuspPoint != 0 {
b.writes("uint32_t coro_susp_point;\n")
if err := g.writeVars(b, o.Body()); err != nil {
return err
}
}
if k.usesScratch {
b.writes("uint64_t scratch;\n")
}
b.printf("} %s%s[%d];\n", cPrefix, o.Name().String(g.tm), maxDepth)
}
+46 -27
View File
@@ -27,6 +27,7 @@ type funk struct {
tempR uint32
public bool
suspendible bool
usesScratch bool
limitVarName string
shortReads []string
}
@@ -899,9 +900,12 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
return g.writeReadUXX(b, n, "src", 32, "LE")
} else if isInSrc(g.tm, n, t.KeySkip32, 1) {
// TODO: is the scratch variable safe to use if callers can trap
// LIMITED_READ and then go down different code paths?
b.writes("self->private_impl.scratch = ")
g.currFunk.usesScratch = true
// TODO: don't hard-code [0], and allow recursive coroutines.
scratchName := fmt.Sprintf("self->private_impl.%s%s[0].scratch",
cPrefix, g.currFunk.astFunc.Name().String(g.tm))
b.printf("%s = ", scratchName)
x := n.Args()[0].Arg().Value()
if err := g.writeExpr(b, x, replaceCallSuspendibles, parenthesesMandatory, depth); err != nil {
return err
@@ -913,8 +917,8 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
return err
}
b.printf("if (self->private_impl.scratch > %srend_src - %srptr_src) {\n", bPrefix, bPrefix)
b.printf("self->private_impl.scratch -= %srend_src - %srptr_src;\n", bPrefix, bPrefix)
b.printf("if (%s > %srend_src - %srptr_src) {\n", scratchName, bPrefix, bPrefix)
b.printf("%s -= %srend_src - %srptr_src;\n", scratchName, bPrefix, bPrefix)
b.printf("%srptr_src = %srend_src;\n", bPrefix, bPrefix)
// TODO: is ptr_to_len the right check?
@@ -925,7 +929,7 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
b.printf("} else { status = %sSUSPENSION_SHORT_READ; } goto suspend;\n", g.PKGPREFIX)
b.writes("}\n")
b.printf("%srptr_src += self->private_impl.scratch;\n", bPrefix)
b.printf("%srptr_src += %s;\n", bPrefix, scratchName)
} else if isInDst(g.tm, n, t.KeyWrite, 1) {
// TODO: don't assume that the argument is "this.stack[s:]".
@@ -964,7 +968,12 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
b.writes("{\n")
b.writes("self->private_impl.scratch = ")
g.currFunk.usesScratch = true
// TODO: don't hard-code [0], and allow recursive coroutines.
scratchName := fmt.Sprintf("self->private_impl.%s%s[0].scratch",
cPrefix, g.currFunk.astFunc.Name().String(g.tm))
b.printf("%s = ", scratchName)
x := n.Args()[1].Arg().Value()
if err := g.writeExpr(b, x, replaceCallSuspendibles, parenthesesMandatory, depth); err != nil {
return err
@@ -974,7 +983,7 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
if err := g.writeCoroSuspPoint(b); err != nil {
return err
}
b.printf("size_t %s%d = self->private_impl.scratch;\n", tPrefix, temp)
b.printf("size_t %s%d = %s;\n", tPrefix, temp, scratchName)
const wName = "dst"
b.printf("if (%s%d > %swend_%s - %swptr_%s) {\n", tPrefix, temp, bPrefix, wName, bPrefix, wName)
@@ -992,7 +1001,7 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
b.printf("memmove(%swptr_%s, %srptr_%s, %s%d);\n", bPrefix, wName, bPrefix, rName, tPrefix, temp)
b.printf("%swptr_%s += %s%d;\n", bPrefix, wName, tPrefix, temp)
b.printf("%srptr_%s += %s%d;\n", bPrefix, rName, tPrefix, temp)
b.printf("if (status) { self->private_impl.scratch -= %s%d; goto suspend; }\n", tPrefix, temp)
b.printf("if (status) { %s -= %s%d; goto suspend; }\n", scratchName, tPrefix, temp)
b.writes("}\n")
@@ -1008,7 +1017,12 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
b.writes("{\n")
b.writes("self->private_impl.scratch = ((uint64_t)(")
g.currFunk.usesScratch = true
// TODO: don't hard-code [0], and allow recursive coroutines.
scratchName := fmt.Sprintf("self->private_impl.%s%s[0].scratch",
cPrefix, g.currFunk.astFunc.Name().String(g.tm))
b.printf("%s = ((uint64_t)(", scratchName)
x0 := n.Args()[0].Arg().Value()
if err := g.writeExpr(b, x0, replaceCallSuspendibles, parenthesesMandatory, depth); err != nil {
return err
@@ -1024,13 +1038,13 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
}
const wName = "dst"
b.printf("size_t %s%d = (size_t)(self->private_impl.scratch >> 32);", tPrefix, temp0)
b.printf("size_t %s%d = (size_t)(%s >> 32);", tPrefix, temp0, scratchName)
// TODO: it's not a BAD_ARGUMENT if we can copy from the sliding window.
b.printf("if (PUFFS_UNLIKELY((%s%d == 0) || (%s%d > (%swptr_%s - %s%s.buf->ptr)))) { "+
"status = %sERROR_BAD_ARGUMENT; goto exit; }\n",
tPrefix, temp0, tPrefix, temp0, bPrefix, wName, aPrefix, wName, g.PKGPREFIX)
b.printf("uint8_t* %s%d = %swptr_%s - %s%d;\n", tPrefix, temp1, bPrefix, wName, tPrefix, temp0)
b.printf("uint32_t %s%d = (uint32_t)(self->private_impl.scratch);", tPrefix, temp2)
b.printf("uint32_t %s%d = (uint32_t)(%s);", tPrefix, temp2, scratchName)
b.printf("if (PUFFS_LIKELY((size_t)(%s%d) <= (%swend_%s - %swptr_%s))) {",
tPrefix, temp2, bPrefix, wName, bPrefix, wName)
@@ -1047,7 +1061,7 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
b.printf("%s%d = (uint32_t)(%swend_%s - %swptr_%s);\n",
tPrefix, temp2, bPrefix, wName, bPrefix, wName)
b.printf("self->private_impl.scratch -= (uint64_t)(%s%d);\n", tPrefix, temp2)
b.printf("%s -= (uint64_t)(%s%d);\n", scratchName, tPrefix, temp2)
b.printf("for (; %s%d; %s%d--) { *%swptr_%s++ = *%s%d++; }\n",
tPrefix, temp2, tPrefix, temp2, bPrefix, wName, tPrefix, temp1)
// TODO: SHORT_WRITE vs LIMITED_WRITE?
@@ -1198,11 +1212,16 @@ func (g *gen) writeReadUXX(b *buffer, n *a.Expr, name string, size uint32, endia
}
b.writes(";")
g.currFunk.usesScratch = true
// TODO: don't hard-code [0], and allow recursive coroutines.
scratchName := fmt.Sprintf("self->private_impl.%s%s[0].scratch",
cPrefix, g.currFunk.astFunc.Name().String(g.tm))
b.printf("if (PUFFS_LIKELY(%srend_src - %srptr_src >= %d)) {", bPrefix, bPrefix, size/8)
b.printf("%s%d = PUFFS_U%d%s(%srptr_src);\n", tPrefix, temp1, size, endianness, bPrefix)
b.printf("%srptr_src += %d;\n", bPrefix, size/8)
b.printf("} else {")
b.printf("self->private_impl.scratch = 0;\n")
b.printf("%s = 0;\n", scratchName)
if err := g.writeCoroSuspPoint(b); err != nil {
return err
}
@@ -1212,28 +1231,28 @@ func (g *gen) writeReadUXX(b *buffer, n *a.Expr, name string, size uint32, endia
bPrefix, name, bPrefix, name, name)
g.currFunk.shortReads = append(g.currFunk.shortReads, name)
b.printf("uint32_t %s%d = self->private_impl.scratch", tPrefix, temp0)
b.printf("uint32_t %s%d = %s", tPrefix, temp0, scratchName)
switch endianness {
case "BE":
b.printf("& 0xFF;")
b.printf("self->private_impl.scratch >>= 8;")
b.printf("self->private_impl.scratch <<= 8;")
b.printf("self->private_impl.scratch |= ((uint64_t)(*%srptr_%s++)) << (64 - %s%d);",
bPrefix, name, tPrefix, temp0)
b.printf("%s >>= 8;", scratchName)
b.printf("%s <<= 8;", scratchName)
b.printf("%s |= ((uint64_t)(*%srptr_%s++)) << (64 - %s%d);",
scratchName, bPrefix, name, tPrefix, temp0)
case "LE":
b.printf(">> 56;")
b.printf("self->private_impl.scratch <<= 8;")
b.printf("self->private_impl.scratch >>= 8;")
b.printf("self->private_impl.scratch |= ((uint64_t)(*%srptr_%s++)) << %s%d;",
bPrefix, name, tPrefix, temp0)
b.printf("%s <<= 8;", scratchName)
b.printf("%s >>= 8;", scratchName)
b.printf("%s |= ((uint64_t)(*%srptr_%s++)) << %s%d;",
scratchName, bPrefix, name, tPrefix, temp0)
}
b.printf("if (%s%d == %d) {", tPrefix, temp0, size-8)
switch endianness {
case "BE":
b.printf("%s%d = self->private_impl.scratch >> (64 - %d);", tPrefix, temp1, size)
b.printf("%s%d = %s >> (64 - %d);", tPrefix, temp1, scratchName, size)
case "LE":
b.printf("%s%d = self->private_impl.scratch;", tPrefix, temp1)
b.printf("%s%d = %s;", tPrefix, temp1, scratchName)
}
b.printf("break;")
b.printf("}")
@@ -1241,9 +1260,9 @@ func (g *gen) writeReadUXX(b *buffer, n *a.Expr, name string, size uint32, endia
b.printf("%s%d += 8;", tPrefix, temp0)
switch endianness {
case "BE":
b.printf("self->private_impl.scratch |= ((uint64_t)(%s%d));", tPrefix, temp0)
b.printf("%s |= ((uint64_t)(%s%d));", scratchName, tPrefix, temp0)
case "LE":
b.printf("self->private_impl.scratch |= ((uint64_t)(%s%d)) << 56;", tPrefix, temp0)
b.printf("%s |= ((uint64_t)(%s%d)) << 56;", scratchName, tPrefix, temp0)
}
b.writes("}}\n")
+39 -30
View File
@@ -152,7 +152,6 @@ typedef struct {
struct {
puffs_flate_status status;
uint32_t magic;
uint64_t scratch;
uint32_t f_bits;
uint32_t f_n_bits;
@@ -171,6 +170,7 @@ typedef struct {
struct {
uint32_t coro_susp_point;
uint32_t v_n;
uint64_t scratch;
} c_decode_uncompressed[1];
struct {
uint32_t coro_susp_point;
@@ -184,6 +184,7 @@ typedef struct {
uint32_t v_redir_mask;
uint32_t v_length;
uint32_t v_distance;
uint64_t scratch;
} c_decode_huffman[1];
struct {
uint32_t coro_susp_point;
@@ -218,7 +219,6 @@ typedef struct {
struct {
puffs_flate_status status;
uint32_t magic;
uint64_t scratch;
puffs_flate_decoder f_dec;
@@ -226,6 +226,7 @@ typedef struct {
uint32_t coro_susp_point;
uint16_t v_x;
uint32_t v_checksum;
uint64_t scratch;
} c_decode[1];
} private_impl;
} puffs_flate_zlib_decoder;
@@ -775,22 +776,25 @@ puffs_flate_status puffs_flate_decoder_decode_uncompressed(
t_1 = PUFFS_U32LE(b_rptr_src);
b_rptr_src += 4;
} else {
self->private_impl.scratch = 0;
self->private_impl.c_decode_uncompressed[0].scratch = 0;
PUFFS_COROUTINE_SUSPENSION_POINT(2);
while (true) {
if (PUFFS_UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
uint32_t t_0 = self->private_impl.scratch >> 56;
self->private_impl.scratch <<= 8;
self->private_impl.scratch >>= 8;
self->private_impl.scratch |= ((uint64_t)(*b_rptr_src++)) << t_0;
uint32_t t_0 =
self->private_impl.c_decode_uncompressed[0].scratch >> 56;
self->private_impl.c_decode_uncompressed[0].scratch <<= 8;
self->private_impl.c_decode_uncompressed[0].scratch >>= 8;
self->private_impl.c_decode_uncompressed[0].scratch |=
((uint64_t)(*b_rptr_src++)) << t_0;
if (t_0 == 24) {
t_1 = self->private_impl.scratch;
t_1 = self->private_impl.c_decode_uncompressed[0].scratch;
break;
}
t_0 += 8;
self->private_impl.scratch |= ((uint64_t)(t_0)) << 56;
self->private_impl.c_decode_uncompressed[0].scratch |= ((uint64_t)(t_0))
<< 56;
}
}
v_n = t_1;
@@ -800,9 +804,10 @@ puffs_flate_status puffs_flate_decoder_decode_uncompressed(
}
PUFFS_COROUTINE_SUSPENSION_POINT(3);
{
self->private_impl.scratch = ((v_n) & ((1 << (16)) - 1));
self->private_impl.c_decode_uncompressed[0].scratch =
((v_n) & ((1 << (16)) - 1));
PUFFS_COROUTINE_SUSPENSION_POINT(4);
size_t t_2 = self->private_impl.scratch;
size_t t_2 = self->private_impl.c_decode_uncompressed[0].scratch;
if (t_2 > b_wend_dst - b_wptr_dst) {
t_2 = b_wend_dst - b_wptr_dst;
status = PUFFS_FLATE_SUSPENSION_SHORT_WRITE;
@@ -815,7 +820,7 @@ puffs_flate_status puffs_flate_decoder_decode_uncompressed(
b_wptr_dst += t_2;
b_rptr_src += t_2;
if (status) {
self->private_impl.scratch -= t_2;
self->private_impl.c_decode_uncompressed[0].scratch -= t_2;
goto suspend;
}
}
@@ -1102,17 +1107,19 @@ puffs_flate_status puffs_flate_decoder_decode_huffman(
v_n_bits -= v_table_entry_n_bits;
PUFFS_COROUTINE_SUSPENSION_POINT(8);
{
self->private_impl.scratch =
self->private_impl.c_decode_huffman[0].scratch =
((uint64_t)(v_distance) << 32) | (uint64_t)(v_length);
PUFFS_COROUTINE_SUSPENSION_POINT(9);
size_t t_6 = (size_t)(self->private_impl.scratch >> 32);
size_t t_6 =
(size_t)(self->private_impl.c_decode_huffman[0].scratch >> 32);
if (PUFFS_UNLIKELY((t_6 == 0) ||
(t_6 > (b_wptr_dst - a_dst.buf->ptr)))) {
status = PUFFS_FLATE_ERROR_BAD_ARGUMENT;
goto exit;
}
uint8_t* t_7 = b_wptr_dst - t_6;
uint32_t t_8 = (uint32_t)(self->private_impl.scratch);
uint32_t t_8 =
(uint32_t)(self->private_impl.c_decode_huffman[0].scratch);
if (PUFFS_LIKELY((size_t)(t_8) <= (b_wend_dst - b_wptr_dst))) {
for (; t_8 >= 8; t_8 -= 8) {
*b_wptr_dst++ = *t_7++;
@@ -1129,7 +1136,7 @@ puffs_flate_status puffs_flate_decoder_decode_huffman(
}
} else {
t_8 = (uint32_t)(b_wend_dst - b_wptr_dst);
self->private_impl.scratch -= (uint64_t)(t_8);
self->private_impl.c_decode_huffman[0].scratch -= (uint64_t)(t_8);
for (; t_8; t_8--) {
*b_wptr_dst++ = *t_7++;
}
@@ -1832,22 +1839,23 @@ puffs_flate_status puffs_flate_zlib_decoder_decode(
t_1 = PUFFS_U16BE(b_rptr_src);
b_rptr_src += 2;
} else {
self->private_impl.scratch = 0;
self->private_impl.c_decode[0].scratch = 0;
PUFFS_COROUTINE_SUSPENSION_POINT(2);
while (true) {
if (PUFFS_UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
uint32_t t_0 = self->private_impl.scratch & 0xFF;
self->private_impl.scratch >>= 8;
self->private_impl.scratch <<= 8;
self->private_impl.scratch |= ((uint64_t)(*b_rptr_src++)) << (64 - t_0);
uint32_t t_0 = self->private_impl.c_decode[0].scratch & 0xFF;
self->private_impl.c_decode[0].scratch >>= 8;
self->private_impl.c_decode[0].scratch <<= 8;
self->private_impl.c_decode[0].scratch |= ((uint64_t)(*b_rptr_src++))
<< (64 - t_0);
if (t_0 == 8) {
t_1 = self->private_impl.scratch >> (64 - 16);
t_1 = self->private_impl.c_decode[0].scratch >> (64 - 16);
break;
}
t_0 += 8;
self->private_impl.scratch |= ((uint64_t)(t_0));
self->private_impl.c_decode[0].scratch |= ((uint64_t)(t_0));
}
}
v_x = t_1;
@@ -1900,22 +1908,23 @@ puffs_flate_status puffs_flate_zlib_decoder_decode(
t_3 = PUFFS_U32BE(b_rptr_src);
b_rptr_src += 4;
} else {
self->private_impl.scratch = 0;
self->private_impl.c_decode[0].scratch = 0;
PUFFS_COROUTINE_SUSPENSION_POINT(5);
while (true) {
if (PUFFS_UNLIKELY(b_rptr_src == b_rend_src)) {
goto short_read_src;
}
uint32_t t_2 = self->private_impl.scratch & 0xFF;
self->private_impl.scratch >>= 8;
self->private_impl.scratch <<= 8;
self->private_impl.scratch |= ((uint64_t)(*b_rptr_src++)) << (64 - t_2);
uint32_t t_2 = self->private_impl.c_decode[0].scratch & 0xFF;
self->private_impl.c_decode[0].scratch >>= 8;
self->private_impl.c_decode[0].scratch <<= 8;
self->private_impl.c_decode[0].scratch |= ((uint64_t)(*b_rptr_src++))
<< (64 - t_2);
if (t_2 == 24) {
t_3 = self->private_impl.scratch >> (64 - 32);
t_3 = self->private_impl.c_decode[0].scratch >> (64 - 32);
break;
}
t_2 += 8;
self->private_impl.scratch |= ((uint64_t)(t_2));
self->private_impl.c_decode[0].scratch |= ((uint64_t)(t_2));
}
}
v_checksum = t_3;
+8 -6
View File
@@ -130,7 +130,6 @@ typedef struct {
struct {
puffs_gif_status status;
uint32_t magic;
uint64_t scratch;
uint32_t f_literal_width;
uint8_t f_stack[4096];
@@ -164,7 +163,6 @@ typedef struct {
struct {
puffs_gif_status status;
uint32_t magic;
uint64_t scratch;
uint32_t f_width;
uint32_t f_height;
@@ -191,6 +189,7 @@ typedef struct {
uint32_t coro_susp_point;
uint8_t v_label;
uint8_t v_block_size;
uint64_t scratch;
} c_decode_extension[1];
struct {
uint32_t coro_susp_point;
@@ -862,10 +861,13 @@ puffs_gif_status puffs_gif_decoder_decode_extension(puffs_gif_decoder* self,
goto label_0_break;
}
PUFFS_COROUTINE_SUSPENSION_POINT(3);
self->private_impl.scratch = ((uint32_t)(v_block_size));
self->private_impl.c_decode_extension[0].scratch =
((uint32_t)(v_block_size));
PUFFS_COROUTINE_SUSPENSION_POINT(4);
if (self->private_impl.scratch > b_rend_src - b_rptr_src) {
self->private_impl.scratch -= b_rend_src - b_rptr_src;
if (self->private_impl.c_decode_extension[0].scratch >
b_rend_src - b_rptr_src) {
self->private_impl.c_decode_extension[0].scratch -=
b_rend_src - b_rptr_src;
b_rptr_src = b_rend_src;
if (a_src.limit.ptr_to_len) {
status = PUFFS_GIF_SUSPENSION_LIMITED_READ;
@@ -877,7 +879,7 @@ puffs_gif_status puffs_gif_decoder_decode_extension(puffs_gif_decoder* self,
}
goto suspend;
}
b_rptr_src += self->private_impl.scratch;
b_rptr_src += self->private_impl.c_decode_extension[0].scratch;
}
label_0_break:;
self->private_impl.c_decode_extension[0].coro_susp_point = 0;
+3 -2
View File
@@ -152,7 +152,6 @@ typedef struct {
struct {
puffs_flate_status status;
uint32_t magic;
uint64_t scratch;
uint32_t f_bits;
uint32_t f_n_bits;
@@ -171,6 +170,7 @@ typedef struct {
struct {
uint32_t coro_susp_point;
uint32_t v_n;
uint64_t scratch;
} c_decode_uncompressed[1];
struct {
uint32_t coro_susp_point;
@@ -184,6 +184,7 @@ typedef struct {
uint32_t v_redir_mask;
uint32_t v_length;
uint32_t v_distance;
uint64_t scratch;
} c_decode_huffman[1];
struct {
uint32_t coro_susp_point;
@@ -218,7 +219,6 @@ typedef struct {
struct {
puffs_flate_status status;
uint32_t magic;
uint64_t scratch;
puffs_flate_decoder f_dec;
@@ -226,6 +226,7 @@ typedef struct {
uint32_t coro_susp_point;
uint16_t v_x;
uint32_t v_checksum;
uint64_t scratch;
} c_decode[1];
} private_impl;
} puffs_flate_zlib_decoder;
+1 -2
View File
@@ -130,7 +130,6 @@ typedef struct {
struct {
puffs_gif_status status;
uint32_t magic;
uint64_t scratch;
uint32_t f_literal_width;
uint8_t f_stack[4096];
@@ -164,7 +163,6 @@ typedef struct {
struct {
puffs_gif_status status;
uint32_t magic;
uint64_t scratch;
uint32_t f_width;
uint32_t f_height;
@@ -191,6 +189,7 @@ typedef struct {
uint32_t coro_susp_point;
uint8_t v_label;
uint8_t v_block_size;
uint64_t scratch;
} c_decode_extension[1];
struct {
uint32_t coro_susp_point;