mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2025-01-20 09:17:29 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactored _writeUnsigned with _writeRaw with unsigned bit limits

Browse Source
This commit is contained in:
Collin Smith 2020-08-09 23:11:48 -07:00
parent f901989e14
commit 66840f94d7
1 changed files with 2 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
core/src/com/riiablo/io/BitOutput.java
View File

@ -66,45 +66,7 @@ public class BitOutput {
assert bits > 0 : "bits(" + bits + ") <= " + 0; assert bits > 0 : "bits(" + bits + ") <= " + 0;
assert bits < Long.SIZE : "bits(" + bits + ") > " + (Long.SIZE - 1); assert bits < Long.SIZE : "bits(" + bits + ") > " + (Long.SIZE - 1);
assert (value & ~MASKS[bits]) == 0 : "value(" + value + ") is larger than bits(" + bits + ")"; assert (value & ~MASKS[bits]) == 0 : "value(" + value + ") is larger than bits(" + bits + ")";
incrementBitsWritten(bits); _writeRaw(value, bits);
cache |= (value << bitsCached);
bitsCached += bits;
if (bitsCached > Long.SIZE) {
writeCacheSafe(value, bits);
} else {
writeCacheUnsafe(bits);
}
}
private void writeCacheSafe(long value, int bits) {
assert bits > 0 : "bits(" + bits + ") < " + 1;
assert bits < Long.SIZE : "bits(" + bits + ") > " + (Long.SIZE - 1);
assert bitsCached > Long.SIZE : "bitsCached(" + bitsCached + ") <= " + Long.SIZE;
assert bitsCached - bits < Byte.SIZE : "bitsCached(" + bitsCached + ") - bits(" + bits + ") > " + (Byte.SIZE - 1);
final int overflowBits = bitsCached - Long.SIZE;
final int overflowShift = Long.SIZE - overflowBits;
for (; bitsCached >= Byte.SIZE; bitsCached -= Byte.SIZE) {
final long octet = cache & 0xFF;
byteOutput._write8(octet);
cache >>>= Byte.SIZE;
}
assert overflowBits > 0 : "overflowBits(" + overflowBits + ") < " + 1;
cache = (value >>> overflowShift) & MASKS[overflowBits];
}
private void writeCacheUnsafe(int bits) {
assert bits > 0 : "bits(" + bits + ") < " + 1;
assert bits < Long.SIZE : "bits(" + bits + ") > " + (Long.SIZE - 1);
assert bitsCached >= bits : "bitsCached(" + bitsCached + ") < bits(" + bits + ")";
assert bitsCached <= Long.SIZE : "bitsCached(" + bitsCached + ") > " + Long.SIZE;
for (; bitsCached >= Byte.SIZE; bitsCached -= Byte.SIZE) {
final long octet = cache & 0xFF;
byteOutput._write8(octet);
cache >>>= Byte.SIZE;
}
} }
void writeSigned(long value, int bits) { void writeSigned(long value, int bits) {
@ -125,6 +87,7 @@ public class BitOutput {
final int overflowBits = bitsCached - Long.SIZE; final int overflowBits = bitsCached - Long.SIZE;
_writeCache(bits); _writeCache(bits);
assert bitsCached < Byte.SIZE : "bitsCached(" + bitsCached + ") > " + (Byte.SIZE - 1);
if (overflowBits > 0) { if (overflowBits > 0) {
final int overflowShift = Long.SIZE - overflowBits; final int overflowShift = Long.SIZE - overflowBits;
cache = (value >>> overflowShift) & MASKS[overflowBits]; cache = (value >>> overflowShift) & MASKS[overflowBits];