Comment: | (u)int_fast*_t -> (u)int*_t
(U)INT_FAST*_MAX is broken on Android, which makes (u)int_fast*_t |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
d3158d091fcff084ba83157f29c6de6b |
User & Date: | js on 2016-01-05 22:00:03 |
Other Links: | manifest | tags |
2016-01-05
| ||
22:45 | configure: Disable compiler TLS on Android/AArch64 check-in: 3eab631674 user: js tags: trunk | |
22:00 | (u)int_fast*_t -> (u)int*_t check-in: d3158d091f user: js tags: trunk | |
17:49 | tests/Makefile: Copy shared libs in run-on-android check-in: a200d99be5 user: js tags: trunk | |
Modified src/OFDate.m from [f2fc0e7161] to [69ce62e752].
︙ | ︙ | |||
353 354 355 356 357 358 359 | - (uint32_t)hash { uint32_t hash; union { double d; uint8_t b[sizeof(double)]; } d; | | | 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 | - (uint32_t)hash { uint32_t hash; union { double d; uint8_t b[sizeof(double)]; } d; uint8_t i; d.d = OF_BSWAP_DOUBLE_IF_BE(_seconds); OF_HASH_INIT(hash); for (i = 0; i < sizeof(double); i++) OF_HASH_ADD(hash, d.b[i]); |
︙ | ︙ |
Modified src/OFInflateStream.h from [677d90ca2c] to [c61dd6afda].
︙ | ︙ | |||
29 30 31 32 33 34 35 | @interface OFInflateStream: OFStream { #ifdef OF_INFLATE_STREAM_M @public #endif OFStream *_stream; uint8_t _buffer[OF_INFLATE_STREAM_BUFFER_SIZE]; | | | | | | | | | | | | | 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 | @interface OFInflateStream: OFStream { #ifdef OF_INFLATE_STREAM_M @public #endif OFStream *_stream; uint8_t _buffer[OF_INFLATE_STREAM_BUFFER_SIZE]; uint16_t _bufferIndex, _bufferLength; uint8_t _byte; uint8_t _bitIndex, _savedBitsLength; uint16_t _savedBits; @protected uint8_t *_slidingWindow; uint16_t _slidingWindowIndex, _slidingWindowMask; enum { OF_INFLATE_STREAM_BLOCK_HEADER, OF_INFLATE_STREAM_UNCOMPRESSED_BLOCK_HEADER, OF_INFLATE_STREAM_UNCOMPRESSED_BLOCK, OF_INFLATE_STREAM_HUFFMAN_TREE, OF_INFLATE_STREAM_HUFFMAN_BLOCK } _state; union { struct { uint8_t position; uint8_t length[4]; } uncompressedHeader; struct { uint16_t position, length; } uncompressed; struct { struct huffman_tree *litLenTree, *distTree; struct huffman_tree *codeLenTree, *treeIter; uint8_t *lengths; uint16_t receivedCount; uint8_t value, litLenCodesCount, distCodesCount; uint8_t codeLenCodesCount; } huffmanTree; struct { struct huffman_tree *litLenTree, *distTree, *treeIter; enum { OF_INFLATE_STREAM_WRITE_VALUE, OF_INFLATE_STREAM_AWAIT_CODE, OF_INFLATE_STREAM_AWAIT_LENGTH_EXTRA_BITS, OF_INFLATE_STREAM_AWAIT_DISTANCE, OF_INFLATE_STREAM_AWAIT_DISTANCE_EXTRA_BITS, OF_INFLATE_STREAM_PROCESS_PAIR } state; uint16_t value, length, distance; uint16_t extraBits; } huffman; } _context; bool _inLastBlock, _atEndOfStream; } /*! * @brief Creates a new OFInflateStream with the specified underlying stream. |
︙ | ︙ |
Modified src/OFInflateStream.m from [91e7a25cd0] to [47e2756e95].
︙ | ︙ | |||
56 57 58 59 60 61 62 | struct huffman_tree { struct huffman_tree *leafs[2]; uint16_t value; }; #ifndef DEFLATE64 | | | | 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 | struct huffman_tree { struct huffman_tree *leafs[2]; uint16_t value; }; #ifndef DEFLATE64 static const uint8_t numDistanceCodes = 30; static const uint8_t lengthCodes[29] = { /* indices are -257, values -3 */ 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 255 }; static const uint8_t lengthExtraBits[29] = { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0 }; static const uint16_t distanceCodes[30] = { 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577 }; static const uint8_t distanceExtraBits[30] = { 0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13 }; #else static const uint8_t numDistanceCodes = 32; static const uint8_t lengthCodes[29] = { /* indices are -257, values -3 */ 0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 0 }; static const uint8_t lengthExtraBits[29] = { 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, |
︙ | ︙ | |||
101 102 103 104 105 106 107 | #endif static const uint8_t codeLengthsOrder[19] = { 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 }; static struct huffman_tree *fixedLitLenTree, *fixedDistTree; static bool | | | | | 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 | #endif static const uint8_t codeLengthsOrder[19] = { 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 }; static struct huffman_tree *fixedLitLenTree, *fixedDistTree; static bool tryReadBits(OFInflateStream *stream, uint16_t *bits, uint8_t count) { uint16_t ret = stream->_savedBits; uint8_t i; assert(stream->_savedBitsLength < count); for (i = stream->_savedBitsLength; i < count; i++) { if OF_UNLIKELY (stream->_bitIndex == 8) { if (stream->_bufferIndex < stream->_bufferLength) stream->_byte = |
︙ | ︙ | |||
126 127 128 129 130 131 132 | stream->_savedBits = ret; stream->_savedBitsLength = i; return false; } stream->_byte = stream->_buffer[0]; stream->_bufferIndex = 1; | | | 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 | stream->_savedBits = ret; stream->_savedBitsLength = i; return false; } stream->_byte = stream->_buffer[0]; stream->_bufferIndex = 1; stream->_bufferLength = (uint16_t)length; } stream->_bitIndex = 0; } ret |= ((stream->_byte >> stream->_bitIndex++) & 1) << i; } |
︙ | ︙ | |||
158 159 160 161 162 163 164 | tree->leafs[0] = tree->leafs[1] = NULL; tree->value = 0xFFFF; return tree; } static void | | | | | | 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 | tree->leafs[0] = tree->leafs[1] = NULL; tree->value = 0xFFFF; return tree; } static void treeInsert(struct huffman_tree *tree, uint16_t code, uint8_t length, uint16_t value) { while (length > 0) { uint8_t bit; length--; bit = (code & (1 << length)) >> length; if (tree->leafs[bit] == NULL) tree->leafs[bit] = newTree(); tree = tree->leafs[bit]; } tree->value = value; } static struct huffman_tree* constructTree(uint8_t lengths[], uint16_t count) { struct huffman_tree *tree; uint16_t lengthCount[MAX_BITS + 1] = { 0 }; uint16_t code, maxCode = 0, nextCode[MAX_BITS + 1]; uint16_t i; for (i = 0; i < count; i++) { uint8_t length = lengths[i]; if OF_UNLIKELY (length > MAX_BITS) @throw [OFInvalidFormatException exception]; |
︙ | ︙ | |||
218 219 220 221 222 223 224 | return tree; } static bool walkTree(OFInflateStream *stream, struct huffman_tree **tree, uint16_t *value) { struct huffman_tree *iter = *tree; | | | | | 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 | return tree; } static bool walkTree(OFInflateStream *stream, struct huffman_tree **tree, uint16_t *value) { struct huffman_tree *iter = *tree; uint16_t bits; while (iter->value == 0xFFFF) { if OF_UNLIKELY (!tryReadBits(stream, &bits, 1)) { *tree = iter; return false; } if OF_UNLIKELY (iter->leafs[bits] == NULL) @throw [OFInvalidFormatException exception]; iter = iter->leafs[bits]; } *value = iter->value; return true; } static void releaseTree(struct huffman_tree *tree) { uint8_t i; for (i = 0; i < 2; i++) if OF_LIKELY (tree->leafs[i] != NULL) releaseTree(tree->leafs[i]); free(tree); } @implementation OFInflateStream + (void)initialize { uint16_t i; uint8_t lengths[288]; if (self != [OFInflateStream class]) return; for (i = 0; i <= 143; i++) lengths[i] = 8; |
︙ | ︙ | |||
308 309 310 311 312 313 314 | } #endif - (size_t)lowlevelReadIntoBuffer: (void*)buffer_ length: (size_t)length { uint8_t *buffer = buffer_; | | | | 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 | } #endif - (size_t)lowlevelReadIntoBuffer: (void*)buffer_ length: (size_t)length { uint8_t *buffer = buffer_; uint16_t bits, i, tmp; uint16_t value; size_t bytesWritten = 0; uint8_t *slidingWindow; uint16_t slidingWindowIndex; if (_atEndOfStream) @throw [OFReadFailedException exceptionWithObject: self requestedLength: length]; start: switch (_state) { |
︙ | ︙ | |||
399 400 401 402 403 404 405 | #undef CTX case UNCOMPRESSED_BLOCK: #define CTX _context.uncompressed if OF_UNLIKELY (length == 0) return bytesWritten; tmp = (length < CTX.length - CTX.position | | < | | | 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 | #undef CTX case UNCOMPRESSED_BLOCK: #define CTX _context.uncompressed if OF_UNLIKELY (length == 0) return bytesWritten; tmp = (length < CTX.length - CTX.position ? (uint16_t)length : CTX.length - CTX.position); tmp = (uint16_t)[_stream readIntoBuffer: buffer + bytesWritten length: tmp]; if OF_UNLIKELY (_slidingWindow == NULL) { _slidingWindow = [self allocMemoryWithSize: _slidingWindowMask + 1]; /* Avoid leaking data */ memset(_slidingWindow, 0, _slidingWindowMask + 1); } |
︙ | ︙ | |||
489 490 491 492 493 494 495 | if OF_LIKELY (CTX.lengths == NULL) CTX.lengths = [self allocMemoryWithSize: CTX.litLenCodesCount + CTX.distCodesCount + 258]; for (i = CTX.receivedCount; i < CTX.litLenCodesCount + CTX.distCodesCount + 258;) { | | | 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 | if OF_LIKELY (CTX.lengths == NULL) CTX.lengths = [self allocMemoryWithSize: CTX.litLenCodesCount + CTX.distCodesCount + 258]; for (i = CTX.receivedCount; i < CTX.litLenCodesCount + CTX.distCodesCount + 258;) { uint8_t j, count; if OF_LIKELY (CTX.value == 0xFF) { if OF_UNLIKELY (!walkTree(self, &CTX.treeIter, &value)) { CTX.receivedCount = i; return bytesWritten; } |
︙ | ︙ | |||
583 584 585 586 587 588 589 | _context.huffman.treeIter = CTX.litLenTree; goto start; #undef CTX case HUFFMAN_BLOCK: #define CTX _context.huffman for (;;) { | | | 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 | _context.huffman.treeIter = CTX.litLenTree; goto start; #undef CTX case HUFFMAN_BLOCK: #define CTX _context.huffman for (;;) { uint8_t extraBits, lengthCodeIndex; if OF_UNLIKELY (CTX.state == WRITE_VALUE) { if OF_UNLIKELY (length == 0) return bytesWritten; buffer[bytesWritten++] = CTX.value; length--; |
︙ | ︙ | |||
659 660 661 662 663 664 665 | CTX.distance += bits; CTX.state = PROCESS_PAIR; } /* Length distance pair */ if (CTX.state == PROCESS_PAIR) { | | | | 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 | CTX.distance += bits; CTX.state = PROCESS_PAIR; } /* Length distance pair */ if (CTX.state == PROCESS_PAIR) { uint16_t j; if OF_UNLIKELY (_slidingWindow == NULL) @throw [OFInvalidFormatException exception]; for (j = 0; j < CTX.length; j++) { uint16_t index; if OF_UNLIKELY (length == 0) { CTX.length -= j; return bytesWritten; } index = (_slidingWindowIndex - |
︙ | ︙ |
Modified src/OFMD5Hash.m from [e0bf0902f7] to [76a6936277].
︙ | ︙ | |||
58 59 60 61 62 63 64 | 7, 12, 17, 22, 5, 9, 14, 20, 4, 11, 16, 23, 6, 10, 15, 21 }; static OF_INLINE void | | | | | 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 | 7, 12, 17, 22, 5, 9, 14, 20, 4, 11, 16, 23, 6, 10, 15, 21 }; static OF_INLINE void byteSwapVectorIfBE(uint32_t *vector, uint8_t length) { #ifdef OF_BIG_ENDIAN uint8_t i; for (i = 0; i < length; i++) vector[i] = OF_BSWAP32(vector[i]); #endif } static void processBlock(uint32_t *state, uint32_t *buffer) { uint32_t new[4]; uint8_t i = 0; new[0] = state[0]; new[1] = state[1]; new[2] = state[2]; new[3] = state[3]; byteSwapVectorIfBE(buffer, 16); |
︙ | ︙ |
Modified src/OFNumber.m from [9f35def2ab] to [8f726b2505].
︙ | ︙ | |||
828 829 830 831 832 833 834 | OF_HASH_INIT(hash); if (type & OF_NUMBER_TYPE_FLOAT) { union { double d; uint8_t b[sizeof(double)]; } d; | | | 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 | OF_HASH_INIT(hash); if (type & OF_NUMBER_TYPE_FLOAT) { union { double d; uint8_t b[sizeof(double)]; } d; uint8_t i; if (isnan([self doubleValue])) return 0; d.d = OF_BSWAP_DOUBLE_IF_BE([self doubleValue]); for (i = 0; i < sizeof(double); i++) |
︙ | ︙ |
Modified src/OFRIPEMD160Hash.m from [482657f939] to [d790f259b5].
︙ | ︙ | |||
54 55 56 57 58 59 60 | 9, 13, 15, 7, 12, 8, 9, 11, 7, 7, 12, 7, 6, 15, 13, 11, 9, 7, 15, 11, 8, 6, 6, 14, 12, 13, 5, 14, 13, 13, 7, 5, 15, 5, 8, 11, 14, 14, 6, 14, 6, 9, 12, 9, 12, 5, 15, 8, 8, 5, 12, 9, 12, 5, 14, 6, 8, 13, 6, 5, 15, 13, 11, 11 }; static OF_INLINE void | | | | | 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 | 9, 13, 15, 7, 12, 8, 9, 11, 7, 7, 12, 7, 6, 15, 13, 11, 9, 7, 15, 11, 8, 6, 6, 14, 12, 13, 5, 14, 13, 13, 7, 5, 15, 5, 8, 11, 14, 14, 6, 14, 6, 9, 12, 9, 12, 5, 15, 8, 8, 5, 12, 9, 12, 5, 14, 6, 8, 13, 6, 5, 15, 13, 11, 11 }; static OF_INLINE void byteSwapVectorIfBE(uint32_t *vector, uint8_t length) { #ifdef OF_BIG_ENDIAN uint8_t i; for (i = 0; i < length; i++) vector[i] = OF_BSWAP32(vector[i]); #endif } static void processBlock(uint32_t *state, uint32_t *buffer) { uint32_t new[5], new2[5]; uint8_t i = 0; new[0] = new2[0] = state[0]; new[1] = new2[1] = state[1]; new[2] = new2[2] = state[2]; new[3] = new2[3] = state[3]; new[4] = new2[4] = state[4]; |
︙ | ︙ |
Modified src/OFSHA1Hash.m from [0458f2aa13] to [7ce937b30f].
︙ | ︙ | |||
24 25 26 27 28 29 30 | #define F(a, b, c, d) ((d) ^ ((b) & ((c) ^ (d)))) #define G(a, b, c, d) ((b) ^ (c) ^ (d)) #define H(a, b, c, d) (((b) & (c)) | ((d) & ((b) | (c)))) #define I(a, b, c, d) ((b) ^ (c) ^ (d)) static OF_INLINE void | | | | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 | #define F(a, b, c, d) ((d) ^ ((b) & ((c) ^ (d)))) #define G(a, b, c, d) ((b) ^ (c) ^ (d)) #define H(a, b, c, d) (((b) & (c)) | ((d) & ((b) | (c)))) #define I(a, b, c, d) ((b) ^ (c) ^ (d)) static OF_INLINE void byteSwapVectorIfLE(uint32_t *vector, uint8_t length) { #ifndef OF_BIG_ENDIAN uint8_t i; for (i = 0; i < length; i++) vector[i] = OF_BSWAP32(vector[i]); #endif } static void processBlock(uint32_t *state, uint32_t *buffer) { uint32_t new[5]; uint8_t i; new[0] = state[0]; new[1] = state[1]; new[2] = state[2]; new[3] = state[3]; new[4] = state[4]; |
︙ | ︙ |
Modified src/OFSHA224Or256Hash.m from [56e8b6283e] to [80ddf15097].
︙ | ︙ | |||
38 39 40 41 42 43 44 | 0x19A4C116, 0x1E376C08, 0x2748774C, 0x34B0BCB5, 0x391C0CB3, 0x4ED8AA4A, 0x5B9CCA4F, 0x682E6FF3, 0x748F82EE, 0x78A5636F, 0x84C87814, 0x8CC70208, 0x90BEFFFA, 0xA4506CEB, 0xBEF9A3F7, 0xC67178F2 }; static OF_INLINE void | | | | | 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 | 0x19A4C116, 0x1E376C08, 0x2748774C, 0x34B0BCB5, 0x391C0CB3, 0x4ED8AA4A, 0x5B9CCA4F, 0x682E6FF3, 0x748F82EE, 0x78A5636F, 0x84C87814, 0x8CC70208, 0x90BEFFFA, 0xA4506CEB, 0xBEF9A3F7, 0xC67178F2 }; static OF_INLINE void byteSwapVectorIfLE(uint32_t *vector, uint8_t length) { #ifndef OF_BIG_ENDIAN uint8_t i; for (i = 0; i < length; i++) vector[i] = OF_BSWAP32(vector[i]); #endif } static void processBlock(uint32_t *state, uint32_t *buffer) { uint32_t new[8]; uint8_t i; new[0] = state[0]; new[1] = state[1]; new[2] = state[2]; new[3] = state[3]; new[4] = state[4]; new[5] = state[5]; |
︙ | ︙ |
Modified src/OFSHA384Or512Hash.m from [ba305d5941] to [0930b3cee0].
︙ | ︙ | |||
49 50 51 52 53 54 55 | 0x0A637DC5A2C898A6, 0x113F9804BEF90DAE, 0x1B710B35131C471B, 0x28DB77F523047D84, 0x32CAAB7B40C72493, 0x3C9EBE0A15C9BEBC, 0x431D67C49C100D4C, 0x4CC5D4BECB3E42B6, 0x597F299CFC657E2A, 0x5FCB6FAB3AD6FAEC, 0x6C44198C4A475817 }; static OF_INLINE void | | | | | 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | 0x0A637DC5A2C898A6, 0x113F9804BEF90DAE, 0x1B710B35131C471B, 0x28DB77F523047D84, 0x32CAAB7B40C72493, 0x3C9EBE0A15C9BEBC, 0x431D67C49C100D4C, 0x4CC5D4BECB3E42B6, 0x597F299CFC657E2A, 0x5FCB6FAB3AD6FAEC, 0x6C44198C4A475817 }; static OF_INLINE void byteSwapVectorIfLE(uint64_t *vector, uint8_t length) { #ifndef OF_BIG_ENDIAN uint8_t i; for (i = 0; i < length; i++) vector[i] = OF_BSWAP64(vector[i]); #endif } static void processBlock(uint64_t *state, uint64_t *buffer) { uint64_t new[8]; uint8_t i; new[0] = state[0]; new[1] = state[1]; new[2] = state[2]; new[3] = state[3]; new[4] = state[4]; new[5] = state[5]; |
︙ | ︙ |
Modified src/OFZIPArchive.m from [c97bd73161] to [b5e5e4f9e4].
︙ | ︙ | |||
82 83 84 85 86 87 88 | localFileHeader: (OFZIPArchive_LocalFileHeader*)localFileHeader; @end uint32_t of_zip_archive_read_field32(uint8_t **data, uint16_t *size) { uint32_t field = 0; | | | | | 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 | localFileHeader: (OFZIPArchive_LocalFileHeader*)localFileHeader; @end uint32_t of_zip_archive_read_field32(uint8_t **data, uint16_t *size) { uint32_t field = 0; uint8_t i; if (*size < 4) @throw [OFInvalidFormatException exception]; for (i = 0; i < 4; i++) field |= (uint32_t)(*data)[i] << (i * 8); *data += 4; *size -= 4; return field; } uint64_t of_zip_archive_read_field64(uint8_t **data, uint16_t *size) { uint64_t field = 0; uint8_t i; if (*size < 8) @throw [OFInvalidFormatException exception]; for (i = 0; i < 8; i++) field |= (uint64_t)(*data)[i] << (i * 8); *data += 8; *size -= 8; return field; } static uint32_t calculateCRC32(uint32_t crc, uint8_t *bytes, size_t length) { size_t i; for (i = 0; i < length; i++) { uint8_t j; crc ^= bytes[i]; for (j = 0; j < 8; j++) crc = (crc >> 1) ^ (CRC32_MAGIC & (~(crc & 1) + 1)); } |
︙ | ︙ |
Modified src/OFZIPArchiveEntry.m from [26c1cf1b29] to [66169b3a5c].
︙ | ︙ | |||
237 238 239 240 241 242 243 | [super dealloc]; } - (OFDate*)modificationDate { void *pool = objc_autoreleasePoolPush(); | | | | | | | | 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 | [super dealloc]; } - (OFDate*)modificationDate { void *pool = objc_autoreleasePoolPush(); uint16_t year = ((_lastModifiedFileDate & 0xFE00) >> 9) + 1980; uint8_t month = (_lastModifiedFileDate & 0x1E0) >> 5; uint8_t day = (_lastModifiedFileDate & 0x1F); uint8_t hour = (_lastModifiedFileTime & 0xF800) >> 11; uint8_t minute = (_lastModifiedFileTime & 0x7E0) >> 5; uint8_t second = (_lastModifiedFileTime & 0x1F) << 1; OFDate *date; OFString *dateString; dateString = [OFString stringWithFormat: @"%04u-%02u-%02u %02u:%02u:%02u", year, month, day, hour, minute, second]; |
︙ | ︙ |
Modified src/exceptions/OFException.m from [3ce36007c3] to [79bfb21fe1].
︙ | ︙ | |||
65 66 67 68 69 70 71 | typedef enum { _URC_OK = 0, _URC_END_OF_STACK = 5 }_Unwind_Reason_Code; struct backtrace_ctx { void **backtrace; | | | 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 | typedef enum { _URC_OK = 0, _URC_END_OF_STACK = 5 }_Unwind_Reason_Code; struct backtrace_ctx { void **backtrace; uint8_t i; }; extern _Unwind_Reason_Code _Unwind_Backtrace( _Unwind_Reason_Code(*)(struct _Unwind_Context*, void*), void*); # ifdef OF_ARM extern int _Unwind_VRS_Get(struct _Unwind_Context*, int, uint32_t, int, void*); # else |
︙ | ︙ | |||
258 259 260 261 262 263 264 | } - (OFArray*)backtrace { #ifdef HAVE_DWARF_EXCEPTIONS OFMutableArray *backtrace = [OFMutableArray array]; void *pool = objc_autoreleasePoolPush(); | | | 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 | } - (OFArray*)backtrace { #ifdef HAVE_DWARF_EXCEPTIONS OFMutableArray *backtrace = [OFMutableArray array]; void *pool = objc_autoreleasePoolPush(); uint8_t i; for (i = 0; i < OF_BACKTRACE_SIZE && _backtrace[i] != NULL; i++) { # ifdef HAVE_DLADDR Dl_info info; if (dladdr(_backtrace[i], &info)) { OFString *frame; |
︙ | ︙ |
Modified src/runtime/class.m from [2f6309b70c] to [ecd4869918].
︙ | ︙ | |||
366 367 368 369 370 371 372 | objc_global_mutex_unlock(); } void objc_register_all_classes(struct objc_abi_symtab *symtab) { | | | 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 | objc_global_mutex_unlock(); } void objc_register_all_classes(struct objc_abi_symtab *symtab) { uint32_t i; for (i = 0; i < symtab->cls_def_cnt; i++) { struct objc_abi_class *cls = (struct objc_abi_class*)symtab->defs[i]; register_class(cls); register_selectors(cls); |
︙ | ︙ | |||
838 839 840 841 842 843 844 | unregister_class(cls); unregister_class(cls->isa); } void objc_unregister_all_classes(void) { | | | | | | 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 | unregister_class(cls); unregister_class(cls->isa); } void objc_unregister_all_classes(void) { uint32_t i; if (classes == NULL) return; for (i = 0; i < classes->size; i++) { if (classes->data[i] != NULL && classes->data[i] != &objc_deleted_bucket) { void *cls = (Class)classes->data[i]->obj; if (cls == Nil || (uintptr_t)cls & 1) continue; objc_unregister_class(cls); /* * The table might have been resized, so go back to the * start again. * * Due to the i++ in the for loop, we need to set it to * UINT32_MAX so that it will get increased at the end * of the loop and thus become 0. */ i = UINT32_MAX; } } assert(classes_cnt == 0); if (empty_dtable != NULL) { objc_dtable_free(empty_dtable); |
︙ | ︙ |
Modified src/runtime/dtable.m from [49bc1623d2] to [bbd4fbe6f2].
︙ | ︙ | |||
26 27 28 29 30 31 32 | #ifdef OF_SELUID24 static struct objc_dtable_level3 *empty_level3 = NULL; #endif static void init(void) { | | | 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | #ifdef OF_SELUID24 static struct objc_dtable_level3 *empty_level3 = NULL; #endif static void init(void) { uint16_t i; empty_level2 = malloc(sizeof(struct objc_dtable_level2)); if (empty_level2 == NULL) OBJC_ERROR("Not enough memory to allocate dtable!"); #ifdef OF_SELUID24 empty_level3 = malloc(sizeof(struct objc_dtable_level3)); |
︙ | ︙ | |||
53 54 55 56 57 58 59 | #endif } struct objc_dtable* objc_dtable_new(void) { struct objc_dtable *dtable; | | | 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 | #endif } struct objc_dtable* objc_dtable_new(void) { struct objc_dtable *dtable; uint16_t i; #ifdef OF_SELUID24 if (empty_level2 == NULL || empty_level3 == NULL) init(); #else if (empty_level2 == NULL) init(); |
︙ | ︙ | |||
75 76 77 78 79 80 81 | return dtable; } void objc_dtable_copy(struct objc_dtable *dst, struct objc_dtable *src) { | | | | 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 | return dtable; } void objc_dtable_copy(struct objc_dtable *dst, struct objc_dtable *src) { uint16_t i, j; #ifdef OF_SELUID24 uint16_t k; #endif uint32_t idx; for (i = 0; i < 256; i++) { if (src->buckets[i] == empty_level2) continue; |
︙ | ︙ | |||
133 134 135 136 137 138 139 | #else uint8_t i = idx >> 8; uint8_t j = idx; #endif if (dtable->buckets[i] == empty_level2) { struct objc_dtable_level2 *level2; | | | | 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 | #else uint8_t i = idx >> 8; uint8_t j = idx; #endif if (dtable->buckets[i] == empty_level2) { struct objc_dtable_level2 *level2; uint16_t l; level2 = malloc(sizeof(struct objc_dtable_level2)); if (level2 == NULL) OBJC_ERROR("Not enough memory to insert into dtable!"); for (l = 0; l < 256; l++) #ifdef OF_SELUID24 level2->buckets[l] = empty_level3; #else level2->buckets[l] = (IMP)0; #endif dtable->buckets[i] = level2; } #ifdef OF_SELUID24 if (dtable->buckets[i]->buckets[j] == empty_level3) { struct objc_dtable_level3 *level3; uint16_t l; level3 = malloc(sizeof(struct objc_dtable_level3)); if (level3 == NULL) OBJC_ERROR("Not enough memory to insert into dtable!"); for (l = 0; l < 256; l++) |
︙ | ︙ | |||
175 176 177 178 179 180 181 | dtable->buckets[i]->buckets[j] = obj; #endif } void objc_dtable_free(struct objc_dtable *dtable) { | | | | 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 | dtable->buckets[i]->buckets[j] = obj; #endif } void objc_dtable_free(struct objc_dtable *dtable) { uint16_t i; #ifdef OF_SELUID24 uint16_t j; #endif for (i = 0; i < 256; i++) { if (dtable->buckets[i] == empty_level2) continue; #ifdef OF_SELUID24 |
︙ | ︙ |
Modified src/runtime/runtime-private.h from [bdf8bbca7f] to [26a5f2070f].
︙ | ︙ | |||
104 105 106 107 108 109 110 | struct objc_hashtable_bucket **data; }; struct objc_sparsearray { struct objc_sparsearray_data { void *next[256]; } *data; | | | 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 | struct objc_hashtable_bucket **data; }; struct objc_sparsearray { struct objc_sparsearray_data { void *next[256]; } *data; uint8_t index_size; }; struct objc_dtable { struct objc_dtable_level2 { #ifdef OF_SELUID24 struct objc_dtable_level3 { IMP buckets[256]; |
︙ | ︙ | |||
141 142 143 144 145 146 147 | const void*); extern void* objc_hashtable_get(struct objc_hashtable*, const void*); extern void objc_hashtable_delete(struct objc_hashtable*, const void*); extern void objc_hashtable_free(struct objc_hashtable*); extern void objc_register_selector(struct objc_abi_selector*); extern void objc_register_all_selectors(struct objc_abi_symtab*); extern void objc_unregister_all_selectors(void); | | | 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 | const void*); extern void* objc_hashtable_get(struct objc_hashtable*, const void*); extern void objc_hashtable_delete(struct objc_hashtable*, const void*); extern void objc_hashtable_free(struct objc_hashtable*); extern void objc_register_selector(struct objc_abi_selector*); extern void objc_register_all_selectors(struct objc_abi_symtab*); extern void objc_unregister_all_selectors(void); extern struct objc_sparsearray* objc_sparsearray_new(uint8_t); extern void* objc_sparsearray_get(struct objc_sparsearray*, uintptr_t); extern void objc_sparsearray_set(struct objc_sparsearray*, uintptr_t, void*); extern void objc_sparsearray_free(struct objc_sparsearray*); extern struct objc_dtable* objc_dtable_new(void); extern void objc_dtable_copy(struct objc_dtable*, struct objc_dtable*); extern void objc_dtable_set(struct objc_dtable*, uint32_t, IMP); extern void objc_dtable_free(struct objc_dtable*); |
︙ | ︙ |
Modified src/runtime/sparsearray.m from [60d6283d84] to [f7f4dd215e].
︙ | ︙ | |||
19 20 21 22 23 24 25 | #include <stdio.h> #include <stdlib.h> #import "runtime.h" #import "runtime-private.h" struct objc_sparsearray* | | | | | | | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 | #include <stdio.h> #include <stdlib.h> #import "runtime.h" #import "runtime-private.h" struct objc_sparsearray* objc_sparsearray_new(uint8_t index_size) { struct objc_sparsearray *sparsearray; if ((sparsearray = calloc(1, sizeof(*sparsearray))) == NULL) OBJC_ERROR("Failed to allocate memory for sparse array!"); if ((sparsearray->data = calloc(1, sizeof(*sparsearray->data))) == NULL) OBJC_ERROR("Failed to allocate memory for sparse array!"); sparsearray->index_size = index_size; return sparsearray; } void* objc_sparsearray_get(struct objc_sparsearray *sparsearray, uintptr_t idx) { struct objc_sparsearray_data *iter = sparsearray->data; uint8_t i; for (i = 0; i < sparsearray->index_size - 1; i++) { uintptr_t j = (idx >> ((sparsearray->index_size - i - 1) * 8)) & 0xFF; if ((iter = iter->next[j]) == NULL) return NULL; } return iter->next[idx & 0xFF]; } void objc_sparsearray_set(struct objc_sparsearray *sparsearray, uintptr_t idx, void *value) { struct objc_sparsearray_data *iter = sparsearray->data; uint8_t i; for (i = 0; i < sparsearray->index_size - 1; i++) { uintptr_t j = (idx >> ((sparsearray->index_size - i - 1) * 8)) & 0xFF; if (iter->next[j] == NULL) if ((iter->next[j] = calloc(1, sizeof(struct objc_sparsearray_data))) == NULL) OBJC_ERROR("Failed to allocate memory for " "sparse array!"); iter = iter->next[j]; } iter->next[idx & 0xFF] = value; } static void free_sparsearray_data(struct objc_sparsearray_data *data, uint8_t depth) { uint16_t i; if (data == NULL || depth == 0) return; for (i = 0; i < 256; i++) free_sparsearray_data(data->next[i], depth - 1); |
︙ | ︙ |
Modified utils/ofzip/OFZIP.m from [3d818b6285] to [7f837623bc].
︙ | ︙ | |||
42 43 44 45 46 47 48 | #endif #ifndef S_IRWXO # define S_IRWXO 0 #endif @interface OFZIP: OFObject { | | | 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 | #endif #ifndef S_IRWXO # define S_IRWXO 0 #endif @interface OFZIP: OFObject { int8_t _override, _outputLevel; int _exitStatus; } - (OFZIPArchive*)openArchiveWithPath: (OFString*)path; - (void)listFilesInArchive: (OFZIPArchive*)archive; - (void)extractFiles: (OFArray OF_GENERIC(OFString*)*)files fromArchive: (OFZIPArchive*)archive; |
︙ | ︙ | |||
326 327 328 329 330 331 332 | OFString *outFileName = [fileName stringByStandardizingPath]; OFArray OF_GENERIC(OFString*) *pathComponents; OFString *directory; OFStream *stream; OFFile *output; char buffer[BUFFER_SIZE]; uint64_t written = 0, size = [entry uncompressedSize]; | | | 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 | OFString *outFileName = [fileName stringByStandardizingPath]; OFArray OF_GENERIC(OFString*) *pathComponents; OFString *directory; OFStream *stream; OFFile *output; char buffer[BUFFER_SIZE]; uint64_t written = 0, size = [entry uncompressedSize]; int8_t percent = -1, newPercent; if (!all && ![files containsObject: fileName]) continue; [missing removeObject: fileName]; #if !defined(OF_WINDOWS) && !defined(OF_MSDOS) |
︙ | ︙ | |||
452 453 454 455 456 457 458 | _exitStatus = 1; goto outer_loop_end; } written += length; newPercent = (written == size | | | 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 | _exitStatus = 1; goto outer_loop_end; } written += length; newPercent = (written == size ? 100 : (int8_t)(written * 100 / size)); if (_outputLevel >= 0 && percent != newPercent) { percent = newPercent; [of_stdout writeFormat: @"\rExtracting %@... %3u%%", fileName, percent]; |
︙ | ︙ |