Add limited read/write status codes.

This commit is contained in:
Nigel Tao committed 2017-07-16 15:51:45 +10:00
1 parent 8c795fb2dc
commit 5eb9bce5f7
6 files changed
+78 -39

No files matched your search

+11 -6
View File
@@ -830,8 +830,9 @@ 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)
// TODO: check limits too.
g.printf("if (%ssrc.buf->closed) {", aPrefix)
g.printf("if (%ssrc.limit.next) {", 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)
g.printf("status = %sSUSPENSION_SHORT_READ; goto suspend;\n", g.PKGPREFIX)
@@ -975,12 +976,16 @@ 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("if ((%s%s.buf->closed) && (%s%s.buf->ri == %s%s.buf->wi)) {",
g.printf("if (%s%s.limit.next) {", 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("status = %sERROR_UNEXPECTED_EOF; goto exit;", g.PKGPREFIX)
g.printf("status = %sERROR_UNEXPECTED_EOF;", g.PKGPREFIX)
g.writes("goto exit;")
g.writes("}")
g.printf("status = %sSUSPENSION_SHORT_READ; goto suspend;\n", g.PKGPREFIX)
g.printf("status = %sSUSPENSION_SHORT_READ;", g.PKGPREFIX)
g.writes("goto suspend;\n")
return nil
}
+3 -1
View File
@@ -88,10 +88,12 @@ var builtInStatuses = [...]string{
"error bad receiver",
"error bad argument",
"error constructor not called",
"error closed for writes",
"error unexpected EOF", // Used if reading when closed == true.
"suspension short read", // Used if reading when closed == false.
"suspension short write",
"error closed for writes",
"suspension limited read",
"suspension limited write",
}
func init() {
+20 -10
View File
@@ -95,10 +95,12 @@ typedef int32_t puffs_flate_status;
#define PUFFS_FLATE_ERROR_BAD_RECEIVER -2147483646 // 0x80000002
#define PUFFS_FLATE_ERROR_BAD_ARGUMENT -2147483645 // 0x80000003
#define PUFFS_FLATE_ERROR_CONSTRUCTOR_NOT_CALLED -2147483644 // 0x80000004
#define PUFFS_FLATE_ERROR_UNEXPECTED_EOF -2147483643 // 0x80000005
#define PUFFS_FLATE_SUSPENSION_SHORT_READ 6 // 0x00000006
#define PUFFS_FLATE_SUSPENSION_SHORT_WRITE 7 // 0x00000007
#define PUFFS_FLATE_ERROR_CLOSED_FOR_WRITES -2147483640 // 0x80000008
#define PUFFS_FLATE_ERROR_CLOSED_FOR_WRITES -2147483643 // 0x80000005
#define PUFFS_FLATE_ERROR_UNEXPECTED_EOF -2147483642 // 0x80000006
#define PUFFS_FLATE_SUSPENSION_SHORT_READ 7 // 0x00000007
#define PUFFS_FLATE_SUSPENSION_SHORT_WRITE 8 // 0x00000008
#define PUFFS_FLATE_SUSPENSION_LIMITED_READ 9 // 0x00000009
#define PUFFS_FLATE_SUSPENSION_LIMITED_WRITE 10 // 0x0000000a
#define PUFFS_FLATE_ERROR_BAD_DISTANCE_CODE_COUNT -1157040128 // 0xbb08f800
#define PUFFS_FLATE_ERROR_BAD_FLATE_BLOCK -1157040127 // 0xbb08f801
@@ -233,16 +235,18 @@ bool puffs_flate_status_is_error(puffs_flate_status s) {
return s < 0;
}
const char* puffs_flate_status_strings0[9] = {
const char* puffs_flate_status_strings0[11] = {
"flate: ok",
"flate: bad puffs version",
"flate: bad receiver",
"flate: bad argument",
"flate: constructor not called",
"flate: closed for writes",
"flate: unexpected EOF",
"flate: short read",
"flate: short write",
"flate: closed for writes",
"flate: limited read",
"flate: limited write",
};
const char* puffs_flate_status_strings1[7] = {
@@ -261,7 +265,7 @@ const char* puffs_flate_status_string(puffs_flate_status s) {
switch ((s >> 10) & 0x1fffff) {
case 0:
a = puffs_flate_status_strings0;
n = 9;
n = 11;
break;
case puffs_flate_packageid:
a = puffs_flate_status_strings1;
@@ -468,7 +472,9 @@ exit:
return status;
short_read_src:
if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) {
if (a_src.limit.next) {
status = PUFFS_FLATE_SUSPENSION_LIMITED_READ;
} else if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) {
status = PUFFS_FLATE_ERROR_UNEXPECTED_EOF;
goto exit;
}
@@ -618,7 +624,9 @@ exit:
return status;
short_read_src:
if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) {
if (a_src.limit.next) {
status = PUFFS_FLATE_SUSPENSION_LIMITED_READ;
} else if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) {
status = PUFFS_FLATE_ERROR_UNEXPECTED_EOF;
goto exit;
}
@@ -758,7 +766,9 @@ exit:
return status;
short_read_src:
if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) {
if (a_src.limit.next) {
status = PUFFS_FLATE_SUSPENSION_LIMITED_READ;
} else if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) {
status = PUFFS_FLATE_ERROR_UNEXPECTED_EOF;
goto exit;
}
+32 -14
View File
@@ -95,10 +95,12 @@ typedef int32_t puffs_gif_status;
#define PUFFS_GIF_ERROR_BAD_RECEIVER -2147483646 // 0x80000002
#define PUFFS_GIF_ERROR_BAD_ARGUMENT -2147483645 // 0x80000003
#define PUFFS_GIF_ERROR_CONSTRUCTOR_NOT_CALLED -2147483644 // 0x80000004
#define PUFFS_GIF_ERROR_UNEXPECTED_EOF -2147483643 // 0x80000005
#define PUFFS_GIF_SUSPENSION_SHORT_READ 6 // 0x00000006
#define PUFFS_GIF_SUSPENSION_SHORT_WRITE 7 // 0x00000007
#define PUFFS_GIF_ERROR_CLOSED_FOR_WRITES -2147483640 // 0x80000008
#define PUFFS_GIF_ERROR_CLOSED_FOR_WRITES -2147483643 // 0x80000005
#define PUFFS_GIF_ERROR_UNEXPECTED_EOF -2147483642 // 0x80000006
#define PUFFS_GIF_SUSPENSION_SHORT_READ 7 // 0x00000007
#define PUFFS_GIF_SUSPENSION_SHORT_WRITE 8 // 0x00000008
#define PUFFS_GIF_SUSPENSION_LIMITED_READ 9 // 0x00000009
#define PUFFS_GIF_SUSPENSION_LIMITED_WRITE 10 // 0x0000000a
#define PUFFS_GIF_ERROR_BAD_GIF_BLOCK -1105848320 // 0xbe161800
#define PUFFS_GIF_ERROR_BAD_GIF_EXTENSION_LABEL -1105848319 // 0xbe161801
@@ -286,16 +288,18 @@ bool puffs_gif_status_is_error(puffs_gif_status s) {
return s < 0;
}
const char* puffs_gif_status_strings0[9] = {
const char* puffs_gif_status_strings0[11] = {
"gif: ok",
"gif: bad puffs version",
"gif: bad receiver",
"gif: bad argument",
"gif: constructor not called",
"gif: closed for writes",
"gif: unexpected EOF",
"gif: short read",
"gif: short write",
"gif: closed for writes",
"gif: limited read",
"gif: limited write",
};
const char* puffs_gif_status_strings1[7] = {
@@ -314,7 +318,7 @@ const char* puffs_gif_status_string(puffs_gif_status s) {
switch ((s >> 10) & 0x1fffff) {
case 0:
a = puffs_gif_status_strings0;
n = 9;
n = 11;
break;
case puffs_gif_packageid:
a = puffs_gif_status_strings1;
@@ -593,7 +597,9 @@ exit:
return status;
short_read_src:
if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) {
if (a_src.limit.next) {
status = PUFFS_GIF_SUSPENSION_LIMITED_READ;
} else if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) {
status = PUFFS_GIF_ERROR_UNEXPECTED_EOF;
goto exit;
}
@@ -677,7 +683,9 @@ exit:
return status;
short_read_src:
if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) {
if (a_src.limit.next) {
status = PUFFS_GIF_SUSPENSION_LIMITED_READ;
} else if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) {
status = PUFFS_GIF_ERROR_UNEXPECTED_EOF;
goto exit;
}
@@ -788,7 +796,9 @@ exit:
return status;
short_read_src:
if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) {
if (a_src.limit.next) {
status = PUFFS_GIF_SUSPENSION_LIMITED_READ;
} else if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) {
status = PUFFS_GIF_ERROR_UNEXPECTED_EOF;
goto exit;
}
@@ -855,7 +865,9 @@ 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;
if (a_src.buf->closed) {
if (a_src.limit.next) {
status = PUFFS_GIF_SUSPENSION_LIMITED_READ;
} else if (a_src.buf->closed) {
status = PUFFS_GIF_ERROR_UNEXPECTED_EOF;
goto exit;
}
@@ -890,7 +902,9 @@ exit:
return status;
short_read_src:
if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) {
if (a_src.limit.next) {
status = PUFFS_GIF_SUSPENSION_LIMITED_READ;
} else if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) {
status = PUFFS_GIF_ERROR_UNEXPECTED_EOF;
goto exit;
}
@@ -1048,7 +1062,9 @@ exit:
return status;
short_read_src:
if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) {
if (a_src.limit.next) {
status = PUFFS_GIF_SUSPENSION_LIMITED_READ;
} else if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) {
status = PUFFS_GIF_ERROR_UNEXPECTED_EOF;
goto exit;
}
@@ -1278,7 +1294,9 @@ exit:
return status;
short_read_src:
if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) {
if (a_src.limit.next) {
status = PUFFS_GIF_SUSPENSION_LIMITED_READ;
} else if ((a_src.buf->closed) && (a_src.buf->ri == a_src.buf->wi)) {
status = PUFFS_GIF_ERROR_UNEXPECTED_EOF;
goto exit;
}
+6 -4
View File
@@ -95,10 +95,12 @@ typedef int32_t puffs_flate_status;
#define PUFFS_FLATE_ERROR_BAD_RECEIVER -2147483646 // 0x80000002
#define PUFFS_FLATE_ERROR_BAD_ARGUMENT -2147483645 // 0x80000003
#define PUFFS_FLATE_ERROR_CONSTRUCTOR_NOT_CALLED -2147483644 // 0x80000004
#define PUFFS_FLATE_ERROR_UNEXPECTED_EOF -2147483643 // 0x80000005
#define PUFFS_FLATE_SUSPENSION_SHORT_READ 6 // 0x00000006
#define PUFFS_FLATE_SUSPENSION_SHORT_WRITE 7 // 0x00000007
#define PUFFS_FLATE_ERROR_CLOSED_FOR_WRITES -2147483640 // 0x80000008
#define PUFFS_FLATE_ERROR_CLOSED_FOR_WRITES -2147483643 // 0x80000005
#define PUFFS_FLATE_ERROR_UNEXPECTED_EOF -2147483642 // 0x80000006
#define PUFFS_FLATE_SUSPENSION_SHORT_READ 7 // 0x00000007
#define PUFFS_FLATE_SUSPENSION_SHORT_WRITE 8 // 0x00000008
#define PUFFS_FLATE_SUSPENSION_LIMITED_READ 9 // 0x00000009
#define PUFFS_FLATE_SUSPENSION_LIMITED_WRITE 10 // 0x0000000a
#define PUFFS_FLATE_ERROR_BAD_DISTANCE_CODE_COUNT -1157040128 // 0xbb08f800
#define PUFFS_FLATE_ERROR_BAD_FLATE_BLOCK -1157040127 // 0xbb08f801
+6 -4
View File
@@ -95,10 +95,12 @@ typedef int32_t puffs_gif_status;
#define PUFFS_GIF_ERROR_BAD_RECEIVER -2147483646 // 0x80000002
#define PUFFS_GIF_ERROR_BAD_ARGUMENT -2147483645 // 0x80000003
#define PUFFS_GIF_ERROR_CONSTRUCTOR_NOT_CALLED -2147483644 // 0x80000004
#define PUFFS_GIF_ERROR_UNEXPECTED_EOF -2147483643 // 0x80000005
#define PUFFS_GIF_SUSPENSION_SHORT_READ 6 // 0x00000006
#define PUFFS_GIF_SUSPENSION_SHORT_WRITE 7 // 0x00000007
#define PUFFS_GIF_ERROR_CLOSED_FOR_WRITES -2147483640 // 0x80000008
#define PUFFS_GIF_ERROR_CLOSED_FOR_WRITES -2147483643 // 0x80000005
#define PUFFS_GIF_ERROR_UNEXPECTED_EOF -2147483642 // 0x80000006
#define PUFFS_GIF_SUSPENSION_SHORT_READ 7 // 0x00000007
#define PUFFS_GIF_SUSPENSION_SHORT_WRITE 8 // 0x00000008
#define PUFFS_GIF_SUSPENSION_LIMITED_READ 9 // 0x00000009
#define PUFFS_GIF_SUSPENSION_LIMITED_WRITE 10 // 0x0000000a
#define PUFFS_GIF_ERROR_BAD_GIF_BLOCK -1105848320 // 0xbe161800
#define PUFFS_GIF_ERROR_BAD_GIF_EXTENSION_LABEL -1105848319 // 0xbe161801