diff options
Diffstat (limited to 'src/evaluate.c')
-rw-r--r-- | src/evaluate.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/evaluate.c b/src/evaluate.c index 0fad0913..f52a0843 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -1869,6 +1869,20 @@ static int stmt_evaluate_payload(struct eval_ctx *ctx, struct stmt *stmt) shift_imm = expr_offset_shift(payload, payload->payload.offset, &extra_len); + payload_byte_size = round_up(payload->len, BITS_PER_BYTE) / BITS_PER_BYTE; + payload_byte_size += (extra_len / BITS_PER_BYTE); + + if (need_csum && payload_byte_size & 1) { + payload_byte_size++; + + if (payload_byte_offset & 1) { /* prefer 16bit aligned fetch */ + payload_byte_offset--; + assert(payload->payload.offset >= BITS_PER_BYTE); + } else { + shift_imm += BITS_PER_BYTE; + } + } + if (shift_imm) { struct expr *off; @@ -1885,17 +1899,6 @@ static int stmt_evaluate_payload(struct eval_ctx *ctx, struct stmt *stmt) stmt->payload.val = binop; } - payload_byte_size = round_up(payload->len, BITS_PER_BYTE) / BITS_PER_BYTE; - payload_byte_size += (extra_len / BITS_PER_BYTE); - - if (need_csum && payload_byte_size & 1) { - payload_byte_size++; - - if (payload_byte_offset & 1) { /* prefer 16bit aligned fetch */ - payload_byte_offset--; - assert(payload->payload.offset >= BITS_PER_BYTE); - } - } masklen = payload_byte_size * BITS_PER_BYTE; mpz_init_bitmask(ff, masklen); |