Add read_u24be etc methods

Fixes #12
This commit is contained in:
Nigel Tao committed 2018-06-02 13:03:24 +10:00
1 parent 9f994948df
commit 20e459cfb2
9 files changed
+195 -72

No files matched your search

+20
View File
@@ -405,10 +405,30 @@ func (g *gen) writeBuiltinCallSuspendibles(b *buffer, n *a.Expr, depth uint32) e
return g.writeReadUXX(b, n, "src", 16, "be")
case t.IDReadU16LE:
return g.writeReadUXX(b, n, "src", 16, "le")
case t.IDReadU24BE:
return g.writeReadUXX(b, n, "src", 24, "be")
case t.IDReadU24LE:
return g.writeReadUXX(b, n, "src", 24, "le")
case t.IDReadU32BE:
return g.writeReadUXX(b, n, "src", 32, "be")
case t.IDReadU32LE:
return g.writeReadUXX(b, n, "src", 32, "le")
case t.IDReadU40BE:
return g.writeReadUXX(b, n, "src", 40, "be")
case t.IDReadU40LE:
return g.writeReadUXX(b, n, "src", 40, "le")
case t.IDReadU48BE:
return g.writeReadUXX(b, n, "src", 48, "be")
case t.IDReadU48LE:
return g.writeReadUXX(b, n, "src", 48, "le")
case t.IDReadU56BE:
return g.writeReadUXX(b, n, "src", 56, "be")
case t.IDReadU56LE:
return g.writeReadUXX(b, n, "src", 56, "le")
case t.IDReadU64BE:
return g.writeReadUXX(b, n, "src", 64, "be")
case t.IDReadU64LE:
return g.writeReadUXX(b, n, "src", 64, "le")
case t.IDSkip32:
g.currFunk.usesScratch = true
+1 -1
View File
@@ -600,7 +600,7 @@ func (g *gen) writeCallSuspendibles(b *buffer, n *a.Expr, depth uint32) error {
}
func (g *gen) writeReadUXX(b *buffer, n *a.Expr, name string, size uint32, endianness string) error {
if size != 16 && size != 32 {
if (size&7 != 0) || (size < 16) || (size > 64) {
return fmt.Errorf("internal error: bad writeReadUXX size %d", size)
}
if endianness != "be" && endianness != "le" {
+88 -53
View File
@@ -1303,6 +1303,8 @@ typedef struct {
uint32_t v_i;
uint8_t v_flags;
uint32_t v_num_palette_entries;
uint32_t v_argb;
uint64_t scratch;
} c_decode_lsd[1];
struct {
uint32_t coro_susp_point;
@@ -1338,9 +1340,11 @@ typedef struct {
bool v_use_local_palette;
uint32_t v_num_palette_entries;
uint32_t v_i;
uint32_t v_argb;
uint8_t v_lw;
uint64_t v_block_size;
wuffs_gif__status v_z;
uint64_t scratch;
} c_decode_id_part1[1];
} private_impl;
} wuffs_gif__decoder;
@@ -2470,6 +2474,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_lsd(
uint32_t v_i;
uint8_t v_flags;
uint32_t v_num_palette_entries;
uint32_t v_argb;
uint8_t* ioptr_src = NULL;
uint8_t* iobounds0orig_src = NULL;
@@ -2494,6 +2499,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_lsd(
v_flags = self->private_impl.c_decode_lsd[0].v_flags;
v_num_palette_entries =
self->private_impl.c_decode_lsd[0].v_num_palette_entries;
v_argb = self->private_impl.c_decode_lsd[0].v_argb;
} else {
}
switch (coro_susp_point) {
@@ -2524,29 +2530,40 @@ static wuffs_gif__status wuffs_gif__decoder__decode_lsd(
while (v_i < v_num_palette_entries) {
{
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
if (WUFFS_BASE__UNLIKELY(ioptr_src == iobounds1_src)) {
goto short_read_src;
uint32_t t_2;
if (WUFFS_BASE__LIKELY(iobounds1_src - ioptr_src >= 3)) {
t_2 = wuffs_base__load_u24be(ioptr_src);
ioptr_src += 3;
} else {
self->private_impl.c_decode_lsd[0].scratch = 0;
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
while (true) {
if (WUFFS_BASE__UNLIKELY(ioptr_src == iobounds1_src)) {
goto short_read_src;
}
uint32_t t_1 = self->private_impl.c_decode_lsd[0].scratch & 0xFF;
self->private_impl.c_decode_lsd[0].scratch >>= 8;
self->private_impl.c_decode_lsd[0].scratch <<= 8;
self->private_impl.c_decode_lsd[0].scratch |=
((uint64_t)(*ioptr_src++)) << (56 - t_1);
if (t_1 == 16) {
t_2 = self->private_impl.c_decode_lsd[0].scratch >> (64 - 24);
break;
}
t_1 += 8;
self->private_impl.c_decode_lsd[0].scratch |= ((uint64_t)(t_1));
}
}
uint8_t t_1 = *ioptr_src++;
self->private_impl.f_palettes[0][((4 * v_i) + 2)] = t_1;
v_argb = (t_2 | 4278190080);
}
{
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
if (WUFFS_BASE__UNLIKELY(ioptr_src == iobounds1_src)) {
goto short_read_src;
}
uint8_t t_2 = *ioptr_src++;
self->private_impl.f_palettes[0][((4 * v_i) + 1)] = t_2;
}
{
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
if (WUFFS_BASE__UNLIKELY(ioptr_src == iobounds1_src)) {
goto short_read_src;
}
uint8_t t_3 = *ioptr_src++;
self->private_impl.f_palettes[0][((4 * v_i) + 0)] = t_3;
}
self->private_impl.f_palettes[0][((4 * v_i) + 3)] = 255;
self->private_impl.f_palettes[0][((4 * v_i) + 0)] =
((uint8_t)(((v_argb >> 0) & 255)));
self->private_impl.f_palettes[0][((4 * v_i) + 1)] =
((uint8_t)(((v_argb >> 8) & 255)));
self->private_impl.f_palettes[0][((4 * v_i) + 2)] =
((uint8_t)(((v_argb >> 16) & 255)));
self->private_impl.f_palettes[0][((4 * v_i) + 3)] =
((uint8_t)(((v_argb >> 24) & 255)));
v_i += 1;
}
while (v_i < 256) {
@@ -2572,6 +2589,7 @@ suspend:
self->private_impl.c_decode_lsd[0].v_flags = v_flags;
self->private_impl.c_decode_lsd[0].v_num_palette_entries =
v_num_palette_entries;
self->private_impl.c_decode_lsd[0].v_argb = v_argb;
goto exit;
exit:
@@ -3347,6 +3365,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id_part1(
bool v_use_local_palette;
uint32_t v_num_palette_entries;
uint32_t v_i;
uint32_t v_argb;
uint8_t v_lw;
uint64_t v_block_size;
wuffs_base__io_writer v_w;
@@ -3384,6 +3403,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id_part1(
v_num_palette_entries =
self->private_impl.c_decode_id_part1[0].v_num_palette_entries;
v_i = self->private_impl.c_decode_id_part1[0].v_i;
v_argb = self->private_impl.c_decode_id_part1[0].v_argb;
v_lw = self->private_impl.c_decode_id_part1[0].v_lw;
v_block_size = self->private_impl.c_decode_id_part1[0].v_block_size;
v_w = ((wuffs_base__io_writer){});
@@ -3413,29 +3433,43 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id_part1(
while (v_i < v_num_palette_entries) {
{
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
if (WUFFS_BASE__UNLIKELY(ioptr_src == iobounds1_src)) {
goto short_read_src;
uint32_t t_2;
if (WUFFS_BASE__LIKELY(iobounds1_src - ioptr_src >= 3)) {
t_2 = wuffs_base__load_u24be(ioptr_src);
ioptr_src += 3;
} else {
self->private_impl.c_decode_id_part1[0].scratch = 0;
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
while (true) {
if (WUFFS_BASE__UNLIKELY(ioptr_src == iobounds1_src)) {
goto short_read_src;
}
uint32_t t_1 =
self->private_impl.c_decode_id_part1[0].scratch & 0xFF;
self->private_impl.c_decode_id_part1[0].scratch >>= 8;
self->private_impl.c_decode_id_part1[0].scratch <<= 8;
self->private_impl.c_decode_id_part1[0].scratch |=
((uint64_t)(*ioptr_src++)) << (56 - t_1);
if (t_1 == 16) {
t_2 = self->private_impl.c_decode_id_part1[0].scratch >>
(64 - 24);
break;
}
t_1 += 8;
self->private_impl.c_decode_id_part1[0].scratch |=
((uint64_t)(t_1));
}
}
uint8_t t_1 = *ioptr_src++;
self->private_impl.f_palettes[1][((4 * v_i) + 2)] = t_1;
v_argb = (t_2 | 4278190080);
}
{
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
if (WUFFS_BASE__UNLIKELY(ioptr_src == iobounds1_src)) {
goto short_read_src;
}
uint8_t t_2 = *ioptr_src++;
self->private_impl.f_palettes[1][((4 * v_i) + 1)] = t_2;
}
{
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
if (WUFFS_BASE__UNLIKELY(ioptr_src == iobounds1_src)) {
goto short_read_src;
}
uint8_t t_3 = *ioptr_src++;
self->private_impl.f_palettes[1][((4 * v_i) + 0)] = t_3;
}
self->private_impl.f_palettes[1][((4 * v_i) + 3)] = 255;
self->private_impl.f_palettes[1][((4 * v_i) + 0)] =
((uint8_t)(((v_argb >> 0) & 255)));
self->private_impl.f_palettes[1][((4 * v_i) + 1)] =
((uint8_t)(((v_argb >> 8) & 255)));
self->private_impl.f_palettes[1][((4 * v_i) + 2)] =
((uint8_t)(((v_argb >> 16) & 255)));
self->private_impl.f_palettes[1][((4 * v_i) + 3)] =
((uint8_t)(((v_argb >> 24) & 255)));
v_i += 1;
}
while (v_i < 256) {
@@ -3454,12 +3488,12 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id_part1(
wuffs_base__return_empty_struct());
}
{
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
if (WUFFS_BASE__UNLIKELY(ioptr_src == iobounds1_src)) {
goto short_read_src;
}
uint8_t t_4 = *ioptr_src++;
v_lw = t_4;
uint8_t t_3 = *ioptr_src++;
v_lw = t_3;
}
if ((v_lw < 2) || (8 < v_lw)) {
status = WUFFS_GIF__ERROR_BAD_LITERAL_WIDTH;
@@ -3470,12 +3504,12 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id_part1(
self->private_impl.f_previous_lzw_decode_ended_abruptly = true;
while (true) {
{
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
if (WUFFS_BASE__UNLIKELY(ioptr_src == iobounds1_src)) {
goto short_read_src;
}
uint8_t t_5 = *ioptr_src++;
v_block_size = ((uint64_t)(t_5));
uint8_t t_4 = *ioptr_src++;
v_block_size = ((uint64_t)(t_4));
}
if (v_block_size == 0) {
goto label_0_break;
@@ -3503,14 +3537,14 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id_part1(
a_src.private_impl.buf->ri =
ioptr_src - a_src.private_impl.buf->ptr;
}
wuffs_gif__status t_6 = wuffs_gif__lzw_decoder__decode(
wuffs_gif__status t_5 = wuffs_gif__lzw_decoder__decode(
&self->private_impl.f_lzw, v_w, a_src);
ioptr_w = u_w.ptr + u_w.wi;
if (a_src.private_impl.buf) {
ioptr_src =
a_src.private_impl.buf->ptr + a_src.private_impl.buf->ri;
}
v_z = t_6;
v_z = t_5;
}
self->private_impl.f_uncompressed_wi =
(4096 - ((uint32_t)(wuffs_base__u64__min(
@@ -3529,7 +3563,7 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id_part1(
a_src = o_0_a_src;
}
if ((v_z == 0) || (v_z == WUFFS_GIF__SUSPENSION_SHORT_WRITE)) {
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7);
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(6);
status = wuffs_gif__decoder__copy_to_image_buffer(self, a_dst);
if (status) {
goto suspend;
@@ -3544,14 +3578,14 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id_part1(
goto label_1_break;
}
status = v_z;
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(8);
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(7);
}
label_1_break:;
}
label_0_break:;
if (self->private_impl.f_uncompressed_ri !=
self->private_impl.f_uncompressed_wi) {
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9);
WUFFS_BASE__COROUTINE_SUSPENSION_POINT(8);
status = wuffs_gif__decoder__copy_to_image_buffer(self, a_dst);
if (status) {
goto suspend;
@@ -3590,6 +3624,7 @@ suspend:
self->private_impl.c_decode_id_part1[0].v_num_palette_entries =
v_num_palette_entries;
self->private_impl.c_decode_id_part1[0].v_i = v_i;
self->private_impl.c_decode_id_part1[0].v_argb = v_argb;
self->private_impl.c_decode_id_part1[0].v_lw = v_lw;
self->private_impl.c_decode_id_part1[0].v_block_size = v_block_size;
self->private_impl.c_decode_id_part1[0].v_z = v_z;
+4
View File
@@ -1303,6 +1303,8 @@ typedef struct {
uint32_t v_i;
uint8_t v_flags;
uint32_t v_num_palette_entries;
uint32_t v_argb;
uint64_t scratch;
} c_decode_lsd[1];
struct {
uint32_t coro_susp_point;
@@ -1338,9 +1340,11 @@ typedef struct {
bool v_use_local_palette;
uint32_t v_num_palette_entries;
uint32_t v_i;
uint32_t v_argb;
uint8_t v_lw;
uint64_t v_block_size;
wuffs_gif__status v_z;
uint64_t scratch;
} c_decode_id_part1[1];
} private_impl;
} wuffs_gif__decoder;
+16
View File
@@ -135,8 +135,16 @@ var Funcs = []string{
"io_reader.read_u8?()(ret u8)",
"io_reader.read_u16be?()(ret u16)",
"io_reader.read_u16le?()(ret u16)",
"io_reader.read_u24be?()(ret u32[..0xFFFFFF])",
"io_reader.read_u24le?()(ret u32[..0xFFFFFF])",
"io_reader.read_u32be?()(ret u32)",
"io_reader.read_u32le?()(ret u32)",
"io_reader.read_u40be?()(ret u64[..0xFFFFFFFFFF])",
"io_reader.read_u40le?()(ret u64[..0xFFFFFFFFFF])",
"io_reader.read_u48be?()(ret u64[..0xFFFFFFFFFFFF])",
"io_reader.read_u48le?()(ret u64[..0xFFFFFFFFFFFF])",
"io_reader.read_u56be?()(ret u64[..0xFFFFFFFFFFFFFF])",
"io_reader.read_u56le?()(ret u64[..0xFFFFFFFFFFFFFF])",
"io_reader.read_u64be?()(ret u64)",
"io_reader.read_u64le?()(ret u64)",
@@ -154,8 +162,16 @@ var Funcs = []string{
"io_writer.write_u8?(x u8)()",
"io_writer.write_u16be?(x u16)()",
"io_writer.write_u16le?(x u16)()",
"io_writer.write_u24be?(x u32[..0xFFFFFF])()",
"io_writer.write_u24le?(x u32[..0xFFFFFF])()",
"io_writer.write_u32be?(x u32)()",
"io_writer.write_u32le?(x u32)()",
"io_writer.write_u40be?(x u64[..0xFFFFFFFFFF])()",
"io_writer.write_u40le?(x u64[..0xFFFFFFFFFF])()",
"io_writer.write_u48be?(x u64[..0xFFFFFFFFFFFF])()",
"io_writer.write_u48le?(x u64[..0xFFFFFFFFFFFF])()",
"io_writer.write_u56be?(x u64[..0xFFFFFFFFFFFFFF])()",
"io_writer.write_u56le?(x u64[..0xFFFFFFFFFFFFFF])()",
"io_writer.write_u64be?(x u64)()",
"io_writer.write_u64le?(x u64)()",
+4
View File
@@ -39,7 +39,11 @@ var (
zero = big.NewInt(+0)
one = big.NewInt(+1)
two = big.NewInt(+2)
three = big.NewInt(+3)
four = big.NewInt(+4)
five = big.NewInt(+5)
six = big.NewInt(+6)
seven = big.NewInt(+7)
eight = big.NewInt(+8)
sixteen = big.NewInt(+16)
thirtyTwo = big.NewInt(+32)
+8
View File
@@ -282,8 +282,16 @@ func ioMethodAdvance(x t.ID) *big.Int {
return one
case t.IDReadU16BE, t.IDReadU16LE, t.IDWriteU16BE, t.IDWriteU16LE:
return two
case t.IDReadU24BE, t.IDReadU24LE, t.IDWriteU24BE, t.IDWriteU24LE:
return three
case t.IDReadU32BE, t.IDReadU32LE, t.IDWriteU32BE, t.IDWriteU32LE:
return four
case t.IDReadU40BE, t.IDReadU40LE, t.IDWriteU40BE, t.IDWriteU40LE:
return five
case t.IDReadU48BE, t.IDReadU48LE, t.IDWriteU48BE, t.IDWriteU48LE:
return six
case t.IDReadU56BE, t.IDReadU56LE, t.IDWriteU56BE, t.IDWriteU56LE:
return seven
case t.IDReadU64BE, t.IDReadU64LE, t.IDWriteU64BE, t.IDWriteU64LE:
return eight
}
+40 -8
View File
@@ -439,19 +439,35 @@ const (
IDReadU8 = ID(0x141)
IDReadU16BE = ID(0x142)
IDReadU16LE = ID(0x143)
IDReadU32BE = ID(0x144)
IDReadU32LE = ID(0x145)
IDReadU64BE = ID(0x146)
IDReadU64LE = ID(0x147)
IDReadU24BE = ID(0x144)
IDReadU24LE = ID(0x145)
IDReadU32BE = ID(0x146)
IDReadU32LE = ID(0x147)
IDReadU40BE = ID(0x148)
IDReadU40LE = ID(0x149)
IDReadU48BE = ID(0x14A)
IDReadU48LE = ID(0x14B)
IDReadU56BE = ID(0x14C)
IDReadU56LE = ID(0x14D)
IDReadU64BE = ID(0x14E)
IDReadU64LE = ID(0x14F)
// TODO: IDUnwriteU8?
IDWriteU8 = ID(0x161)
IDWriteU16BE = ID(0x162)
IDWriteU16LE = ID(0x163)
IDWriteU32BE = ID(0x164)
IDWriteU32LE = ID(0x165)
IDWriteU64BE = ID(0x166)
IDWriteU64LE = ID(0x167)
IDWriteU24BE = ID(0x164)
IDWriteU24LE = ID(0x165)
IDWriteU32BE = ID(0x166)
IDWriteU32LE = ID(0x167)
IDWriteU40BE = ID(0x168)
IDWriteU40LE = ID(0x169)
IDWriteU48BE = ID(0x16A)
IDWriteU48LE = ID(0x16B)
IDWriteU56BE = ID(0x16C)
IDWriteU56LE = ID(0x16D)
IDWriteU64BE = ID(0x16E)
IDWriteU64LE = ID(0x16F)
IDSetLimit = ID(0x180)
IDSetMark = ID(0x181)
@@ -662,16 +678,32 @@ var builtInsByID = [nBuiltInIDs]string{
IDReadU8: "read_u8",
IDReadU16BE: "read_u16be",
IDReadU16LE: "read_u16le",
IDReadU24BE: "read_u24be",
IDReadU24LE: "read_u24le",
IDReadU32BE: "read_u32be",
IDReadU32LE: "read_u32le",
IDReadU40BE: "read_u40be",
IDReadU40LE: "read_u40le",
IDReadU48BE: "read_u48be",
IDReadU48LE: "read_u48le",
IDReadU56BE: "read_u56be",
IDReadU56LE: "read_u56le",
IDReadU64BE: "read_u64be",
IDReadU64LE: "read_u64le",
IDWriteU8: "write_u8",
IDWriteU16BE: "write_u16be",
IDWriteU16LE: "write_u16le",
IDWriteU24BE: "write_u24be",
IDWriteU24LE: "write_u24le",
IDWriteU32BE: "write_u32be",
IDWriteU32LE: "write_u32le",
IDWriteU40BE: "write_u40be",
IDWriteU40LE: "write_u40le",
IDWriteU48BE: "write_u48be",
IDWriteU48LE: "write_u48le",
IDWriteU56BE: "write_u56be",
IDWriteU56LE: "write_u56le",
IDWriteU64BE: "write_u64be",
IDWriteU64LE: "write_u64le",
+14 -10
View File
@@ -187,11 +187,13 @@ pri func decoder.decode_lsd?(src base.io_reader)() {
i = 0
while i < num_palette_entries {
assert i < 256 via "a < b: a < c; c <= b"(c:num_palette_entries)
// Convert from RGB to BGRA.
this.palettes[0][(4 * i) + 2] = in.src.read_u8?()
this.palettes[0][(4 * i) + 1] = in.src.read_u8?()
this.palettes[0][(4 * i) + 0] = in.src.read_u8?()
this.palettes[0][(4 * i) + 3] = 0xFF
// Convert from RGB (in memory order) to ARGB (in native u32 order)
// to BGRA (in memory order).
var argb base.u32 = in.src.read_u24be?() | 0xFF000000
this.palettes[0][(4 * i) + 0] = ((argb >> 0) & 0xFF) as base.u8
this.palettes[0][(4 * i) + 1] = ((argb >> 8) & 0xFF) as base.u8
this.palettes[0][(4 * i) + 2] = ((argb >> 16) & 0xFF) as base.u8
this.palettes[0][(4 * i) + 3] = ((argb >> 24) & 0xFF) as base.u8
i += 1
}
// Set the remaining palette entries to transparent black.
@@ -382,11 +384,13 @@ pri func decoder.decode_id_part1?(dst ptr base.image_buffer, src base.io_reader)
var i base.u32
while i < num_palette_entries {
assert i < 256 via "a < b: a < c; c <= b"(c:num_palette_entries)
// Convert from RGB to BGRA.
this.palettes[1][(4 * i) + 2] = in.src.read_u8?()
this.palettes[1][(4 * i) + 1] = in.src.read_u8?()
this.palettes[1][(4 * i) + 0] = in.src.read_u8?()
this.palettes[1][(4 * i) + 3] = 0xFF
// Convert from RGB (in memory order) to ARGB (in native u32 order)
// to BGRA (in memory order).
var argb base.u32 = in.src.read_u24be?() | 0xFF000000
this.palettes[1][(4 * i) + 0] = ((argb >> 0) & 0xFF) as base.u8
this.palettes[1][(4 * i) + 1] = ((argb >> 8) & 0xFF) as base.u8
this.palettes[1][(4 * i) + 2] = ((argb >> 16) & 0xFF) as base.u8
this.palettes[1][(4 * i) + 3] = ((argb >> 24) & 0xFF) as base.u8
i += 1
}
// Set the remaining palette entries to transparent black.