From 21bb96d756d3b728868eb3f2c016fb05ad9c3402 Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 16 Jul 2017 15:21:27 +1000 Subject: [PATCH] Refactor short read status code calculations. --- cmd/puffs-gen-c/func.go | 16 ++++++++------ gen/c/std/flate.c | 21 ++++++++---------- gen/c/std/gif.c | 48 ++++++++++++++++++----------------------- 3 files changed, 39 insertions(+), 46 deletions(-) diff --git a/cmd/puffs-gen-c/func.go b/cmd/puffs-gen-c/func.go index 3ce615be..d778c8e2 100644 --- a/cmd/puffs-gen-c/func.go +++ b/cmd/puffs-gen-c/func.go @@ -830,9 +830,10 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error { 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("status = %ssrc.buf->closed ? PUFFS_%s_ERROR_UNEXPECTED_EOF : PUFFS_%s_SUSPENSION_SHORT_READ;", - aPrefix, g.PKGNAME, g.PKGNAME) - g.writes("if (status < 0) { goto exit; } goto suspend;") + // TODO: check limits too. + g.printf("if (%ssrc.buf->closed) {", aPrefix) + g.printf("status = PUFFS_%s_ERROR_UNEXPECTED_EOF; goto exit; }", g.PKGNAME) + g.printf("status = PUFFS_%s_SUSPENSION_SHORT_READ; goto suspend;\n", g.PKGNAME) g.writes("}\n") g.printf("%srptr_src += %s%d;\n", bPrefix, tPrefix, temp) @@ -975,10 +976,11 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error { func (g *gen) writeShortRead(name string) error { g.printf("\nshort_read_%s:\n", name) // TODO: ri == wi isn't the right condition. - g.printf("status = ((%s%s.buf->closed) && (%s%s.buf->ri == %s%s.buf->wi)) ?"+ - "PUFFS_%s_ERROR_UNEXPECTED_EOF : PUFFS_%s_SUSPENSION_SHORT_READ;", - aPrefix, name, aPrefix, name, aPrefix, name, g.PKGNAME, g.PKGNAME) - g.writes("if (status < 0) { goto exit; } goto suspend;") + g.printf("if ((%s%s.buf->closed) && (%s%s.buf->ri == %s%s.buf->wi)) {", + aPrefix, name, aPrefix, name, aPrefix, name) + g.printf("status = PUFFS_%s_ERROR_UNEXPECTED_EOF; goto exit;", g.PKGNAME) + g.writes("}") + g.printf("status = PUFFS_%s_SUSPENSION_SHORT_READ; goto suspend;\n", g.PKGNAME) return nil } diff --git a/gen/c/std/flate.c b/gen/c/std/flate.c index c1a3f318..716e07c4 100644 --- a/gen/c/std/flate.c +++ b/gen/c/std/flate.c @@ -468,12 +468,11 @@ exit: return status; short_read_src: - status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) - ? PUFFS_FLATE_ERROR_UNEXPECTED_EOF - : PUFFS_FLATE_SUSPENSION_SHORT_READ; - if (status < 0) { + if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) { + status = PUFFS_FLATE_ERROR_UNEXPECTED_EOF; goto exit; } + status = PUFFS_FLATE_SUSPENSION_SHORT_READ; goto suspend; } @@ -619,12 +618,11 @@ exit: return status; short_read_src: - status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) - ? PUFFS_FLATE_ERROR_UNEXPECTED_EOF - : PUFFS_FLATE_SUSPENSION_SHORT_READ; - if (status < 0) { + if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) { + status = PUFFS_FLATE_ERROR_UNEXPECTED_EOF; goto exit; } + status = PUFFS_FLATE_SUSPENSION_SHORT_READ; goto suspend; } @@ -760,11 +758,10 @@ exit: return status; short_read_src: - status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) - ? PUFFS_FLATE_ERROR_UNEXPECTED_EOF - : PUFFS_FLATE_SUSPENSION_SHORT_READ; - if (status < 0) { + if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) { + status = PUFFS_FLATE_ERROR_UNEXPECTED_EOF; goto exit; } + status = PUFFS_FLATE_SUSPENSION_SHORT_READ; goto suspend; } diff --git a/gen/c/std/gif.c b/gen/c/std/gif.c index 228a325a..d0c9bd81 100644 --- a/gen/c/std/gif.c +++ b/gen/c/std/gif.c @@ -593,12 +593,11 @@ exit: return status; short_read_src: - status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) - ? PUFFS_GIF_ERROR_UNEXPECTED_EOF - : PUFFS_GIF_SUSPENSION_SHORT_READ; - if (status < 0) { + if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) { + status = PUFFS_GIF_ERROR_UNEXPECTED_EOF; goto exit; } + status = PUFFS_GIF_SUSPENSION_SHORT_READ; goto suspend; } @@ -678,12 +677,11 @@ exit: return status; short_read_src: - status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) - ? PUFFS_GIF_ERROR_UNEXPECTED_EOF - : PUFFS_GIF_SUSPENSION_SHORT_READ; - if (status < 0) { + if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) { + status = PUFFS_GIF_ERROR_UNEXPECTED_EOF; goto exit; } + status = PUFFS_GIF_SUSPENSION_SHORT_READ; goto suspend; } @@ -790,12 +788,11 @@ exit: return status; short_read_src: - status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) - ? PUFFS_GIF_ERROR_UNEXPECTED_EOF - : PUFFS_GIF_SUSPENSION_SHORT_READ; - if (status < 0) { + if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) { + status = PUFFS_GIF_ERROR_UNEXPECTED_EOF; goto exit; } + status = PUFFS_GIF_SUSPENSION_SHORT_READ; goto suspend; } @@ -858,11 +855,11 @@ puffs_gif_status puffs_gif_decoder_decode_extension(puffs_gif_decoder* self, 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; - status = a_src.buf->closed ? PUFFS_GIF_ERROR_UNEXPECTED_EOF - : PUFFS_GIF_SUSPENSION_SHORT_READ; - if (status < 0) { + if (a_src.buf->closed) { + status = PUFFS_GIF_ERROR_UNEXPECTED_EOF; goto exit; } + status = PUFFS_GIF_SUSPENSION_SHORT_READ; goto suspend; } b_rptr_src += t_2; @@ -893,12 +890,11 @@ exit: return status; short_read_src: - status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) - ? PUFFS_GIF_ERROR_UNEXPECTED_EOF - : PUFFS_GIF_SUSPENSION_SHORT_READ; - if (status < 0) { + if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) { + status = PUFFS_GIF_ERROR_UNEXPECTED_EOF; goto exit; } + status = PUFFS_GIF_SUSPENSION_SHORT_READ; goto suspend; } @@ -1052,12 +1048,11 @@ exit: return status; short_read_src: - status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) - ? PUFFS_GIF_ERROR_UNEXPECTED_EOF - : PUFFS_GIF_SUSPENSION_SHORT_READ; - if (status < 0) { + if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) { + status = PUFFS_GIF_ERROR_UNEXPECTED_EOF; goto exit; } + status = PUFFS_GIF_SUSPENSION_SHORT_READ; goto suspend; } @@ -1283,11 +1278,10 @@ exit: return status; short_read_src: - status = ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) - ? PUFFS_GIF_ERROR_UNEXPECTED_EOF - : PUFFS_GIF_SUSPENSION_SHORT_READ; - if (status < 0) { + if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) { + status = PUFFS_GIF_ERROR_UNEXPECTED_EOF; goto exit; } + status = PUFFS_GIF_SUSPENSION_SHORT_READ; goto suspend; }