mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-19 16:47:28 +01:00
Rename b_rptr_foo as ioptr_foo
This commit is contained in:
1 parent
2448b2ae7a
commit
7452ec8035
8 files changed
+609
-608
No files matched your search
@@ -83,14 +83,14 @@ func (g *gen) writeBuiltinIO(b *buffer, recv *a.Expr, method t.ID, args []*a.Nod
|
||||
// TODO: don't hard-code these.
|
||||
switch recv.Str(g.tm) {
|
||||
case "in.dst":
|
||||
p0 = bPrefix + "wend_dst"
|
||||
p1 = bPrefix + "wptr_dst"
|
||||
p0 = "iobounds1_dst"
|
||||
p1 = "ioptr_dst"
|
||||
case "in.src":
|
||||
p0 = bPrefix + "rend_src"
|
||||
p1 = bPrefix + "rptr_src"
|
||||
p0 = "iobounds1_src"
|
||||
p1 = "ioptr_src"
|
||||
case "w":
|
||||
p0 = bPrefix + "wend_w"
|
||||
p1 = bPrefix + "wptr_w"
|
||||
p0 = "iobounds1_w"
|
||||
p1 = "ioptr_w"
|
||||
}
|
||||
if p0 == "" {
|
||||
return fmt.Errorf(`TODO: cgen a "foo.available" expression`)
|
||||
@@ -103,8 +103,8 @@ func (g *gen) writeBuiltinIO(b *buffer, recv *a.Expr, method t.ID, args []*a.Nod
|
||||
if len(args) == 1 {
|
||||
typ = "writer"
|
||||
}
|
||||
// TODO: don't hard-code v_w and u_w, and wptr vs rptr.
|
||||
b.printf("wuffs_base__io_%s__set(&v_w, &u_w, &b_wptr_w, &b_wend_w,", typ)
|
||||
// TODO: don't hard-code v_w and u_w.
|
||||
b.printf("wuffs_base__io_%s__set(&v_w, &u_w, &ioptr_w, &iobounds1_w,", typ)
|
||||
return g.writeArgs(b, args, rp, depth)
|
||||
|
||||
}
|
||||
@@ -115,19 +115,19 @@ func (g *gen) writeBuiltinIOReader(b *buffer, recv *a.Expr, method t.ID, args []
|
||||
// TODO: don't hard-code the recv being a_src.
|
||||
switch method {
|
||||
case t.IDSetLimit:
|
||||
b.printf("wuffs_base__io_reader__set_limit(&%ssrc, %srptr_src,", aPrefix, bPrefix)
|
||||
// TODO: update the bPrefix variables?
|
||||
b.printf("wuffs_base__io_reader__set_limit(&%ssrc, ioptr_src,", aPrefix)
|
||||
// TODO: update the ioptr variables?
|
||||
return g.writeArgs(b, args, rp, depth)
|
||||
|
||||
case t.IDSetMark:
|
||||
b.printf("wuffs_base__io_reader__set_mark(&%ssrc, %srptr_src)", aPrefix, bPrefix)
|
||||
b.printf("wuffs_base__io_reader__set_mark(&%ssrc, ioptr_src)", aPrefix)
|
||||
return nil
|
||||
|
||||
case t.IDSinceMark:
|
||||
b.printf("((wuffs_base__slice_u8){ "+
|
||||
".ptr = %ssrc.private_impl.bounds[0], "+
|
||||
".len = (size_t)(%srptr_src - %ssrc.private_impl.bounds[0]), })",
|
||||
aPrefix, bPrefix, aPrefix)
|
||||
".len = (size_t)(ioptr_src - %ssrc.private_impl.bounds[0]), })",
|
||||
aPrefix, aPrefix)
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -144,8 +144,8 @@ func (g *gen) writeBuiltinIOWriter(b *buffer, recv *a.Expr, method t.ID, args []
|
||||
bco = "__bco"
|
||||
}
|
||||
b.printf("wuffs_base__io_writer__copy_from_history32%s("+
|
||||
"&%swptr_dst, %sdst.private_impl.bounds[0] , %swend_dst",
|
||||
bco, bPrefix, aPrefix, bPrefix)
|
||||
"&ioptr_dst, %sdst.private_impl.bounds[0], iobounds1_dst",
|
||||
bco, aPrefix)
|
||||
for _, o := range args {
|
||||
b.writeb(',')
|
||||
if err := g.writeExpr(b, o.Arg().Value(), rp, depth); err != nil {
|
||||
@@ -156,19 +156,17 @@ func (g *gen) writeBuiltinIOWriter(b *buffer, recv *a.Expr, method t.ID, args []
|
||||
return nil
|
||||
|
||||
case t.IDCopyFromReader32:
|
||||
b.printf("wuffs_base__io_writer__copy_from_reader32(&%swptr_dst, %swend_dst,",
|
||||
bPrefix, bPrefix)
|
||||
b.printf("wuffs_base__io_writer__copy_from_reader32(&ioptr_dst, iobounds1_dst,")
|
||||
// TODO: don't assume that the first argument is "in.src".
|
||||
b.printf("&%srptr_src, %srend_src,", bPrefix, bPrefix)
|
||||
b.printf("&ioptr_src, iobounds1_src,")
|
||||
return g.writeArgs(b, args[1:], rp, depth)
|
||||
|
||||
case t.IDCopyFromSlice:
|
||||
b.printf("wuffs_base__io_writer__copy_from_slice(&%swptr_dst, %swend_dst,", bPrefix, bPrefix)
|
||||
b.printf("wuffs_base__io_writer__copy_from_slice(&ioptr_dst, iobounds1_dst,")
|
||||
return g.writeArgs(b, args, rp, depth)
|
||||
|
||||
case t.IDCopyFromSlice32:
|
||||
b.printf("wuffs_base__io_writer__copy_from_slice32("+
|
||||
"&%swptr_dst, %swend_dst,", bPrefix, bPrefix)
|
||||
b.printf("wuffs_base__io_writer__copy_from_slice32(&ioptr_dst, iobounds1_dst,")
|
||||
return g.writeArgs(b, args, rp, depth)
|
||||
|
||||
case t.IDSetMark:
|
||||
@@ -176,14 +174,14 @@ func (g *gen) writeBuiltinIOWriter(b *buffer, recv *a.Expr, method t.ID, args []
|
||||
// if the function is passed a (ptr io_writer) instead of a
|
||||
// (io_writer)? Do we still want to have that mark live outside of
|
||||
// the function scope?
|
||||
b.printf("wuffs_base__io_writer__set_mark(&%sdst, %swptr_dst)", aPrefix, bPrefix)
|
||||
b.printf("wuffs_base__io_writer__set_mark(&%sdst, ioptr_dst)", aPrefix)
|
||||
return nil
|
||||
|
||||
case t.IDSinceMark:
|
||||
b.printf("((wuffs_base__slice_u8){ "+
|
||||
".ptr = %sdst.private_impl.bounds[0], "+
|
||||
".len = (size_t)(%swptr_dst - %sdst.private_impl.bounds[0]), })",
|
||||
aPrefix, bPrefix, aPrefix)
|
||||
".len = (size_t)(ioptr_dst - %sdst.private_impl.bounds[0]), })",
|
||||
aPrefix, aPrefix)
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -341,11 +339,11 @@ func (g *gen) writeBuiltinCallSuspendibles(b *buffer, n *a.Expr, depth uint32) e
|
||||
if recvTyp.QID()[1] == t.IDIOReader {
|
||||
switch method.Ident() {
|
||||
case t.IDUnreadU8:
|
||||
b.printf("if (%srptr_src == %srstart_src) { status = %sERROR_INVALID_I_O_OPERATION;",
|
||||
bPrefix, bPrefix, g.PKGPREFIX)
|
||||
b.printf("if (ioptr_src == iobounds0orig_src) { status = %sERROR_INVALID_I_O_OPERATION;",
|
||||
g.PKGPREFIX)
|
||||
b.writes("goto exit;")
|
||||
b.writes("}\n")
|
||||
b.printf("%srptr_src--;\n", bPrefix)
|
||||
b.printf("ioptr_src--;\n")
|
||||
return nil
|
||||
|
||||
case t.IDReadU8:
|
||||
@@ -356,8 +354,7 @@ func (g *gen) writeBuiltinCallSuspendibles(b *buffer, n *a.Expr, depth uint32) e
|
||||
g.currFunk.tempW++
|
||||
|
||||
if !n.ProvenNotToSuspend() {
|
||||
b.printf("if (WUFFS_BASE__UNLIKELY(%srptr_src == %srend_src)) { goto short_read_src; }",
|
||||
bPrefix, bPrefix)
|
||||
b.printf("if (WUFFS_BASE__UNLIKELY(ioptr_src == iobounds1_src)) { goto short_read_src; }")
|
||||
g.currFunk.shortReads = append(g.currFunk.shortReads, "src")
|
||||
}
|
||||
|
||||
@@ -366,7 +363,7 @@ func (g *gen) writeBuiltinCallSuspendibles(b *buffer, n *a.Expr, depth uint32) e
|
||||
if err := g.writeCTypeName(b, n.MType(), tPrefix, fmt.Sprint(temp)); err != nil {
|
||||
return err
|
||||
}
|
||||
b.printf(" = *%srptr_src++;\n", bPrefix)
|
||||
b.printf(" = *ioptr_src++;\n")
|
||||
return nil
|
||||
|
||||
case t.IDReadU16BE:
|
||||
@@ -396,13 +393,13 @@ func (g *gen) writeBuiltinCallSuspendibles(b *buffer, n *a.Expr, depth uint32) e
|
||||
return err
|
||||
}
|
||||
|
||||
b.printf("if (%s > %srend_src - %srptr_src) {\n", scratchName, bPrefix, bPrefix)
|
||||
b.printf("%s -= %srend_src - %srptr_src;\n", scratchName, bPrefix, bPrefix)
|
||||
b.printf("%srptr_src = %srend_src;\n", bPrefix, bPrefix)
|
||||
b.printf("if (%s > iobounds1_src - ioptr_src) {\n", scratchName)
|
||||
b.printf("%s -= iobounds1_src - ioptr_src;\n", scratchName)
|
||||
b.printf("ioptr_src = iobounds1_src;\n")
|
||||
|
||||
b.writes("goto short_read_src; }\n")
|
||||
g.currFunk.shortReads = append(g.currFunk.shortReads, "src")
|
||||
b.printf("%srptr_src += %s;\n", bPrefix, scratchName)
|
||||
b.printf("ioptr_src += %s;\n", scratchName)
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -410,13 +407,13 @@ func (g *gen) writeBuiltinCallSuspendibles(b *buffer, n *a.Expr, depth uint32) e
|
||||
switch method.Ident() {
|
||||
case t.IDWriteU8:
|
||||
if !n.ProvenNotToSuspend() {
|
||||
b.printf("if (%swptr_dst == %swend_dst) { status = %sSUSPENSION_SHORT_WRITE;",
|
||||
bPrefix, bPrefix, g.PKGPREFIX)
|
||||
b.printf("if (ioptr_dst == iobounds1_dst) { status = %sSUSPENSION_SHORT_WRITE;",
|
||||
g.PKGPREFIX)
|
||||
b.writes("goto suspend;")
|
||||
b.writes("}\n")
|
||||
}
|
||||
|
||||
b.printf("*%swptr_dst++ = ", bPrefix)
|
||||
b.printf("*ioptr_dst++ = ")
|
||||
x := n.Args()[0].Arg().Value()
|
||||
if err := g.writeExpr(b, x, replaceCallSuspendibles, depth); err != nil {
|
||||
return err
|
||||
|
||||
@@ -48,7 +48,6 @@ var (
|
||||
// "double" being a valid Wuffs variable name but not a valid C one.
|
||||
const (
|
||||
aPrefix = "a_" // Function argument.
|
||||
bPrefix = "b_" // Derived from a function argument.
|
||||
cPrefix = "c_" // Coroutine state.
|
||||
fPrefix = "f_" // Struct field.
|
||||
iPrefix = "i_" // Iterate variable.
|
||||
|
||||
@@ -177,15 +177,16 @@ func (g *gen) writeStatementIOBind(b *buffer, n *a.IOBind, depth uint32) error {
|
||||
b.printf("wuffs_base__io_%s %s%d_%s%s = %s%s;\n",
|
||||
cTyp, oPrefix, ioBindNum, prefix, name, prefix, name)
|
||||
|
||||
// TODO: save / restore all bPrefix vars, not just for local IO vars?
|
||||
// How does this work if the io_bind body advances these pointers,
|
||||
// either directly or by calling other funcs?
|
||||
// TODO: save / restore all ioptr vars, not just for local IO vars? How
|
||||
// does this work if the io_bind body advances these pointers, either
|
||||
// directly or by calling other funcs?
|
||||
//
|
||||
// TODO: rename ioptr1 to ioptr, etc.
|
||||
if e.Operator() == 0 {
|
||||
// TODO: don't hard-code wptr vs rptr.
|
||||
b.printf("uint8_t *%s%d_ioptr1_%s%s = %swptr_%s;\n",
|
||||
oPrefix, ioBindNum, prefix, name, bPrefix, name)
|
||||
b.printf("uint8_t *%s%d_ioptr2_%s%s = %swend_%s;\n",
|
||||
oPrefix, ioBindNum, prefix, name, bPrefix, name)
|
||||
b.printf("uint8_t *%s%d_ioptr1_%s%s = ioptr_%s;\n",
|
||||
oPrefix, ioBindNum, prefix, name, name)
|
||||
b.printf("uint8_t *%s%d_ioptr2_%s%s = iobounds1_%s;\n",
|
||||
oPrefix, ioBindNum, prefix, name, name)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -205,10 +206,10 @@ func (g *gen) writeStatementIOBind(b *buffer, n *a.IOBind, depth uint32) error {
|
||||
b.printf("%s%s = %s%d_%s%s;\n",
|
||||
prefix, name, oPrefix, ioBindNum, prefix, name)
|
||||
if e.Operator() == 0 {
|
||||
b.printf("%swptr_%s = %s%d_ioptr1_%s%s;\n",
|
||||
bPrefix, name, oPrefix, ioBindNum, prefix, name)
|
||||
b.printf("%swend_%s = %s%d_ioptr2_%s%s;\n",
|
||||
bPrefix, name, oPrefix, ioBindNum, prefix, name)
|
||||
b.printf("ioptr_%s = %s%d_ioptr1_%s%s;\n",
|
||||
name, oPrefix, ioBindNum, prefix, name)
|
||||
b.printf("iobounds1_%s = %s%d_ioptr2_%s%s;\n",
|
||||
name, oPrefix, ioBindNum, prefix, name)
|
||||
}
|
||||
}
|
||||
b.writes("}\n")
|
||||
@@ -624,9 +625,9 @@ func (g *gen) writeReadUXX(b *buffer, n *a.Expr, name string, size uint32, endia
|
||||
scratchName := fmt.Sprintf("self->private_impl.%s%s[0].scratch",
|
||||
cPrefix, g.currFunk.astFunc.FuncName().Str(g.tm))
|
||||
|
||||
b.printf("if (WUFFS_BASE__LIKELY(%srend_src - %srptr_src >= %d)) {", bPrefix, bPrefix, size/8)
|
||||
b.printf("%s%d = wuffs_base__load_u%d%s(%srptr_src);\n", tPrefix, temp1, size, endianness, bPrefix)
|
||||
b.printf("%srptr_src += %d;\n", bPrefix, size/8)
|
||||
b.printf("if (WUFFS_BASE__LIKELY(iobounds1_src - ioptr_src >= %d)) {", size/8)
|
||||
b.printf("%s%d = wuffs_base__load_u%d%s(ioptr_src);\n", tPrefix, temp1, size, endianness)
|
||||
b.printf("ioptr_src += %d;\n", size/8)
|
||||
b.printf("} else {")
|
||||
b.printf("%s = 0;\n", scratchName)
|
||||
if err := g.writeCoroSuspPoint(b, false); err != nil {
|
||||
@@ -634,8 +635,8 @@ func (g *gen) writeReadUXX(b *buffer, n *a.Expr, name string, size uint32, endia
|
||||
}
|
||||
b.printf("while (true) {")
|
||||
|
||||
b.printf("if (WUFFS_BASE__UNLIKELY(%srptr_%s == %srend_%s)) { goto short_read_%s; }",
|
||||
bPrefix, name, bPrefix, name, name)
|
||||
b.printf("if (WUFFS_BASE__UNLIKELY(ioptr_%s == iobounds1_%s)) { goto short_read_%s; }",
|
||||
name, name, name)
|
||||
g.currFunk.shortReads = append(g.currFunk.shortReads, name)
|
||||
|
||||
b.printf("uint32_t %s%d = %s", tPrefix, temp0, scratchName)
|
||||
@@ -644,14 +645,14 @@ func (g *gen) writeReadUXX(b *buffer, n *a.Expr, name string, size uint32, endia
|
||||
b.printf("& 0xFF;")
|
||||
b.printf("%s >>= 8;", scratchName)
|
||||
b.printf("%s <<= 8;", scratchName)
|
||||
b.printf("%s |= ((uint64_t)(*%srptr_%s++)) << (56 - %s%d);",
|
||||
scratchName, bPrefix, name, tPrefix, temp0)
|
||||
b.printf("%s |= ((uint64_t)(*ioptr_%s++)) << (56 - %s%d);",
|
||||
scratchName, name, tPrefix, temp0)
|
||||
case "le":
|
||||
b.printf(">> 56;")
|
||||
b.printf("%s <<= 8;", scratchName)
|
||||
b.printf("%s >>= 8;", scratchName)
|
||||
b.printf("%s |= ((uint64_t)(*%srptr_%s++)) << %s%d;",
|
||||
scratchName, bPrefix, name, tPrefix, temp0)
|
||||
b.printf("%s |= ((uint64_t)(*ioptr_%s++)) << %s%d;",
|
||||
scratchName, name, tPrefix, temp0)
|
||||
}
|
||||
|
||||
b.printf("if (%s%d == %d) {", tPrefix, temp0, size-8)
|
||||
|
||||
@@ -87,7 +87,7 @@ func (g *gen) writeLoadDerivedVar(b *buffer, hack string, name t.ID, typ *a.Type
|
||||
}
|
||||
// TODO: also remove this hack.
|
||||
if hack == "w" {
|
||||
b.printf("%swptr_w = %sw.ptr + %sw.wi;\n", bPrefix, uPrefix, uPrefix)
|
||||
b.printf("ioptr_w = %sw.ptr + %sw.wi;\n", uPrefix, uPrefix)
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -101,52 +101,52 @@ func (g *gen) writeLoadDerivedVar(b *buffer, hack string, name t.ID, typ *a.Type
|
||||
switch typ.QID() {
|
||||
case t.QID{t.IDBase, t.IDIOReader}:
|
||||
if header {
|
||||
b.printf("uint8_t* %srptr_%s = NULL;", bPrefix, nameStr)
|
||||
b.printf("uint8_t* %srstart_%s = NULL;", bPrefix, nameStr)
|
||||
b.printf("uint8_t* %srend_%s = NULL;", bPrefix, nameStr)
|
||||
b.printf("uint8_t* ioptr_%s = NULL;", nameStr)
|
||||
b.printf("uint8_t* iobounds0orig_%s = NULL;", nameStr)
|
||||
b.printf("uint8_t* iobounds1_%s = NULL;", nameStr)
|
||||
}
|
||||
b.printf("if (%s%s.private_impl.buf) {", aPrefix, nameStr)
|
||||
|
||||
b.printf("%srptr_%s = %s%s.private_impl.buf->ptr + %s%s.private_impl.buf->ri;",
|
||||
bPrefix, nameStr, aPrefix, nameStr, aPrefix, nameStr)
|
||||
b.printf("ioptr_%s = %s%s.private_impl.buf->ptr + %s%s.private_impl.buf->ri;",
|
||||
nameStr, aPrefix, nameStr, aPrefix, nameStr)
|
||||
|
||||
if header {
|
||||
b.printf("if (!%s%s.private_impl.bounds[0]) {", aPrefix, nameStr)
|
||||
b.printf("%s%s.private_impl.bounds[0] = %srptr_%s;", aPrefix, nameStr, bPrefix, nameStr)
|
||||
b.printf("%s%s.private_impl.bounds[0] = ioptr_%s;", aPrefix, nameStr, nameStr)
|
||||
b.printf("%s%s.private_impl.bounds[1] = %s%s.private_impl.buf->ptr + %s%s.private_impl.buf->wi;",
|
||||
aPrefix, nameStr, aPrefix, nameStr, aPrefix, nameStr)
|
||||
b.printf("}\n")
|
||||
|
||||
b.printf("%srstart_%s = %s%s.private_impl.bounds[0];", bPrefix, nameStr, aPrefix, nameStr)
|
||||
b.printf("%srend_%s = %s%s.private_impl.bounds[1];", bPrefix, nameStr, aPrefix, nameStr)
|
||||
b.printf("iobounds0orig_%s = %s%s.private_impl.bounds[0];", nameStr, aPrefix, nameStr)
|
||||
b.printf("iobounds1_%s = %s%s.private_impl.bounds[1];", nameStr, aPrefix, nameStr)
|
||||
}
|
||||
|
||||
b.printf("}\n")
|
||||
|
||||
case t.QID{t.IDBase, t.IDIOWriter}:
|
||||
if header {
|
||||
b.printf("uint8_t* %swptr_%s = NULL;", bPrefix, nameStr)
|
||||
b.printf("uint8_t* %swstart_%s = NULL;", bPrefix, nameStr)
|
||||
b.printf("uint8_t* %swend_%s = NULL;", bPrefix, nameStr)
|
||||
b.printf("uint8_t* ioptr_%s = NULL;", nameStr)
|
||||
b.printf("uint8_t* iobounds0orig_%s = NULL;", nameStr)
|
||||
b.printf("uint8_t* iobounds1_%s = NULL;", nameStr)
|
||||
}
|
||||
b.printf("if (%s%s.private_impl.buf) {", aPrefix, nameStr)
|
||||
|
||||
b.printf("%swptr_%s = %s%s.private_impl.buf->ptr + %s%s.private_impl.buf->wi;",
|
||||
bPrefix, nameStr, aPrefix, nameStr, aPrefix, nameStr)
|
||||
b.printf("ioptr_%s = %s%s.private_impl.buf->ptr + %s%s.private_impl.buf->wi;",
|
||||
nameStr, aPrefix, nameStr, aPrefix, nameStr)
|
||||
|
||||
if header {
|
||||
b.printf("if (!%s%s.private_impl.bounds[0]) {", aPrefix, nameStr)
|
||||
b.printf("%s%s.private_impl.bounds[0] = %swptr_%s;", aPrefix, nameStr, bPrefix, nameStr)
|
||||
b.printf("%s%s.private_impl.bounds[0] = ioptr_%s;", aPrefix, nameStr, nameStr)
|
||||
b.printf("%s%s.private_impl.bounds[1] = %s%s.private_impl.buf->ptr + %s%s.private_impl.buf->len;",
|
||||
aPrefix, nameStr, aPrefix, nameStr, aPrefix, nameStr)
|
||||
b.printf("}\n")
|
||||
|
||||
b.printf("if (%s%s.private_impl.buf->closed) {", aPrefix, nameStr)
|
||||
b.printf("%s%s.private_impl.bounds[1] = %swptr_%s;", aPrefix, nameStr, bPrefix, nameStr)
|
||||
b.printf("%s%s.private_impl.bounds[1] = ioptr_%s;", aPrefix, nameStr, nameStr)
|
||||
b.printf("}\n")
|
||||
|
||||
b.printf("%swstart_%s = %s%s.private_impl.bounds[0];", bPrefix, nameStr, aPrefix, nameStr)
|
||||
b.printf("%swend_%s = %s%s.private_impl.bounds[1];", bPrefix, nameStr, aPrefix, nameStr)
|
||||
b.printf("iobounds0orig_%s = %s%s.private_impl.bounds[0];", nameStr, aPrefix, nameStr)
|
||||
b.printf("iobounds1_%s = %s%s.private_impl.bounds[1];", nameStr, aPrefix, nameStr)
|
||||
}
|
||||
|
||||
b.printf("}\n")
|
||||
@@ -162,7 +162,7 @@ func (g *gen) writeSaveDerivedVar(b *buffer, hack string, name t.ID, typ *a.Type
|
||||
}
|
||||
// TODO: also remove this hack.
|
||||
if hack == "w" {
|
||||
b.printf("%sw.wi = %swptr_w - %sw.ptr;\n", uPrefix, bPrefix, uPrefix)
|
||||
b.printf("%sw.wi = ioptr_w - %sw.ptr;\n", uPrefix, uPrefix)
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -177,12 +177,12 @@ func (g *gen) writeSaveDerivedVar(b *buffer, hack string, name t.ID, typ *a.Type
|
||||
case t.QID{t.IDBase, t.IDIOReader}:
|
||||
b.printf("if (%s%s.private_impl.buf) {", aPrefix, nameStr)
|
||||
|
||||
b.printf("%s%s.private_impl.buf->ri = %srptr_%s - %s%s.private_impl.buf->ptr;",
|
||||
aPrefix, nameStr, bPrefix, nameStr, aPrefix, nameStr)
|
||||
b.printf("%s%s.private_impl.buf->ri = ioptr_%s - %s%s.private_impl.buf->ptr;",
|
||||
aPrefix, nameStr, nameStr, aPrefix, nameStr)
|
||||
|
||||
if footer {
|
||||
b.printf("WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(%srstart_%s);", bPrefix, nameStr)
|
||||
b.printf("WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(%srend_%s);", bPrefix, nameStr)
|
||||
b.printf("WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_%s);", nameStr)
|
||||
b.printf("WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_%s);", nameStr)
|
||||
}
|
||||
|
||||
b.printf("}\n")
|
||||
@@ -190,12 +190,12 @@ func (g *gen) writeSaveDerivedVar(b *buffer, hack string, name t.ID, typ *a.Type
|
||||
case t.QID{t.IDBase, t.IDIOWriter}:
|
||||
b.printf("if (%s%s.private_impl.buf) {", aPrefix, nameStr)
|
||||
|
||||
b.printf("%s%s.private_impl.buf->wi = %swptr_%s - %s%s.private_impl.buf->ptr;",
|
||||
aPrefix, nameStr, bPrefix, nameStr, aPrefix, nameStr)
|
||||
b.printf("%s%s.private_impl.buf->wi = ioptr_%s - %s%s.private_impl.buf->ptr;",
|
||||
aPrefix, nameStr, nameStr, aPrefix, nameStr)
|
||||
|
||||
if footer {
|
||||
b.printf("WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(%swstart_%s);", bPrefix, nameStr)
|
||||
b.printf("WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(%swend_%s);", bPrefix, nameStr)
|
||||
b.printf("WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds0orig_%s);", nameStr)
|
||||
b.printf("WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_%s);", nameStr)
|
||||
}
|
||||
|
||||
b.printf("}\n")
|
||||
@@ -405,12 +405,12 @@ func (g *gen) writeVars(b *buffer, block []*a.Node, skipPointerTypes bool, skipI
|
||||
b.writes(";\n")
|
||||
if typ.IsIOType() {
|
||||
b.printf("wuffs_base__io_buffer %s%s;\n", uPrefix, name)
|
||||
// TODO: don't hard code wptr instead of rptr.
|
||||
b.printf("uint8_t* %swptr_%s = NULL;\n", bPrefix, name)
|
||||
b.printf("uint8_t* %swend_%s = NULL;\n", bPrefix, name)
|
||||
// TODO: iobounds0_%s or iobounds0orig_%s variables?
|
||||
b.printf("uint8_t* ioptr_%s = NULL;\n", name)
|
||||
b.printf("uint8_t* iobounds1_%s = NULL;\n", name)
|
||||
b.printf("WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(%s%s);\n", uPrefix, name)
|
||||
b.printf("WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(%swptr_%s);\n", bPrefix, name)
|
||||
b.printf("WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(%swend_%s);\n", bPrefix, name)
|
||||
b.printf("WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(ioptr_%s);\n", name)
|
||||
b.printf("WUFFS_BASE__IGNORE_POTENTIALLY_UNUSED_VARIABLE(iobounds1_%s);\n", name)
|
||||
}
|
||||
return nil
|
||||
})
|
||||
|
||||
Reference in new issue
Block a user