Add token_writer.write_fast_token

This commit is contained in:
Nigel Tao committed 2020-02-12 21:45:06 +11:00
1 parent 36857984c7
commit e9aba8924a
6 files changed
+74 -44

No files matched your search

+22 -3
View File
@@ -94,6 +94,8 @@ func (g *gen) writeBuiltinCall(b *buffer, n *a.Expr, depth uint32) error {
return g.writeBuiltinIOReader(b, recv, method.Ident(), n.Args(), depth)
case t.IDIOWriter:
return g.writeBuiltinIOWriter(b, recv, method.Ident(), n.Args(), depth)
case t.IDTokenWriter:
return g.writeBuiltinTokenWriter(b, recv, method.Ident(), n.Args(), depth)
case t.IDUtility:
switch method.Ident() {
case t.IDEmptyIOReader, t.IDEmptyIOWriter:
@@ -307,6 +309,23 @@ func (g *gen) writeBuiltinIOWriter(b *buffer, recv *a.Expr, method t.ID, args []
return g.writeBuiltinIO(b, recv, method, args, depth)
}
func (g *gen) writeBuiltinTokenWriter(b *buffer, recv *a.Expr, method t.ID, args []*a.Node, depth uint32) error {
if method == t.IDWriteFastToken {
b.printf("*iop_a_dst++ = wuffs_base__make_token((((uint64_t)(")
if err := g.writeExpr(b, args[0].AsArg().Value(), depth); err != nil {
return err
}
b.writes(")) << WUFFS_BASE__TOKEN__VALUE__SHIFT) | (((uint64_t)(")
if err := g.writeExpr(b, args[1].AsArg().Value(), depth); err != nil {
return err
}
b.writes(")) << WUFFS_BASE__TOKEN__LENGTH__SHIFT))")
return nil
}
return g.writeBuiltinIO(b, recv, method, args, depth)
}
func (g *gen) writeBuiltinNumType(b *buffer, recv *a.Expr, method t.ID, args []*a.Node, depth uint32) error {
switch method {
case t.IDLowBits:
@@ -663,15 +682,15 @@ func (g *gen) writeBuiltinQuestionCall(b *buffer, n *a.Expr, depth uint32) error
scratchName := fmt.Sprintf("self->private_data.%s%s[0].scratch",
sPrefix, g.currFunk.astFunc.FuncName().Str(g.tm))
b.printf("%s = ((", scratchName)
b.printf("%s = (((uint64_t)(", scratchName)
if err := g.writeExpr(b, n.Args()[0].AsArg().Value(), depth); err != nil {
return err
}
b.writes(") << WUFFS_BASE__TOKEN__VALUE__SHIFT) | ((")
b.writes(")) << WUFFS_BASE__TOKEN__VALUE__SHIFT) | (((uint64_t)(")
if err := g.writeExpr(b, n.Args()[1].AsArg().Value(), depth); err != nil {
return err
}
b.writes(") << WUFFS_BASE__TOKEN__LENGTH__SHIFT);\n")
b.writes(")) << WUFFS_BASE__TOKEN__LENGTH__SHIFT);\n")
if err := g.writeCoroSuspPoint(b, false); err != nil {
return err
+4
View File
@@ -324,6 +324,10 @@ var Funcs = []string{
"token_writer.write_token?(value: u64[..= 0xFFFFFFFFFFFF], length: u64[..= 0xFFFF])",
"token_writer.write_fast_token!(value: u64[..= 0xFFFFFFFFFFFF], length: u64[..= 0xFFFF])",
"token_writer.available() u64",
// ---- frame_config
// Duration's upper bound is the maximum possible i64 value.
+3 -1
View File
@@ -1040,7 +1040,7 @@ func (q *checker) bcheckExprCallSpecialCases(n *a.Expr, depth uint32) (bounds, e
}
}
} else if recvTyp.IsIOType() {
} else if recvTyp.IsIOTokenType() {
advance, update := (*big.Int)(nil), false
if method == t.IDUndoByte {
@@ -1260,6 +1260,8 @@ var ioMethodAdvances = [...]struct {
t.IDWriteFastU56LE - t.IDPeekU8: {seven, true},
t.IDWriteFastU64BE - t.IDPeekU8: {eight, true},
t.IDWriteFastU64LE - t.IDPeekU8: {eight, true},
t.IDWriteFastToken - t.IDPeekU8: {one, true},
}
func makeConstValueExpr(tm *t.Map, cv *big.Int) (*a.Expr, error) {
+32 -24
View File
@@ -606,6 +606,11 @@ const (
IDWriteFastU64BE = ID(0x1EE)
IDWriteFastU64LE = ID(0x1EF)
// --------
IDWriteToken = ID(0x1F0)
IDWriteFastToken = ID(0x1F1)
// -------- 0x200 block.
IDInitialize = ID(0x200)
@@ -625,18 +630,17 @@ const (
IDIsOK = ID(0x231)
IDIsSuspension = ID(0x232)
IDAvailable = ID(0x240)
IDHeight = ID(0x241)
IDLength = ID(0x242)
IDPrefix = ID(0x243)
IDRow = ID(0x244)
IDStride = ID(0x245)
IDSuffix = ID(0x246)
IDWidth = ID(0x247)
IDIO = ID(0x248)
IDLimit = ID(0x249)
IDData = ID(0x24A)
IDWriteToken = ID(0x24B)
IDAvailable = ID(0x240)
IDHeight = ID(0x241)
IDLength = ID(0x242)
IDPrefix = ID(0x243)
IDRow = ID(0x244)
IDStride = ID(0x245)
IDSuffix = ID(0x246)
IDWidth = ID(0x247)
IDIO = ID(0x248)
IDLimit = ID(0x249)
IDData = ID(0x24A)
)
var builtInsByID = [nBuiltInIDs]string{
@@ -950,6 +954,11 @@ var builtInsByID = [nBuiltInIDs]string{
IDWriteFastU64BE: "write_fast_u64be",
IDWriteFastU64LE: "write_fast_u64le",
// --------
IDWriteToken: "write_token",
IDWriteFastToken: "write_fast_token",
// -------- 0x200 block.
IDInitialize: "initialize",
@@ -967,18 +976,17 @@ var builtInsByID = [nBuiltInIDs]string{
IDIsOK: "is_ok",
IDIsSuspension: "is_suspension",
IDAvailable: "available",
IDHeight: "height",
IDLength: "length",
IDPrefix: "prefix",
IDRow: "row",
IDStride: "stride",
IDSuffix: "suffix",
IDWidth: "width",
IDIO: "io",
IDLimit: "limit",
IDData: "data",
IDWriteToken: "write_token",
IDAvailable: "available",
IDHeight: "height",
IDLength: "length",
IDPrefix: "prefix",
IDRow: "row",
IDStride: "stride",
IDSuffix: "suffix",
IDWidth: "width",
IDIO: "io",
IDLimit: "limit",
IDData: "data",
}
var builtInsByName = map[string]ID{}
+6 -15
View File
@@ -5137,12 +5137,6 @@ struct wuffs_json__decoder__struct {
uint32_t p_decode_tokens[1];
} private_impl;
struct {
struct {
uint64_t scratch;
} s_decode_tokens[1];
} private_data;
#ifdef __cplusplus
#if (__cplusplus >= 201103L) && !defined(WUFFS_IMPLEMENTATION)
// Disallow constructing or copying an object via standard C++ mechanisms,
@@ -18235,17 +18229,14 @@ wuffs_json__decoder__decode_tokens(wuffs_json__decoder* self,
switch (coro_susp_point) {
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
v_length = 456;
self->private_data.s_decode_tokens[0].scratch =
((123) << WUFFS_BASE__TOKEN__VALUE__SHIFT) |
((v_length) << WUFFS_BASE__TOKEN__LENGTH__SHIFT);
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
if (iop_a_dst == io2_a_dst) {
while (((uint64_t)(io2_a_dst - iop_a_dst)) <= 0) {
status = wuffs_base__make_status(wuffs_base__suspension__short_write);
goto suspend;
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(1);
}
*iop_a_dst++ =
wuffs_base__make_token(self->private_data.s_decode_tokens[0].scratch);
v_length = 456;
*iop_a_dst++ = wuffs_base__make_token(
(((uint64_t)(123)) << WUFFS_BASE__TOKEN__VALUE__SHIFT) |
(((uint64_t)(v_length)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
status = wuffs_base__make_status(NULL);
goto ok;
goto ok;
+7 -1
View File
@@ -20,7 +20,13 @@ pub struct decoder?(
pub func decoder.decode_tokens?(dst: base.token_writer, src: base.io_reader) {
var length : base.u64[..= 0xFFFF]
while args.dst.available() <= 0,
post args.dst.available() > 0,
{
yield? base."$short write"
}
length = 456
args.dst.write_token?(value: 123, length: length)
args.dst.write_fast_token!(value: 123, length: length)
return ok
}