Add a zlib decoder to std/flate.

This commit is contained in:
Nigel Tao committed 2017-08-05 16:34:03 +10:00
1 parent 2e6b364dcc
commit b3710e583f
13 files changed
+566 -117

No files matched your search

+5
View File
@@ -8,6 +8,11 @@
// TODO: look for (ifdef) the x86 architecture and cast the pointer? Only do so
// if a benchmark justifies the additional code path.
#define PUFFS_U16BE(p) (((uint16_t)(p[0]) << 8) | ((uint16_t)(p[1]) << 0))
#define PUFFS_U16LE(p) (((uint16_t)(p[0]) << 0) | ((uint16_t)(p[1]) << 8))
#define PUFFS_U32BE(p) \
(((uint32_t)(p[0]) << 24) | ((uint32_t)(p[1]) << 16) | \
((uint32_t)(p[2]) << 8) | ((uint32_t)(p[3]) << 0))
#define PUFFS_U32LE(p) \
(((uint32_t)(p[0]) << 0) | ((uint32_t)(p[1]) << 8) | \
((uint32_t)(p[2]) << 16) | ((uint32_t)(p[3]) << 24))
+2 -2
View File
@@ -12,6 +12,6 @@ const baseHeader = "" +
""
const baseImpl = "" +
"#ifndef PUFFS_BASE_IMPL_H\n#define PUFFS_BASE_IMPL_H\n\n// Use of this source code is governed by a BSD-style license that can be found\n// in the LICENSE file.\n\n// TODO: look for (ifdef) the x86 architecture and cast the pointer? Only do so\n// if a benchmark justifies the additional code path.\n#define PUFFS_U32LE(p) \\\n (((uint32_t)(p[0]) << 0) | ((uint32_t)(p[1]) << 8) | \\\n ((uint32_t)(p[2]) << 16) | ((uint32_t)(p[3]) << 24))\n\n// Use switch cases for coroutine suspension points, similar to the technique\n// in https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html\n//\n// We use a trivial macro instead of an explicit assignment and case statement\n// so that clang-format doesn't get confused by the unusual \"case\"s.\n#define PUFFS_COROUTINE_SUSPENSION_POINT(n) \\\n coro_susp_point = n; \\\n case n:\n\n// Clang also defines \"__GNUC__\".\n#if defined(__GNUC__)\n#define PUFFS_LIKELY(expr) (__builtin_expect(!!(expr), 1))\n#define PUFFS_UNLIKELY(expr) (__builtin_expect(" +
"!!(expr), 0))\n// Declare the printf prototype. The generated code shouldn't need this at all,\n// but it's useful for manual printf debugging.\nextern int printf(const char* __restrict __format, ...);\n#else\n#define PUFFS_LIKELY(expr) (expr)\n#define PUFFS_UNLIKELY(expr) (expr)\n#endif\n\n#endif // PUFFS_BASE_IMPL_H\n" +
"#ifndef PUFFS_BASE_IMPL_H\n#define PUFFS_BASE_IMPL_H\n\n// Use of this source code is governed by a BSD-style license that can be found\n// in the LICENSE file.\n\n// TODO: look for (ifdef) the x86 architecture and cast the pointer? Only do so\n// if a benchmark justifies the additional code path.\n#define PUFFS_U16BE(p) (((uint16_t)(p[0]) << 8) | ((uint16_t)(p[1]) << 0))\n#define PUFFS_U16LE(p) (((uint16_t)(p[0]) << 0) | ((uint16_t)(p[1]) << 8))\n#define PUFFS_U32BE(p) \\\n (((uint32_t)(p[0]) << 24) | ((uint32_t)(p[1]) << 16) | \\\n ((uint32_t)(p[2]) << 8) | ((uint32_t)(p[3]) << 0))\n#define PUFFS_U32LE(p) \\\n (((uint32_t)(p[0]) << 0) | ((uint32_t)(p[1]) << 8) | \\\n ((uint32_t)(p[2]) << 16) | ((uint32_t)(p[3]) << 24))\n\n// Use switch cases for coroutine suspension points, similar to the technique\n// in https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html\n//\n// We use a trivial macro instead of an explicit assignment and case statement\n// so that c" +
"lang-format doesn't get confused by the unusual \"case\"s.\n#define PUFFS_COROUTINE_SUSPENSION_POINT(n) \\\n coro_susp_point = n; \\\n case n:\n\n// Clang also defines \"__GNUC__\".\n#if defined(__GNUC__)\n#define PUFFS_LIKELY(expr) (__builtin_expect(!!(expr), 1))\n#define PUFFS_UNLIKELY(expr) (__builtin_expect(!!(expr), 0))\n// Declare the printf prototype. The generated code shouldn't need this at all,\n// but it's useful for manual printf debugging.\nextern int printf(const char* __restrict __format, ...);\n#else\n#define PUFFS_LIKELY(expr) (expr)\n#define PUFFS_UNLIKELY(expr) (expr)\n#endif\n\n#endif // PUFFS_BASE_IMPL_H\n" +
""
+65 -17
View File
@@ -812,8 +812,17 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error {
}
g.printf(" = *%srptr_src++;\n", bPrefix)
} else if isInSrc(g.tm, n, t.KeyReadU16BE, 0) {
return g.writeReadUXX(n, "src", 16, "BE")
} else if isInSrc(g.tm, n, t.KeyReadU16LE, 0) {
return g.writeReadUXX(n, "src", 16, "LE")
} else if isInSrc(g.tm, n, t.KeyReadU32BE, 0) {
return g.writeReadUXX(n, "src", 32, "BE")
} else if isInSrc(g.tm, n, t.KeyReadU32LE, 0) {
return g.writeReadUXX(n, "src", 32, "le")
return g.writeReadUXX(n, "src", 32, "LE")
} else if isInSrc(g.tm, n, t.KeySkip32, 1) {
// TODO: is the scratch variable safe to use if callers can trap
@@ -1056,13 +1065,25 @@ func (g *gen) writeCallSuspendibles(n *a.Expr, depth uint32) error {
g.writes("if (status) { goto suspend; }\n")
} else if isDecode(g.tm, n) {
g.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(n); err != nil {
return err
switch g.pkgName {
case "flate":
g.printf("status = %sdecoder_decode(&self->private_impl.f_dec, %sdst, %ssrc);\n",
g.pkgPrefix, aPrefix, aPrefix)
if err := g.writeLoadExprDerivedVars(n); err != nil {
return err
}
g.writes("if (status) { goto suspend; }\n")
case "gif":
g.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(n); err != nil {
return err
}
// TODO: be principled with "if (l_lzw_src && etc)".
g.writes("if (l_lzw_src && status) { goto suspend; }\n")
default:
return fmt.Errorf("cannot convert Puffs call %q to C", n.String(g.tm))
}
// TODO: be principled with "if (l_lzw_src && etc)".
g.writes("if (l_lzw_src && status) { goto suspend; }\n")
} else {
// TODO: fix this.
@@ -1087,6 +1108,13 @@ func (g *gen) writeShortRead(name string) error {
}
func (g *gen) writeReadUXX(n *a.Expr, name string, size uint32, endianness string) error {
if size != 16 && size != 32 {
return fmt.Errorf("internal error: bad writeReadUXX size %d", size)
}
if endianness != "BE" && endianness != "LE" {
return fmt.Errorf("internal error: bad writeReadUXX endianness %q", endianness)
}
if g.perFunc.tempW > maxTemp-1 {
return fmt.Errorf("too many temporary variables required")
}
@@ -1101,9 +1129,9 @@ func (g *gen) writeReadUXX(n *a.Expr, name string, size uint32, endianness strin
}
g.writes(";")
g.printf("if (PUFFS_LIKELY(%srend_src - %srptr_src >= 4)) {", bPrefix, bPrefix)
g.printf("%s%d = PUFFS_U32LE(%srptr_src);\n", tPrefix, temp1, bPrefix)
g.printf("%srptr_src += 4;\n", bPrefix)
g.printf("if (PUFFS_LIKELY(%srend_src - %srptr_src >= %d)) {", bPrefix, bPrefix, size/8)
g.printf("%s%d = PUFFS_U%d%s(%srptr_src);\n", tPrefix, temp1, size, endianness, bPrefix)
g.printf("%srptr_src += %d;\n", bPrefix, size/8)
g.printf("} else {")
g.printf("self->private_impl.scratch = 0;\n")
if err := g.writeCoroSuspPoint(); err != nil {
@@ -1115,19 +1143,39 @@ func (g *gen) writeReadUXX(n *a.Expr, name string, size uint32, endianness strin
bPrefix, name, bPrefix, name, name)
g.perFunc.shortReads = append(g.perFunc.shortReads, name)
// TODO: look at endianness.
g.printf("uint32_t %s%d = self->private_impl.scratch >> 56;", tPrefix, temp0)
g.printf("self->private_impl.scratch <<= 8;")
g.printf("self->private_impl.scratch >>= 8;")
g.printf("self->private_impl.scratch |= ((uint64_t)(*%srptr_%s++)) << %s%d;", bPrefix, name, tPrefix, temp0)
g.printf("uint32_t %s%d = self->private_impl.scratch", tPrefix, temp0)
switch endianness {
case "BE":
g.printf("& 0xFF;")
g.printf("self->private_impl.scratch >>= 8;")
g.printf("self->private_impl.scratch <<= 8;")
g.printf("self->private_impl.scratch |= ((uint64_t)(*%srptr_%s++)) << (64 - %s%d);",
bPrefix, name, tPrefix, temp0)
case "LE":
g.printf(">> 56;")
g.printf("self->private_impl.scratch <<= 8;")
g.printf("self->private_impl.scratch >>= 8;")
g.printf("self->private_impl.scratch |= ((uint64_t)(*%srptr_%s++)) << %s%d;",
bPrefix, name, tPrefix, temp0)
}
g.printf("if (%s%d == %d) {", tPrefix, temp0, size-8)
g.printf("%s%d = self->private_impl.scratch;", tPrefix, temp1)
switch endianness {
case "BE":
g.printf("%s%d = self->private_impl.scratch >> (64 - %d);", tPrefix, temp1, size)
case "LE":
g.printf("%s%d = self->private_impl.scratch;", tPrefix, temp1)
}
g.printf("break;")
g.printf("}")
g.printf("%s%d += 8;", tPrefix, temp0)
g.printf("self->private_impl.scratch |= ((uint64_t)(%s%d)) << 56;", tPrefix, temp0)
switch endianness {
case "BE":
g.printf("self->private_impl.scratch |= ((uint64_t)(%s%d));", tPrefix, temp0)
case "LE":
g.printf("self->private_impl.scratch |= ((uint64_t)(%s%d)) << 56;", tPrefix, temp0)
}
g.writes("}}\n")
return nil
+13 -11
View File
@@ -807,17 +807,18 @@ var cTypeNames = [...]string{
}
var cOpNames = [256]string{
t.KeyEq: " = ",
t.KeyPlusEq: " += ",
t.KeyMinusEq: " -= ",
t.KeyStarEq: " *= ",
t.KeySlashEq: " /= ",
t.KeyShiftLEq: " <<= ",
t.KeyShiftREq: " >>= ",
t.KeyAmpEq: " &= ",
t.KeyAmpHatEq: " no_such_amp_hat_C_operator ",
t.KeyPipeEq: " |= ",
t.KeyHatEq: " ^= ",
t.KeyEq: " = ",
t.KeyPlusEq: " += ",
t.KeyMinusEq: " -= ",
t.KeyStarEq: " *= ",
t.KeySlashEq: " /= ",
t.KeyShiftLEq: " <<= ",
t.KeyShiftREq: " >>= ",
t.KeyAmpEq: " &= ",
t.KeyAmpHatEq: " no_such_amp_hat_C_operator ",
t.KeyPipeEq: " |= ",
t.KeyHatEq: " ^= ",
t.KeyPercentEq: " %= ",
t.KeyXUnaryPlus: "+",
t.KeyXUnaryMinus: "-",
@@ -833,6 +834,7 @@ var cOpNames = [256]string{
t.KeyXBinaryAmpHat: " no_such_amp_hat_C_operator ",
t.KeyXBinaryPipe: " | ",
t.KeyXBinaryHat: " ^ ",
t.KeyXBinaryPercent: " % ",
t.KeyXBinaryNotEq: " != ",
t.KeyXBinaryLessThan: " < ",
t.KeyXBinaryLessEq: " <= ",