diff --git a/example/jsonptr/jsonptr.cc b/example/jsonptr/jsonptr.cc index 1c70de3c..e153c5eb 100644 --- a/example/jsonptr/jsonptr.cc +++ b/example/jsonptr/jsonptr.cc @@ -1614,7 +1614,15 @@ handle_token(wuffs_base__token t, bool start_of_token_chain) { if (t.value_major() == WUFFS_CBOR__TOKEN_VALUE_MAJOR) { uint64_t value_minor = t.value_minor(); - if (value_minor & WUFFS_CBOR__TOKEN_VALUE_MINOR__TAG) { + if (value_minor & WUFFS_CBOR__TOKEN_VALUE_MINOR__MINUS_1_MINUS_X) { + TRY(write_cbor_minus_1_minus_x( + g_src.data.ptr + g_curr_token_end_src_index - len, len)); + goto after_value; + } else if (value_minor & WUFFS_CBOR__TOKEN_VALUE_MINOR__SIMPLE_VALUE) { + TRY(write_cbor_simple_value( + vbd, g_src.data.ptr + g_curr_token_end_src_index - len, len)); + goto after_value; + } else if (value_minor & WUFFS_CBOR__TOKEN_VALUE_MINOR__TAG) { if (t.continued()) { if (len != 0) { return "main: internal error: unexpected to-be-extended length"; @@ -1625,14 +1633,6 @@ handle_token(wuffs_base__token t, bool start_of_token_chain) { } return write_cbor_tag( vbd, g_src.data.ptr + g_curr_token_end_src_index - len, len); - } else if (value_minor & WUFFS_CBOR__TOKEN_VALUE_MINOR__MINUS_1_MINUS_X) { - TRY(write_cbor_minus_1_minus_x( - g_src.data.ptr + g_curr_token_end_src_index - len, len)); - goto after_value; - } else if (value_minor & WUFFS_CBOR__TOKEN_VALUE_MINOR__SIMPLE_VALUE) { - TRY(write_cbor_simple_value( - vbd, g_src.data.ptr + g_curr_token_end_src_index - len, len)); - goto after_value; } } diff --git a/release/c/wuffs-unsupported-snapshot.c b/release/c/wuffs-unsupported-snapshot.c index c68b1f66..d76bac70 100644 --- a/release/c/wuffs-unsupported-snapshot.c +++ b/release/c/wuffs-unsupported-snapshot.c @@ -5550,11 +5550,11 @@ extern const char wuffs_cbor__error__unsupported_recursion_depth[]; #define WUFFS_CBOR__TOKEN_VALUE_MINOR__DETAIL_MASK 262143 -#define WUFFS_CBOR__TOKEN_VALUE_MINOR__TAG 16777216 +#define WUFFS_CBOR__TOKEN_VALUE_MINOR__MINUS_1_MINUS_X 16777216 -#define WUFFS_CBOR__TOKEN_VALUE_MINOR__MINUS_1_MINUS_X 8388608 +#define WUFFS_CBOR__TOKEN_VALUE_MINOR__SIMPLE_VALUE 8388608 -#define WUFFS_CBOR__TOKEN_VALUE_MINOR__SIMPLE_VALUE 4194304 +#define WUFFS_CBOR__TOKEN_VALUE_MINOR__TAG 4194304 // ---------------- Struct Declarations @@ -16597,7 +16597,7 @@ wuffs_cbor__decoder__decode_tokens( } else { *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(787997)) << WUFFS_BASE__TOKEN__VALUE_MAJOR__SHIFT) | - (((uint64_t)(8388608)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | + (((uint64_t)(16777216)) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | (((uint64_t)(9)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); } goto label__goto_parsed_a_leaf_value__break; @@ -16809,12 +16809,12 @@ wuffs_cbor__decoder__decode_tokens( if (v_string_length < 262144) { *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(787997)) << WUFFS_BASE__TOKEN__VALUE_MAJOR__SHIFT) | - (((uint64_t)((16777216 | ((uint32_t)(v_string_length))))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | + (((uint64_t)((4194304 | ((uint32_t)(v_string_length))))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | (((uint64_t)(((uint32_t)(WUFFS_CBOR__TOKEN_LENGTHS[v_c_minor])))) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); } else { *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(787997)) << WUFFS_BASE__TOKEN__VALUE_MAJOR__SHIFT) | - (((uint64_t)((16777216 | ((uint32_t)((v_string_length >> 46)))))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | + (((uint64_t)((4194304 | ((uint32_t)((v_string_length >> 46)))))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | (((uint64_t)(1)) << WUFFS_BASE__TOKEN__CONTINUED__SHIFT) | (((uint64_t)(0)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); *iop_a_dst++ = wuffs_base__make_token( @@ -16826,7 +16826,7 @@ wuffs_cbor__decoder__decode_tokens( if (v_c_minor < 20) { *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(787997)) << WUFFS_BASE__TOKEN__VALUE_MAJOR__SHIFT) | - (((uint64_t)((4194304 | ((uint32_t)((v_string_length & 255)))))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | + (((uint64_t)((8388608 | ((uint32_t)((v_string_length & 255)))))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | (((uint64_t)(1)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); goto label__goto_parsed_a_leaf_value__break; } else if (v_c_minor < 24) { @@ -16840,7 +16840,7 @@ wuffs_cbor__decoder__decode_tokens( } *iop_a_dst++ = wuffs_base__make_token( (((uint64_t)(787997)) << WUFFS_BASE__TOKEN__VALUE_MAJOR__SHIFT) | - (((uint64_t)((4194304 | ((uint32_t)((v_string_length & 255)))))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | + (((uint64_t)((8388608 | ((uint32_t)((v_string_length & 255)))))) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) | (((uint64_t)(2)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT)); goto label__goto_parsed_a_leaf_value__break; } else if (v_c_minor == 31) { diff --git a/std/cbor/decode_cbor.wuffs b/std/cbor/decode_cbor.wuffs index 1eafc813..ccb0ecea 100644 --- a/std/cbor/decode_cbor.wuffs +++ b/std/cbor/decode_cbor.wuffs @@ -25,6 +25,21 @@ pub const TOKEN_VALUE_MAJOR : base.u32 = 0x0C_061D // value_minor. 18 is 64 - base.TOKEN__VALUE_EXTENSION__NUM_BITS. pub const TOKEN_VALUE_MINOR__DETAIL_MASK : base.u64 = 0x003_FFFF +// TOKEN_VALUE_MINOR__MINUS_1_MINUS_X means that the 9-byte length token holds +// the negative integer (-1 - x), where x is the big-endian unsigned integer in +// the token's final 8 bytes. The most significant bit of x is guaranteed to be +// set, so that (-1 - x) will always underflow an int64_t and its absolute +// value (+1 + x) might also overflow a uint64_t. +pub const TOKEN_VALUE_MINOR__MINUS_1_MINUS_X : base.u32 = 0x100_0000 + +// TOKEN_VALUE_MINOR__SIMPLE_VALUE means that the low 8 bits (or, equivalently, +// the low 18 bits) of the token's value_minor is a CBOR simple value either in +// the range 0 ..= 19 or in the range 24 ..= 255. +// +// Simple values in the range 20 ..= 23 (which correspond to: false, true, null +// and undefined) are represented by WUFFS_BASE__TOKEN__VBC__LITERAL tokens. +pub const TOKEN_VALUE_MINOR__SIMPLE_VALUE : base.u32 = 0x080_0000 + // TOKEN_VALUE_MINOR__TAG means that the low 18 bits of the token's value_minor // is a CBOR tag. That token may be continued, in which case the following // token is an extended token whose value_extension holds a further @@ -34,22 +49,7 @@ pub const TOKEN_VALUE_MINOR__DETAIL_MASK : base.u64 = 0x003_FFFF // // When a token chain contains extended tokens like this, all but the last // token has zero length. -pub const TOKEN_VALUE_MINOR__TAG : base.u32 = 0x100_0000 - -// TOKEN_VALUE_MINOR__MINUS_1_MINUS_X means that the 9-byte length token holds -// the negative integer (-1 - x), where x is the big-endian unsigned integer in -// the token's final 8 bytes. The most significant bit of x is guaranteed to be -// set, so that (-1 - x) will always underflow an int64_t and its absolute -// value (+1 + x) might also overflow a uint64_t. -pub const TOKEN_VALUE_MINOR__MINUS_1_MINUS_X : base.u32 = 0x080_0000 - -// TOKEN_VALUE_MINOR__SIMPLE_VALUE means that the low 8 bits of the token's -// value_minor is a CBOR simple value either in the range 0 ..= 19 or in the -// range 24 ..= 255. -// -// Simple values in the range 20 ..= 23 (which correspond to: false, true, null -// and undefined) are represented by WUFFS_BASE__TOKEN__VBC__LITERAL tokens. -pub const TOKEN_VALUE_MINOR__SIMPLE_VALUE : base.u32 = 0x040_0000 +pub const TOKEN_VALUE_MINOR__TAG : base.u32 = 0x040_0000 pri const LITERALS : array[4] base.u32[..= 0x1FF_FFFF] = [ (base.TOKEN__VBC__LITERAL << 21) | base.TOKEN__VBD__LITERAL__FALSE,