Be explicit in the since_mark length typecast

This commit is contained in:
Nigel Tao committed 2018-05-02 17:10:10 +10:00
1 parent 394e846061
commit af403d94bf
5 files changed
+53 -53

No files matched your search

+2 -9
View File
@@ -178,7 +178,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
if isInSrc(g.tm, n, t.IDSinceMark, 0) {
b.printf("((wuffs_base__slice_u8){ "+
".ptr = %ssrc.private_impl.bounds[0], "+
".len = %srptr_src - %ssrc.private_impl.bounds[0], })",
".len = (size_t)(%srptr_src - %ssrc.private_impl.bounds[0]), })",
aPrefix, bPrefix, aPrefix)
return nil
}
@@ -196,7 +196,7 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
if isInDst(g.tm, n, t.IDSinceMark, 0) {
b.printf("((wuffs_base__slice_u8){ "+
".ptr = %sdst.private_impl.bounds[0], "+
".len = %swptr_dst - %sdst.private_impl.bounds[0], })",
".len = (size_t)(%swptr_dst - %sdst.private_impl.bounds[0]), })",
aPrefix, bPrefix, aPrefix)
return nil
}
@@ -335,13 +335,6 @@ func (g *gen) writeExprOther(b *buffer, n *a.Expr, rp replacementPolicy, pp pare
b.printf("wuffs_base__io_reader__mark(&v_r, b_rptr_src)")
return nil
}
if isThatMethod(g.tm, n, t.IDSinceMark, 0) {
// TODO: don't hard-code v_r or b_rptr_src.
b.printf("((wuffs_base__slice_u8){ " +
".ptr = v_r.private_impl.bounds[0], " +
".len = b_rptr_src - v_r.private_impl.bounds[0], })")
return nil
}
if isThatMethod(g.tm, n, g.tm.ByName("initialize"), 5) {
// TODO: don't hard-code a_dst.
b.printf("wuffs_base__image_config__initialize(a_dst")
+35 -30
View File
@@ -1933,7 +1933,7 @@ wuffs_deflate__status wuffs_deflate__decoder__decode(
}
v_written = ((wuffs_base__slice_u8){
.ptr = a_dst.private_impl.bounds[0],
.len = b_wptr_dst - a_dst.private_impl.bounds[0],
.len = (size_t)(b_wptr_dst - a_dst.private_impl.bounds[0]),
});
if (((uint64_t)(v_written.len)) >= 32768) {
v_written = wuffs_base__slice_u8_suffix(v_written, 32768);
@@ -3313,19 +3313,21 @@ label_0_continue:;
v_n_copied = 0;
while (true) {
if (((uint64_t)((v_dist_minus_1 + 1))) >
((uint64_t)(((wuffs_base__slice_u8){
.ptr = a_dst.private_impl.bounds[0],
.len = b_wptr_dst - a_dst.private_impl.bounds[0],
})
.len))) {
((uint64_t)(
((wuffs_base__slice_u8){
.ptr = a_dst.private_impl.bounds[0],
.len = (size_t)(b_wptr_dst - a_dst.private_impl.bounds[0]),
})
.len))) {
v_hlen = 0;
v_hdist = ((uint32_t)(
(((uint64_t)((v_dist_minus_1 + 1))) -
((uint64_t)(((wuffs_base__slice_u8){
.ptr = a_dst.private_impl.bounds[0],
.len = b_wptr_dst - a_dst.private_impl.bounds[0],
})
.len)))));
v_hdist = ((uint32_t)((
((uint64_t)((v_dist_minus_1 + 1))) -
((uint64_t)(
((wuffs_base__slice_u8){
.ptr = a_dst.private_impl.bounds[0],
.len = (size_t)(b_wptr_dst - a_dst.private_impl.bounds[0]),
})
.len)))));
if (v_length > v_hdist) {
v_length -= v_hdist;
v_hlen = v_hdist;
@@ -3367,11 +3369,12 @@ label_0_continue:;
goto label_0_continue;
}
if (((uint64_t)((v_dist_minus_1 + 1))) >
((uint64_t)(((wuffs_base__slice_u8){
.ptr = a_dst.private_impl.bounds[0],
.len = b_wptr_dst - a_dst.private_impl.bounds[0],
})
.len))) {
((uint64_t)(
((wuffs_base__slice_u8){
.ptr = a_dst.private_impl.bounds[0],
.len = (size_t)(b_wptr_dst - a_dst.private_impl.bounds[0]),
})
.len))) {
status = WUFFS_DEFLATE__ERROR_INTERNAL_ERROR_INCONSISTENT_DISTANCE;
goto exit;
}
@@ -3739,19 +3742,21 @@ static wuffs_deflate__status wuffs_deflate__decoder__decode_huffman_slow(
v_n_copied = 0;
while (true) {
if (((uint64_t)((v_dist_minus_1 + 1))) >
((uint64_t)(((wuffs_base__slice_u8){
.ptr = a_dst.private_impl.bounds[0],
.len = b_wptr_dst - a_dst.private_impl.bounds[0],
})
.len))) {
((uint64_t)(
((wuffs_base__slice_u8){
.ptr = a_dst.private_impl.bounds[0],
.len = (size_t)(b_wptr_dst - a_dst.private_impl.bounds[0]),
})
.len))) {
v_hlen = 0;
v_hdist = ((uint32_t)((
((uint64_t)((v_dist_minus_1 + 1))) -
((uint64_t)(((wuffs_base__slice_u8){
.ptr = a_dst.private_impl.bounds[0],
.len = b_wptr_dst - a_dst.private_impl.bounds[0],
})
.len)))));
v_hdist = ((uint32_t)(
(((uint64_t)((v_dist_minus_1 + 1))) -
((uint64_t)(((wuffs_base__slice_u8){
.ptr = a_dst.private_impl.bounds[0],
.len = (size_t)(b_wptr_dst -
a_dst.private_impl.bounds[0]),
})
.len)))));
if (v_length > v_hdist) {
v_length -= v_hdist;
v_hlen = v_hdist;
+6 -5
View File
@@ -3181,11 +3181,12 @@ static wuffs_gif__status wuffs_gif__decoder__decode_id(
}
wuffs_base__u64__sat_sub_indirect(
&v_block_size,
((uint64_t)(((wuffs_base__slice_u8){
.ptr = a_src.private_impl.bounds[0],
.len = b_rptr_src - a_src.private_impl.bounds[0],
})
.len)));
((uint64_t)(
((wuffs_base__slice_u8){
.ptr = a_src.private_impl.bounds[0],
.len = (size_t)(b_rptr_src - a_src.private_impl.bounds[0]),
})
.len)));
if ((v_block_size == 0) && (v_z == WUFFS_GIF__SUSPENSION_SHORT_READ)) {
goto label_1_break;
}
+9 -8
View File
@@ -2250,15 +2250,16 @@ wuffs_gzip__status wuffs_gzip__decoder__decode(wuffs_gzip__decoder* self,
&self->private_impl.f_checksum,
((wuffs_base__slice_u8){
.ptr = a_dst.private_impl.bounds[0],
.len = b_wptr_dst - a_dst.private_impl.bounds[0],
.len = (size_t)(b_wptr_dst - a_dst.private_impl.bounds[0]),
}));
v_decoded_length_got += ((uint32_t)(
(((uint64_t)(((wuffs_base__slice_u8){
.ptr = a_dst.private_impl.bounds[0],
.len = b_wptr_dst - a_dst.private_impl.bounds[0],
})
.len)) &
4294967295)));
v_decoded_length_got += ((uint32_t)((
((uint64_t)(
((wuffs_base__slice_u8){
.ptr = a_dst.private_impl.bounds[0],
.len = (size_t)(b_wptr_dst - a_dst.private_impl.bounds[0]),
})
.len)) &
4294967295)));
}
if (v_z == 0) {
goto label_2_break;
+1 -1
View File
@@ -2153,7 +2153,7 @@ wuffs_zlib__status wuffs_zlib__decoder__decode(wuffs_zlib__decoder* self,
&self->private_impl.f_checksum,
((wuffs_base__slice_u8){
.ptr = a_dst.private_impl.bounds[0],
.len = b_wptr_dst - a_dst.private_impl.bounds[0],
.len = (size_t)(b_wptr_dst - a_dst.private_impl.bounds[0]),
}));
}
if (v_z == 0) {