mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-18 00:32:11 +01:00
Have std/gif pass through an intermediary
This commit is contained in:
1 parent
ed1a8b4057
commit
f10ff8c896
5 files changed
+32
-28
No files matched your search
@@ -228,7 +228,7 @@ func (g *gen) writeFuncImplHeader(b *buffer) error {
|
||||
g.findDerivedVars()
|
||||
for _, o := range g.currFunk.astFunc.In().Fields() {
|
||||
o := o.Field()
|
||||
if err := g.writeLoadDerivedVar(b, o.Name(), o.XType(), true); err != nil {
|
||||
if err := g.writeLoadDerivedVar(b, "", o.Name(), o.XType(), true); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
@@ -300,7 +300,7 @@ func (g *gen) writeFuncImplFooter(b *buffer) error {
|
||||
|
||||
for _, o := range g.currFunk.astFunc.In().Fields() {
|
||||
o := o.Field()
|
||||
if err := g.writeSaveDerivedVar(b, o.Name(), o.XType(), true); err != nil {
|
||||
if err := g.writeSaveDerivedVar(b, "", o.Name(), o.XType(), true); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
@@ -801,10 +801,10 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
|
||||
temp := g.currFunk.tempW
|
||||
g.currFunk.tempW++
|
||||
|
||||
// TODO: don't hard-code a_dst or a_src.
|
||||
b.printf("%sstatus %s%d = %slzw_decoder__decode(&self->private_impl.f_lzw, %sdst, %ssrc);\n",
|
||||
// TODO: don't hard-code v_w or a_src.
|
||||
b.printf("%sstatus %s%d = %slzw_decoder__decode(&self->private_impl.f_lzw, %sw, %ssrc);\n",
|
||||
g.pkgPrefix, tPrefix, temp,
|
||||
g.pkgPrefix, aPrefix, aPrefix)
|
||||
g.pkgPrefix, vPrefix, aPrefix)
|
||||
if err := g.writeLoadExprDerivedVars(b, n); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -79,12 +79,17 @@ func (g *gen) findDerivedVars() {
|
||||
}
|
||||
}
|
||||
|
||||
func (g *gen) writeLoadDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, header bool) error {
|
||||
func (g *gen) writeLoadDerivedVar(b *buffer, hack string, name t.ID, typ *a.TypeExpr, header bool) error {
|
||||
// TODO: remove this hack. We're picking up the wrong name for "src:r,
|
||||
// dummy:in.src".
|
||||
if name.Str(g.tm) == "dummy" {
|
||||
name = g.tm.ByName("src")
|
||||
}
|
||||
// TODO: also remove this hack.
|
||||
if hack == "w" {
|
||||
b.printf("%swptr_w = %sw.ptr + %sw.wi;\n", bPrefix, uPrefix, uPrefix)
|
||||
return nil
|
||||
}
|
||||
|
||||
if g.currFunk.derivedVars == nil {
|
||||
return nil
|
||||
@@ -149,12 +154,17 @@ func (g *gen) writeLoadDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, header
|
||||
return nil
|
||||
}
|
||||
|
||||
func (g *gen) writeSaveDerivedVar(b *buffer, name t.ID, typ *a.TypeExpr, footer bool) error {
|
||||
func (g *gen) writeSaveDerivedVar(b *buffer, hack string, name t.ID, typ *a.TypeExpr, footer bool) error {
|
||||
// TODO: remove this hack. We're picking up the wrong name for "src:r,
|
||||
// dummy:in.src".
|
||||
if name.Str(g.tm) == "dummy" {
|
||||
name = g.tm.ByName("src")
|
||||
}
|
||||
// TODO: also remove this hack.
|
||||
if hack == "w" {
|
||||
b.printf("%sw.wi = %swptr_w - %sw.ptr;\n", uPrefix, bPrefix, uPrefix)
|
||||
return nil
|
||||
}
|
||||
|
||||
if g.currFunk.derivedVars == nil {
|
||||
return nil
|
||||
@@ -203,10 +213,13 @@ func (g *gen) writeLoadExprDerivedVars(b *buffer, n *a.Expr) error {
|
||||
for _, o := range n.Args() {
|
||||
o := o.Arg()
|
||||
// TODO: don't hard-code these.
|
||||
if s := o.Value().Str(g.tm); s != "in.dst" && s != "in.src" {
|
||||
hack := ""
|
||||
if s := o.Value().Str(g.tm); s != "in.dst" && s != "in.src" && s != "w" {
|
||||
continue
|
||||
} else if s == "w" {
|
||||
hack = "w"
|
||||
}
|
||||
if err := g.writeLoadDerivedVar(b, o.Name(), o.Value().MType(), false); err != nil {
|
||||
if err := g.writeLoadDerivedVar(b, hack, o.Name(), o.Value().MType(), false); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
@@ -223,10 +236,13 @@ func (g *gen) writeSaveExprDerivedVars(b *buffer, n *a.Expr) error {
|
||||
for _, o := range n.Args() {
|
||||
o := o.Arg()
|
||||
// TODO: don't hard-code these.
|
||||
if s := o.Value().Str(g.tm); s != "in.dst" && s != "in.src" {
|
||||
hack := ""
|
||||
if s := o.Value().Str(g.tm); s != "in.dst" && s != "in.src" && s != "w" {
|
||||
continue
|
||||
} else if s == "w" {
|
||||
hack = "w"
|
||||
}
|
||||
if err := g.writeSaveDerivedVar(b, o.Name(), o.Value().MType(), false); err != nil {
|
||||
if err := g.writeSaveDerivedVar(b, hack, o.Name(), o.Value().MType(), false); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
+4
-12
@@ -2941,20 +2941,14 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id(
|
||||
wuffs_base__io_reader__set_limit(&a_src, b_rptr_src, v_block_size);
|
||||
wuffs_base__io_reader__set_mark(&a_src, b_rptr_src);
|
||||
{
|
||||
if (a_dst.private_impl.buf) {
|
||||
a_dst.private_impl.buf->wi =
|
||||
b_wptr_dst - a_dst.private_impl.buf->ptr;
|
||||
}
|
||||
u_w.wi = b_wptr_w - u_w.ptr;
|
||||
if (a_src.private_impl.buf) {
|
||||
a_src.private_impl.buf->ri =
|
||||
b_rptr_src - a_src.private_impl.buf->ptr;
|
||||
}
|
||||
wuffs_gif__status t_14 = wuffs_gif__lzw_decoder__decode(
|
||||
&self->private_impl.f_lzw, a_dst, a_src);
|
||||
if (a_dst.private_impl.buf) {
|
||||
b_wptr_dst =
|
||||
a_dst.private_impl.buf->ptr + a_dst.private_impl.buf->wi;
|
||||
}
|
||||
&self->private_impl.f_lzw, v_w, a_src);
|
||||
b_wptr_w = u_w.ptr + u_w.wi;
|
||||
if (a_src.private_impl.buf) {
|
||||
b_rptr_src =
|
||||
a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri;
|
||||
@@ -3001,8 +2995,6 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id(
|
||||
}
|
||||
label_2_break:;
|
||||
if (v_z == WUFFS_GIF__SUSPENSION_SHORT_WRITE) {
|
||||
status = v_z;
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(16);
|
||||
goto label_1_continue;
|
||||
}
|
||||
self->private_impl.f_previous_lzw_decode_ended_abruptly = false;
|
||||
@@ -3012,7 +3004,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id(
|
||||
goto label_1_break;
|
||||
}
|
||||
status = v_z;
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(17);
|
||||
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(16);
|
||||
}
|
||||
label_1_break:;
|
||||
}
|
||||
|
||||
@@ -351,8 +351,7 @@ pri func decoder.decode_id?(dst base.io_writer, src base.io_reader)() {
|
||||
// Should calling r.set_mark also require r.is_bound()?
|
||||
in.src.set_limit!(l:block_size)
|
||||
in.src.set_mark!()
|
||||
// TODO: in.dst should be w.
|
||||
var z base.status = try this.lzw.decode?(dst:in.dst, src:in.src)
|
||||
var z base.status = try this.lzw.decode?(dst:w, src:in.src)
|
||||
this.uncompressed_wi = 4096 - (w.available().min(x:4096) as base.u32)
|
||||
block_size ~sat-= in.src.since_mark().length()
|
||||
}
|
||||
@@ -376,9 +375,6 @@ pri func decoder.decode_id?(dst base.io_writer, src base.io_reader)() {
|
||||
}
|
||||
|
||||
if z == suspension "short write" {
|
||||
// TODO: don't yield, once lzw.decode writes to w instead
|
||||
// of in.dst.
|
||||
yield z
|
||||
continue:inner
|
||||
}
|
||||
// TODO: check that block_size is zero?
|
||||
|
||||
Reference in new issue
Block a user