Change cgen's limit from a count to a pointer.

This commit is contained in:
Nigel Tao committed 2017-10-27 10:28:35 +11:00
1 parent 3485950a3f
commit aa396e7992
12 files changed
+298 -278

No files matched your search

+9 -9
View File
@@ -189,14 +189,14 @@ const char* puffs_flate_decode(puffs_base__buf1* dst,
uint64_t rlimit) {
puffs_flate__flate_decoder dec;
puffs_flate__flate_decoder__initialize(&dec, PUFFS_VERSION, 0);
puffs_base__writer1 dst_writer = {.buf = dst};
puffs_base__reader1 src_reader = {.buf = src};
while (true) {
puffs_base__writer1 dst_writer = {.buf = dst};
if (wlimit) {
puffs_base__writer1__limit(&dst_writer, wlimit);
puffs_base__writer1__limit(&dst_writer, dst->ptr + dst->wi, wlimit);
}
puffs_base__reader1 src_reader = {.buf = src};
if (rlimit) {
puffs_base__reader1__limit(&src_reader, rlimit);
puffs_base__reader1__limit(&src_reader, src->ptr + src->ri, rlimit);
}
puffs_flate__status s =
@@ -219,15 +219,15 @@ const char* puffs_zlib_decode(puffs_base__buf1* dst,
uint64_t rlimit) {
puffs_flate__zlib_decoder dec;
puffs_flate__zlib_decoder__initialize(&dec, PUFFS_VERSION, 0);
puffs_base__writer1 dst_writer = {.buf = dst};
puffs_base__reader1 src_reader = {.buf = src};
while (true) {
puffs_base__writer1 dst_writer = {.buf = dst};
if (wlimit) {
puffs_base__writer1__limit(&dst_writer, wlimit);
puffs_base__writer1__limit(&dst_writer, dst->ptr + dst->wi, wlimit);
}
puffs_base__reader1 src_reader = {.buf = src};
if (rlimit) {
puffs_base__reader1__limit(&src_reader, rlimit);
puffs_base__reader1__limit(&src_reader, src->ptr + src->ri, rlimit);
}
puffs_flate__status s =
@@ -373,7 +373,7 @@ bool do_test_puffs_flate_history(int i,
dec->private_impl.f_history_index = starting_history_index;
puffs_base__writer1__limit(&dst_writer, limit);
puffs_base__writer1__limit(&dst_writer, got->ptr + got->wi, limit);
puffs_flate__status got_s =
puffs_flate__flate_decoder__decode(dec, dst_writer, src_reader);
+10 -11
View File
@@ -229,16 +229,16 @@ bool do_test_puffs_gif_lzw_decode(const char* src_filename,
puffs_gif__lzw_decoder dec;
puffs_gif__lzw_decoder__initialize(&dec, PUFFS_VERSION, 0);
puffs_gif__lzw_decoder__set_literal_width(&dec, literal_width);
puffs_base__writer1 got_writer = {.buf = &got};
puffs_base__reader1 src_reader = {.buf = &src};
int num_iters = 0;
while (true) {
num_iters++;
puffs_base__writer1 got_writer = {.buf = &got};
if (wlimit) {
puffs_base__writer1__limit(&got_writer, wlimit);
puffs_base__writer1__limit(&got_writer, got.ptr + got.wi, wlimit);
}
puffs_base__reader1 src_reader = {.buf = &src};
if (rlimit) {
puffs_base__reader1__limit(&src_reader, rlimit);
puffs_base__reader1__limit(&src_reader, src.ptr + src.ri, rlimit);
}
size_t old_wi = got.wi;
size_t old_ri = src.ri;
@@ -408,16 +408,16 @@ bool do_test_puffs_gif_decode(const char* filename,
puffs_gif__decoder dec;
puffs_gif__decoder__initialize(&dec, PUFFS_VERSION, 0);
puffs_base__writer1 got_writer = {.buf = &got};
puffs_base__reader1 src_reader = {.buf = &src};
int num_iters = 0;
while (true) {
num_iters++;
puffs_base__writer1 got_writer = {.buf = &got};
if (wlimit) {
puffs_base__writer1__limit(&got_writer, wlimit);
puffs_base__writer1__limit(&got_writer, got.ptr + got.wi, wlimit);
}
puffs_base__reader1 src_reader = {.buf = &src};
if (rlimit) {
puffs_base__reader1__limit(&src_reader, rlimit);
puffs_base__reader1__limit(&src_reader, src.ptr + src.ri, rlimit);
}
size_t old_wi = got.wi;
size_t old_ri = src.ri;
@@ -727,9 +727,8 @@ proc tests[] = {
// GIF Tests
test_puffs_gif_decode_input_is_a_gif, //
// TODO: uncomment.
// test_puffs_gif_decode_input_is_a_gif_many_big_reads, //
// test_puffs_gif_decode_input_is_a_gif_many_medium_reads, //
test_puffs_gif_decode_input_is_a_gif_many_big_reads, //
test_puffs_gif_decode_input_is_a_gif_many_medium_reads, //
test_puffs_gif_decode_input_is_a_gif_many_small_writes_reads, //
test_puffs_gif_decode_input_is_a_png, //