Call memset instead of using an explicit loop.

This commit is contained in:
Nigel Tao committed 2017-07-28 16:24:47 +10:00
1 parent 23a4aeb7ce
commit 7fe783d785
3 files changed
+36 -68

No files matched your search

+12 -20
View File
@@ -481,7 +481,8 @@ func (g *gen) visitVars(block []*a.Node, depth uint32, f func(*gen, *a.Var) erro
}
func (g *gen) writeResumeSuspend1(n *a.Var, prefix string, suspend bool) error {
lhs := fmt.Sprintf("%s%s", prefix, n.Name().String(g.tm))
local := fmt.Sprintf("%s%s", prefix, n.Name().String(g.tm))
lhs := local
// TODO: don't hard-code [0], and allow recursive coroutines.
rhs := fmt.Sprintf("self->private_impl.%s%s[0].%s", cPrefix, g.perFunc.funk.Name().String(g.tm), lhs)
if suspend {
@@ -497,21 +498,9 @@ func (g *gen) writeResumeSuspend1(n *a.Var, prefix string, suspend bool) error {
if inner.Decorator() != 0 {
break
}
multiplier := 0
switch inner.Name().Key() {
case t.KeyU8:
multiplier = 1
case t.KeyU16:
multiplier = 2
case t.KeyU32:
multiplier = 4
case t.KeyU64:
multiplier = 8
}
cv := typ.ArrayLength().ConstValue()
// TODO: check that multiplier * cv is within size_t's range.
if multiplier != 0 {
g.printf("memcpy(%s, %s, %d * %v);\n", lhs, rhs, multiplier, cv)
case t.KeyU8, t.KeyU16, t.KeyU32, t.KeyU64:
g.printf("memcpy(%s, %s, sizeof(%s));\n", lhs, rhs, local)
return nil
}
}
@@ -695,13 +684,16 @@ func (g *gen) writeStatement(n *a.Node, depth uint32) error {
}
if n.XType().Decorator().Key() == t.KeyOpenBracket {
if n.Value() != nil {
// TODO: something like:
// cv := n.XType().ArrayLength().ConstValue()
// // TODO: check that cv is within size_t's range.
// g.printf("{ size_t i; for (i = 0; i < %d; i++) { %s%s[i] = $DEFAULT_VALUE; }}\n",
// cv, vPrefix, n.Name().String(g.tm))
return fmt.Errorf("TODO: array initializers for non-zero default values")
}
// TODO: arrays of arrays.
cv := n.XType().ArrayLength().ConstValue()
// TODO: check that cv is within size_t's range.
g.printf("{ size_t i; for (i = 0; i < %d; i++) { %s%s[i] = 0; }}\n",
cv, vPrefix, n.Name().String(g.tm))
name := n.Name().String(g.tm)
g.printf("memset(%s%s, 0, sizeof(%s%s));\n", vPrefix, name, vPrefix, name)
} else {
g.printf("%s%s = ", vPrefix, n.Name().String(g.tm))
if v := n.Value(); v != nil {
@@ -711,8 +703,8 @@ func (g *gen) writeStatement(n *a.Node, depth uint32) error {
} else {
g.writeb('0')
}
g.writes(";\n")
}
g.writes(";\n")
return nil
case a.KWhile:
+15 -24
View File
@@ -1360,13 +1360,16 @@ puffs_flate_status puffs_flate_decoder_init_huff(puffs_flate_decoder* self,
uint32_t coro_susp_point = self->private_impl.c_init_huff[0].coro_susp_point;
if (coro_susp_point) {
memcpy(v_counts, self->private_impl.c_init_huff[0].v_counts, 2 * 16);
memcpy(v_counts, self->private_impl.c_init_huff[0].v_counts,
sizeof(v_counts));
v_i = self->private_impl.c_init_huff[0].v_i;
v_remaining = self->private_impl.c_init_huff[0].v_remaining;
memcpy(v_offsets, self->private_impl.c_init_huff[0].v_offsets, 2 * 16);
memcpy(v_offsets, self->private_impl.c_init_huff[0].v_offsets,
sizeof(v_offsets));
v_n_symbols = self->private_impl.c_init_huff[0].v_n_symbols;
v_count = self->private_impl.c_init_huff[0].v_count;
memcpy(v_symbols, self->private_impl.c_init_huff[0].v_symbols, 2 * 320);
memcpy(v_symbols, self->private_impl.c_init_huff[0].v_symbols,
sizeof(v_symbols));
v_max_cl = self->private_impl.c_init_huff[0].v_max_cl;
v_prev_cl = self->private_impl.c_init_huff[0].v_prev_cl;
v_code = self->private_impl.c_init_huff[0].v_code;
@@ -1380,12 +1383,7 @@ puffs_flate_status puffs_flate_decoder_init_huff(puffs_flate_decoder* self,
switch (coro_susp_point) {
PUFFS_COROUTINE_SUSPENSION_POINT(0);
{
size_t i;
for (i = 0; i < 16; i++) {
v_counts[i] = 0;
}
};
memset(v_counts, 0, sizeof(v_counts));
v_i = a_n_codes0;
while (v_i < a_n_codes1) {
if (v_counts[self->private_impl.f_code_lengths[v_i]] >= 320) {
@@ -1420,12 +1418,7 @@ puffs_flate_status puffs_flate_decoder_init_huff(puffs_flate_decoder* self,
status = PUFFS_FLATE_ERROR_BAD_HUFFMAN_CODE_UNDER_SUBSCRIBED;
goto exit;
}
{
size_t i;
for (i = 0; i < 16; i++) {
v_offsets[i] = 0;
}
};
memset(v_offsets, 0, sizeof(v_offsets));
v_n_symbols = 0;
v_i = 1;
while (v_i <= 15) {
@@ -1444,12 +1437,7 @@ puffs_flate_status puffs_flate_decoder_init_huff(puffs_flate_decoder* self,
PUFFS_FLATE_ERROR_INTERNAL_ERROR_INCONSISTENT_HUFFMAN_DECODER_STATE;
goto exit;
}
{
size_t i;
for (i = 0; i < 320; i++) {
v_symbols[i] = 0;
}
};
memset(v_symbols, 0, sizeof(v_symbols));
v_i = a_n_codes0;
while (v_i < a_n_codes1) {
if (v_i < a_n_codes0) {
@@ -1572,13 +1560,16 @@ puffs_flate_status puffs_flate_decoder_init_huff(puffs_flate_decoder* self,
goto suspend;
suspend:
self->private_impl.c_init_huff[0].coro_susp_point = coro_susp_point;
memcpy(self->private_impl.c_init_huff[0].v_counts, v_counts, 2 * 16);
memcpy(self->private_impl.c_init_huff[0].v_counts, v_counts,
sizeof(v_counts));
self->private_impl.c_init_huff[0].v_i = v_i;
self->private_impl.c_init_huff[0].v_remaining = v_remaining;
memcpy(self->private_impl.c_init_huff[0].v_offsets, v_offsets, 2 * 16);
memcpy(self->private_impl.c_init_huff[0].v_offsets, v_offsets,
sizeof(v_offsets));
self->private_impl.c_init_huff[0].v_n_symbols = v_n_symbols;
self->private_impl.c_init_huff[0].v_count = v_count;
memcpy(self->private_impl.c_init_huff[0].v_symbols, v_symbols, 2 * 320);
memcpy(self->private_impl.c_init_huff[0].v_symbols, v_symbols,
sizeof(v_symbols));
self->private_impl.c_init_huff[0].v_max_cl = v_max_cl;
self->private_impl.c_init_huff[0].v_prev_cl = v_prev_cl;
self->private_impl.c_init_huff[0].v_code = v_code;
+9 -24
View File
@@ -635,18 +635,13 @@ puffs_gif_status puffs_gif_decoder_decode_header(puffs_gif_decoder* self,
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, 1 * 6);
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;
}
switch (coro_susp_point) {
PUFFS_COROUTINE_SUSPENSION_POINT(0);
{
size_t i;
for (i = 0; i < 6; i++) {
v_c[i] = 0;
}
};
memset(v_c, 0, sizeof(v_c));
v_i = 0;
while (v_i < 6) {
PUFFS_COROUTINE_SUSPENSION_POINT(1);
@@ -669,7 +664,7 @@ puffs_gif_status puffs_gif_decoder_decode_header(puffs_gif_decoder* self,
goto suspend;
suspend:
self->private_impl.c_decode_header[0].coro_susp_point = coro_susp_point;
memcpy(self->private_impl.c_decode_header[0].v_c, v_c, 1 * 6);
memcpy(self->private_impl.c_decode_header[0].v_c, v_c, sizeof(v_c));
self->private_impl.c_decode_header[0].v_i = v_i;
exit:
@@ -722,19 +717,14 @@ puffs_gif_status puffs_gif_decoder_decode_lsd(puffs_gif_decoder* self,
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, 1 * 7);
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;
}
switch (coro_susp_point) {
PUFFS_COROUTINE_SUSPENSION_POINT(0);
{
size_t i;
for (i = 0; i < 7; i++) {
v_c[i] = 0;
}
};
memset(v_c, 0, sizeof(v_c));
v_i = 0;
while (v_i < 7) {
PUFFS_COROUTINE_SUSPENSION_POINT(1);
@@ -782,7 +772,7 @@ puffs_gif_status puffs_gif_decoder_decode_lsd(puffs_gif_decoder* self,
goto suspend;
suspend:
self->private_impl.c_decode_lsd[0].coro_susp_point = coro_susp_point;
memcpy(self->private_impl.c_decode_lsd[0].v_c, v_c, 1 * 7);
memcpy(self->private_impl.c_decode_lsd[0].v_c, v_c, sizeof(v_c));
self->private_impl.c_decode_lsd[0].v_i = v_i;
self->private_impl.c_decode_lsd[0].v_gct_size = v_gct_size;
@@ -950,7 +940,7 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self,
uint32_t coro_susp_point = self->private_impl.c_decode_id[0].coro_susp_point;
if (coro_susp_point) {
memcpy(v_c, self->private_impl.c_decode_id[0].v_c, 1 * 9);
memcpy(v_c, self->private_impl.c_decode_id[0].v_c, sizeof(v_c));
v_i = self->private_impl.c_decode_id[0].v_i;
v_interlace = self->private_impl.c_decode_id[0].v_interlace;
v_lw = self->private_impl.c_decode_id[0].v_lw;
@@ -961,12 +951,7 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self,
switch (coro_susp_point) {
PUFFS_COROUTINE_SUSPENSION_POINT(0);
{
size_t i;
for (i = 0; i < 9; i++) {
v_c[i] = 0;
}
};
memset(v_c, 0, sizeof(v_c));
v_i = 0;
while (v_i < 9) {
PUFFS_COROUTINE_SUSPENSION_POINT(1);
@@ -1048,7 +1033,7 @@ puffs_gif_status puffs_gif_decoder_decode_id(puffs_gif_decoder* self,
goto suspend;
suspend:
self->private_impl.c_decode_id[0].coro_susp_point = coro_susp_point;
memcpy(self->private_impl.c_decode_id[0].v_c, v_c, 1 * 9);
memcpy(self->private_impl.c_decode_id[0].v_c, v_c, sizeof(v_c));
self->private_impl.c_decode_id[0].v_i = v_i;
self->private_impl.c_decode_id[0].v_interlace = v_interlace;
self->private_impl.c_decode_id[0].v_lw = v_lw;