Track copy_from32 bytes remaining after suspend.

This commit is contained in:
Nigel Tao committed 2017-07-13 10:30:39 +10:00
1 parent 8c5b50ef1f
commit d83cf7f3d5
6 files changed
+27 -5

No files matched your search

+7 -3
View File
@@ -877,13 +877,18 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error {
g.writes("{\n")
g.printf("size_t %s%d = ", tPrefix, temp)
g.writes("self->private_impl.scratch = ")
x := n.Args()[1].Arg().Value()
if err := g.writeExpr(x, replaceCallSuspendibles, parenthesesMandatory, depth); err != nil {
return err
}
g.writes(";\n")
if err := g.writeSuspend(); err != nil {
return err
}
g.printf("size_t %s%d = self->private_impl.scratch;\n", tPrefix, temp)
const wName = "dst"
g.printf("if (%s%d > %swend_%s - %swptr_%s) {\n", tPrefix, temp, bPrefix, wName, bPrefix, wName)
g.printf("%s%d = %swend_%s - %swptr_%s;\n", tPrefix, temp, bPrefix, wName, bPrefix, wName)
@@ -900,8 +905,7 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error {
g.printf("memmove(%swptr_%s, %srptr_%s, %s%d);\n", bPrefix, wName, bPrefix, rName, tPrefix, temp)
g.printf("%swptr_%s += %s%d;\n", bPrefix, wName, tPrefix, temp)
g.printf("%srptr_%s += %s%d;\n", bPrefix, rName, tPrefix, temp)
// TODO: when suspending, save how many bytes remain to be copied.
g.writes("if (status) { goto suspend; }\n")
g.printf("if (status) { self->private_impl.scratch = %s%d; goto suspend; }\n", tPrefix, temp)
g.writes("}\n")
+3 -1
View File
@@ -441,7 +441,9 @@ func (g *gen) writeStruct(n *a.Struct) error {
g.writes("struct {\n")
if n.Suspendible() {
g.printf("puffs_%s_status status;\n", g.pkgName)
g.printf("uint32_t magic;\n")
g.writes("uint32_t magic;\n")
g.writes("uint64_t scratch;\n")
g.writes("\n")
}
for _, o := range n.Fields() {
+7 -1
View File
@@ -125,6 +125,8 @@ typedef struct {
struct {
puffs_flate_status status;
uint32_t magic;
uint64_t scratch;
uint32_t f_bits;
uint32_t f_n_bits;
@@ -512,7 +514,10 @@ puffs_flate_status puffs_flate_decoder_decode_uncompressed(
}
PUFFS_COROUTINE_STATE(5);
{
size_t t_4 = ((((uint32_t)(v_n1)) << 8) | ((uint32_t)(v_n0)));
self->private_impl.scratch =
((((uint32_t)(v_n1)) << 8) | ((uint32_t)(v_n0)));
PUFFS_COROUTINE_STATE(6);
size_t t_4 = self->private_impl.scratch;
if (t_4 > b_wend_dst - b_wptr_dst) {
t_4 = b_wend_dst - b_wptr_dst;
status = PUFFS_FLATE_SUSPENSION_SHORT_WRITE;
@@ -525,6 +530,7 @@ puffs_flate_status puffs_flate_decoder_decode_uncompressed(
b_wptr_dst += t_4;
b_rptr_src += t_4;
if (status) {
self->private_impl.scratch = t_4;
goto suspend;
}
}
+4
View File
@@ -126,6 +126,8 @@ typedef struct {
struct {
puffs_gif_status status;
uint32_t magic;
uint64_t scratch;
uint32_t f_literal_width;
uint8_t f_stack[4096];
uint8_t f_suffixes[4096];
@@ -158,6 +160,8 @@ typedef struct {
struct {
puffs_gif_status status;
uint32_t magic;
uint64_t scratch;
uint32_t f_width;
uint32_t f_height;
uint8_t f_background_color_index;
+2
View File
@@ -125,6 +125,8 @@ typedef struct {
struct {
puffs_flate_status status;
uint32_t magic;
uint64_t scratch;
uint32_t f_bits;
uint32_t f_n_bits;
+4
View File
@@ -126,6 +126,8 @@ typedef struct {
struct {
puffs_gif_status status;
uint32_t magic;
uint64_t scratch;
uint32_t f_literal_width;
uint8_t f_stack[4096];
uint8_t f_suffixes[4096];
@@ -158,6 +160,8 @@ typedef struct {
struct {
puffs_gif_status status;
uint32_t magic;
uint64_t scratch;
uint32_t f_width;
uint32_t f_height;
uint8_t f_background_color_index;