Improve the check for LIMITED_READ vs SHORT_READ.

This commit is contained in:
Nigel Tao committed 2017-07-16 19:24:16 +10:00
1 parent 5eb9bce5f7
commit a0c772f617
3 files changed
+26 -27

No files matched your search

+6 -7
View File
@@ -817,7 +817,6 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error {
g.perFunc.tempW++
g.perFunc.tempR++
// TODO: loop over all limits.
g.printf("size_t %s%d = ", tPrefix, temp)
x := n.Args()[0].Arg().Value()
if err := g.writeExpr(x, replaceCallSuspendibles, parenthesesMandatory, depth); err != nil {
@@ -828,9 +827,10 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error {
g.printf("if (%s%d > %srend_src - %srptr_src) {\n", tPrefix, temp, bPrefix, bPrefix)
// TODO: save tPrefix+temp as coroutine state, and suspend.
g.printf("%s%d -= %srend_src - %srptr_src;\n", tPrefix, temp, bPrefix, bPrefix)
g.printf("%ssrc.buf->ri = %ssrc.buf->wi;\n", aPrefix, aPrefix)
g.printf("%ssrc.buf->ri += %srend_src - %srptr_src;\n", aPrefix, bPrefix, bPrefix)
g.printf("if (%ssrc.limit.next) {", aPrefix)
// TODO: is ptr_to_len the right check?
g.printf("if (%ssrc.limit.ptr_to_len) {", aPrefix)
g.printf("status = %sSUSPENSION_LIMITED_READ;", g.PKGPREFIX)
g.printf("} else if (%ssrc.buf->closed) {", aPrefix)
g.printf("status = %sERROR_UNEXPECTED_EOF; goto exit; }", g.PKGPREFIX)
@@ -976,11 +976,10 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error {
func (g *gen) writeShortRead(name string) error {
g.printf("\nshort_read_%s:\n", name)
g.printf("if (%s%s.limit.next) {", aPrefix, name)
// TODO: is ptr_to_len the right check?
g.printf("if (%s%s.limit.ptr_to_len) {", aPrefix, name)
g.printf("status = %sSUSPENSION_LIMITED_READ;", g.PKGPREFIX)
// TODO: we should be able to eliminate the ri == wi check.
g.printf("} else if ((%s%s.buf->closed) && (%s%s.buf->ri == %s%s.buf->wi)) {",
aPrefix, name, aPrefix, name, aPrefix, name)
g.printf("} else if (%s%s.buf->closed) {", aPrefix, name)
g.printf("status = %sERROR_UNEXPECTED_EOF;", g.PKGPREFIX)
g.writes("goto exit;")
g.writes("}")
+6 -6
View File
@@ -472,9 +472,9 @@ exit:
return status;
short_read_src:
if (a_src.limit.next) {
if (a_src.limit.ptr_to_len) {
status = PUFFS_FLATE_SUSPENSION_LIMITED_READ;
} else if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) {
} else if (a_src.buf->closed) {
status = PUFFS_FLATE_ERROR_UNEXPECTED_EOF;
goto exit;
}
@@ -624,9 +624,9 @@ exit:
return status;
short_read_src:
if (a_src.limit.next) {
if (a_src.limit.ptr_to_len) {
status = PUFFS_FLATE_SUSPENSION_LIMITED_READ;
} else if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) {
} else if (a_src.buf->closed) {
status = PUFFS_FLATE_ERROR_UNEXPECTED_EOF;
goto exit;
}
@@ -766,9 +766,9 @@ exit:
return status;
short_read_src:
if (a_src.limit.next) {
if (a_src.limit.ptr_to_len) {
status = PUFFS_FLATE_SUSPENSION_LIMITED_READ;
} else if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) {
} else if (a_src.buf->closed) {
status = PUFFS_FLATE_ERROR_UNEXPECTED_EOF;
goto exit;
}
+14 -14
View File
@@ -597,9 +597,9 @@ exit:
return status;
short_read_src:
if (a_src.limit.next) {
if (a_src.limit.ptr_to_len) {
status = PUFFS_GIF_SUSPENSION_LIMITED_READ;
} else if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) {
} else if (a_src.buf->closed) {
status = PUFFS_GIF_ERROR_UNEXPECTED_EOF;
goto exit;
}
@@ -683,9 +683,9 @@ exit:
return status;
short_read_src:
if (a_src.limit.next) {
if (a_src.limit.ptr_to_len) {
status = PUFFS_GIF_SUSPENSION_LIMITED_READ;
} else if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) {
} else if (a_src.buf->closed) {
status = PUFFS_GIF_ERROR_UNEXPECTED_EOF;
goto exit;
}
@@ -796,9 +796,9 @@ exit:
return status;
short_read_src:
if (a_src.limit.next) {
if (a_src.limit.ptr_to_len) {
status = PUFFS_GIF_SUSPENSION_LIMITED_READ;
} else if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) {
} else if (a_src.buf->closed) {
status = PUFFS_GIF_ERROR_UNEXPECTED_EOF;
goto exit;
}
@@ -864,8 +864,8 @@ puffs_gif_status puffs_gif_decoder_decode_extension(puffs_gif_decoder* self,
size_t t_2 = ((uint32_t)(v_block_size));
if (t_2 > b_rend_src - b_rptr_src) {
t_2 -= b_rend_src - b_rptr_src;
a_src.buf->ri = a_src.buf->wi;
if (a_src.limit.next) {
a_src.buf->ri += b_rend_src - b_rptr_src;
if (a_src.limit.ptr_to_len) {
status = PUFFS_GIF_SUSPENSION_LIMITED_READ;
} else if (a_src.buf->closed) {
status = PUFFS_GIF_ERROR_UNEXPECTED_EOF;
@@ -902,9 +902,9 @@ exit:
return status;
short_read_src:
if (a_src.limit.next) {
if (a_src.limit.ptr_to_len) {
status = PUFFS_GIF_SUSPENSION_LIMITED_READ;
} else if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) {
} else if (a_src.buf->closed) {
status = PUFFS_GIF_ERROR_UNEXPECTED_EOF;
goto exit;
}
@@ -1062,9 +1062,9 @@ exit:
return status;
short_read_src:
if (a_src.limit.next) {
if (a_src.limit.ptr_to_len) {
status = PUFFS_GIF_SUSPENSION_LIMITED_READ;
} else if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) {
} else if (a_src.buf->closed) {
status = PUFFS_GIF_ERROR_UNEXPECTED_EOF;
goto exit;
}
@@ -1294,9 +1294,9 @@ exit:
return status;
short_read_src:
if (a_src.limit.next) {
if (a_src.limit.ptr_to_len) {
status = PUFFS_GIF_SUSPENSION_LIMITED_READ;
} else if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) {
} else if (a_src.buf->closed) {
status = PUFFS_GIF_ERROR_UNEXPECTED_EOF;
goto exit;
}