Generate double '_'s for pkg__type__method names.

This commit is contained in:
Nigel Tao committed 2017-10-21 15:10:25 +11:00
1 parent 8ee56a7911
commit 6815375de5
13 files changed
+663 -660

No files matched your search

+20 -23
View File
@@ -60,8 +60,8 @@ const (
func Do(args []string) error {
return generate.Do(args, func(pkgName string, tm *t.Map, c *check.Checker, files []*a.File) ([]byte, error) {
g := &gen{
PKGPREFIX: "PUFFS_" + strings.ToUpper(pkgName) + "_",
pkgPrefix: "puffs_" + pkgName + "_",
PKGPREFIX: "PUFFS_" + strings.ToUpper(pkgName) + "__",
pkgPrefix: "puffs_" + pkgName + "__",
pkgName: pkgName,
tm: tm,
checker: c,
@@ -154,8 +154,8 @@ func (b *buffer) writes(s string) { *b = append(*b, s.
func (b *buffer) writex(s []byte) { *b = append(*b, s...) }
type gen struct {
PKGPREFIX string // e.g. "PUFFS_JPEG_"
pkgPrefix string // e.g. "puffs_jpeg_"
PKGPREFIX string // e.g. "PUFFS_JPEG__"
pkgPrefix string // e.g. "puffs_jpeg__"
pkgName string // e.g. "jpeg"
tm *t.Map
@@ -222,7 +222,7 @@ func (g *gen) genHeader(b *buffer) error {
b.writes("// ---------------- Status Codes\n\n")
b.writes(statusCodeDescription)
b.printf("//\n// Do not manipulate these bits directly. Use the API functions such as\n"+
"// %sstatus_is_error instead.\n", g.pkgPrefix)
"// %sstatus__is_error instead.\n", g.pkgPrefix)
b.printf("typedef int32_t %sstatus;\n\n", g.pkgPrefix)
pkgID := g.checker.PackageID()
b.printf("#define %spackageid %d // %#08x\n\n", g.pkgPrefix, pkgID, pkgID)
@@ -250,8 +250,8 @@ func (g *gen) genHeader(b *buffer) error {
}
b.writes("\n")
b.printf("bool %sstatus_is_error(%sstatus s);\n\n", g.pkgPrefix, g.pkgPrefix)
b.printf("const char* %sstatus_string(%sstatus s);\n\n", g.pkgPrefix, g.pkgPrefix)
b.printf("bool %sstatus__is_error(%sstatus s);\n\n", g.pkgPrefix, g.pkgPrefix)
b.printf("const char* %sstatus__string(%sstatus s);\n\n", g.pkgPrefix, g.pkgPrefix)
b.writes("// ---------------- Public Consts\n\n")
if err := g.forEachConst(b, pubOnly, (*gen).writeConst); err != nil {
@@ -289,26 +289,26 @@ func (g *gen) genImpl(b *buffer) error {
b.writes("\n")
b.writes("// ---------------- Status Codes Implementations\n\n")
b.printf("bool %sstatus_is_error(%sstatus s) { return s < 0; }\n\n", g.pkgPrefix, g.pkgPrefix)
b.printf("bool %sstatus__is_error(%sstatus s) { return s < 0; }\n\n", g.pkgPrefix, g.pkgPrefix)
b.printf("const char* %sstatus_strings0[%d] = {\n", g.pkgPrefix, len(builtin.StatusList))
b.printf("const char* %sstatus__strings0[%d] = {\n", g.pkgPrefix, len(builtin.StatusList))
for _, z := range builtin.StatusList {
b.printf("%q,", g.pkgName+": "+z.Message)
}
b.writes("};\n\n")
b.printf("const char* %sstatus_strings1[%d] = {\n", g.pkgPrefix, len(g.statusList))
b.printf("const char* %sstatus__strings1[%d] = {\n", g.pkgPrefix, len(g.statusList))
for _, s := range g.statusList {
b.printf("%q,", g.pkgName+": "+s.msg)
}
b.writes("};\n\n")
b.printf("const char* %sstatus_string(%sstatus s) {\n", g.pkgPrefix, g.pkgPrefix)
b.printf("const char* %sstatus__string(%sstatus s) {\n", g.pkgPrefix, g.pkgPrefix)
b.printf("const char** a = NULL;\n")
b.printf("uint32_t n = 0;\n")
b.printf("switch ((s >> %d) & %#x) {\n", statusCodeNamespaceShift, statusCodeNamespaceMask)
b.printf("case 0: a = %sstatus_strings0; n = %d; break;\n", g.pkgPrefix, len(builtin.StatusList))
b.printf("case %spackageid: a = %sstatus_strings1; n = %d; break;\n",
b.printf("case 0: a = %sstatus__strings0; n = %d; break;\n", g.pkgPrefix, len(builtin.StatusList))
b.printf("case %spackageid: a = %sstatus__strings1; n = %d; break;\n",
g.pkgPrefix, g.pkgPrefix, len(g.statusList))
// TODO: add cases for other packages used by this one.
b.printf("}\n")
@@ -411,10 +411,7 @@ func (g *gen) forEachStatus(b *buffer, v visibility, f func(*gen, *buffer, *a.St
}
func (g *gen) cName(name string) string {
s := []byte(nil)
s = append(s, "puffs_"...)
s = append(s, g.pkgName...)
s = append(s, '_')
s := []byte(g.pkgPrefix)
underscore := true
for _, r := range name {
if 'A' <= r && r <= 'Z' {
@@ -508,14 +505,14 @@ func (g *gen) writeConstList(b *buffer, n *a.Expr) error {
func (g *gen) writeStruct(b *buffer, n *a.Struct) error {
// For API/ABI compatibility, the very first field in the struct's
// private_impl must be the status code. This lets the initializer callee
// set "self->private_impl.status = etc_error_bad_puffs_version;"
// set "self->private_impl.status = PUFFS_ETC__ERROR_BAD_PUFFS_VERSION;"
// regardless of the sizeof(*self) struct reserved by the caller and even
// if the caller and callee were built with different versions.
structName := n.Name().String(g.tm)
b.writes("typedef struct {\n")
b.writes("// Do not access the private_impl's fields directly. There is no API/ABI\n")
b.writes("// compatibility or safety guarantee if you do so. Instead, use the\n")
b.printf("// %s%s_etc functions.\n", g.pkgPrefix, structName)
b.printf("// %s%s__etc functions.\n", g.pkgPrefix, structName)
b.writes("//\n")
b.writes("// In C++, these fields would be \"private\", but C does not support that.\n")
b.writes("//\n")
@@ -574,14 +571,14 @@ func (g *gen) writeStruct(b *buffer, n *a.Struct) error {
func (g *gen) writeInitializerSignature(b *buffer, n *a.Struct, public bool) error {
structName := n.Name().String(g.tm)
if public {
b.printf("// %s%s_initialize is an initializer function.\n", g.pkgPrefix, structName)
b.printf("// %s%s__initialize is an initializer function.\n", g.pkgPrefix, structName)
b.printf("//\n")
b.printf("// It should be called before any other %s%s_* function.\n",
b.printf("// It should be called before any other %s%s__* function.\n",
g.pkgPrefix, structName)
b.printf("//\n")
b.printf("// Pass PUFFS_VERSION and 0 for puffs_version and for_internal_use_only.\n")
}
b.printf("void %s%s_initialize(%s%s *self", g.pkgPrefix, structName, g.pkgPrefix, structName)
b.printf("void %s%s__initialize(%s%s *self", g.pkgPrefix, structName, g.pkgPrefix, structName)
b.printf(", uint32_t puffs_version, uint32_t for_internal_use_only")
b.printf(")")
return nil
@@ -636,7 +633,7 @@ func (g *gen) writeInitializerImpl(b *buffer, n *a.Struct) error {
if g.structMap[x.Name()] == nil {
continue
}
b.printf("%s%s_initialize(&self->private_impl.%s%s,"+
b.printf("%s%s__initialize(&self->private_impl.%s%s,"+
"PUFFS_VERSION, PUFFS_ALREADY_ZEROED);\n",
g.pkgPrefix, x.Name().String(g.tm), fPrefix, f.Name().String(g.tm))
}
+2 -2
View File
@@ -267,7 +267,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
}
if isThatMethod(g.tm, n, g.tm.ByName("update").Key(), 1) {
// TODO: don't hard-code this.adler.
b.printf("%sadler32_update(&self->private_impl.f_adler, ", g.pkgPrefix)
b.printf("%sadler32__update(&self->private_impl.f_adler, ", g.pkgPrefix)
a := n.Args()[0].Arg().Value()
if err := g.writeExpr(b, a, rp, parenthesesMandatory, depth); err != nil {
return err
@@ -277,7 +277,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
}
if isThatMethod(g.tm, n, g.tm.ByName("set_literal_width").Key(), 1) {
// TODO: don't hard-code lzw.
b.printf("%slzw_decoder_set_literal_width(&self->private_impl.f_lzw, ", g.pkgPrefix)
b.printf("%slzw_decoder__set_literal_width(&self->private_impl.f_lzw, ", g.pkgPrefix)
a := n.Args()[0].Arg().Value()
if err := g.writeExpr(b, a, rp, parenthesesMandatory, depth); err != nil {
return err
+1 -1
View File
@@ -75,7 +75,7 @@ func (g *gen) writeFuncSignature(b *buffer, n *a.Func) error {
b.writes(g.pkgPrefix)
if r := n.Receiver(); r != 0 {
b.writes(r.String(g.tm))
b.writeb('_')
b.writes("__")
}
b.printf("%s(", n.Name().String(g.tm))
+12 -12
View File
@@ -448,7 +448,7 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
b.writes(";\n")
} else if isThisMethod(g.tm, n, "decode_header", 1) {
b.printf("status = %s%s_decode_header(self, %ssrc);\n",
b.printf("status = %s%s__decode_header(self, %ssrc);\n",
g.pkgPrefix, g.currFunk.astFunc.Receiver().String(g.tm), aPrefix)
if err := g.writeLoadExprDerivedVars(b, n); err != nil {
return err
@@ -458,7 +458,7 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
b.writes("if (status) { goto suspend; }\n")
} else if isThisMethod(g.tm, n, "decode_lsd", 1) {
b.printf("status = %s%s_decode_lsd(self, %ssrc);\n",
b.printf("status = %s%s__decode_lsd(self, %ssrc);\n",
g.pkgPrefix, g.currFunk.astFunc.Receiver().String(g.tm), aPrefix)
if err := g.writeLoadExprDerivedVars(b, n); err != nil {
return err
@@ -466,7 +466,7 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
b.writes("if (status) { goto suspend; }\n")
} else if isThisMethod(g.tm, n, "decode_extension", 1) {
b.printf("status = %s%s_decode_extension(self, %ssrc);\n",
b.printf("status = %s%s__decode_extension(self, %ssrc);\n",
g.pkgPrefix, g.currFunk.astFunc.Receiver().String(g.tm), aPrefix)
if err := g.writeLoadExprDerivedVars(b, n); err != nil {
return err
@@ -474,7 +474,7 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
b.writes("if (status) { goto suspend; }\n")
} else if isThisMethod(g.tm, n, "decode_id", 2) {
b.printf("status = %s%s_decode_id(self, %sdst, %ssrc);\n",
b.printf("status = %s%s__decode_id(self, %sdst, %ssrc);\n",
g.pkgPrefix, g.currFunk.astFunc.Receiver().String(g.tm), aPrefix, aPrefix)
if err := g.writeLoadExprDerivedVars(b, n); err != nil {
return err
@@ -489,7 +489,7 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
temp := g.currFunk.tempW
g.currFunk.tempW++
b.printf("%sstatus %s%d = %s%s_decode_blocks(self, %sdst, %ssrc);\n",
b.printf("%sstatus %s%d = %s%s__decode_blocks(self, %sdst, %ssrc);\n",
g.pkgPrefix, tPrefix, temp,
g.pkgPrefix, g.currFunk.astFunc.Receiver().String(g.tm), aPrefix, aPrefix)
if err := g.writeLoadExprDerivedVars(b, n); err != nil {
@@ -498,7 +498,7 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
// TODO: check if tPrefix_temp is an error, and return?
} else if isThisMethod(g.tm, n, "decode_uncompressed", 2) {
b.printf("status = %s%s_decode_uncompressed(self, %sdst, %ssrc);\n",
b.printf("status = %s%s__decode_uncompressed(self, %sdst, %ssrc);\n",
g.pkgPrefix, g.currFunk.astFunc.Receiver().String(g.tm), aPrefix, aPrefix)
if err := g.writeLoadExprDerivedVars(b, n); err != nil {
return err
@@ -506,7 +506,7 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
b.writes("if (status) { goto suspend; }\n")
} else if isThisMethod(g.tm, n, "decode_huffman", 2) {
b.printf("status = %s%s_decode_huffman(self, %sdst, %ssrc);\n",
b.printf("status = %s%s__decode_huffman(self, %sdst, %ssrc);\n",
g.pkgPrefix, g.currFunk.astFunc.Receiver().String(g.tm), aPrefix, aPrefix)
if err := g.writeLoadExprDerivedVars(b, n); err != nil {
return err
@@ -514,7 +514,7 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
b.writes("if (status) { goto suspend; }\n")
} else if isThisMethod(g.tm, n, "init_fixed_huffman", 0) {
b.printf("status = %s%s_init_fixed_huffman(self);\n",
b.printf("status = %s%s__init_fixed_huffman(self);\n",
g.pkgPrefix, g.currFunk.astFunc.Receiver().String(g.tm))
if err := g.writeLoadExprDerivedVars(b, n); err != nil {
return err
@@ -522,7 +522,7 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
b.writes("if (status) { goto suspend; }\n")
} else if isThisMethod(g.tm, n, "init_dynamic_huffman", 1) {
b.printf("status = %s%s_init_dynamic_huffman(self, %ssrc);\n",
b.printf("status = %s%s__init_dynamic_huffman(self, %ssrc);\n",
g.pkgPrefix, g.currFunk.astFunc.Receiver().String(g.tm), aPrefix)
if err := g.writeLoadExprDerivedVars(b, n); err != nil {
return err
@@ -530,7 +530,7 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
b.writes("if (status) { goto suspend; }\n")
} else if isThisMethod(g.tm, n, "init_huff", 4) {
b.printf("status = %s%s_init_huff(self,",
b.printf("status = %s%s__init_huff(self,",
g.pkgPrefix, g.currFunk.astFunc.Receiver().String(g.tm))
for i, o := range n.Args() {
if i != 0 {
@@ -556,7 +556,7 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
temp := g.currFunk.tempW
g.currFunk.tempW++
b.printf("%sstatus %s%d = %sflate_decoder_decode(&self->private_impl.f_flate, %sdst, %ssrc);\n",
b.printf("%sstatus %s%d = %sflate_decoder__decode(&self->private_impl.f_flate, %sdst, %ssrc);\n",
g.pkgPrefix, tPrefix, temp,
g.pkgPrefix, aPrefix, aPrefix)
if err := g.writeLoadExprDerivedVars(b, n); err != nil {
@@ -565,7 +565,7 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
// TODO: check if tPrefix_temp is an error, and return?
case "gif":
b.printf("status = %slzw_decoder_decode(&self->private_impl.f_lzw, %sdst, %s%s);\n",
b.printf("status = %slzw_decoder__decode(&self->private_impl.f_lzw, %sdst, %s%s);\n",
g.pkgPrefix, aPrefix, vPrefix, n.Args()[1].Arg().Value().String(g.tm))
if err := g.writeLoadExprDerivedVars(b, n); err != nil {
return err
+5 -5
View File
@@ -54,12 +54,12 @@ static const char* decode() {
puffs_base_writer1 dst_writer = {.buf = &dst};
puffs_base_reader1 src_reader = {.buf = &src};
puffs_flate_flate_decoder dec;
puffs_flate_flate_decoder_initialize(&dec, PUFFS_VERSION, 0);
puffs_flate_status s =
puffs_flate_flate_decoder_decode(&dec, dst_writer, src_reader);
puffs_flate__flate_decoder dec;
puffs_flate__flate_decoder__initialize(&dec, PUFFS_VERSION, 0);
puffs_flate__status s =
puffs_flate__flate_decoder__decode(&dec, dst_writer, src_reader);
if (s) {
return puffs_flate_status_string(s);
return puffs_flate__status__string(s);
}
ignore_return_value(write(1, dst.ptr, dst.wi));
return NULL;
+5 -4
View File
@@ -53,11 +53,12 @@ static const char* decode() {
puffs_base_writer1 dst_writer = {.buf = &dst};
puffs_base_reader1 src_reader = {.buf = &src};
puffs_gif_decoder dec;
puffs_gif_decoder_initialize(&dec, PUFFS_VERSION, 0);
puffs_gif_status s = puffs_gif_decoder_decode(&dec, dst_writer, src_reader);
puffs_gif__decoder dec;
puffs_gif__decoder__initialize(&dec, PUFFS_VERSION, 0);
puffs_gif__status s =
puffs_gif__decoder__decode(&dec, dst_writer, src_reader);
if (s) {
return puffs_gif_status_string(s);
return puffs_gif__status__string(s);
}
if (dst.wi != WIDTH * HEIGHT) {
+225 -225
View File
@@ -104,57 +104,57 @@ extern "C" {
// - bits 0-7 are a package-namespaced numeric code
//
// Do not manipulate these bits directly. Use the API functions such as
// puffs_flate_status_is_error instead.
typedef int32_t puffs_flate_status;
// puffs_flate__status__is_error instead.
typedef int32_t puffs_flate__status;
#define puffs_flate_packageid 967230 // 0x000ec23e
#define puffs_flate__packageid 967230 // 0x000ec23e
#define PUFFS_FLATE_STATUS_OK 0 // 0x00000000
#define PUFFS_FLATE_ERROR_BAD_PUFFS_VERSION -2147483647 // 0x80000001
#define PUFFS_FLATE_ERROR_BAD_RECEIVER -2147483646 // 0x80000002
#define PUFFS_FLATE_ERROR_BAD_ARGUMENT -2147483645 // 0x80000003
#define PUFFS_FLATE_ERROR_INITIALIZER_NOT_CALLED -2147483644 // 0x80000004
#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__STATUS_OK 0 // 0x00000000
#define PUFFS_FLATE__ERROR_BAD_PUFFS_VERSION -2147483647 // 0x80000001
#define PUFFS_FLATE__ERROR_BAD_RECEIVER -2147483646 // 0x80000002
#define PUFFS_FLATE__ERROR_BAD_ARGUMENT -2147483645 // 0x80000003
#define PUFFS_FLATE__ERROR_INITIALIZER_NOT_CALLED -2147483644 // 0x80000004
#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_ERROR_BAD_HUFFMAN_CODE_OVER_SUBSCRIBED \
#define PUFFS_FLATE__ERROR_BAD_HUFFMAN_CODE_OVER_SUBSCRIBED \
-1157040128 // 0xbb08f800
#define PUFFS_FLATE_ERROR_BAD_HUFFMAN_CODE_UNDER_SUBSCRIBED \
#define PUFFS_FLATE__ERROR_BAD_HUFFMAN_CODE_UNDER_SUBSCRIBED \
-1157040127 // 0xbb08f801
#define PUFFS_FLATE_ERROR_BAD_HUFFMAN_CODE_LENGTH_COUNT \
#define PUFFS_FLATE__ERROR_BAD_HUFFMAN_CODE_LENGTH_COUNT \
-1157040126 // 0xbb08f802
#define PUFFS_FLATE_ERROR_BAD_HUFFMAN_CODE_LENGTH_REPETITION \
-1157040125 // 0xbb08f803
#define PUFFS_FLATE_ERROR_BAD_HUFFMAN_CODE -1157040124 // 0xbb08f804
#define PUFFS_FLATE_ERROR_BAD_HUFFMAN_MINIMUM_CODE_LENGTH \
-1157040123 // 0xbb08f805
#define PUFFS_FLATE_ERROR_BAD_DISTANCE -1157040122 // 0xbb08f806
#define PUFFS_FLATE_ERROR_BAD_DISTANCE_CODE_COUNT -1157040121 // 0xbb08f807
#define PUFFS_FLATE_ERROR_BAD_FLATE_BLOCK -1157040120 // 0xbb08f808
#define PUFFS_FLATE_ERROR_BAD_LITERAL_LENGTH_CODE_COUNT \
-1157040119 // 0xbb08f809
#define PUFFS_FLATE_ERROR_CHECKSUM_MISMATCH -1157040118 // 0xbb08f80a
#define PUFFS_FLATE_ERROR_INCONSISTENT_STORED_BLOCK_LENGTH \
#define PUFFS_FLATE__ERROR_BAD_HUFFMAN_CODE_LENGTH_REPETITION \
-1157040125 // 0xbb08f803
#define PUFFS_FLATE__ERROR_BAD_HUFFMAN_CODE -1157040124 // 0xbb08f804
#define PUFFS_FLATE__ERROR_BAD_HUFFMAN_MINIMUM_CODE_LENGTH \
-1157040123 // 0xbb08f805
#define PUFFS_FLATE__ERROR_BAD_DISTANCE -1157040122 // 0xbb08f806
#define PUFFS_FLATE__ERROR_BAD_DISTANCE_CODE_COUNT -1157040121 // 0xbb08f807
#define PUFFS_FLATE__ERROR_BAD_FLATE_BLOCK -1157040120 // 0xbb08f808
#define PUFFS_FLATE__ERROR_BAD_LITERAL_LENGTH_CODE_COUNT \
-1157040119 // 0xbb08f809
#define PUFFS_FLATE__ERROR_CHECKSUM_MISMATCH -1157040118 // 0xbb08f80a
#define PUFFS_FLATE__ERROR_INCONSISTENT_STORED_BLOCK_LENGTH \
-1157040117 // 0xbb08f80b
#define PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE \
#define PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE \
-1157040116 // 0xbb08f80c
#define PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_N_BITS \
-1157040115 // 0xbb08f80d
#define PUFFS_FLATE_ERROR_MISSING_END_OF_BLOCK_CODE -1157040114 // 0xbb08f80e
#define PUFFS_FLATE_ERROR_NO_HUFFMAN_CODES -1157040113 // 0xbb08f80f
#define PUFFS_FLATE_ERROR_INVALID_ZLIB_COMPRESSION_METHOD \
#define PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_N_BITS \
-1157040115 // 0xbb08f80d
#define PUFFS_FLATE__ERROR_MISSING_END_OF_BLOCK_CODE -1157040114 // 0xbb08f80e
#define PUFFS_FLATE__ERROR_NO_HUFFMAN_CODES -1157040113 // 0xbb08f80f
#define PUFFS_FLATE__ERROR_INVALID_ZLIB_COMPRESSION_METHOD \
-1157040112 // 0xbb08f810
#define PUFFS_FLATE_ERROR_INVALID_ZLIB_COMPRESSION_WINDOW_SIZE \
-1157040111 // 0xbb08f811
#define PUFFS_FLATE_ERROR_INVALID_ZLIB_PARITY_CHECK -1157040110 // 0xbb08f812
#define PUFFS_FLATE_ERROR_TODO_UNSUPPORTED_ZLIB_PRESET_DICTIONARY \
#define PUFFS_FLATE__ERROR_INVALID_ZLIB_COMPRESSION_WINDOW_SIZE \
-1157040111 // 0xbb08f811
#define PUFFS_FLATE__ERROR_INVALID_ZLIB_PARITY_CHECK -1157040110 // 0xbb08f812
#define PUFFS_FLATE__ERROR_TODO_UNSUPPORTED_ZLIB_PRESET_DICTIONARY \
-1157040109 // 0xbb08f813
bool puffs_flate_status_is_error(puffs_flate_status s);
bool puffs_flate__status__is_error(puffs_flate__status s);
const char* puffs_flate_status_string(puffs_flate_status s);
const char* puffs_flate__status__string(puffs_flate__status s);
// ---------------- Public Consts
@@ -163,13 +163,13 @@ const char* puffs_flate_status_string(puffs_flate_status s);
typedef struct {
// Do not access the private_impl's fields directly. There is no API/ABI
// compatibility or safety guarantee if you do so. Instead, use the
// puffs_flate_flate_decoder_etc functions.
// puffs_flate__flate_decoder__etc functions.
//
// In C++, these fields would be "private", but C does not support that.
//
// It is a struct, not a struct*, so that it can be stack allocated.
struct {
puffs_flate_status status;
puffs_flate__status status;
uint32_t magic;
uint32_t f_bits;
@@ -182,7 +182,7 @@ typedef struct {
struct {
uint32_t coro_susp_point;
puffs_flate_status v_z;
puffs_flate__status v_z;
uint64_t v_n_copied;
uint32_t v_already_full;
} c_decode[1];
@@ -233,79 +233,79 @@ typedef struct {
uint32_t v_rep_count;
} c_init_dynamic_huffman[1];
} private_impl;
} puffs_flate_flate_decoder;
} puffs_flate__flate_decoder;
typedef struct {
// Do not access the private_impl's fields directly. There is no API/ABI
// compatibility or safety guarantee if you do so. Instead, use the
// puffs_flate_adler32_etc functions.
// puffs_flate__adler32__etc functions.
//
// In C++, these fields would be "private", but C does not support that.
//
// It is a struct, not a struct*, so that it can be stack allocated.
struct {
puffs_flate_status status;
puffs_flate__status status;
uint32_t magic;
uint32_t f_state;
} private_impl;
} puffs_flate_adler32;
} puffs_flate__adler32;
typedef struct {
// Do not access the private_impl's fields directly. There is no API/ABI
// compatibility or safety guarantee if you do so. Instead, use the
// puffs_flate_zlib_decoder_etc functions.
// puffs_flate__zlib_decoder__etc functions.
//
// In C++, these fields would be "private", but C does not support that.
//
// It is a struct, not a struct*, so that it can be stack allocated.
struct {
puffs_flate_status status;
puffs_flate__status status;
uint32_t magic;
puffs_flate_flate_decoder f_flate;
puffs_flate_adler32 f_adler;
puffs_flate__flate_decoder f_flate;
puffs_flate__adler32 f_adler;
struct {
uint32_t coro_susp_point;
uint16_t v_x;
uint32_t v_checksum;
puffs_flate_status v_z;
puffs_flate__status v_z;
uint64_t scratch;
} c_decode[1];
} private_impl;
} puffs_flate_zlib_decoder;
} puffs_flate__zlib_decoder;
// ---------------- Public Initializer Prototypes
// puffs_flate_flate_decoder_initialize is an initializer function.
// puffs_flate__flate_decoder__initialize is an initializer function.
//
// It should be called before any other puffs_flate_flate_decoder_* function.
// It should be called before any other puffs_flate__flate_decoder__* function.
//
// Pass PUFFS_VERSION and 0 for puffs_version and for_internal_use_only.
void puffs_flate_flate_decoder_initialize(puffs_flate_flate_decoder* self,
uint32_t puffs_version,
uint32_t for_internal_use_only);
void puffs_flate__flate_decoder__initialize(puffs_flate__flate_decoder* self,
uint32_t puffs_version,
uint32_t for_internal_use_only);
// puffs_flate_zlib_decoder_initialize is an initializer function.
// puffs_flate__zlib_decoder__initialize is an initializer function.
//
// It should be called before any other puffs_flate_zlib_decoder_* function.
// It should be called before any other puffs_flate__zlib_decoder__* function.
//
// Pass PUFFS_VERSION and 0 for puffs_version and for_internal_use_only.
void puffs_flate_zlib_decoder_initialize(puffs_flate_zlib_decoder* self,
uint32_t puffs_version,
uint32_t for_internal_use_only);
void puffs_flate__zlib_decoder__initialize(puffs_flate__zlib_decoder* self,
uint32_t puffs_version,
uint32_t for_internal_use_only);
// ---------------- Public Function Prototypes
puffs_flate_status puffs_flate_flate_decoder_decode(
puffs_flate_flate_decoder* self,
puffs_flate__status puffs_flate__flate_decoder__decode(
puffs_flate__flate_decoder* self,
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src);
puffs_flate_status puffs_flate_zlib_decoder_decode(
puffs_flate_zlib_decoder* self,
puffs_flate__status puffs_flate__zlib_decoder__decode(
puffs_flate__zlib_decoder* self,
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src);
@@ -568,11 +568,11 @@ static inline uint32_t puffs_base_writer1_copy_from_slice32(
// ---------------- Status Codes Implementations
bool puffs_flate_status_is_error(puffs_flate_status s) {
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[9] = {
"flate: ok",
"flate: bad puffs version",
"flate: bad receiver",
@@ -584,7 +584,7 @@ const char* puffs_flate_status_strings0[9] = {
"flate: short write",
};
const char* puffs_flate_status_strings1[20] = {
const char* puffs_flate__status__strings1[20] = {
"flate: bad Huffman code (over-subscribed)",
"flate: bad Huffman code (under-subscribed)",
"flate: bad Huffman code length count",
@@ -607,16 +607,16 @@ const char* puffs_flate_status_strings1[20] = {
"flate: TODO: unsupported zlib preset dictionary",
};
const char* puffs_flate_status_string(puffs_flate_status s) {
const char* puffs_flate__status__string(puffs_flate__status s) {
const char** a = NULL;
uint32_t n = 0;
switch ((s >> 10) & 0x1fffff) {
case 0:
a = puffs_flate_status_strings0;
a = puffs_flate__status__strings0;
n = 9;
break;
case puffs_flate_packageid:
a = puffs_flate_status_strings1;
case puffs_flate__packageid:
a = puffs_flate__status__strings1;
n = 20;
break;
}
@@ -626,11 +626,11 @@ const char* puffs_flate_status_string(puffs_flate_status s) {
// ---------------- Private Consts
static const uint8_t puffs_flate_code_order[19] = {
static const uint8_t puffs_flate__code_order[19] = {
16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15,
};
static const uint8_t puffs_flate_reverse8[256] = {
static const uint8_t puffs_flate__reverse8[256] = {
0, 128, 64, 192, 32, 160, 96, 224, 16, 144, 80, 208, 48, 176, 112, 240,
8, 136, 72, 200, 40, 168, 104, 232, 24, 152, 88, 216, 56, 184, 120, 248,
4, 132, 68, 196, 36, 164, 100, 228, 20, 148, 84, 212, 52, 180, 116, 244,
@@ -649,7 +649,7 @@ static const uint8_t puffs_flate_reverse8[256] = {
15, 143, 79, 207, 47, 175, 111, 239, 31, 159, 95, 223, 63, 191, 127, 255,
};
static const uint32_t puffs_flate_lcode_magic_numbers[32] = {
static const uint32_t puffs_flate__lcode_magic_numbers[32] = {
1073742592, 1073742848, 1073743104, 1073743360, 1073743616, 1073743872,
1073744128, 1073744384, 1073744656, 1073745168, 1073745680, 1073746192,
1073746720, 1073747744, 1073748768, 1073749792, 1073750832, 1073752880,
@@ -658,7 +658,7 @@ static const uint32_t puffs_flate_lcode_magic_numbers[32] = {
134217728, 134217728,
};
static const uint32_t puffs_flate_dcode_magic_numbers[32] = {
static const uint32_t puffs_flate__dcode_magic_numbers[32] = {
1073742080, 1073742336, 1073742592, 1073742848, 1073743120, 1073743632,
1073744160, 1073745184, 1073746224, 1073748272, 1073750336, 1073754432,
1073758544, 1073766736, 1073774944, 1073791328, 1073807728, 1073840496,
@@ -669,43 +669,43 @@ static const uint32_t puffs_flate_dcode_magic_numbers[32] = {
// ---------------- Private Initializer Prototypes
void puffs_flate_adler32_initialize(puffs_flate_adler32* self,
uint32_t puffs_version,
uint32_t for_internal_use_only);
void puffs_flate__adler32__initialize(puffs_flate__adler32* self,
uint32_t puffs_version,
uint32_t for_internal_use_only);
// ---------------- Private Function Prototypes
puffs_flate_status puffs_flate_flate_decoder_decode_blocks(
puffs_flate_flate_decoder* self,
puffs_flate__status puffs_flate__flate_decoder__decode_blocks(
puffs_flate__flate_decoder* self,
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src);
puffs_flate_status puffs_flate_flate_decoder_decode_uncompressed(
puffs_flate_flate_decoder* self,
puffs_flate__status puffs_flate__flate_decoder__decode_uncompressed(
puffs_flate__flate_decoder* self,
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src);
puffs_flate_status puffs_flate_flate_decoder_decode_huffman(
puffs_flate_flate_decoder* self,
puffs_flate__status puffs_flate__flate_decoder__decode_huffman(
puffs_flate__flate_decoder* self,
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src);
puffs_flate_status puffs_flate_flate_decoder_init_fixed_huffman(
puffs_flate_flate_decoder* self);
puffs_flate__status puffs_flate__flate_decoder__init_fixed_huffman(
puffs_flate__flate_decoder* self);
puffs_flate_status puffs_flate_flate_decoder_init_dynamic_huffman(
puffs_flate_flate_decoder* self,
puffs_flate__status puffs_flate__flate_decoder__init_dynamic_huffman(
puffs_flate__flate_decoder* self,
puffs_base_reader1 a_src);
puffs_flate_status puffs_flate_flate_decoder_init_huff(
puffs_flate_flate_decoder* self,
puffs_flate__status puffs_flate__flate_decoder__init_huff(
puffs_flate__flate_decoder* self,
uint32_t a_which,
uint32_t a_n_codes0,
uint32_t a_n_codes1,
uint32_t a_base_symbol);
uint32_t puffs_flate_adler32_update(puffs_flate_adler32* self,
puffs_base_slice_u8 a_x);
uint32_t puffs_flate__adler32__update(puffs_flate__adler32* self,
puffs_base_slice_u8 a_x);
// ---------------- Initializer Implementations
@@ -723,14 +723,14 @@ uint32_t puffs_flate_adler32_update(puffs_flate_adler32* self,
// Its (non-zero) value is arbitrary, based on md5sum("zeroed").
#define PUFFS_ALREADY_ZEROED (0x68602EF1U)
void puffs_flate_flate_decoder_initialize(puffs_flate_flate_decoder* self,
uint32_t puffs_version,
uint32_t for_internal_use_only) {
void puffs_flate__flate_decoder__initialize(puffs_flate__flate_decoder* self,
uint32_t puffs_version,
uint32_t for_internal_use_only) {
if (!self) {
return;
}
if (puffs_version != PUFFS_VERSION) {
self->private_impl.status = PUFFS_FLATE_ERROR_BAD_PUFFS_VERSION;
self->private_impl.status = PUFFS_FLATE__ERROR_BAD_PUFFS_VERSION;
return;
}
if (for_internal_use_only != PUFFS_ALREADY_ZEROED) {
@@ -739,14 +739,14 @@ void puffs_flate_flate_decoder_initialize(puffs_flate_flate_decoder* self,
self->private_impl.magic = PUFFS_MAGIC;
}
void puffs_flate_adler32_initialize(puffs_flate_adler32* self,
uint32_t puffs_version,
uint32_t for_internal_use_only) {
void puffs_flate__adler32__initialize(puffs_flate__adler32* self,
uint32_t puffs_version,
uint32_t for_internal_use_only) {
if (!self) {
return;
}
if (puffs_version != PUFFS_VERSION) {
self->private_impl.status = PUFFS_FLATE_ERROR_BAD_PUFFS_VERSION;
self->private_impl.status = PUFFS_FLATE__ERROR_BAD_PUFFS_VERSION;
return;
}
if (for_internal_use_only != PUFFS_ALREADY_ZEROED) {
@@ -756,44 +756,44 @@ void puffs_flate_adler32_initialize(puffs_flate_adler32* self,
self->private_impl.f_state = 1;
}
void puffs_flate_zlib_decoder_initialize(puffs_flate_zlib_decoder* self,
uint32_t puffs_version,
uint32_t for_internal_use_only) {
void puffs_flate__zlib_decoder__initialize(puffs_flate__zlib_decoder* self,
uint32_t puffs_version,
uint32_t for_internal_use_only) {
if (!self) {
return;
}
if (puffs_version != PUFFS_VERSION) {
self->private_impl.status = PUFFS_FLATE_ERROR_BAD_PUFFS_VERSION;
self->private_impl.status = PUFFS_FLATE__ERROR_BAD_PUFFS_VERSION;
return;
}
if (for_internal_use_only != PUFFS_ALREADY_ZEROED) {
memset(self, 0, sizeof(*self));
}
self->private_impl.magic = PUFFS_MAGIC;
puffs_flate_flate_decoder_initialize(&self->private_impl.f_flate,
PUFFS_VERSION, PUFFS_ALREADY_ZEROED);
puffs_flate_adler32_initialize(&self->private_impl.f_adler, PUFFS_VERSION,
PUFFS_ALREADY_ZEROED);
puffs_flate__flate_decoder__initialize(&self->private_impl.f_flate,
PUFFS_VERSION, PUFFS_ALREADY_ZEROED);
puffs_flate__adler32__initialize(&self->private_impl.f_adler, PUFFS_VERSION,
PUFFS_ALREADY_ZEROED);
}
// ---------------- Function Implementations
puffs_flate_status puffs_flate_flate_decoder_decode(
puffs_flate_flate_decoder* self,
puffs_flate__status puffs_flate__flate_decoder__decode(
puffs_flate__flate_decoder* self,
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src) {
if (!self) {
return PUFFS_FLATE_ERROR_BAD_RECEIVER;
return PUFFS_FLATE__ERROR_BAD_RECEIVER;
}
if (self->private_impl.magic != PUFFS_MAGIC) {
self->private_impl.status = PUFFS_FLATE_ERROR_INITIALIZER_NOT_CALLED;
self->private_impl.status = PUFFS_FLATE__ERROR_INITIALIZER_NOT_CALLED;
}
if (self->private_impl.status < 0) {
return self->private_impl.status;
}
puffs_flate_status status = PUFFS_FLATE_STATUS_OK;
puffs_flate__status status = PUFFS_FLATE__STATUS_OK;
puffs_flate_status v_z;
puffs_flate__status v_z;
puffs_base_slice_u8 v_written;
uint64_t v_n_copied;
uint32_t v_already_full;
@@ -839,8 +839,8 @@ puffs_flate_status puffs_flate_flate_decoder_decode(
}
}
}
puffs_flate_status t_0 =
puffs_flate_flate_decoder_decode_blocks(self, a_dst, a_src);
puffs_flate__status t_0 =
puffs_flate__flate_decoder__decode_blocks(self, a_dst, a_src);
if (a_dst.buf) {
b_wptr_dst = a_dst.buf->ptr + a_dst.buf->wi;
b_wend_dst = b_wptr_dst;
@@ -931,11 +931,11 @@ exit:
return status;
}
puffs_flate_status puffs_flate_flate_decoder_decode_blocks(
puffs_flate_flate_decoder* self,
puffs_flate__status puffs_flate__flate_decoder__decode_blocks(
puffs_flate__flate_decoder* self,
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src) {
puffs_flate_status status = PUFFS_FLATE_STATUS_OK;
puffs_flate__status status = PUFFS_FLATE__STATUS_OK;
uint32_t v_final;
uint32_t v_type;
@@ -995,7 +995,7 @@ puffs_flate_status puffs_flate_flate_decoder_decode_blocks(
}
}
status =
puffs_flate_flate_decoder_decode_uncompressed(self, a_dst, a_src);
puffs_flate__flate_decoder__decode_uncompressed(self, a_dst, a_src);
if (a_src.buf) {
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
size_t len = a_src.buf->wi - a_src.buf->ri;
@@ -1013,7 +1013,7 @@ puffs_flate_status puffs_flate_flate_decoder_decode_blocks(
goto label_0_continue;
} else if (v_type == 1) {
PUFFS_COROUTINE_SUSPENSION_POINT(3);
status = puffs_flate_flate_decoder_init_fixed_huffman(self);
status = puffs_flate__flate_decoder__init_fixed_huffman(self);
if (status) {
goto suspend;
}
@@ -1029,7 +1029,7 @@ puffs_flate_status puffs_flate_flate_decoder_decode_blocks(
}
}
}
status = puffs_flate_flate_decoder_init_dynamic_huffman(self, a_src);
status = puffs_flate__flate_decoder__init_dynamic_huffman(self, a_src);
if (a_src.buf) {
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
size_t len = a_src.buf->wi - a_src.buf->ri;
@@ -1045,7 +1045,7 @@ puffs_flate_status puffs_flate_flate_decoder_decode_blocks(
goto suspend;
}
} else {
status = PUFFS_FLATE_ERROR_BAD_FLATE_BLOCK;
status = PUFFS_FLATE__ERROR_BAD_FLATE_BLOCK;
goto exit;
}
PUFFS_COROUTINE_SUSPENSION_POINT(5);
@@ -1059,7 +1059,7 @@ puffs_flate_status puffs_flate_flate_decoder_decode_blocks(
}
}
}
status = puffs_flate_flate_decoder_decode_huffman(self, a_dst, a_src);
status = puffs_flate__flate_decoder__decode_huffman(self, a_dst, a_src);
if (a_src.buf) {
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
size_t len = a_src.buf->wi - a_src.buf->ri;
@@ -1106,18 +1106,18 @@ exit:
short_read_src:
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
status = PUFFS_FLATE_ERROR_UNEXPECTED_EOF;
status = PUFFS_FLATE__ERROR_UNEXPECTED_EOF;
goto exit;
}
status = PUFFS_FLATE_SUSPENSION_SHORT_READ;
status = PUFFS_FLATE__SUSPENSION_SHORT_READ;
goto suspend;
}
puffs_flate_status puffs_flate_flate_decoder_decode_uncompressed(
puffs_flate_flate_decoder* self,
puffs_flate__status puffs_flate__flate_decoder__decode_uncompressed(
puffs_flate__flate_decoder* self,
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src) {
puffs_flate_status status = PUFFS_FLATE_STATUS_OK;
puffs_flate__status status = PUFFS_FLATE__STATUS_OK;
uint32_t v_length;
uint32_t v_n_copied;
@@ -1166,7 +1166,7 @@ puffs_flate_status puffs_flate_flate_decoder_decode_uncompressed(
PUFFS_COROUTINE_SUSPENSION_POINT(0);
if (self->private_impl.f_n_bits >= 8) {
status = PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_N_BITS;
status = PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_N_BITS;
goto exit;
}
self->private_impl.f_n_bits = 0;
@@ -1200,7 +1200,7 @@ puffs_flate_status puffs_flate_flate_decoder_decode_uncompressed(
v_length = t_1;
if ((((v_length) & ((1 << (16)) - 1)) + ((v_length) >> (32 - (16)))) !=
65535) {
status = PUFFS_FLATE_ERROR_INCONSISTENT_STORED_BLOCK_LENGTH;
status = PUFFS_FLATE__ERROR_INCONSISTENT_STORED_BLOCK_LENGTH;
goto exit;
}
v_length = ((v_length) & ((1 << (16)) - 1));
@@ -1213,10 +1213,10 @@ puffs_flate_status puffs_flate_flate_decoder_decode_uncompressed(
}
v_length -= v_n_copied;
if (((uint64_t)(b_wend_dst - b_wptr_dst)) == 0) {
status = PUFFS_FLATE_SUSPENSION_SHORT_WRITE;
status = PUFFS_FLATE__SUSPENSION_SHORT_WRITE;
PUFFS_COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(3);
} else {
status = PUFFS_FLATE_SUSPENSION_SHORT_READ;
status = PUFFS_FLATE__SUSPENSION_SHORT_READ;
PUFFS_COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(4);
}
}
@@ -1264,18 +1264,18 @@ exit:
short_read_src:
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
status = PUFFS_FLATE_ERROR_UNEXPECTED_EOF;
status = PUFFS_FLATE__ERROR_UNEXPECTED_EOF;
goto exit;
}
status = PUFFS_FLATE_SUSPENSION_SHORT_READ;
status = PUFFS_FLATE__SUSPENSION_SHORT_READ;
goto suspend;
}
puffs_flate_status puffs_flate_flate_decoder_decode_huffman(
puffs_flate_flate_decoder* self,
puffs_flate__status puffs_flate__flate_decoder__decode_huffman(
puffs_flate__flate_decoder* self,
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src) {
puffs_flate_status status = PUFFS_FLATE_STATUS_OK;
puffs_flate__status status = PUFFS_FLATE__STATUS_OK;
uint32_t v_bits;
uint32_t v_n_bits;
@@ -1377,7 +1377,7 @@ puffs_flate_status puffs_flate_flate_decoder_decode_huffman(
while (true) {
if ((v_redir_top + (v_bits & v_redir_mask)) >= 1234) {
status =
PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
v_table_entry =
@@ -1400,14 +1400,14 @@ puffs_flate_status puffs_flate_flate_decoder_decode_huffman(
label_2_break:;
if ((v_table_entry >> 28) == 1) {
status =
PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
}
if ((v_table_entry >> 31) != 0) {
PUFFS_COROUTINE_SUSPENSION_POINT(3);
if (b_wptr_dst == b_wend_dst) {
status = PUFFS_FLATE_SUSPENSION_SHORT_WRITE;
status = PUFFS_FLATE__SUSPENSION_SHORT_WRITE;
goto suspend;
}
*b_wptr_dst++ = ((v_table_entry >> 8) & 255);
@@ -1416,11 +1416,11 @@ puffs_flate_status puffs_flate_flate_decoder_decode_huffman(
} else if ((v_table_entry >> 29) != 0) {
goto label_0_break;
} else if ((v_table_entry >> 24) == 8) {
status = PUFFS_FLATE_ERROR_BAD_HUFFMAN_CODE;
status = PUFFS_FLATE__ERROR_BAD_HUFFMAN_CODE;
goto exit;
} else {
status =
PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
v_length = ((v_table_entry >> 8) & 32767);
@@ -1462,7 +1462,7 @@ puffs_flate_status puffs_flate_flate_decoder_decode_huffman(
while (true) {
if ((v_redir_top + (v_bits & v_redir_mask)) >= 1234) {
status =
PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
v_table_entry =
@@ -1485,17 +1485,17 @@ puffs_flate_status puffs_flate_flate_decoder_decode_huffman(
label_4_break:;
if ((v_table_entry >> 31) != 0) {
status =
PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
}
if ((v_table_entry >> 24) != 64) {
if ((v_table_entry >> 24) == 8) {
status = PUFFS_FLATE_ERROR_BAD_HUFFMAN_CODE;
status = PUFFS_FLATE__ERROR_BAD_HUFFMAN_CODE;
goto exit;
}
status =
PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
v_distance = ((v_table_entry >> 8) & 32767);
@@ -1529,7 +1529,7 @@ puffs_flate_status puffs_flate_flate_decoder_decode_huffman(
v_length = 0;
}
if (self->private_impl.f_history_index < v_hdist) {
status = PUFFS_FLATE_ERROR_BAD_DISTANCE;
status = PUFFS_FLATE__ERROR_BAD_DISTANCE;
goto exit;
}
v_hdist = ((self->private_impl.f_history_index - v_hdist) & 32767);
@@ -1552,7 +1552,7 @@ puffs_flate_status puffs_flate_flate_decoder_decode_huffman(
goto label_5_break;
}
}
status = PUFFS_FLATE_SUSPENSION_SHORT_WRITE;
status = PUFFS_FLATE__SUSPENSION_SHORT_WRITE;
PUFFS_COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(8);
}
label_5_break:;
@@ -1571,7 +1571,7 @@ puffs_flate_status puffs_flate_flate_decoder_decode_huffman(
}
v_hlen -= v_n_copied;
v_hdist = ((v_hdist + (v_n_copied & 32767)) & 32767);
status = PUFFS_FLATE_SUSPENSION_SHORT_WRITE;
status = PUFFS_FLATE__SUSPENSION_SHORT_WRITE;
PUFFS_COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(9);
}
label_6_break:;
@@ -1587,7 +1587,7 @@ puffs_flate_status puffs_flate_flate_decoder_decode_huffman(
goto label_7_break;
}
v_length -= v_n_copied;
status = PUFFS_FLATE_SUSPENSION_SHORT_WRITE;
status = PUFFS_FLATE__SUSPENSION_SHORT_WRITE;
PUFFS_COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(10);
}
label_7_break:;
@@ -1650,16 +1650,16 @@ exit:
short_read_src:
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
status = PUFFS_FLATE_ERROR_UNEXPECTED_EOF;
status = PUFFS_FLATE__ERROR_UNEXPECTED_EOF;
goto exit;
}
status = PUFFS_FLATE_SUSPENSION_SHORT_READ;
status = PUFFS_FLATE__SUSPENSION_SHORT_READ;
goto suspend;
}
puffs_flate_status puffs_flate_flate_decoder_init_fixed_huffman(
puffs_flate_flate_decoder* self) {
puffs_flate_status status = PUFFS_FLATE_STATUS_OK;
puffs_flate__status puffs_flate__flate_decoder__init_fixed_huffman(
puffs_flate__flate_decoder* self) {
puffs_flate__status status = PUFFS_FLATE__STATUS_OK;
uint32_t v_i;
@@ -1693,12 +1693,12 @@ puffs_flate_status puffs_flate_flate_decoder_init_fixed_huffman(
v_i += 1;
}
PUFFS_COROUTINE_SUSPENSION_POINT(1);
status = puffs_flate_flate_decoder_init_huff(self, 0, 0, 288, 257);
status = puffs_flate__flate_decoder__init_huff(self, 0, 0, 288, 257);
if (status) {
goto suspend;
}
PUFFS_COROUTINE_SUSPENSION_POINT(2);
status = puffs_flate_flate_decoder_init_huff(self, 1, 288, 320, 0);
status = puffs_flate__flate_decoder__init_huff(self, 1, 288, 320, 0);
if (status) {
goto suspend;
}
@@ -1718,10 +1718,10 @@ exit:
return status;
}
puffs_flate_status puffs_flate_flate_decoder_init_dynamic_huffman(
puffs_flate_flate_decoder* self,
puffs_flate__status puffs_flate__flate_decoder__init_dynamic_huffman(
puffs_flate__flate_decoder* self,
puffs_base_reader1 a_src) {
puffs_flate_status status = PUFFS_FLATE_STATUS_OK;
puffs_flate__status status = PUFFS_FLATE__STATUS_OK;
uint32_t v_bits;
uint32_t v_n_bits;
@@ -1786,13 +1786,13 @@ puffs_flate_status puffs_flate_flate_decoder_init_dynamic_huffman(
}
v_n_lit = (((v_bits) & ((1 << (5)) - 1)) + 257);
if (v_n_lit > 286) {
status = PUFFS_FLATE_ERROR_BAD_LITERAL_LENGTH_CODE_COUNT;
status = PUFFS_FLATE__ERROR_BAD_LITERAL_LENGTH_CODE_COUNT;
goto exit;
}
v_bits >>= 5;
v_n_dist = (((v_bits) & ((1 << (5)) - 1)) + 1);
if (v_n_dist > 30) {
status = PUFFS_FLATE_ERROR_BAD_DISTANCE_CODE_COUNT;
status = PUFFS_FLATE__ERROR_BAD_DISTANCE_CODE_COUNT;
goto exit;
}
v_bits >>= 5;
@@ -1810,18 +1810,18 @@ puffs_flate_status puffs_flate_flate_decoder_init_dynamic_huffman(
v_bits |= (((uint32_t)(t_1)) << v_n_bits);
v_n_bits += 8;
}
self->private_impl.f_code_lengths[puffs_flate_code_order[v_i]] =
self->private_impl.f_code_lengths[puffs_flate__code_order[v_i]] =
((uint8_t)((v_bits & 7)));
v_bits >>= 3;
v_n_bits -= 3;
v_i += 1;
}
while (v_i < 19) {
self->private_impl.f_code_lengths[puffs_flate_code_order[v_i]] = 0;
self->private_impl.f_code_lengths[puffs_flate__code_order[v_i]] = 0;
v_i += 1;
}
PUFFS_COROUTINE_SUSPENSION_POINT(3);
status = puffs_flate_flate_decoder_init_huff(self, 0, 0, 19, 4095);
status = puffs_flate__flate_decoder__init_huff(self, 0, 0, 19, 4095);
if (status) {
goto suspend;
}
@@ -1849,7 +1849,7 @@ puffs_flate_status puffs_flate_flate_decoder_init_dynamic_huffman(
label_1_break:;
if ((v_table_entry >> 24) != 128) {
status =
PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
v_table_entry = ((v_table_entry >> 8) & 255);
@@ -1864,7 +1864,7 @@ puffs_flate_status puffs_flate_flate_decoder_init_dynamic_huffman(
if (v_table_entry == 16) {
v_n_extra_bits = 2;
if (v_i <= 0) {
status = PUFFS_FLATE_ERROR_BAD_HUFFMAN_CODE_LENGTH_REPETITION;
status = PUFFS_FLATE__ERROR_BAD_HUFFMAN_CODE_LENGTH_REPETITION;
goto exit;
}
v_rep_symbol = self->private_impl.f_code_lengths[v_i - 1];
@@ -1879,7 +1879,7 @@ puffs_flate_status puffs_flate_flate_decoder_init_dynamic_huffman(
v_rep_count = 11;
} else {
status =
PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
while (v_n_bits < v_n_extra_bits) {
@@ -1896,7 +1896,7 @@ puffs_flate_status puffs_flate_flate_decoder_init_dynamic_huffman(
v_n_bits -= v_n_extra_bits;
while (v_rep_count > 0) {
if (v_i >= (v_n_lit + v_n_dist)) {
status = PUFFS_FLATE_ERROR_BAD_HUFFMAN_CODE_LENGTH_COUNT;
status = PUFFS_FLATE__ERROR_BAD_HUFFMAN_CODE_LENGTH_COUNT;
goto exit;
}
self->private_impl.f_code_lengths[v_i] = v_rep_symbol;
@@ -1905,21 +1905,21 @@ puffs_flate_status puffs_flate_flate_decoder_init_dynamic_huffman(
}
}
if (v_i != (v_n_lit + v_n_dist)) {
status = PUFFS_FLATE_ERROR_BAD_HUFFMAN_CODE_LENGTH_COUNT;
status = PUFFS_FLATE__ERROR_BAD_HUFFMAN_CODE_LENGTH_COUNT;
goto exit;
}
if (self->private_impl.f_code_lengths[256] == 0) {
status = PUFFS_FLATE_ERROR_MISSING_END_OF_BLOCK_CODE;
status = PUFFS_FLATE__ERROR_MISSING_END_OF_BLOCK_CODE;
goto exit;
}
PUFFS_COROUTINE_SUSPENSION_POINT(6);
status = puffs_flate_flate_decoder_init_huff(self, 0, 0, v_n_lit, 257);
status = puffs_flate__flate_decoder__init_huff(self, 0, 0, v_n_lit, 257);
if (status) {
goto suspend;
}
PUFFS_COROUTINE_SUSPENSION_POINT(7);
status = puffs_flate_flate_decoder_init_huff(self, 1, v_n_lit,
(v_n_lit + v_n_dist), 0);
status = puffs_flate__flate_decoder__init_huff(self, 1, v_n_lit,
(v_n_lit + v_n_dist), 0);
if (status) {
goto suspend;
}
@@ -1968,20 +1968,20 @@ exit:
short_read_src:
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
status = PUFFS_FLATE_ERROR_UNEXPECTED_EOF;
status = PUFFS_FLATE__ERROR_UNEXPECTED_EOF;
goto exit;
}
status = PUFFS_FLATE_SUSPENSION_SHORT_READ;
status = PUFFS_FLATE__SUSPENSION_SHORT_READ;
goto suspend;
}
puffs_flate_status puffs_flate_flate_decoder_init_huff(
puffs_flate_flate_decoder* self,
puffs_flate__status puffs_flate__flate_decoder__init_huff(
puffs_flate__flate_decoder* self,
uint32_t a_which,
uint32_t a_n_codes0,
uint32_t a_n_codes1,
uint32_t a_base_symbol) {
puffs_flate_status status = PUFFS_FLATE_STATUS_OK;
puffs_flate__status status = PUFFS_FLATE__STATUS_OK;
uint16_t v_counts[16];
uint32_t v_i;
@@ -2014,14 +2014,14 @@ puffs_flate_status puffs_flate_flate_decoder_init_huff(
while (v_i < a_n_codes1) {
if (v_counts[self->private_impl.f_code_lengths[v_i]] >= 320) {
status =
PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
v_counts[self->private_impl.f_code_lengths[v_i]] += 1;
v_i += 1;
}
if ((((uint32_t)(v_counts[0])) + a_n_codes0) == a_n_codes1) {
status = PUFFS_FLATE_ERROR_NO_HUFFMAN_CODES;
status = PUFFS_FLATE__ERROR_NO_HUFFMAN_CODES;
goto exit;
}
v_remaining = 1;
@@ -2029,19 +2029,19 @@ puffs_flate_status puffs_flate_flate_decoder_init_huff(
while (v_i <= 15) {
if (v_remaining > 1073741824) {
status =
PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
v_remaining <<= 1;
if (v_remaining < ((uint32_t)(v_counts[v_i]))) {
status = PUFFS_FLATE_ERROR_BAD_HUFFMAN_CODE_OVER_SUBSCRIBED;
status = PUFFS_FLATE__ERROR_BAD_HUFFMAN_CODE_OVER_SUBSCRIBED;
goto exit;
}
v_remaining -= ((uint32_t)(v_counts[v_i]));
v_i += 1;
}
if (v_remaining != 0) {
status = PUFFS_FLATE_ERROR_BAD_HUFFMAN_CODE_UNDER_SUBSCRIBED;
status = PUFFS_FLATE__ERROR_BAD_HUFFMAN_CODE_UNDER_SUBSCRIBED;
goto exit;
}
memset(v_offsets, 0, sizeof(v_offsets));
@@ -2052,7 +2052,7 @@ puffs_flate_status puffs_flate_flate_decoder_init_huff(
v_count = ((uint32_t)(v_counts[v_i]));
if (v_n_symbols > (320 - v_count)) {
status =
PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
v_n_symbols = (v_n_symbols + v_count);
@@ -2060,7 +2060,7 @@ puffs_flate_status puffs_flate_flate_decoder_init_huff(
}
if (v_n_symbols > 288) {
status =
PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
memset(v_symbols, 0, sizeof(v_symbols));
@@ -2068,13 +2068,13 @@ puffs_flate_status puffs_flate_flate_decoder_init_huff(
while (v_i < a_n_codes1) {
if (v_i < a_n_codes0) {
status =
PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
if (self->private_impl.f_code_lengths[v_i] != 0) {
if (v_offsets[self->private_impl.f_code_lengths[v_i]] >= 320) {
status =
PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
v_symbols[v_offsets[self->private_impl.f_code_lengths[v_i]]] =
@@ -2089,7 +2089,7 @@ puffs_flate_status puffs_flate_flate_decoder_init_huff(
goto label_0_break;
}
if (v_min_cl >= 9) {
status = PUFFS_FLATE_ERROR_BAD_HUFFMAN_MINIMUM_CODE_LENGTH;
status = PUFFS_FLATE__ERROR_BAD_HUFFMAN_MINIMUM_CODE_LENGTH;
goto exit;
}
v_min_cl += 1;
@@ -2101,7 +2101,7 @@ label_0_break:;
goto label_1_break;
}
if (v_max_cl <= 1) {
status = PUFFS_FLATE_ERROR_NO_HUFFMAN_CODES;
status = PUFFS_FLATE__ERROR_NO_HUFFMAN_CODES;
goto exit;
}
v_max_cl -= 1;
@@ -2116,12 +2116,12 @@ label_1_break:;
if ((v_n_symbols != ((uint32_t)(v_offsets[v_max_cl]))) ||
(v_n_symbols != ((uint32_t)(v_offsets[15])))) {
status =
PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
if ((a_n_codes0 + ((uint32_t)(v_symbols[0]))) >= 320) {
status =
PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
v_initial_high_bits = 512;
@@ -2140,7 +2140,7 @@ label_1_break:;
while (true) {
if ((a_n_codes0 + ((uint32_t)(v_symbols[v_i]))) >= 320) {
status =
PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
v_cl = ((uint32_t)(
@@ -2150,7 +2150,7 @@ label_1_break:;
v_code <<= (v_cl - v_prev_cl);
if (v_code >= 32768) {
status =
PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
}
@@ -2172,7 +2172,7 @@ label_1_break:;
v_remaining -= ((uint32_t)(v_counts[v_j]));
if (v_remaining > 1073741824) {
status =
PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
v_remaining <<= 1;
@@ -2181,7 +2181,7 @@ label_1_break:;
label_2_break:;
if ((v_j <= 9) || (15 < v_j)) {
status =
PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
v_tmp = (v_j - 9);
@@ -2189,12 +2189,12 @@ label_1_break:;
v_top = v_next_top;
if ((v_top + (((uint32_t)(1)) << v_tmp)) > 1234) {
status =
PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
v_next_top = (v_top + (((uint32_t)(1)) << v_tmp));
v_redirect_key =
(((uint32_t)(puffs_flate_reverse8[v_redirect_key >> 1])) |
(((uint32_t)(puffs_flate__reverse8[v_redirect_key >> 1])) |
((v_redirect_key & 1) << 8));
self->private_impl.f_huffs[a_which][v_redirect_key] =
(268435465 | (v_top << 8) | (v_tmp << 4));
@@ -2202,12 +2202,12 @@ label_1_break:;
}
if ((v_key >= 512) || (v_counts[v_prev_cl] <= 0)) {
status =
PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
v_counts[v_prev_cl] -= 1;
v_reversed_key =
(((uint32_t)(puffs_flate_reverse8[v_key >> 1])) | ((v_key & 1) << 8));
(((uint32_t)(puffs_flate__reverse8[v_key >> 1])) | ((v_key & 1) << 8));
v_reversed_key >>= (9 - v_cl);
v_symbol = ((uint32_t)(v_symbols[v_i]));
if (v_symbol == 256) {
@@ -2217,13 +2217,13 @@ label_1_break:;
} else if (v_symbol >= a_base_symbol) {
v_symbol -= a_base_symbol;
if (a_which == 0) {
v_value = (puffs_flate_lcode_magic_numbers[v_symbol & 31] | v_cl);
v_value = (puffs_flate__lcode_magic_numbers[v_symbol & 31] | v_cl);
} else {
v_value = (puffs_flate_dcode_magic_numbers[v_symbol & 31] | v_cl);
v_value = (puffs_flate__dcode_magic_numbers[v_symbol & 31] | v_cl);
}
} else {
status =
PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
v_high_bits = v_initial_high_bits;
@@ -2232,7 +2232,7 @@ label_1_break:;
v_high_bits -= v_delta;
if ((v_top + ((v_high_bits | v_reversed_key) & 511)) >= 1234) {
status =
PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
self->private_impl
@@ -2246,7 +2246,7 @@ label_1_break:;
v_code += 1;
if (v_code >= 32768) {
status =
PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
}
@@ -2255,24 +2255,24 @@ exit:
return status;
}
puffs_flate_status puffs_flate_zlib_decoder_decode(
puffs_flate_zlib_decoder* self,
puffs_flate__status puffs_flate__zlib_decoder__decode(
puffs_flate__zlib_decoder* self,
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src) {
if (!self) {
return PUFFS_FLATE_ERROR_BAD_RECEIVER;
return PUFFS_FLATE__ERROR_BAD_RECEIVER;
}
if (self->private_impl.magic != PUFFS_MAGIC) {
self->private_impl.status = PUFFS_FLATE_ERROR_INITIALIZER_NOT_CALLED;
self->private_impl.status = PUFFS_FLATE__ERROR_INITIALIZER_NOT_CALLED;
}
if (self->private_impl.status < 0) {
return self->private_impl.status;
}
puffs_flate_status status = PUFFS_FLATE_STATUS_OK;
puffs_flate__status status = PUFFS_FLATE__STATUS_OK;
uint16_t v_x;
uint32_t v_checksum;
puffs_flate_status v_z;
puffs_flate__status v_z;
uint8_t* b_wptr_dst = NULL;
uint8_t* b_wstart_dst = NULL;
@@ -2344,19 +2344,19 @@ puffs_flate_status puffs_flate_zlib_decoder_decode(
}
v_x = t_1;
if (((v_x >> 8) & 15) != 8) {
status = PUFFS_FLATE_ERROR_INVALID_ZLIB_COMPRESSION_METHOD;
status = PUFFS_FLATE__ERROR_INVALID_ZLIB_COMPRESSION_METHOD;
goto exit;
}
if ((v_x >> 12) > 7) {
status = PUFFS_FLATE_ERROR_INVALID_ZLIB_COMPRESSION_WINDOW_SIZE;
status = PUFFS_FLATE__ERROR_INVALID_ZLIB_COMPRESSION_WINDOW_SIZE;
goto exit;
}
if ((v_x & 32) != 0) {
status = PUFFS_FLATE_ERROR_TODO_UNSUPPORTED_ZLIB_PRESET_DICTIONARY;
status = PUFFS_FLATE__ERROR_TODO_UNSUPPORTED_ZLIB_PRESET_DICTIONARY;
goto exit;
}
if ((v_x % 31) != 0) {
status = PUFFS_FLATE_ERROR_INVALID_ZLIB_PARITY_CHECK;
status = PUFFS_FLATE__ERROR_INVALID_ZLIB_PARITY_CHECK;
goto exit;
}
v_checksum = 0;
@@ -2382,7 +2382,7 @@ puffs_flate_status puffs_flate_zlib_decoder_decode(
}
}
}
puffs_flate_status t_2 = puffs_flate_flate_decoder_decode(
puffs_flate__status t_2 = puffs_flate__flate_decoder__decode(
&self->private_impl.f_flate, a_dst, a_src);
if (a_dst.buf) {
b_wptr_dst = a_dst.buf->ptr + a_dst.buf->wi;
@@ -2410,7 +2410,7 @@ puffs_flate_status puffs_flate_zlib_decoder_decode(
b_rend_src = b_rptr_src + len;
}
v_z = t_2;
v_checksum = puffs_flate_adler32_update(
v_checksum = puffs_flate__adler32__update(
&self->private_impl.f_adler, ((puffs_base_slice_u8){
.ptr = b_wstart_dst,
.len = b_wptr_dst - b_wstart_dst,
@@ -2448,7 +2448,7 @@ puffs_flate_status puffs_flate_zlib_decoder_decode(
}
}
if (v_checksum != t_4) {
status = PUFFS_FLATE_ERROR_CHECKSUM_MISMATCH;
status = PUFFS_FLATE__ERROR_CHECKSUM_MISMATCH;
goto exit;
}
@@ -2496,15 +2496,15 @@ exit:
short_read_src:
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
status = PUFFS_FLATE_ERROR_UNEXPECTED_EOF;
status = PUFFS_FLATE__ERROR_UNEXPECTED_EOF;
goto exit;
}
status = PUFFS_FLATE_SUSPENSION_SHORT_READ;
status = PUFFS_FLATE__SUSPENSION_SHORT_READ;
goto suspend;
}
uint32_t puffs_flate_adler32_update(puffs_flate_adler32* self,
puffs_base_slice_u8 a_x) {
uint32_t puffs_flate__adler32__update(puffs_flate__adler32* self,
puffs_base_slice_u8 a_x) {
uint32_t v_s1;
uint32_t v_s2;
puffs_base_slice_u8 v_remaining;
+136 -134
View File
@@ -104,33 +104,33 @@ extern "C" {
// - bits 0-7 are a package-namespaced numeric code
//
// Do not manipulate these bits directly. Use the API functions such as
// puffs_gif_status_is_error instead.
typedef int32_t puffs_gif_status;
// puffs_gif__status__is_error instead.
typedef int32_t puffs_gif__status;
#define puffs_gif_packageid 1017222 // 0x000f8586
#define puffs_gif__packageid 1017222 // 0x000f8586
#define PUFFS_GIF_STATUS_OK 0 // 0x00000000
#define PUFFS_GIF_ERROR_BAD_PUFFS_VERSION -2147483647 // 0x80000001
#define PUFFS_GIF_ERROR_BAD_RECEIVER -2147483646 // 0x80000002
#define PUFFS_GIF_ERROR_BAD_ARGUMENT -2147483645 // 0x80000003
#define PUFFS_GIF_ERROR_INITIALIZER_NOT_CALLED -2147483644 // 0x80000004
#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__STATUS_OK 0 // 0x00000000
#define PUFFS_GIF__ERROR_BAD_PUFFS_VERSION -2147483647 // 0x80000001
#define PUFFS_GIF__ERROR_BAD_RECEIVER -2147483646 // 0x80000002
#define PUFFS_GIF__ERROR_BAD_ARGUMENT -2147483645 // 0x80000003
#define PUFFS_GIF__ERROR_INITIALIZER_NOT_CALLED -2147483644 // 0x80000004
#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_ERROR_BAD_GIF_BLOCK -1105848320 // 0xbe161800
#define PUFFS_GIF_ERROR_BAD_GIF_EXTENSION_LABEL -1105848319 // 0xbe161801
#define PUFFS_GIF_ERROR_BAD_GIF_HEADER -1105848318 // 0xbe161802
#define PUFFS_GIF_ERROR_BAD_LZW_LITERAL_WIDTH -1105848317 // 0xbe161803
#define PUFFS_GIF_ERROR_TODO_UNSUPPORTED_LOCAL_COLOR_TABLE \
-1105848316 // 0xbe161804
#define PUFFS_GIF_ERROR_LZW_CODE_IS_OUT_OF_RANGE -1105848315 // 0xbe161805
#define PUFFS_GIF_ERROR_LZW_PREFIX_CHAIN_IS_CYCLICAL -1105848314 // 0xbe161806
#define PUFFS_GIF__ERROR_BAD_GIF_BLOCK -1105848320 // 0xbe161800
#define PUFFS_GIF__ERROR_BAD_GIF_EXTENSION_LABEL -1105848319 // 0xbe161801
#define PUFFS_GIF__ERROR_BAD_GIF_HEADER -1105848318 // 0xbe161802
#define PUFFS_GIF__ERROR_BAD_LZW_LITERAL_WIDTH -1105848317 // 0xbe161803
#define PUFFS_GIF__ERROR_TODO_UNSUPPORTED_LOCAL_COLOR_TABLE \
-1105848316 // 0xbe161804
#define PUFFS_GIF__ERROR_LZW_CODE_IS_OUT_OF_RANGE -1105848315 // 0xbe161805
#define PUFFS_GIF__ERROR_LZW_PREFIX_CHAIN_IS_CYCLICAL -1105848314 // 0xbe161806
bool puffs_gif_status_is_error(puffs_gif_status s);
bool puffs_gif__status__is_error(puffs_gif__status s);
const char* puffs_gif_status_string(puffs_gif_status s);
const char* puffs_gif__status__string(puffs_gif__status s);
// ---------------- Public Consts
@@ -139,13 +139,13 @@ const char* puffs_gif_status_string(puffs_gif_status s);
typedef struct {
// Do not access the private_impl's fields directly. There is no API/ABI
// compatibility or safety guarantee if you do so. Instead, use the
// puffs_gif_lzw_decoder_etc functions.
// puffs_gif__lzw_decoder__etc functions.
//
// In C++, these fields would be "private", but C does not support that.
//
// It is a struct, not a struct*, so that it can be stack allocated.
struct {
puffs_gif_status status;
puffs_gif__status status;
uint32_t magic;
uint32_t f_literal_width;
@@ -168,25 +168,25 @@ typedef struct {
uint64_t v_n_copied;
} c_decode[1];
} private_impl;
} puffs_gif_lzw_decoder;
} puffs_gif__lzw_decoder;
typedef struct {
// Do not access the private_impl's fields directly. There is no API/ABI
// compatibility or safety guarantee if you do so. Instead, use the
// puffs_gif_decoder_etc functions.
// puffs_gif__decoder__etc functions.
//
// In C++, these fields would be "private", but C does not support that.
//
// It is a struct, not a struct*, so that it can be stack allocated.
struct {
puffs_gif_status status;
puffs_gif__status status;
uint32_t magic;
uint32_t f_width;
uint32_t f_height;
uint8_t f_background_color_index;
uint8_t f_gct[768];
puffs_gif_lzw_decoder f_lzw;
puffs_gif__lzw_decoder f_lzw;
struct {
uint32_t coro_susp_point;
@@ -220,40 +220,40 @@ typedef struct {
puffs_base_reader1 v_lzw_src;
} c_decode_id[1];
} private_impl;
} puffs_gif_decoder;
} puffs_gif__decoder;
// ---------------- Public Initializer Prototypes
// puffs_gif_lzw_decoder_initialize is an initializer function.
// puffs_gif__lzw_decoder__initialize is an initializer function.
//
// It should be called before any other puffs_gif_lzw_decoder_* function.
// It should be called before any other puffs_gif__lzw_decoder__* function.
//
// Pass PUFFS_VERSION and 0 for puffs_version and for_internal_use_only.
void puffs_gif_lzw_decoder_initialize(puffs_gif_lzw_decoder* self,
uint32_t puffs_version,
uint32_t for_internal_use_only);
void puffs_gif__lzw_decoder__initialize(puffs_gif__lzw_decoder* self,
uint32_t puffs_version,
uint32_t for_internal_use_only);
// puffs_gif_decoder_initialize is an initializer function.
// puffs_gif__decoder__initialize is an initializer function.
//
// It should be called before any other puffs_gif_decoder_* function.
// It should be called before any other puffs_gif__decoder__* function.
//
// Pass PUFFS_VERSION and 0 for puffs_version and for_internal_use_only.
void puffs_gif_decoder_initialize(puffs_gif_decoder* self,
uint32_t puffs_version,
uint32_t for_internal_use_only);
void puffs_gif__decoder__initialize(puffs_gif__decoder* self,
uint32_t puffs_version,
uint32_t for_internal_use_only);
// ---------------- Public Function Prototypes
puffs_gif_status puffs_gif_decoder_decode(puffs_gif_decoder* self,
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src);
puffs_gif__status puffs_gif__decoder__decode(puffs_gif__decoder* self,
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src);
void puffs_gif_lzw_decoder_set_literal_width(puffs_gif_lzw_decoder* self,
uint32_t a_lw);
void puffs_gif__lzw_decoder__set_literal_width(puffs_gif__lzw_decoder* self,
uint32_t a_lw);
puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self,
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src);
puffs_gif__status puffs_gif__lzw_decoder__decode(puffs_gif__lzw_decoder* self,
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src);
#ifdef __cplusplus
} // extern "C"
@@ -514,11 +514,11 @@ static inline uint32_t puffs_base_writer1_copy_from_slice32(
// ---------------- Status Codes Implementations
bool puffs_gif_status_is_error(puffs_gif_status s) {
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[9] = {
"gif: ok",
"gif: bad puffs version",
"gif: bad receiver",
@@ -530,7 +530,7 @@ const char* puffs_gif_status_strings0[9] = {
"gif: short write",
};
const char* puffs_gif_status_strings1[7] = {
const char* puffs_gif__status__strings1[7] = {
"gif: bad GIF block",
"gif: bad GIF extension label",
"gif: bad GIF header",
@@ -540,16 +540,16 @@ const char* puffs_gif_status_strings1[7] = {
"gif: LZW prefix chain is cyclical",
};
const char* puffs_gif_status_string(puffs_gif_status s) {
const char* puffs_gif__status__string(puffs_gif__status s) {
const char** a = NULL;
uint32_t n = 0;
switch ((s >> 10) & 0x1fffff) {
case 0:
a = puffs_gif_status_strings0;
a = puffs_gif__status__strings0;
n = 9;
break;
case puffs_gif_packageid:
a = puffs_gif_status_strings1;
case puffs_gif__packageid:
a = puffs_gif__status__strings1;
n = 7;
break;
}
@@ -563,18 +563,19 @@ const char* puffs_gif_status_string(puffs_gif_status s) {
// ---------------- Private Function Prototypes
puffs_gif_status puffs_gif_decoder_decode_header(puffs_gif_decoder* self,
puffs_base_reader1 a_src);
puffs_gif_status puffs_gif_decoder_decode_lsd(puffs_gif_decoder* self,
puffs_base_reader1 a_src);
puffs_gif_status puffs_gif_decoder_decode_extension(puffs_gif_decoder* self,
puffs_gif__status puffs_gif__decoder__decode_header(puffs_gif__decoder* self,
puffs_base_reader1 a_src);
puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self,
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src);
puffs_gif__status puffs_gif__decoder__decode_lsd(puffs_gif__decoder* self,
puffs_base_reader1 a_src);
puffs_gif__status puffs_gif__decoder__decode_extension(
puffs_gif__decoder* self,
puffs_base_reader1 a_src);
puffs_gif__status puffs_gif__decoder__decode_id(puffs_gif__decoder* self,
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src);
// ---------------- Initializer Implementations
@@ -592,14 +593,14 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self,
// Its (non-zero) value is arbitrary, based on md5sum("zeroed").
#define PUFFS_ALREADY_ZEROED (0x68602EF1U)
void puffs_gif_lzw_decoder_initialize(puffs_gif_lzw_decoder* self,
uint32_t puffs_version,
uint32_t for_internal_use_only) {
void puffs_gif__lzw_decoder__initialize(puffs_gif__lzw_decoder* self,
uint32_t puffs_version,
uint32_t for_internal_use_only) {
if (!self) {
return;
}
if (puffs_version != PUFFS_VERSION) {
self->private_impl.status = PUFFS_GIF_ERROR_BAD_PUFFS_VERSION;
self->private_impl.status = PUFFS_GIF__ERROR_BAD_PUFFS_VERSION;
return;
}
if (for_internal_use_only != PUFFS_ALREADY_ZEROED) {
@@ -609,39 +610,39 @@ void puffs_gif_lzw_decoder_initialize(puffs_gif_lzw_decoder* self,
self->private_impl.f_literal_width = 8;
}
void puffs_gif_decoder_initialize(puffs_gif_decoder* self,
uint32_t puffs_version,
uint32_t for_internal_use_only) {
void puffs_gif__decoder__initialize(puffs_gif__decoder* self,
uint32_t puffs_version,
uint32_t for_internal_use_only) {
if (!self) {
return;
}
if (puffs_version != PUFFS_VERSION) {
self->private_impl.status = PUFFS_GIF_ERROR_BAD_PUFFS_VERSION;
self->private_impl.status = PUFFS_GIF__ERROR_BAD_PUFFS_VERSION;
return;
}
if (for_internal_use_only != PUFFS_ALREADY_ZEROED) {
memset(self, 0, sizeof(*self));
}
self->private_impl.magic = PUFFS_MAGIC;
puffs_gif_lzw_decoder_initialize(&self->private_impl.f_lzw, PUFFS_VERSION,
PUFFS_ALREADY_ZEROED);
puffs_gif__lzw_decoder__initialize(&self->private_impl.f_lzw, PUFFS_VERSION,
PUFFS_ALREADY_ZEROED);
}
// ---------------- Function Implementations
puffs_gif_status puffs_gif_decoder_decode(puffs_gif_decoder* self,
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src) {
puffs_gif__status puffs_gif__decoder__decode(puffs_gif__decoder* self,
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src) {
if (!self) {
return PUFFS_GIF_ERROR_BAD_RECEIVER;
return PUFFS_GIF__ERROR_BAD_RECEIVER;
}
if (self->private_impl.magic != PUFFS_MAGIC) {
self->private_impl.status = PUFFS_GIF_ERROR_INITIALIZER_NOT_CALLED;
self->private_impl.status = PUFFS_GIF__ERROR_INITIALIZER_NOT_CALLED;
}
if (self->private_impl.status < 0) {
return self->private_impl.status;
}
puffs_gif_status status = PUFFS_GIF_STATUS_OK;
puffs_gif__status status = PUFFS_GIF__STATUS_OK;
uint8_t v_c;
@@ -679,7 +680,7 @@ puffs_gif_status puffs_gif_decoder_decode(puffs_gif_decoder* self,
}
}
}
status = puffs_gif_decoder_decode_header(self, a_src);
status = puffs_gif__decoder__decode_header(self, a_src);
if (a_src.buf) {
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
size_t len = a_src.buf->wi - a_src.buf->ri;
@@ -705,7 +706,7 @@ puffs_gif_status puffs_gif_decoder_decode(puffs_gif_decoder* self,
}
}
}
status = puffs_gif_decoder_decode_lsd(self, a_src);
status = puffs_gif__decoder__decode_lsd(self, a_src);
if (a_src.buf) {
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
size_t len = a_src.buf->wi - a_src.buf->ri;
@@ -739,7 +740,7 @@ puffs_gif_status puffs_gif_decoder_decode(puffs_gif_decoder* self,
}
}
}
status = puffs_gif_decoder_decode_extension(self, a_src);
status = puffs_gif__decoder__decode_extension(self, a_src);
if (a_src.buf) {
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
size_t len = a_src.buf->wi - a_src.buf->ri;
@@ -766,7 +767,7 @@ puffs_gif_status puffs_gif_decoder_decode(puffs_gif_decoder* self,
}
}
}
status = puffs_gif_decoder_decode_id(self, a_dst, a_src);
status = puffs_gif__decoder__decode_id(self, a_dst, a_src);
if (a_src.buf) {
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
size_t len = a_src.buf->wi - a_src.buf->ri;
@@ -782,10 +783,10 @@ puffs_gif_status puffs_gif_decoder_decode(puffs_gif_decoder* self,
goto suspend;
}
} else if (v_c == 59) {
status = PUFFS_GIF_STATUS_OK;
status = PUFFS_GIF__STATUS_OK;
goto ok;
} else {
status = PUFFS_GIF_ERROR_BAD_GIF_BLOCK;
status = PUFFS_GIF__ERROR_BAD_GIF_BLOCK;
goto exit;
}
}
@@ -820,16 +821,16 @@ exit:
short_read_src:
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
status = PUFFS_GIF_ERROR_UNEXPECTED_EOF;
status = PUFFS_GIF__ERROR_UNEXPECTED_EOF;
goto exit;
}
status = PUFFS_GIF_SUSPENSION_SHORT_READ;
status = PUFFS_GIF__SUSPENSION_SHORT_READ;
goto suspend;
}
puffs_gif_status puffs_gif_decoder_decode_header(puffs_gif_decoder* self,
puffs_base_reader1 a_src) {
puffs_gif_status status = PUFFS_GIF_STATUS_OK;
puffs_gif__status puffs_gif__decoder__decode_header(puffs_gif__decoder* self,
puffs_base_reader1 a_src) {
puffs_gif__status status = PUFFS_GIF__STATUS_OK;
uint8_t v_c[6];
uint32_t v_i;
@@ -872,7 +873,7 @@ puffs_gif_status puffs_gif_decoder_decode_header(puffs_gif_decoder* self,
}
if ((v_c[0] != 71) || (v_c[1] != 73) || (v_c[2] != 70) || (v_c[3] != 56) ||
((v_c[4] != 55) && (v_c[4] != 57)) || (v_c[5] != 97)) {
status = PUFFS_GIF_ERROR_BAD_GIF_HEADER;
status = PUFFS_GIF__ERROR_BAD_GIF_HEADER;
goto exit;
}
@@ -906,16 +907,16 @@ exit:
short_read_src:
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
status = PUFFS_GIF_ERROR_UNEXPECTED_EOF;
status = PUFFS_GIF__ERROR_UNEXPECTED_EOF;
goto exit;
}
status = PUFFS_GIF_SUSPENSION_SHORT_READ;
status = PUFFS_GIF__SUSPENSION_SHORT_READ;
goto suspend;
}
puffs_gif_status puffs_gif_decoder_decode_lsd(puffs_gif_decoder* self,
puffs_base_reader1 a_src) {
puffs_gif_status status = PUFFS_GIF_STATUS_OK;
puffs_gif__status puffs_gif__decoder__decode_lsd(puffs_gif__decoder* self,
puffs_base_reader1 a_src) {
puffs_gif__status status = PUFFS_GIF__STATUS_OK;
uint8_t v_c[7];
uint32_t v_i;
@@ -1019,16 +1020,17 @@ exit:
short_read_src:
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
status = PUFFS_GIF_ERROR_UNEXPECTED_EOF;
status = PUFFS_GIF__ERROR_UNEXPECTED_EOF;
goto exit;
}
status = PUFFS_GIF_SUSPENSION_SHORT_READ;
status = PUFFS_GIF__SUSPENSION_SHORT_READ;
goto suspend;
}
puffs_gif_status puffs_gif_decoder_decode_extension(puffs_gif_decoder* self,
puffs_base_reader1 a_src) {
puffs_gif_status status = PUFFS_GIF_STATUS_OK;
puffs_gif__status puffs_gif__decoder__decode_extension(
puffs_gif__decoder* self,
puffs_base_reader1 a_src) {
puffs_gif__status status = PUFFS_GIF__STATUS_OK;
uint8_t v_label;
uint8_t v_block_size;
@@ -1069,7 +1071,7 @@ puffs_gif_status puffs_gif_decoder_decode_extension(puffs_gif_decoder* self,
} else if (v_label == 254) {
} else if (v_label == 255) {
} else {
status = PUFFS_GIF_ERROR_BAD_GIF_EXTENSION_LABEL;
status = PUFFS_GIF__ERROR_BAD_GIF_EXTENSION_LABEL;
goto exit;
}
while (true) {
@@ -1127,17 +1129,17 @@ exit:
short_read_src:
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
status = PUFFS_GIF_ERROR_UNEXPECTED_EOF;
status = PUFFS_GIF__ERROR_UNEXPECTED_EOF;
goto exit;
}
status = PUFFS_GIF_SUSPENSION_SHORT_READ;
status = PUFFS_GIF__SUSPENSION_SHORT_READ;
goto suspend;
}
puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self,
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src) {
puffs_gif_status status = PUFFS_GIF_STATUS_OK;
puffs_gif__status puffs_gif__decoder__decode_id(puffs_gif__decoder* self,
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src) {
puffs_gif__status status = PUFFS_GIF__STATUS_OK;
uint8_t v_c[9];
uint32_t v_i;
@@ -1191,7 +1193,7 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self,
if (v_interlace) {
}
if ((v_c[8] & 128) != 0) {
status = PUFFS_GIF_ERROR_TODO_UNSUPPORTED_LOCAL_COLOR_TABLE;
status = PUFFS_GIF__ERROR_TODO_UNSUPPORTED_LOCAL_COLOR_TABLE;
goto exit;
}
PUFFS_COROUTINE_SUSPENSION_POINT(2);
@@ -1201,11 +1203,11 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self,
uint8_t t_1 = *b_rptr_src++;
v_lw = t_1;
if ((v_lw < 2) || (8 < v_lw)) {
status = PUFFS_GIF_ERROR_BAD_LZW_LITERAL_WIDTH;
status = PUFFS_GIF__ERROR_BAD_LZW_LITERAL_WIDTH;
goto exit;
}
puffs_gif_lzw_decoder_set_literal_width(&self->private_impl.f_lzw,
((uint32_t)(v_lw)));
puffs_gif__lzw_decoder__set_literal_width(&self->private_impl.f_lzw,
((uint32_t)(v_lw)));
while (true) {
PUFFS_COROUTINE_SUSPENSION_POINT(3);
if (PUFFS_UNLIKELY(b_rptr_src == b_rend_src)) {
@@ -1233,8 +1235,8 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self,
}
}
}
status = puffs_gif_lzw_decoder_decode(&self->private_impl.f_lzw, a_dst,
v_lzw_src);
status = puffs_gif__lzw_decoder__decode(&self->private_impl.f_lzw, a_dst,
v_lzw_src);
if (a_src.buf) {
b_rptr_src = a_src.buf->ptr + a_src.buf->ri;
size_t len = a_src.buf->wi - a_src.buf->ri;
@@ -1287,45 +1289,45 @@ exit:
short_read_src:
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
status = PUFFS_GIF_ERROR_UNEXPECTED_EOF;
status = PUFFS_GIF__ERROR_UNEXPECTED_EOF;
goto exit;
}
status = PUFFS_GIF_SUSPENSION_SHORT_READ;
status = PUFFS_GIF__SUSPENSION_SHORT_READ;
goto suspend;
}
void puffs_gif_lzw_decoder_set_literal_width(puffs_gif_lzw_decoder* self,
uint32_t a_lw) {
void puffs_gif__lzw_decoder__set_literal_width(puffs_gif__lzw_decoder* self,
uint32_t a_lw) {
if (!self) {
return;
}
if (self->private_impl.magic != PUFFS_MAGIC) {
self->private_impl.status = PUFFS_GIF_ERROR_INITIALIZER_NOT_CALLED;
self->private_impl.status = PUFFS_GIF__ERROR_INITIALIZER_NOT_CALLED;
}
if (self->private_impl.status < 0) {
return;
}
if (a_lw < 2 || a_lw > 8) {
self->private_impl.status = PUFFS_GIF_ERROR_BAD_ARGUMENT;
self->private_impl.status = PUFFS_GIF__ERROR_BAD_ARGUMENT;
return;
}
self->private_impl.f_literal_width = a_lw;
}
puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self,
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src) {
puffs_gif__status puffs_gif__lzw_decoder__decode(puffs_gif__lzw_decoder* self,
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src) {
if (!self) {
return PUFFS_GIF_ERROR_BAD_RECEIVER;
return PUFFS_GIF__ERROR_BAD_RECEIVER;
}
if (self->private_impl.magic != PUFFS_MAGIC) {
self->private_impl.status = PUFFS_GIF_ERROR_INITIALIZER_NOT_CALLED;
self->private_impl.status = PUFFS_GIF__ERROR_INITIALIZER_NOT_CALLED;
}
if (self->private_impl.status < 0) {
return self->private_impl.status;
}
puffs_gif_status status = PUFFS_GIF_STATUS_OK;
puffs_gif__status status = PUFFS_GIF__STATUS_OK;
uint32_t v_clear_code;
uint32_t v_end_code;
@@ -1416,7 +1418,7 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self,
if (v_code < v_clear_code) {
PUFFS_COROUTINE_SUSPENSION_POINT(2);
if (b_wptr_dst == b_wend_dst) {
status = PUFFS_GIF_SUSPENSION_SHORT_WRITE;
status = PUFFS_GIF__SUSPENSION_SHORT_WRITE;
goto suspend;
}
*b_wptr_dst++ = ((uint8_t)(v_code));
@@ -1431,7 +1433,7 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self,
v_width = (self->private_impl.f_literal_width + 1);
goto label_0_continue;
} else if (v_code == v_end_code) {
status = PUFFS_GIF_STATUS_OK;
status = PUFFS_GIF__STATUS_OK;
goto ok;
} else if (v_code <= v_save_code) {
v_s = 4095;
@@ -1443,7 +1445,7 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self,
while (v_c >= v_clear_code) {
self->private_impl.f_stack[v_s] = self->private_impl.f_suffixes[v_c];
if (v_s == 0) {
status = PUFFS_GIF_ERROR_LZW_PREFIX_CHAIN_IS_CYCLICAL;
status = PUFFS_GIF__ERROR_LZW_PREFIX_CHAIN_IS_CYCLICAL;
goto exit;
}
v_s -= 1;
@@ -1464,7 +1466,7 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self,
goto label_1_break;
}
v_s = ((v_s + ((uint32_t)((v_n_copied & 4095)))) & 4095);
status = PUFFS_GIF_SUSPENSION_SHORT_WRITE;
status = PUFFS_GIF__SUSPENSION_SHORT_WRITE;
PUFFS_COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(3);
}
label_1_break:;
@@ -1474,7 +1476,7 @@ puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self,
((uint16_t)(v_prev_code));
}
} else {
status = PUFFS_GIF_ERROR_LZW_CODE_IS_OUT_OF_RANGE;
status = PUFFS_GIF__ERROR_LZW_CODE_IS_OUT_OF_RANGE;
goto exit;
}
if (v_save_code <= 4095) {
@@ -1538,9 +1540,9 @@ exit:
short_read_src:
if (a_src.buf && a_src.buf->closed && !a_src.limit.ptr_to_len) {
status = PUFFS_GIF_ERROR_UNEXPECTED_EOF;
status = PUFFS_GIF__ERROR_UNEXPECTED_EOF;
goto exit;
}
status = PUFFS_GIF_SUSPENSION_SHORT_READ;
status = PUFFS_GIF__SUSPENSION_SHORT_READ;
goto suspend;
}
+66 -66
View File
@@ -104,57 +104,57 @@ extern "C" {
// - bits 0-7 are a package-namespaced numeric code
//
// Do not manipulate these bits directly. Use the API functions such as
// puffs_flate_status_is_error instead.
typedef int32_t puffs_flate_status;
// puffs_flate__status__is_error instead.
typedef int32_t puffs_flate__status;
#define puffs_flate_packageid 967230 // 0x000ec23e
#define puffs_flate__packageid 967230 // 0x000ec23e
#define PUFFS_FLATE_STATUS_OK 0 // 0x00000000
#define PUFFS_FLATE_ERROR_BAD_PUFFS_VERSION -2147483647 // 0x80000001
#define PUFFS_FLATE_ERROR_BAD_RECEIVER -2147483646 // 0x80000002
#define PUFFS_FLATE_ERROR_BAD_ARGUMENT -2147483645 // 0x80000003
#define PUFFS_FLATE_ERROR_INITIALIZER_NOT_CALLED -2147483644 // 0x80000004
#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__STATUS_OK 0 // 0x00000000
#define PUFFS_FLATE__ERROR_BAD_PUFFS_VERSION -2147483647 // 0x80000001
#define PUFFS_FLATE__ERROR_BAD_RECEIVER -2147483646 // 0x80000002
#define PUFFS_FLATE__ERROR_BAD_ARGUMENT -2147483645 // 0x80000003
#define PUFFS_FLATE__ERROR_INITIALIZER_NOT_CALLED -2147483644 // 0x80000004
#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_ERROR_BAD_HUFFMAN_CODE_OVER_SUBSCRIBED \
#define PUFFS_FLATE__ERROR_BAD_HUFFMAN_CODE_OVER_SUBSCRIBED \
-1157040128 // 0xbb08f800
#define PUFFS_FLATE_ERROR_BAD_HUFFMAN_CODE_UNDER_SUBSCRIBED \
#define PUFFS_FLATE__ERROR_BAD_HUFFMAN_CODE_UNDER_SUBSCRIBED \
-1157040127 // 0xbb08f801
#define PUFFS_FLATE_ERROR_BAD_HUFFMAN_CODE_LENGTH_COUNT \
#define PUFFS_FLATE__ERROR_BAD_HUFFMAN_CODE_LENGTH_COUNT \
-1157040126 // 0xbb08f802
#define PUFFS_FLATE_ERROR_BAD_HUFFMAN_CODE_LENGTH_REPETITION \
-1157040125 // 0xbb08f803
#define PUFFS_FLATE_ERROR_BAD_HUFFMAN_CODE -1157040124 // 0xbb08f804
#define PUFFS_FLATE_ERROR_BAD_HUFFMAN_MINIMUM_CODE_LENGTH \
-1157040123 // 0xbb08f805
#define PUFFS_FLATE_ERROR_BAD_DISTANCE -1157040122 // 0xbb08f806
#define PUFFS_FLATE_ERROR_BAD_DISTANCE_CODE_COUNT -1157040121 // 0xbb08f807
#define PUFFS_FLATE_ERROR_BAD_FLATE_BLOCK -1157040120 // 0xbb08f808
#define PUFFS_FLATE_ERROR_BAD_LITERAL_LENGTH_CODE_COUNT \
-1157040119 // 0xbb08f809
#define PUFFS_FLATE_ERROR_CHECKSUM_MISMATCH -1157040118 // 0xbb08f80a
#define PUFFS_FLATE_ERROR_INCONSISTENT_STORED_BLOCK_LENGTH \
#define PUFFS_FLATE__ERROR_BAD_HUFFMAN_CODE_LENGTH_REPETITION \
-1157040125 // 0xbb08f803
#define PUFFS_FLATE__ERROR_BAD_HUFFMAN_CODE -1157040124 // 0xbb08f804
#define PUFFS_FLATE__ERROR_BAD_HUFFMAN_MINIMUM_CODE_LENGTH \
-1157040123 // 0xbb08f805
#define PUFFS_FLATE__ERROR_BAD_DISTANCE -1157040122 // 0xbb08f806
#define PUFFS_FLATE__ERROR_BAD_DISTANCE_CODE_COUNT -1157040121 // 0xbb08f807
#define PUFFS_FLATE__ERROR_BAD_FLATE_BLOCK -1157040120 // 0xbb08f808
#define PUFFS_FLATE__ERROR_BAD_LITERAL_LENGTH_CODE_COUNT \
-1157040119 // 0xbb08f809
#define PUFFS_FLATE__ERROR_CHECKSUM_MISMATCH -1157040118 // 0xbb08f80a
#define PUFFS_FLATE__ERROR_INCONSISTENT_STORED_BLOCK_LENGTH \
-1157040117 // 0xbb08f80b
#define PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE \
#define PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE \
-1157040116 // 0xbb08f80c
#define PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_N_BITS \
-1157040115 // 0xbb08f80d
#define PUFFS_FLATE_ERROR_MISSING_END_OF_BLOCK_CODE -1157040114 // 0xbb08f80e
#define PUFFS_FLATE_ERROR_NO_HUFFMAN_CODES -1157040113 // 0xbb08f80f
#define PUFFS_FLATE_ERROR_INVALID_ZLIB_COMPRESSION_METHOD \
#define PUFFS_FLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_N_BITS \
-1157040115 // 0xbb08f80d
#define PUFFS_FLATE__ERROR_MISSING_END_OF_BLOCK_CODE -1157040114 // 0xbb08f80e
#define PUFFS_FLATE__ERROR_NO_HUFFMAN_CODES -1157040113 // 0xbb08f80f
#define PUFFS_FLATE__ERROR_INVALID_ZLIB_COMPRESSION_METHOD \
-1157040112 // 0xbb08f810
#define PUFFS_FLATE_ERROR_INVALID_ZLIB_COMPRESSION_WINDOW_SIZE \
-1157040111 // 0xbb08f811
#define PUFFS_FLATE_ERROR_INVALID_ZLIB_PARITY_CHECK -1157040110 // 0xbb08f812
#define PUFFS_FLATE_ERROR_TODO_UNSUPPORTED_ZLIB_PRESET_DICTIONARY \
#define PUFFS_FLATE__ERROR_INVALID_ZLIB_COMPRESSION_WINDOW_SIZE \
-1157040111 // 0xbb08f811
#define PUFFS_FLATE__ERROR_INVALID_ZLIB_PARITY_CHECK -1157040110 // 0xbb08f812
#define PUFFS_FLATE__ERROR_TODO_UNSUPPORTED_ZLIB_PRESET_DICTIONARY \
-1157040109 // 0xbb08f813
bool puffs_flate_status_is_error(puffs_flate_status s);
bool puffs_flate__status__is_error(puffs_flate__status s);
const char* puffs_flate_status_string(puffs_flate_status s);
const char* puffs_flate__status__string(puffs_flate__status s);
// ---------------- Public Consts
@@ -163,13 +163,13 @@ const char* puffs_flate_status_string(puffs_flate_status s);
typedef struct {
// Do not access the private_impl's fields directly. There is no API/ABI
// compatibility or safety guarantee if you do so. Instead, use the
// puffs_flate_flate_decoder_etc functions.
// puffs_flate__flate_decoder__etc functions.
//
// In C++, these fields would be "private", but C does not support that.
//
// It is a struct, not a struct*, so that it can be stack allocated.
struct {
puffs_flate_status status;
puffs_flate__status status;
uint32_t magic;
uint32_t f_bits;
@@ -182,7 +182,7 @@ typedef struct {
struct {
uint32_t coro_susp_point;
puffs_flate_status v_z;
puffs_flate__status v_z;
uint64_t v_n_copied;
uint32_t v_already_full;
} c_decode[1];
@@ -233,79 +233,79 @@ typedef struct {
uint32_t v_rep_count;
} c_init_dynamic_huffman[1];
} private_impl;
} puffs_flate_flate_decoder;
} puffs_flate__flate_decoder;
typedef struct {
// Do not access the private_impl's fields directly. There is no API/ABI
// compatibility or safety guarantee if you do so. Instead, use the
// puffs_flate_adler32_etc functions.
// puffs_flate__adler32__etc functions.
//
// In C++, these fields would be "private", but C does not support that.
//
// It is a struct, not a struct*, so that it can be stack allocated.
struct {
puffs_flate_status status;
puffs_flate__status status;
uint32_t magic;
uint32_t f_state;
} private_impl;
} puffs_flate_adler32;
} puffs_flate__adler32;
typedef struct {
// Do not access the private_impl's fields directly. There is no API/ABI
// compatibility or safety guarantee if you do so. Instead, use the
// puffs_flate_zlib_decoder_etc functions.
// puffs_flate__zlib_decoder__etc functions.
//
// In C++, these fields would be "private", but C does not support that.
//
// It is a struct, not a struct*, so that it can be stack allocated.
struct {
puffs_flate_status status;
puffs_flate__status status;
uint32_t magic;
puffs_flate_flate_decoder f_flate;
puffs_flate_adler32 f_adler;
puffs_flate__flate_decoder f_flate;
puffs_flate__adler32 f_adler;
struct {
uint32_t coro_susp_point;
uint16_t v_x;
uint32_t v_checksum;
puffs_flate_status v_z;
puffs_flate__status v_z;
uint64_t scratch;
} c_decode[1];
} private_impl;
} puffs_flate_zlib_decoder;
} puffs_flate__zlib_decoder;
// ---------------- Public Initializer Prototypes
// puffs_flate_flate_decoder_initialize is an initializer function.
// puffs_flate__flate_decoder__initialize is an initializer function.
//
// It should be called before any other puffs_flate_flate_decoder_* function.
// It should be called before any other puffs_flate__flate_decoder__* function.
//
// Pass PUFFS_VERSION and 0 for puffs_version and for_internal_use_only.
void puffs_flate_flate_decoder_initialize(puffs_flate_flate_decoder* self,
uint32_t puffs_version,
uint32_t for_internal_use_only);
void puffs_flate__flate_decoder__initialize(puffs_flate__flate_decoder* self,
uint32_t puffs_version,
uint32_t for_internal_use_only);
// puffs_flate_zlib_decoder_initialize is an initializer function.
// puffs_flate__zlib_decoder__initialize is an initializer function.
//
// It should be called before any other puffs_flate_zlib_decoder_* function.
// It should be called before any other puffs_flate__zlib_decoder__* function.
//
// Pass PUFFS_VERSION and 0 for puffs_version and for_internal_use_only.
void puffs_flate_zlib_decoder_initialize(puffs_flate_zlib_decoder* self,
uint32_t puffs_version,
uint32_t for_internal_use_only);
void puffs_flate__zlib_decoder__initialize(puffs_flate__zlib_decoder* self,
uint32_t puffs_version,
uint32_t for_internal_use_only);
// ---------------- Public Function Prototypes
puffs_flate_status puffs_flate_flate_decoder_decode(
puffs_flate_flate_decoder* self,
puffs_flate__status puffs_flate__flate_decoder__decode(
puffs_flate__flate_decoder* self,
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src);
puffs_flate_status puffs_flate_zlib_decoder_decode(
puffs_flate_zlib_decoder* self,
puffs_flate__status puffs_flate__zlib_decoder__decode(
puffs_flate__zlib_decoder* self,
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src);
+47 -47
View File
@@ -104,33 +104,33 @@ extern "C" {
// - bits 0-7 are a package-namespaced numeric code
//
// Do not manipulate these bits directly. Use the API functions such as
// puffs_gif_status_is_error instead.
typedef int32_t puffs_gif_status;
// puffs_gif__status__is_error instead.
typedef int32_t puffs_gif__status;
#define puffs_gif_packageid 1017222 // 0x000f8586
#define puffs_gif__packageid 1017222 // 0x000f8586
#define PUFFS_GIF_STATUS_OK 0 // 0x00000000
#define PUFFS_GIF_ERROR_BAD_PUFFS_VERSION -2147483647 // 0x80000001
#define PUFFS_GIF_ERROR_BAD_RECEIVER -2147483646 // 0x80000002
#define PUFFS_GIF_ERROR_BAD_ARGUMENT -2147483645 // 0x80000003
#define PUFFS_GIF_ERROR_INITIALIZER_NOT_CALLED -2147483644 // 0x80000004
#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__STATUS_OK 0 // 0x00000000
#define PUFFS_GIF__ERROR_BAD_PUFFS_VERSION -2147483647 // 0x80000001
#define PUFFS_GIF__ERROR_BAD_RECEIVER -2147483646 // 0x80000002
#define PUFFS_GIF__ERROR_BAD_ARGUMENT -2147483645 // 0x80000003
#define PUFFS_GIF__ERROR_INITIALIZER_NOT_CALLED -2147483644 // 0x80000004
#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_ERROR_BAD_GIF_BLOCK -1105848320 // 0xbe161800
#define PUFFS_GIF_ERROR_BAD_GIF_EXTENSION_LABEL -1105848319 // 0xbe161801
#define PUFFS_GIF_ERROR_BAD_GIF_HEADER -1105848318 // 0xbe161802
#define PUFFS_GIF_ERROR_BAD_LZW_LITERAL_WIDTH -1105848317 // 0xbe161803
#define PUFFS_GIF_ERROR_TODO_UNSUPPORTED_LOCAL_COLOR_TABLE \
-1105848316 // 0xbe161804
#define PUFFS_GIF_ERROR_LZW_CODE_IS_OUT_OF_RANGE -1105848315 // 0xbe161805
#define PUFFS_GIF_ERROR_LZW_PREFIX_CHAIN_IS_CYCLICAL -1105848314 // 0xbe161806
#define PUFFS_GIF__ERROR_BAD_GIF_BLOCK -1105848320 // 0xbe161800
#define PUFFS_GIF__ERROR_BAD_GIF_EXTENSION_LABEL -1105848319 // 0xbe161801
#define PUFFS_GIF__ERROR_BAD_GIF_HEADER -1105848318 // 0xbe161802
#define PUFFS_GIF__ERROR_BAD_LZW_LITERAL_WIDTH -1105848317 // 0xbe161803
#define PUFFS_GIF__ERROR_TODO_UNSUPPORTED_LOCAL_COLOR_TABLE \
-1105848316 // 0xbe161804
#define PUFFS_GIF__ERROR_LZW_CODE_IS_OUT_OF_RANGE -1105848315 // 0xbe161805
#define PUFFS_GIF__ERROR_LZW_PREFIX_CHAIN_IS_CYCLICAL -1105848314 // 0xbe161806
bool puffs_gif_status_is_error(puffs_gif_status s);
bool puffs_gif__status__is_error(puffs_gif__status s);
const char* puffs_gif_status_string(puffs_gif_status s);
const char* puffs_gif__status__string(puffs_gif__status s);
// ---------------- Public Consts
@@ -139,13 +139,13 @@ const char* puffs_gif_status_string(puffs_gif_status s);
typedef struct {
// Do not access the private_impl's fields directly. There is no API/ABI
// compatibility or safety guarantee if you do so. Instead, use the
// puffs_gif_lzw_decoder_etc functions.
// puffs_gif__lzw_decoder__etc functions.
//
// In C++, these fields would be "private", but C does not support that.
//
// It is a struct, not a struct*, so that it can be stack allocated.
struct {
puffs_gif_status status;
puffs_gif__status status;
uint32_t magic;
uint32_t f_literal_width;
@@ -168,25 +168,25 @@ typedef struct {
uint64_t v_n_copied;
} c_decode[1];
} private_impl;
} puffs_gif_lzw_decoder;
} puffs_gif__lzw_decoder;
typedef struct {
// Do not access the private_impl's fields directly. There is no API/ABI
// compatibility or safety guarantee if you do so. Instead, use the
// puffs_gif_decoder_etc functions.
// puffs_gif__decoder__etc functions.
//
// In C++, these fields would be "private", but C does not support that.
//
// It is a struct, not a struct*, so that it can be stack allocated.
struct {
puffs_gif_status status;
puffs_gif__status status;
uint32_t magic;
uint32_t f_width;
uint32_t f_height;
uint8_t f_background_color_index;
uint8_t f_gct[768];
puffs_gif_lzw_decoder f_lzw;
puffs_gif__lzw_decoder f_lzw;
struct {
uint32_t coro_susp_point;
@@ -220,40 +220,40 @@ typedef struct {
puffs_base_reader1 v_lzw_src;
} c_decode_id[1];
} private_impl;
} puffs_gif_decoder;
} puffs_gif__decoder;
// ---------------- Public Initializer Prototypes
// puffs_gif_lzw_decoder_initialize is an initializer function.
// puffs_gif__lzw_decoder__initialize is an initializer function.
//
// It should be called before any other puffs_gif_lzw_decoder_* function.
// It should be called before any other puffs_gif__lzw_decoder__* function.
//
// Pass PUFFS_VERSION and 0 for puffs_version and for_internal_use_only.
void puffs_gif_lzw_decoder_initialize(puffs_gif_lzw_decoder* self,
uint32_t puffs_version,
uint32_t for_internal_use_only);
void puffs_gif__lzw_decoder__initialize(puffs_gif__lzw_decoder* self,
uint32_t puffs_version,
uint32_t for_internal_use_only);
// puffs_gif_decoder_initialize is an initializer function.
// puffs_gif__decoder__initialize is an initializer function.
//
// It should be called before any other puffs_gif_decoder_* function.
// It should be called before any other puffs_gif__decoder__* function.
//
// Pass PUFFS_VERSION and 0 for puffs_version and for_internal_use_only.
void puffs_gif_decoder_initialize(puffs_gif_decoder* self,
uint32_t puffs_version,
uint32_t for_internal_use_only);
void puffs_gif__decoder__initialize(puffs_gif__decoder* self,
uint32_t puffs_version,
uint32_t for_internal_use_only);
// ---------------- Public Function Prototypes
puffs_gif_status puffs_gif_decoder_decode(puffs_gif_decoder* self,
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src);
puffs_gif__status puffs_gif__decoder__decode(puffs_gif__decoder* self,
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src);
void puffs_gif_lzw_decoder_set_literal_width(puffs_gif_lzw_decoder* self,
uint32_t a_lw);
void puffs_gif__lzw_decoder__set_literal_width(puffs_gif__lzw_decoder* self,
uint32_t a_lw);
puffs_gif_status puffs_gif_lzw_decoder_decode(puffs_gif_lzw_decoder* self,
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src);
puffs_gif__status puffs_gif__lzw_decoder__decode(puffs_gif__lzw_decoder* self,
puffs_base_writer1 a_dst,
puffs_base_reader1 a_src);
#ifdef __cplusplus
} // extern "C"
+1 -1
View File
@@ -40,7 +40,7 @@
//
// status = puffs_flate_decoder_decode_huffman(self, a_dst, a_src);
//
// TODO: "puffs_flate_decoder" should be "puffs_flate_flate_decoder".
// TODO: "puffs_flate_decoder" should be "puffs_flate__flate_decoder".
//
// Change the "puffs" to "c_puffs", i.e. add a "c_" prefix. The net result
// should look something like:
+65 -64
View File
@@ -157,13 +157,13 @@ void test_puffs_adler32() {
if (!read_file(&src, test_cases[i].filename)) {
return;
}
puffs_flate_adler32 checksum;
puffs_flate_adler32_initialize(&checksum, PUFFS_VERSION, 0);
puffs_flate__adler32 checksum;
puffs_flate__adler32__initialize(&checksum, PUFFS_VERSION, 0);
uint32_t got =
puffs_flate_adler32_update(&checksum, ((puffs_base_slice_u8){
.ptr = src.ptr + src.ri,
.len = src.wi - src.ri,
}));
puffs_flate__adler32__update(&checksum, ((puffs_base_slice_u8){
.ptr = src.ptr + src.ri,
.len = src.wi - src.ri,
}));
if (got != test_cases[i].want) {
FAIL("i=%d, filename=\"%s\": got 0x%08" PRIX32 ", want 0x%08" PRIX32 "\n",
i, test_cases[i].filename, got, test_cases[i].want);
@@ -178,8 +178,8 @@ const char* puffs_flate_decode(puffs_base_buf1* dst,
puffs_base_buf1* src,
uint64_t wlimit,
uint64_t rlimit) {
puffs_flate_flate_decoder dec;
puffs_flate_flate_decoder_initialize(&dec, PUFFS_VERSION, 0);
puffs_flate__flate_decoder dec;
puffs_flate__flate_decoder__initialize(&dec, PUFFS_VERSION, 0);
puffs_base_writer1 dst_writer = {.buf = dst};
puffs_base_reader1 src_reader = {.buf = src};
while (true) {
@@ -192,17 +192,17 @@ const char* puffs_flate_decode(puffs_base_buf1* dst,
src_reader.limit.ptr_to_len = &rlim;
}
puffs_flate_status s =
puffs_flate_flate_decoder_decode(&dec, dst_writer, src_reader);
puffs_flate__status s =
puffs_flate__flate_decoder__decode(&dec, dst_writer, src_reader);
if (s == PUFFS_FLATE_STATUS_OK) {
if (s == PUFFS_FLATE__STATUS_OK) {
return NULL;
}
if ((wlimit && (s == PUFFS_FLATE_SUSPENSION_SHORT_WRITE)) ||
(rlimit && (s == PUFFS_FLATE_SUSPENSION_SHORT_READ))) {
if ((wlimit && (s == PUFFS_FLATE__SUSPENSION_SHORT_WRITE)) ||
(rlimit && (s == PUFFS_FLATE__SUSPENSION_SHORT_READ))) {
continue;
}
return puffs_flate_status_string(s);
return puffs_flate__status__string(s);
}
}
@@ -210,8 +210,8 @@ const char* puffs_zlib_decode(puffs_base_buf1* dst,
puffs_base_buf1* src,
uint64_t wlimit,
uint64_t rlimit) {
puffs_flate_zlib_decoder dec;
puffs_flate_zlib_decoder_initialize(&dec, PUFFS_VERSION, 0);
puffs_flate__zlib_decoder dec;
puffs_flate__zlib_decoder__initialize(&dec, PUFFS_VERSION, 0);
puffs_base_writer1 dst_writer = {.buf = dst};
puffs_base_reader1 src_reader = {.buf = src};
@@ -225,17 +225,17 @@ const char* puffs_zlib_decode(puffs_base_buf1* dst,
src_reader.limit.ptr_to_len = &rlim;
}
puffs_flate_status s =
puffs_flate_zlib_decoder_decode(&dec, dst_writer, src_reader);
puffs_flate__status s =
puffs_flate__zlib_decoder__decode(&dec, dst_writer, src_reader);
if (s == PUFFS_FLATE_STATUS_OK) {
if (s == PUFFS_FLATE__STATUS_OK) {
return NULL;
}
if ((wlimit && (s == PUFFS_FLATE_SUSPENSION_SHORT_WRITE)) ||
(rlimit && (s == PUFFS_FLATE_SUSPENSION_SHORT_READ))) {
if ((wlimit && (s == PUFFS_FLATE__SUSPENSION_SHORT_WRITE)) ||
(rlimit && (s == PUFFS_FLATE__SUSPENSION_SHORT_READ))) {
continue;
}
return puffs_flate_status_string(s);
return puffs_flate__status__string(s);
}
}
@@ -294,7 +294,7 @@ void test_puffs_flate_decode_split_src() {
return;
}
puffs_flate_flate_decoder dec;
puffs_flate__flate_decoder dec;
puffs_base_writer1 dst_writer = {.buf = &got};
puffs_base_reader1 src_reader = {.buf = &src};
@@ -307,31 +307,31 @@ void test_puffs_flate_decode_split_src() {
}
got.wi = 0;
puffs_flate_flate_decoder_initialize(&dec, PUFFS_VERSION, 0);
puffs_flate__flate_decoder__initialize(&dec, PUFFS_VERSION, 0);
src.closed = false;
src.ri = gt->src_offset0;
src.wi = split;
puffs_flate_status s0 =
puffs_flate_flate_decoder_decode(&dec, dst_writer, src_reader);
puffs_flate__status s0 =
puffs_flate__flate_decoder__decode(&dec, dst_writer, src_reader);
src.closed = true;
src.ri = split;
src.wi = gt->src_offset1;
puffs_flate_status s1 =
puffs_flate_flate_decoder_decode(&dec, dst_writer, src_reader);
puffs_flate__status s1 =
puffs_flate__flate_decoder__decode(&dec, dst_writer, src_reader);
if (s0 != PUFFS_FLATE_SUSPENSION_SHORT_READ) {
if (s0 != PUFFS_FLATE__SUSPENSION_SHORT_READ) {
FAIL("i=%d: s0: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", i, s0,
puffs_flate_status_string(s0), PUFFS_FLATE_SUSPENSION_SHORT_READ,
puffs_flate_status_string(PUFFS_FLATE_SUSPENSION_SHORT_READ));
puffs_flate__status__string(s0), PUFFS_FLATE__SUSPENSION_SHORT_READ,
puffs_flate__status__string(PUFFS_FLATE__SUSPENSION_SHORT_READ));
return;
}
if (s1 != PUFFS_FLATE_STATUS_OK) {
if (s1 != PUFFS_FLATE__STATUS_OK) {
FAIL("i=%d: s1: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", i, s1,
puffs_flate_status_string(s1), PUFFS_FLATE_STATUS_OK,
puffs_flate_status_string(PUFFS_FLATE_STATUS_OK));
puffs_flate__status__string(s1), PUFFS_FLATE__STATUS_OK,
puffs_flate__status__string(PUFFS_FLATE__STATUS_OK));
return;
}
@@ -347,16 +347,16 @@ bool do_test_puffs_flate_history(int i,
golden_test* gt,
puffs_base_buf1* src,
puffs_base_buf1* got,
puffs_flate_flate_decoder* dec,
puffs_flate__flate_decoder* dec,
uint32_t starting_history_index,
uint64_t limit,
puffs_flate_status want_s) {
puffs_flate__status want_s) {
src->ri = gt->src_offset0;
src->wi = gt->src_offset1;
got->ri = 0;
got->wi = 0;
puffs_flate_flate_decoder_initialize(dec, PUFFS_VERSION, 0);
puffs_flate__flate_decoder__initialize(dec, PUFFS_VERSION, 0);
puffs_base_writer1 dst_writer = {.buf = got};
puffs_base_reader1 src_reader = {.buf = src};
@@ -364,13 +364,13 @@ bool do_test_puffs_flate_history(int i,
dst_writer.limit.ptr_to_len = &limit;
puffs_flate_status got_s =
puffs_flate_flate_decoder_decode(dec, dst_writer, src_reader);
puffs_flate__status got_s =
puffs_flate__flate_decoder__decode(dec, dst_writer, src_reader);
if (got_s != want_s) {
FAIL("i=%d: starting_history_index=0x%04" PRIX32
": decode status: got %" PRIi32 " (%s), want %" PRIi32 " (%s)",
i, starting_history_index, got_s, puffs_flate_status_string(got_s),
want_s, puffs_flate_status_string(want_s));
i, starting_history_index, got_s, puffs_flate__status__string(got_s),
want_s, puffs_flate__status__string(want_s));
return false;
}
return true;
@@ -394,11 +394,11 @@ void test_puffs_flate_history_full() {
const int full_history_size = 0x8000;
int i;
for (i = -2; i <= +2; i++) {
puffs_flate_flate_decoder dec;
puffs_flate__flate_decoder dec;
if (!do_test_puffs_flate_history(
i, gt, &src, &got, &dec, 0, want.wi + i,
i >= 0 ? PUFFS_FLATE_STATUS_OK
: PUFFS_FLATE_SUSPENSION_SHORT_WRITE)) {
i >= 0 ? PUFFS_FLATE__STATUS_OK
: PUFFS_FLATE__SUSPENSION_SHORT_WRITE)) {
return;
}
@@ -456,10 +456,10 @@ void test_puffs_flate_history_partial() {
const char* fragment = "3.14";
const uint32_t fragment_length = 4;
puffs_flate_flate_decoder dec;
puffs_flate__flate_decoder dec;
if (!do_test_puffs_flate_history(i, gt, &src, &got, &dec,
starting_history_index, fragment_length,
PUFFS_FLATE_SUSPENSION_SHORT_WRITE)) {
PUFFS_FLATE__SUSPENSION_SHORT_WRITE)) {
return;
}
@@ -537,8 +537,8 @@ void test_puffs_flate_table_redirect() {
// 1st is the key in the first level table (9 bits).
// 2nd is the key in the second level table (variable bits).
puffs_flate_flate_decoder dec;
puffs_flate_flate_decoder_initialize(&dec, PUFFS_VERSION, 0);
puffs_flate__flate_decoder dec;
puffs_flate__flate_decoder__initialize(&dec, PUFFS_VERSION, 0);
// The initializer should zero out dec's fields, but to be paranoid, we zero
// it out explicitly.
@@ -561,10 +561,10 @@ void test_puffs_flate_table_redirect() {
dec.private_impl.f_code_lengths[n++] = 13;
dec.private_impl.f_code_lengths[n++] = 13;
puffs_flate_status s =
puffs_flate_flate_decoder_init_huff(&dec, 0, 0, n, 257);
puffs_flate__status s =
puffs_flate__flate_decoder__init_huff(&dec, 0, 0, n, 257);
if (s) {
FAIL("%s", puffs_flate_status_string(s));
FAIL("%s", puffs_flate__status__string(s));
return;
}
@@ -639,17 +639,18 @@ void test_puffs_zlib_checksum_mismatch() {
// Flip a bit in the zlib checksum, which comes at the end of the file.
src.ptr[src.wi - 1] ^= 1;
puffs_flate_zlib_decoder dec;
puffs_flate_zlib_decoder_initialize(&dec, PUFFS_VERSION, 0);
puffs_flate__zlib_decoder dec;
puffs_flate__zlib_decoder__initialize(&dec, PUFFS_VERSION, 0);
puffs_base_writer1 got_writer = {.buf = &got};
puffs_base_reader1 src_reader = {.buf = &src};
puffs_flate_status status =
puffs_flate_zlib_decoder_decode(&dec, got_writer, src_reader);
if (status != PUFFS_FLATE_ERROR_CHECKSUM_MISMATCH) {
puffs_flate__status status =
puffs_flate__zlib_decoder__decode(&dec, got_writer, src_reader);
if (status != PUFFS_FLATE__ERROR_CHECKSUM_MISMATCH) {
FAIL("status: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status,
puffs_flate_status_string(status), PUFFS_FLATE_ERROR_CHECKSUM_MISMATCH,
puffs_flate_status_string(PUFFS_FLATE_ERROR_CHECKSUM_MISMATCH));
puffs_flate__status__string(status),
PUFFS_FLATE__ERROR_CHECKSUM_MISMATCH,
puffs_flate__status__string(PUFFS_FLATE__ERROR_CHECKSUM_MISMATCH));
return;
}
}
@@ -726,13 +727,13 @@ const char* puffs_bench_adler32(puffs_base_buf1* dst,
uint64_t wlimit,
uint64_t rlimit) {
// TODO: don't ignore wlimit and rlimit.
puffs_flate_adler32 checksum;
puffs_flate_adler32_initialize(&checksum, PUFFS_VERSION, 0);
puffs_flate__adler32 checksum;
puffs_flate__adler32__initialize(&checksum, PUFFS_VERSION, 0);
global_puffs_flate_unused_u32 =
puffs_flate_adler32_update(&checksum, ((puffs_base_slice_u8){
.ptr = src->ptr + src->ri,
.len = src->wi - src->ri,
}));
puffs_flate__adler32__update(&checksum, ((puffs_base_slice_u8){
.ptr = src->ptr + src->ri,
.len = src->wi - src->ri,
}));
src->ri = src->wi;
return NULL;
}
+78 -76
View File
@@ -46,28 +46,28 @@ const char* proc_filename = "std/gif.c";
void test_basic_bad_argument_out_of_range() {
proc_funcname = __func__;
puffs_gif_lzw_decoder dec;
puffs_gif_lzw_decoder_initialize(&dec, PUFFS_VERSION, 0);
puffs_gif__lzw_decoder dec;
puffs_gif__lzw_decoder__initialize(&dec, PUFFS_VERSION, 0);
// Setting to 8 is in the [2..8] range.
puffs_gif_lzw_decoder_set_literal_width(&dec, 8);
if (dec.private_impl.status != PUFFS_GIF_STATUS_OK) {
puffs_gif__lzw_decoder__set_literal_width(&dec, 8);
if (dec.private_impl.status != PUFFS_GIF__STATUS_OK) {
FAIL("status: got %d, want %d", dec.private_impl.status,
PUFFS_GIF_STATUS_OK);
PUFFS_GIF__STATUS_OK);
}
// Setting to 999 is out of range.
puffs_gif_lzw_decoder_set_literal_width(&dec, 999);
if (dec.private_impl.status != PUFFS_GIF_ERROR_BAD_ARGUMENT) {
puffs_gif__lzw_decoder__set_literal_width(&dec, 999);
if (dec.private_impl.status != PUFFS_GIF__ERROR_BAD_ARGUMENT) {
FAIL("status: got %d, want %d", dec.private_impl.status,
PUFFS_GIF_ERROR_BAD_ARGUMENT);
PUFFS_GIF__ERROR_BAD_ARGUMENT);
}
// That error status code should be sticky.
puffs_gif_lzw_decoder_set_literal_width(&dec, 8);
if (dec.private_impl.status != PUFFS_GIF_ERROR_BAD_ARGUMENT) {
puffs_gif__lzw_decoder__set_literal_width(&dec, 8);
if (dec.private_impl.status != PUFFS_GIF__ERROR_BAD_ARGUMENT) {
FAIL("status: got %d, want %d", dec.private_impl.status,
PUFFS_GIF_ERROR_BAD_ARGUMENT);
PUFFS_GIF__ERROR_BAD_ARGUMENT);
}
}
@@ -75,39 +75,39 @@ void test_basic_bad_receiver() {
proc_funcname = __func__;
puffs_base_writer1 dst = {0};
puffs_base_reader1 src = {0};
puffs_gif_status status = puffs_gif_lzw_decoder_decode(NULL, dst, src);
if (status != PUFFS_GIF_ERROR_BAD_RECEIVER) {
FAIL("status: got %d, want %d", status, PUFFS_GIF_ERROR_BAD_RECEIVER);
puffs_gif__status status = puffs_gif__lzw_decoder__decode(NULL, dst, src);
if (status != PUFFS_GIF__ERROR_BAD_RECEIVER) {
FAIL("status: got %d, want %d", status, PUFFS_GIF__ERROR_BAD_RECEIVER);
}
}
void test_basic_initializer_not_called() {
proc_funcname = __func__;
puffs_gif_lzw_decoder dec = {{0}};
puffs_gif__lzw_decoder dec = {{0}};
puffs_base_writer1 dst = {0};
puffs_base_reader1 src = {0};
puffs_gif_status status = puffs_gif_lzw_decoder_decode(&dec, dst, src);
if (status != PUFFS_GIF_ERROR_INITIALIZER_NOT_CALLED) {
puffs_gif__status status = puffs_gif__lzw_decoder__decode(&dec, dst, src);
if (status != PUFFS_GIF__ERROR_INITIALIZER_NOT_CALLED) {
FAIL("status: got %d, want %d", status,
PUFFS_GIF_ERROR_INITIALIZER_NOT_CALLED);
PUFFS_GIF__ERROR_INITIALIZER_NOT_CALLED);
}
}
void test_basic_puffs_version_bad() {
proc_funcname = __func__;
puffs_gif_lzw_decoder dec;
puffs_gif_lzw_decoder_initialize(&dec, 0, 0); // 0 is not PUFFS_VERSION.
if (dec.private_impl.status != PUFFS_GIF_ERROR_BAD_PUFFS_VERSION) {
puffs_gif__lzw_decoder dec;
puffs_gif__lzw_decoder__initialize(&dec, 0, 0); // 0 is not PUFFS_VERSION.
if (dec.private_impl.status != PUFFS_GIF__ERROR_BAD_PUFFS_VERSION) {
FAIL("status: got %d, want %d", dec.private_impl.status,
PUFFS_GIF_ERROR_BAD_PUFFS_VERSION);
PUFFS_GIF__ERROR_BAD_PUFFS_VERSION);
return;
}
}
void test_basic_puffs_version_good() {
proc_funcname = __func__;
puffs_gif_lzw_decoder dec;
puffs_gif_lzw_decoder_initialize(&dec, PUFFS_VERSION, 0);
puffs_gif__lzw_decoder dec;
puffs_gif__lzw_decoder__initialize(&dec, PUFFS_VERSION, 0);
if (dec.private_impl.magic != PUFFS_MAGIC) {
FAIL("magic: got %u, want %u", dec.private_impl.magic, PUFFS_MAGIC);
return;
@@ -121,19 +121,19 @@ void test_basic_puffs_version_good() {
void test_basic_status_is_error() {
proc_funcname = __func__;
if (puffs_gif_status_is_error(PUFFS_GIF_STATUS_OK)) {
if (puffs_gif__status__is_error(PUFFS_GIF__STATUS_OK)) {
FAIL("is_error(OK) returned true");
return;
}
if (!puffs_gif_status_is_error(PUFFS_GIF_ERROR_BAD_PUFFS_VERSION)) {
if (!puffs_gif__status__is_error(PUFFS_GIF__ERROR_BAD_PUFFS_VERSION)) {
FAIL("is_error(BAD_PUFFS_VERSION) returned false");
return;
}
if (puffs_gif_status_is_error(PUFFS_GIF_SUSPENSION_SHORT_WRITE)) {
if (puffs_gif__status__is_error(PUFFS_GIF__SUSPENSION_SHORT_WRITE)) {
FAIL("is_error(SHORT_WRITE) returned true");
return;
}
if (!puffs_gif_status_is_error(PUFFS_GIF_ERROR_LZW_CODE_IS_OUT_OF_RANGE)) {
if (!puffs_gif__status__is_error(PUFFS_GIF__ERROR_LZW_CODE_IS_OUT_OF_RANGE)) {
FAIL("is_error(LZW_CODE_IS_OUT_OF_RANGE) returned false");
return;
}
@@ -141,32 +141,33 @@ void test_basic_status_is_error() {
void test_basic_status_strings() {
proc_funcname = __func__;
const char* s0 = puffs_gif_status_string(PUFFS_GIF_STATUS_OK);
const char* s0 = puffs_gif__status__string(PUFFS_GIF__STATUS_OK);
const char* t0 = "gif: ok";
if (strcmp(s0, t0)) {
FAIL("got \"%s\", want \"%s\"", s0, t0);
return;
}
const char* s1 = puffs_gif_status_string(PUFFS_GIF_ERROR_BAD_PUFFS_VERSION);
const char* s1 =
puffs_gif__status__string(PUFFS_GIF__ERROR_BAD_PUFFS_VERSION);
const char* t1 = "gif: bad puffs version";
if (strcmp(s1, t1)) {
FAIL("got \"%s\", want \"%s\"", s1, t1);
return;
}
const char* s2 = puffs_gif_status_string(PUFFS_GIF_SUSPENSION_SHORT_WRITE);
const char* s2 = puffs_gif__status__string(PUFFS_GIF__SUSPENSION_SHORT_WRITE);
const char* t2 = "gif: short write";
if (strcmp(s2, t2)) {
FAIL("got \"%s\", want \"%s\"", s2, t2);
return;
}
const char* s3 =
puffs_gif_status_string(PUFFS_GIF_ERROR_LZW_CODE_IS_OUT_OF_RANGE);
puffs_gif__status__string(PUFFS_GIF__ERROR_LZW_CODE_IS_OUT_OF_RANGE);
const char* t3 = "gif: LZW code is out of range";
if (strcmp(s3, t3)) {
FAIL("got \"%s\", want \"%s\"", s3, t3);
return;
}
const char* s4 = puffs_gif_status_string(-254);
const char* s4 = puffs_gif__status__string(-254);
const char* t4 = "gif: unknown status";
if (strcmp(s4, t4)) {
FAIL("got \"%s\", want \"%s\"", s4, t4);
@@ -176,8 +177,8 @@ void test_basic_status_strings() {
void test_basic_sub_struct_initializer() {
proc_funcname = __func__;
puffs_gif_decoder dec;
puffs_gif_decoder_initialize(&dec, PUFFS_VERSION, 0);
puffs_gif__decoder dec;
puffs_gif__decoder__initialize(&dec, PUFFS_VERSION, 0);
if (dec.private_impl.magic != PUFFS_MAGIC) {
FAIL("outer magic: got %u, want %u", dec.private_impl.magic, PUFFS_MAGIC);
return;
@@ -224,9 +225,9 @@ bool do_test_puffs_gif_lzw_decode(const char* src_filename,
return false;
}
puffs_gif_lzw_decoder dec;
puffs_gif_lzw_decoder_initialize(&dec, PUFFS_VERSION, 0);
puffs_gif_lzw_decoder_set_literal_width(&dec, literal_width);
puffs_gif__lzw_decoder dec;
puffs_gif__lzw_decoder__initialize(&dec, PUFFS_VERSION, 0);
puffs_gif__lzw_decoder__set_literal_width(&dec, literal_width);
puffs_base_writer1 got_writer = {.buf = &got};
puffs_base_reader1 src_reader = {.buf = &src};
int num_iters = 0;
@@ -243,24 +244,24 @@ bool do_test_puffs_gif_lzw_decode(const char* src_filename,
size_t old_wi = got.wi;
size_t old_ri = src.ri;
puffs_gif_status status =
puffs_gif_lzw_decoder_decode(&dec, got_writer, src_reader);
if (status == PUFFS_GIF_STATUS_OK) {
puffs_gif__status status =
puffs_gif__lzw_decoder__decode(&dec, got_writer, src_reader);
if (status == PUFFS_GIF__STATUS_OK) {
if (src.ri != src.wi) {
FAIL("decode returned ok but src was not exhausted");
return false;
}
break;
}
if ((status != PUFFS_GIF_SUSPENSION_SHORT_READ) &&
(status != PUFFS_GIF_SUSPENSION_SHORT_WRITE)) {
if ((status != PUFFS_GIF__SUSPENSION_SHORT_READ) &&
(status != PUFFS_GIF__SUSPENSION_SHORT_WRITE)) {
FAIL("status: got %" PRIi32 " (%s), want %" PRIi32 " (%s) or %" PRIi32
" (%s)",
status, puffs_gif_status_string(status),
PUFFS_GIF_SUSPENSION_SHORT_READ,
puffs_gif_status_string(PUFFS_GIF_SUSPENSION_SHORT_READ),
PUFFS_GIF_SUSPENSION_SHORT_WRITE,
puffs_gif_status_string(PUFFS_GIF_SUSPENSION_SHORT_WRITE));
status, puffs_gif__status__string(status),
PUFFS_GIF__SUSPENSION_SHORT_READ,
puffs_gif__status__string(PUFFS_GIF__SUSPENSION_SHORT_READ),
PUFFS_GIF__SUSPENSION_SHORT_WRITE,
puffs_gif__status__string(PUFFS_GIF__SUSPENSION_SHORT_WRITE));
return false;
}
@@ -354,12 +355,12 @@ bool do_bench_puffs_gif_lzw_decode(const char* filename, uint64_t reps) {
for (i = 0; i < reps; i++) {
dst.wi = 0;
src.ri = 1; // Skip the literal width.
puffs_gif_lzw_decoder dec;
puffs_gif_lzw_decoder_initialize(&dec, PUFFS_VERSION, 0);
puffs_gif_status s =
puffs_gif_lzw_decoder_decode(&dec, dst_writer, src_reader);
puffs_gif__lzw_decoder dec;
puffs_gif__lzw_decoder__initialize(&dec, PUFFS_VERSION, 0);
puffs_gif__status s =
puffs_gif__lzw_decoder__decode(&dec, dst_writer, src_reader);
if (s) {
FAIL("decode: %" PRIi32 " (%s)", s, puffs_gif_status_string(s));
FAIL("decode: %" PRIi32 " (%s)", s, puffs_gif__status__string(s));
return false;
}
n_bytes += dst.wi;
@@ -382,13 +383,14 @@ void bench_puffs_gif_lzw_decode_100k() {
// ---------------- GIF Tests
const char* puffs_gif_decode(puffs_base_buf1* dst, puffs_base_buf1* src) {
puffs_gif_decoder dec;
puffs_gif_decoder_initialize(&dec, PUFFS_VERSION, 0);
puffs_gif__decoder dec;
puffs_gif__decoder__initialize(&dec, PUFFS_VERSION, 0);
puffs_base_writer1 dst_writer = {.buf = dst};
puffs_base_reader1 src_reader = {.buf = src};
puffs_gif_status s = puffs_gif_decoder_decode(&dec, dst_writer, src_reader);
puffs_gif__status s =
puffs_gif__decoder__decode(&dec, dst_writer, src_reader);
if (s) {
return puffs_gif_status_string(s);
return puffs_gif__status__string(s);
}
return NULL;
}
@@ -405,8 +407,8 @@ bool do_test_puffs_gif_decode(const char* filename,
return false;
}
puffs_gif_decoder dec;
puffs_gif_decoder_initialize(&dec, PUFFS_VERSION, 0);
puffs_gif__decoder dec;
puffs_gif__decoder__initialize(&dec, PUFFS_VERSION, 0);
puffs_base_writer1 got_writer = {.buf = &got};
puffs_base_reader1 src_reader = {.buf = &src};
int num_iters = 0;
@@ -423,24 +425,24 @@ bool do_test_puffs_gif_decode(const char* filename,
size_t old_wi = got.wi;
size_t old_ri = src.ri;
puffs_gif_status status =
puffs_gif_decoder_decode(&dec, got_writer, src_reader);
if (status == PUFFS_GIF_STATUS_OK) {
puffs_gif__status status =
puffs_gif__decoder__decode(&dec, got_writer, src_reader);
if (status == PUFFS_GIF__STATUS_OK) {
if (src.ri != src.wi) {
FAIL("decode returned ok but src was not exhausted");
return false;
}
break;
}
if ((status != PUFFS_GIF_SUSPENSION_SHORT_READ) &&
(status != PUFFS_GIF_SUSPENSION_SHORT_WRITE)) {
if ((status != PUFFS_GIF__SUSPENSION_SHORT_READ) &&
(status != PUFFS_GIF__SUSPENSION_SHORT_WRITE)) {
FAIL("status: got %" PRIi32 " (%s), want %" PRIi32 " (%s) or %" PRIi32
" (%s)",
status, puffs_gif_status_string(status),
PUFFS_GIF_SUSPENSION_SHORT_READ,
puffs_gif_status_string(PUFFS_GIF_SUSPENSION_SHORT_READ),
PUFFS_GIF_SUSPENSION_SHORT_WRITE,
puffs_gif_status_string(PUFFS_GIF_SUSPENSION_SHORT_WRITE));
status, puffs_gif__status__string(status),
PUFFS_GIF__SUSPENSION_SHORT_READ,
puffs_gif__status__string(PUFFS_GIF__SUSPENSION_SHORT_READ),
PUFFS_GIF__SUSPENSION_SHORT_WRITE,
puffs_gif__status__string(PUFFS_GIF__SUSPENSION_SHORT_WRITE));
return false;
}
@@ -538,17 +540,17 @@ void test_puffs_gif_decode_input_is_a_png() {
return;
}
puffs_gif_decoder dec;
puffs_gif_decoder_initialize(&dec, PUFFS_VERSION, 0);
puffs_gif__decoder dec;
puffs_gif__decoder__initialize(&dec, PUFFS_VERSION, 0);
puffs_base_writer1 got_writer = {.buf = &got};
puffs_base_reader1 src_reader = {.buf = &src};
puffs_gif_status status =
puffs_gif_decoder_decode(&dec, got_writer, src_reader);
if (status != PUFFS_GIF_ERROR_BAD_GIF_HEADER) {
puffs_gif__status status =
puffs_gif__decoder__decode(&dec, got_writer, src_reader);
if (status != PUFFS_GIF__ERROR_BAD_GIF_HEADER) {
FAIL("status: got %" PRIi32 " (%s), want %" PRIi32 " (%s)", status,
puffs_gif_status_string(status), PUFFS_GIF_ERROR_BAD_GIF_HEADER,
puffs_gif_status_string(PUFFS_GIF_ERROR_BAD_GIF_HEADER));
puffs_gif__status__string(status), PUFFS_GIF__ERROR_BAD_GIF_HEADER,
puffs_gif__status__string(PUFFS_GIF__ERROR_BAD_GIF_HEADER));
return;
}
}