Rename skip / copy_n_etc to skip32 / copy_n32_etc

This commit is contained in:
Nigel Tao committed 2020-01-16 22:07:44 +11:00
1 parent 1dcb5a9283
commit 09ed091fe3
14 files changed
+138 -136

No files matched your search

+1 -1
View File
@@ -281,7 +281,7 @@ pri func decoder.decode_uncompressed?(dst: base.io_writer, src: base.io_reader)
}
length = length.low_bits(n: 16)
while true {
n_copied = args.dst.copy_n_from_reader!(n: length, r: args.src)
n_copied = args.dst.copy_n32_from_reader!(n: length, r: args.src)
if length <= n_copied {
return ok
}
+15 -15
View File
@@ -76,10 +76,10 @@ pri func decoder.decode_huffman_fast!(dst: base.io_writer, src: base.io_reader)
if n_bits < 15 {
assert n_bits >= 0 // TODO: this shouldn't be necessary.
bits |= args.src.peek_u8_as_u32() << n_bits
args.src.skip_fast!(actual: 1, worst_case: 1)
args.src.skip32_fast!(actual: 1, worst_case: 1)
n_bits += 8
bits |= args.src.peek_u8_as_u32() << n_bits
args.src.skip_fast!(actual: 1, worst_case: 1)
args.src.skip32_fast!(actual: 1, worst_case: 1)
n_bits += 8
assert n_bits >= 15
} else {
@@ -115,10 +115,10 @@ pri func decoder.decode_huffman_fast!(dst: base.io_writer, src: base.io_reader)
if n_bits < 15 {
assert n_bits >= 0 // TODO: this shouldn't be necessary.
bits |= args.src.peek_u8_as_u32() << n_bits
args.src.skip_fast!(actual: 1, worst_case: 1)
args.src.skip32_fast!(actual: 1, worst_case: 1)
n_bits += 8
bits |= args.src.peek_u8_as_u32() << n_bits
args.src.skip_fast!(actual: 1, worst_case: 1)
args.src.skip32_fast!(actual: 1, worst_case: 1)
n_bits += 8
assert n_bits >= 15
} else {
@@ -173,10 +173,10 @@ pri func decoder.decode_huffman_fast!(dst: base.io_writer, src: base.io_reader)
if n_bits < 15 {
assert n_bits >= 0 // TODO: this shouldn't be necessary.
bits |= args.src.peek_u8_as_u32() << n_bits
args.src.skip_fast!(actual: 1, worst_case: 1)
args.src.skip32_fast!(actual: 1, worst_case: 1)
n_bits += 8
bits |= args.src.peek_u8_as_u32() << n_bits
args.src.skip_fast!(actual: 1, worst_case: 1)
args.src.skip32_fast!(actual: 1, worst_case: 1)
n_bits += 8
assert n_bits >= 15
} else {
@@ -200,10 +200,10 @@ pri func decoder.decode_huffman_fast!(dst: base.io_writer, src: base.io_reader)
if n_bits < 15 {
assert n_bits >= 0 // TODO: this shouldn't be necessary.
bits |= args.src.peek_u8_as_u32() << n_bits
args.src.skip_fast!(actual: 1, worst_case: 1)
args.src.skip32_fast!(actual: 1, worst_case: 1)
n_bits += 8
bits |= args.src.peek_u8_as_u32() << n_bits
args.src.skip_fast!(actual: 1, worst_case: 1)
args.src.skip32_fast!(actual: 1, worst_case: 1)
n_bits += 8
assert n_bits >= 15
} else {
@@ -225,10 +225,10 @@ pri func decoder.decode_huffman_fast!(dst: base.io_writer, src: base.io_reader)
if n_bits < 15 {
assert n_bits >= 0 // TODO: this shouldn't be necessary.
bits |= args.src.peek_u8_as_u32() << n_bits
args.src.skip_fast!(actual: 1, worst_case: 1)
args.src.skip32_fast!(actual: 1, worst_case: 1)
n_bits += 8
bits |= args.src.peek_u8_as_u32() << n_bits
args.src.skip_fast!(actual: 1, worst_case: 1)
args.src.skip32_fast!(actual: 1, worst_case: 1)
n_bits += 8
assert n_bits >= 15
} else {
@@ -269,10 +269,10 @@ pri func decoder.decode_huffman_fast!(dst: base.io_writer, src: base.io_reader)
assert n_bits < 15 via "a < b: a < c; c <= b"(c: table_entry_n_bits)
assert n_bits >= 0 // TODO: this shouldn't be necessary.
bits |= args.src.peek_u8_as_u32() << n_bits
args.src.skip_fast!(actual: 1, worst_case: 1)
args.src.skip32_fast!(actual: 1, worst_case: 1)
n_bits += 8
bits |= args.src.peek_u8_as_u32() << n_bits
args.src.skip_fast!(actual: 1, worst_case: 1)
args.src.skip32_fast!(actual: 1, worst_case: 1)
n_bits += 8
assert table_entry_n_bits <= n_bits via "a <= b: a <= c; c <= b"(c: 16)
assert n_bits >= table_entry_n_bits via "a >= b: b <= a"()
@@ -330,13 +330,13 @@ pri func decoder.decode_huffman_fast!(dst: base.io_writer, src: base.io_reader)
// TODO: copy_from_slice32 should probably update the
// "args.dst.available() >= 258" fact. It should certainly
// invalidate any fact that was "<=" instead of ">=".
n_copied = args.dst.copy_n_from_slice!(
n_copied = args.dst.copy_n32_from_slice!(
n: hlen, s: this.history[hdist & 0x7FFF ..])
if hlen <= n_copied {
break
}
hlen -= n_copied
args.dst.copy_n_from_slice!(n: hlen, s: this.history[..])
args.dst.copy_n32_from_slice!(n: hlen, s: this.history[..])
break
}
@@ -359,7 +359,7 @@ pri func decoder.decode_huffman_fast!(dst: base.io_writer, src: base.io_reader)
assert (length as base.u64) <= args.dst.available() via "a <= b: a <= c; c <= b"(c: 258)
// Copy from args.dst.
args.dst.copy_n_from_history_fast!(n: length, distance: (dist_minus_1 + 1))
args.dst.copy_n32_from_history_fast!(n: length, distance: (dist_minus_1 + 1))
break
}
}
+3 -3
View File
@@ -226,7 +226,7 @@ pri func decoder.decode_huffman_slow?(dst: base.io_writer, src: base.io_reader)
// Copy from hdist to the end of this.history.
while true {
n_copied = args.dst.copy_n_from_slice!(
n_copied = args.dst.copy_n32_from_slice!(
n: hlen, s: this.history[hdist & 0x7FFF ..])
if hlen <= n_copied {
hlen = 0
@@ -245,7 +245,7 @@ pri func decoder.decode_huffman_slow?(dst: base.io_writer, src: base.io_reader)
// Copy from the start of this.history, if we wrapped around.
if hlen > 0 {
while true {
n_copied = args.dst.copy_n_from_slice!(
n_copied = args.dst.copy_n32_from_slice!(
n: hlen, s: this.history[hdist & 0x7FFF ..])
if hlen <= n_copied {
hlen = 0
@@ -264,7 +264,7 @@ pri func decoder.decode_huffman_slow?(dst: base.io_writer, src: base.io_reader)
}
// Copy from args.dst.
n_copied = args.dst.copy_n_from_history!(n: length, distance: (dist_minus_1 + 1))
n_copied = args.dst.copy_n32_from_history!(n: length, distance: (dist_minus_1 + 1))
if length <= n_copied {
length = 0
break
+12 -12
View File
@@ -253,7 +253,7 @@ pub func decoder.ack_metadata_chunk?(src: base.io_reader) {
// metadata passed to the caller.
this.metadata_chunk_length_value += 1
} else {
args.src.skip_fast!(actual: 1, worst_case: 1)
args.src.skip32_fast!(actual: 1, worst_case: 1)
}
this.metadata_io_position =
args.src.position() ~sat+ this.metadata_chunk_length_value
@@ -261,7 +261,7 @@ pub func decoder.ack_metadata_chunk?(src: base.io_reader) {
}
// Consume the '\x00' that means a zero-length block.
args.src.skip_fast!(actual: 1, worst_case: 1)
args.src.skip32_fast!(actual: 1, worst_case: 1)
}
this.call_sequence = 2
@@ -399,7 +399,7 @@ pri func decoder.skip_frame?(src: base.io_reader) {
// Skip the optional Local Color Table, 3 bytes (RGB) per entry.
flags = args.src.read_u8?()
if (flags & 0x80) <> 0 {
args.src.skip?(n: (3 as base.u32) << (1 + (flags & 0x07)))
args.src.skip32?(n: (3 as base.u32) << (1 + (flags & 0x07)))
}
// Process the LZW literal width.
@@ -516,7 +516,7 @@ pri func decoder.decode_lsd?(src: base.io_reader) {
flags = args.src.read_u8?()
background_color_index = args.src.read_u8?()
// Ignore the Pixel Aspect Ratio byte.
args.src.skip?(n: 1)
args.src.skip32?(n: 1)
// Read the optional Global Color Table.
i = 0
@@ -598,7 +598,7 @@ pri func decoder.skip_blocks?(src: base.io_reader) {
if block_size == 0 {
return ok
}
args.src.skip?(n: block_size as base.u32)
args.src.skip32?(n: block_size as base.u32)
}
}
@@ -646,7 +646,7 @@ pri func decoder.decode_ae?(src: base.io_reader) {
//
// Other extensions include XMP metadata.
if block_size <> 11 {
args.src.skip?(n: block_size as base.u32)
args.src.skip32?(n: block_size as base.u32)
break
}
is_animexts = true
@@ -668,12 +668,12 @@ pri func decoder.decode_ae?(src: base.io_reader) {
// count.
block_size = args.src.read_u8?()
if block_size <> 3 {
args.src.skip?(n: block_size as base.u32)
args.src.skip32?(n: block_size as base.u32)
break
}
c = args.src.read_u8?()
if c <> 0x01 {
args.src.skip?(n: 2)
args.src.skip32?(n: 2)
break
}
this.num_loops = args.src.read_u16le_as_u32?()
@@ -703,7 +703,7 @@ pri func decoder.decode_ae?(src: base.io_reader) {
yield? base."$short read"
}
this.metadata_chunk_length_value = args.src.peek_u8_as_u64()
args.src.skip_fast!(actual: 1, worst_case: 1)
args.src.skip32_fast!(actual: 1, worst_case: 1)
this.metadata_fourcc_value = 0x49434350 // "ICCP"
this.metadata_io_position = args.src.position() ~sat+ this.metadata_chunk_length_value
this.call_sequence = 1
@@ -722,7 +722,7 @@ pri func decoder.decode_ae?(src: base.io_reader) {
// metadata passed to the caller.
this.metadata_chunk_length_value += 1
} else {
args.src.skip_fast!(actual: 1, worst_case: 1)
args.src.skip32_fast!(actual: 1, worst_case: 1)
}
this.metadata_fourcc_value = 0x584D5020 // "XMP "
this.metadata_io_position = args.src.position() ~sat+ this.metadata_chunk_length_value
@@ -962,7 +962,7 @@ pri func decoder.decode_id_part2?(dst: ptr base.pixel_buffer, src: base.io_reade
break
}
block_size = args.src.peek_u8_as_u64()
args.src.skip_fast!(actual: 1, worst_case: 1)
args.src.skip32_fast!(actual: 1, worst_case: 1)
}
if decoder_workbuf_len_max_incl_worst_case > args.workbuf.length() {
@@ -993,7 +993,7 @@ pri func decoder.decode_id_part2?(dst: ptr base.pixel_buffer, src: base.io_reade
// Skip any trailing blocks.
if need_block_size or (block_size > 0) {
args.src.skip?(n: block_size as base.u32)
args.src.skip32?(n: block_size as base.u32)
this.skip_blocks?(src: args.src)
}
+3 -3
View File
@@ -68,12 +68,12 @@ pub func decoder.transform_io?(dst: base.io_writer, src: base.io_reader, workbuf
}
flags = args.src.read_u8?()
// TODO: API for returning the header's MTIME field.
args.src.skip?(n: 6)
args.src.skip32?(n: 6)
// Handle FEXTRA.
if (flags & 0x04) <> 0 {
xlen = args.src.read_u16le?()
args.src.skip?(n: xlen as base.u32)
args.src.skip32?(n: xlen as base.u32)
}
// Handle FNAME.
@@ -102,7 +102,7 @@ pub func decoder.transform_io?(dst: base.io_writer, src: base.io_reader, workbuf
// Handle FHCRC.
if (flags & 0x02) <> 0 {
args.src.skip?(n: 2)
args.src.skip32?(n: 2)
}
// Reserved flags bits must be zero.
+3 -3
View File
@@ -159,7 +159,7 @@ pri func decoder.read_from!(src: base.io_reader) {
// Read 4 bytes, using the "Variant 4" technique of
// https://fgiesen.wordpress.com/2018/02/20/reading-bits-in-far-too-many-ways-part-2/
bits |= args.src.peek_u32le() ~mod<< n_bits
args.src.skip_fast!(actual: (31 - n_bits) >> 3, worst_case: 3)
args.src.skip32_fast!(actual: (31 - n_bits) >> 3, worst_case: 3)
n_bits |= 24
assert width <= n_bits via "a <= b: a <= c; c <= b"(c: 12)
assert n_bits >= width via "a >= b: b <= a"()
@@ -168,7 +168,7 @@ pri func decoder.read_from!(src: base.io_reader) {
break
} else {
bits |= args.src.peek_u8_as_u32() << n_bits
args.src.skip_fast!(actual: 1, worst_case: 1)
args.src.skip32_fast!(actual: 1, worst_case: 1)
n_bits += 8
if n_bits >= width {
// No-op.
@@ -177,7 +177,7 @@ pri func decoder.read_from!(src: base.io_reader) {
break
} else {
bits |= args.src.peek_u8_as_u32() << n_bits
args.src.skip_fast!(actual: 1, worst_case: 1)
args.src.skip32_fast!(actual: 1, worst_case: 1)
n_bits += 8
assert width <= n_bits via "a <= b: a <= c; c <= b"(c: 12)
assert n_bits >= width via "a >= b: b <= a"()
+1 -1
View File
@@ -208,7 +208,7 @@ pri func decoder.skip_frame?(src: base.io_reader) {
total_bytes = bytes_per_row * (this.height as base.u64)
// TODO: total_bytes may be larger than UINT32_MAX.
args.src.skip?(n: (total_bytes & 0xFFFFFFFF) as base.u32)
args.src.skip32?(n: (total_bytes & 0xFFFFFFFF) as base.u32)
this.seen_frame = true
this.call_sequence = 2