Roll back 'unconditionally resume local vars'

See the previous commit for the rationale.
This commit is contained in:
Nigel Tao committed 2018-02-22 11:23:58 +11:00
1 parent 2b6b0acb4f
commit 5a927d6905
5 files changed
+129 -73

No files matched your search

+9 -3
View File
@@ -225,12 +225,18 @@ func (g *gen) writeFuncImplHeader(b *buffer) error {
func (g *gen) writeFuncImplBodyResume(b *buffer) error {
if g.currFunk.suspendible {
if err := g.writeResumeSuspend(b, g.currFunk.astFunc.Body(), false, false); err != nil {
return err
}
// TODO: don't hard-code [0], and allow recursive coroutines.
b.printf("uint32_t coro_susp_point = self->private_impl.%s%s[0].coro_susp_point;\n",
cPrefix, g.currFunk.astFunc.FuncName().Str(g.tm))
b.printf("if (coro_susp_point) {\n")
if err := g.writeResumeSuspend(b, g.currFunk.astFunc.Body(), false, false); err != nil {
return err
}
b.writes("} else {\n")
if err := g.writeResumeSuspend(b, g.currFunk.astFunc.Body(), false, true); err != nil {
return err
}
b.writes("}\n")
// Generate a coroutine switch similiar to the technique in
// https://www.chiark.greenend.org.uk/~sgtatham/coroutines.html
//
-1
View File
@@ -296,7 +296,6 @@ func (g *gen) visitVars(b *buffer, block []*a.Node, depth uint32, f func(*gen, *
return nil
}
// TODO: initBoolTypedVars is never used.
func (g *gen) writeResumeSuspend1(b *buffer, n *a.Var, suspend bool, initBoolTypedVars bool) error {
local := fmt.Sprintf("%s%s", vPrefix, n.Name().Str(g.tm))
+55 -36
View File
@@ -908,11 +908,14 @@ wuffs_deflate__status wuffs_deflate__decoder__decode(
}
}
v_z = self->private_impl.c_decode[0].v_z;
v_written = ((wuffs_base__slice_u8){});
v_n_copied = self->private_impl.c_decode[0].v_n_copied;
v_already_full = self->private_impl.c_decode[0].v_already_full;
uint32_t coro_susp_point = self->private_impl.c_decode[0].coro_susp_point;
if (coro_susp_point) {
v_z = self->private_impl.c_decode[0].v_z;
v_written = ((wuffs_base__slice_u8){});
v_n_copied = self->private_impl.c_decode[0].v_n_copied;
v_already_full = self->private_impl.c_decode[0].v_already_full;
} else {
}
switch (coro_susp_point) {
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
@@ -1044,10 +1047,13 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_blocks(
b_rend_src = b_rptr_src + len;
}
v_final = self->private_impl.c_decode_blocks[0].v_final;
v_type = self->private_impl.c_decode_blocks[0].v_type;
uint32_t coro_susp_point =
self->private_impl.c_decode_blocks[0].coro_susp_point;
if (coro_susp_point) {
v_final = self->private_impl.c_decode_blocks[0].v_final;
v_type = self->private_impl.c_decode_blocks[0].v_type;
} else {
}
switch (coro_susp_point) {
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
@@ -1248,10 +1254,13 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_uncompressed(
b_rend_src = b_rptr_src + len;
}
v_length = self->private_impl.c_decode_uncompressed[0].v_length;
v_n_copied = self->private_impl.c_decode_uncompressed[0].v_n_copied;
uint32_t coro_susp_point =
self->private_impl.c_decode_uncompressed[0].coro_susp_point;
if (coro_susp_point) {
v_length = self->private_impl.c_decode_uncompressed[0].v_length;
v_n_copied = self->private_impl.c_decode_uncompressed[0].v_n_copied;
} else {
}
switch (coro_susp_point) {
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
@@ -1371,9 +1380,12 @@ static wuffs_deflate__status wuffs_deflate__decoder__init_fixed_huffman(
uint32_t v_i;
v_i = self->private_impl.c_init_fixed_huffman[0].v_i;
uint32_t coro_susp_point =
self->private_impl.c_init_fixed_huffman[0].coro_susp_point;
if (coro_susp_point) {
v_i = self->private_impl.c_init_fixed_huffman[0].v_i;
} else {
}
switch (coro_susp_point) {
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
@@ -1458,21 +1470,25 @@ static wuffs_deflate__status wuffs_deflate__decoder__init_dynamic_huffman(
b_rend_src = b_rptr_src + len;
}
v_bits = self->private_impl.c_init_dynamic_huffman[0].v_bits;
v_n_bits = self->private_impl.c_init_dynamic_huffman[0].v_n_bits;
v_n_lit = self->private_impl.c_init_dynamic_huffman[0].v_n_lit;
v_n_dist = self->private_impl.c_init_dynamic_huffman[0].v_n_dist;
v_n_clen = self->private_impl.c_init_dynamic_huffman[0].v_n_clen;
v_i = self->private_impl.c_init_dynamic_huffman[0].v_i;
v_mask = self->private_impl.c_init_dynamic_huffman[0].v_mask;
v_table_entry = self->private_impl.c_init_dynamic_huffman[0].v_table_entry;
v_table_entry_n_bits =
self->private_impl.c_init_dynamic_huffman[0].v_table_entry_n_bits;
v_n_extra_bits = self->private_impl.c_init_dynamic_huffman[0].v_n_extra_bits;
v_rep_symbol = self->private_impl.c_init_dynamic_huffman[0].v_rep_symbol;
v_rep_count = self->private_impl.c_init_dynamic_huffman[0].v_rep_count;
uint32_t coro_susp_point =
self->private_impl.c_init_dynamic_huffman[0].coro_susp_point;
if (coro_susp_point) {
v_bits = self->private_impl.c_init_dynamic_huffman[0].v_bits;
v_n_bits = self->private_impl.c_init_dynamic_huffman[0].v_n_bits;
v_n_lit = self->private_impl.c_init_dynamic_huffman[0].v_n_lit;
v_n_dist = self->private_impl.c_init_dynamic_huffman[0].v_n_dist;
v_n_clen = self->private_impl.c_init_dynamic_huffman[0].v_n_clen;
v_i = self->private_impl.c_init_dynamic_huffman[0].v_i;
v_mask = self->private_impl.c_init_dynamic_huffman[0].v_mask;
v_table_entry = self->private_impl.c_init_dynamic_huffman[0].v_table_entry;
v_table_entry_n_bits =
self->private_impl.c_init_dynamic_huffman[0].v_table_entry_n_bits;
v_n_extra_bits =
self->private_impl.c_init_dynamic_huffman[0].v_n_extra_bits;
v_rep_symbol = self->private_impl.c_init_dynamic_huffman[0].v_rep_symbol;
v_rep_count = self->private_impl.c_init_dynamic_huffman[0].v_rep_count;
} else {
}
switch (coro_susp_point) {
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
@@ -2404,22 +2420,25 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_huffman_slow(
b_rend_src = b_rptr_src + len;
}
v_bits = self->private_impl.c_decode_huffman_slow[0].v_bits;
v_n_bits = self->private_impl.c_decode_huffman_slow[0].v_n_bits;
v_table_entry = self->private_impl.c_decode_huffman_slow[0].v_table_entry;
v_table_entry_n_bits =
self->private_impl.c_decode_huffman_slow[0].v_table_entry_n_bits;
v_lmask = self->private_impl.c_decode_huffman_slow[0].v_lmask;
v_dmask = self->private_impl.c_decode_huffman_slow[0].v_dmask;
v_redir_top = self->private_impl.c_decode_huffman_slow[0].v_redir_top;
v_redir_mask = self->private_impl.c_decode_huffman_slow[0].v_redir_mask;
v_length = self->private_impl.c_decode_huffman_slow[0].v_length;
v_distance = self->private_impl.c_decode_huffman_slow[0].v_distance;
v_n_copied = self->private_impl.c_decode_huffman_slow[0].v_n_copied;
v_hlen = self->private_impl.c_decode_huffman_slow[0].v_hlen;
v_hdist = self->private_impl.c_decode_huffman_slow[0].v_hdist;
uint32_t coro_susp_point =
self->private_impl.c_decode_huffman_slow[0].coro_susp_point;
if (coro_susp_point) {
v_bits = self->private_impl.c_decode_huffman_slow[0].v_bits;
v_n_bits = self->private_impl.c_decode_huffman_slow[0].v_n_bits;
v_table_entry = self->private_impl.c_decode_huffman_slow[0].v_table_entry;
v_table_entry_n_bits =
self->private_impl.c_decode_huffman_slow[0].v_table_entry_n_bits;
v_lmask = self->private_impl.c_decode_huffman_slow[0].v_lmask;
v_dmask = self->private_impl.c_decode_huffman_slow[0].v_dmask;
v_redir_top = self->private_impl.c_decode_huffman_slow[0].v_redir_top;
v_redir_mask = self->private_impl.c_decode_huffman_slow[0].v_redir_mask;
v_length = self->private_impl.c_decode_huffman_slow[0].v_length;
v_distance = self->private_impl.c_decode_huffman_slow[0].v_distance;
v_n_copied = self->private_impl.c_decode_huffman_slow[0].v_n_copied;
v_hlen = self->private_impl.c_decode_huffman_slow[0].v_hlen;
v_hdist = self->private_impl.c_decode_huffman_slow[0].v_hdist;
} else {
}
switch (coro_susp_point) {
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
+59 -30
View File
@@ -905,6 +905,9 @@ wuffs_gif__status wuffs_gif__decoder__decode_config(
uint32_t coro_susp_point =
self->private_impl.c_decode_config[0].coro_susp_point;
if (coro_susp_point) {
} else {
}
switch (coro_susp_point) {
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
@@ -1054,6 +1057,9 @@ wuffs_gif__status wuffs_gif__decoder__decode_frame(wuffs_gif__decoder* self,
uint32_t coro_susp_point =
self->private_impl.c_decode_frame[0].coro_susp_point;
if (coro_susp_point) {
} else {
}
switch (coro_susp_point) {
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
@@ -1187,10 +1193,13 @@ static wuffs_gif__status wuffs_gif__decoder__decode_header(
b_rend_src = b_rptr_src + len;
}
memcpy(v_c, self->private_impl.c_decode_header[0].v_c, sizeof(v_c));
v_i = self->private_impl.c_decode_header[0].v_i;
uint32_t coro_susp_point =
self->private_impl.c_decode_header[0].coro_susp_point;
if (coro_susp_point) {
memcpy(v_c, self->private_impl.c_decode_header[0].v_c, sizeof(v_c));
v_i = self->private_impl.c_decode_header[0].v_i;
} else {
}
switch (coro_susp_point) {
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
@@ -1275,10 +1284,13 @@ static wuffs_gif__status wuffs_gif__decoder__decode_lsd(
b_rend_src = b_rptr_src + len;
}
memcpy(v_c, self->private_impl.c_decode_lsd[0].v_c, sizeof(v_c));
v_i = self->private_impl.c_decode_lsd[0].v_i;
v_gct_size = self->private_impl.c_decode_lsd[0].v_gct_size;
uint32_t coro_susp_point = self->private_impl.c_decode_lsd[0].coro_susp_point;
if (coro_susp_point) {
memcpy(v_c, self->private_impl.c_decode_lsd[0].v_c, sizeof(v_c));
v_i = self->private_impl.c_decode_lsd[0].v_i;
v_gct_size = self->private_impl.c_decode_lsd[0].v_gct_size;
} else {
}
switch (coro_susp_point) {
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
@@ -1394,9 +1406,12 @@ static wuffs_gif__status wuffs_gif__decoder__decode_extension(
b_rend_src = b_rptr_src + len;
}
v_label = self->private_impl.c_decode_extension[0].v_label;
uint32_t coro_susp_point =
self->private_impl.c_decode_extension[0].coro_susp_point;
if (coro_susp_point) {
v_label = self->private_impl.c_decode_extension[0].v_label;
} else {
}
switch (coro_susp_point) {
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
@@ -1509,9 +1524,12 @@ static wuffs_gif__status wuffs_gif__decoder__skip_blocks(
b_rend_src = b_rptr_src + len;
}
v_block_size = self->private_impl.c_skip_blocks[0].v_block_size;
uint32_t coro_susp_point =
self->private_impl.c_skip_blocks[0].coro_susp_point;
if (coro_susp_point) {
v_block_size = self->private_impl.c_skip_blocks[0].v_block_size;
} else {
}
switch (coro_susp_point) {
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
@@ -1602,11 +1620,16 @@ static wuffs_gif__status wuffs_gif__decoder__decode_ae(
b_rend_src = b_rptr_src + len;
}
v_c = self->private_impl.c_decode_ae[0].v_c;
v_block_size = self->private_impl.c_decode_ae[0].v_block_size;
v_not_animexts = self->private_impl.c_decode_ae[0].v_not_animexts;
v_not_netscape = self->private_impl.c_decode_ae[0].v_not_netscape;
uint32_t coro_susp_point = self->private_impl.c_decode_ae[0].coro_susp_point;
if (coro_susp_point) {
v_c = self->private_impl.c_decode_ae[0].v_c;
v_block_size = self->private_impl.c_decode_ae[0].v_block_size;
v_not_animexts = self->private_impl.c_decode_ae[0].v_not_animexts;
v_not_netscape = self->private_impl.c_decode_ae[0].v_not_netscape;
} else {
v_not_animexts = false;
v_not_netscape = false;
}
switch (coro_susp_point) {
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
@@ -1825,14 +1848,17 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id(
b_rend_src = b_rptr_src + len;
}
v_flags = self->private_impl.c_decode_id[0].v_flags;
v_lct_size = self->private_impl.c_decode_id[0].v_lct_size;
v_i = self->private_impl.c_decode_id[0].v_i;
v_lw = self->private_impl.c_decode_id[0].v_lw;
v_block_size = self->private_impl.c_decode_id[0].v_block_size;
v_r = ((wuffs_base__reader1){});
v_z = self->private_impl.c_decode_id[0].v_z;
uint32_t coro_susp_point = self->private_impl.c_decode_id[0].coro_susp_point;
if (coro_susp_point) {
v_flags = self->private_impl.c_decode_id[0].v_flags;
v_lct_size = self->private_impl.c_decode_id[0].v_lct_size;
v_i = self->private_impl.c_decode_id[0].v_i;
v_lw = self->private_impl.c_decode_id[0].v_lw;
v_block_size = self->private_impl.c_decode_id[0].v_block_size;
v_r = ((wuffs_base__reader1){});
v_z = self->private_impl.c_decode_id[0].v_z;
} else {
}
switch (coro_susp_point) {
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
@@ -2172,19 +2198,22 @@ static wuffs_gif__status wuffs_gif__lzw_decoder__decode(
b_rend_src = b_rptr_src + len;
}
v_clear_code = self->private_impl.c_decode[0].v_clear_code;
v_end_code = self->private_impl.c_decode[0].v_end_code;
v_save_code = self->private_impl.c_decode[0].v_save_code;
v_prev_code = self->private_impl.c_decode[0].v_prev_code;
v_width = self->private_impl.c_decode[0].v_width;
v_bits = self->private_impl.c_decode[0].v_bits;
v_n_bits = self->private_impl.c_decode[0].v_n_bits;
v_code = self->private_impl.c_decode[0].v_code;
v_s = self->private_impl.c_decode[0].v_s;
v_c = self->private_impl.c_decode[0].v_c;
v_expansion = ((wuffs_base__slice_u8){});
v_n_copied = self->private_impl.c_decode[0].v_n_copied;
uint32_t coro_susp_point = self->private_impl.c_decode[0].coro_susp_point;
if (coro_susp_point) {
v_clear_code = self->private_impl.c_decode[0].v_clear_code;
v_end_code = self->private_impl.c_decode[0].v_end_code;
v_save_code = self->private_impl.c_decode[0].v_save_code;
v_prev_code = self->private_impl.c_decode[0].v_prev_code;
v_width = self->private_impl.c_decode[0].v_width;
v_bits = self->private_impl.c_decode[0].v_bits;
v_n_bits = self->private_impl.c_decode[0].v_n_bits;
v_code = self->private_impl.c_decode[0].v_code;
v_s = self->private_impl.c_decode[0].v_s;
v_c = self->private_impl.c_decode[0].v_c;
v_expansion = ((wuffs_base__slice_u8){});
v_n_copied = self->private_impl.c_decode[0].v_n_copied;
} else {
}
switch (coro_susp_point) {
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
+6 -3
View File
@@ -1008,10 +1008,13 @@ wuffs_zlib__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self,
b_rend_src = b_rptr_src + len;
}
v_x = self->private_impl.c_decode[0].v_x;
v_checksum = self->private_impl.c_decode[0].v_checksum;
v_z = self->private_impl.c_decode[0].v_z;
uint32_t coro_susp_point = self->private_impl.c_decode[0].coro_susp_point;
if (coro_susp_point) {
v_x = self->private_impl.c_decode[0].v_x;
v_checksum = self->private_impl.c_decode[0].v_checksum;
v_z = self->private_impl.c_decode[0].v_z;
} else {
}
switch (coro_susp_point) {
WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;