Skip to content

Commit 323b134

Browse files
msimacekmsimacek
committed
Implement crc_hqx
1 parent 89143c8 commit 323b134

File tree

3 files changed

+71
-0
lines changed

3 files changed

+71
-0
lines changed

‎graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_binascii.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,25 @@
11
*graalpython.lib-python.3.test.test_binascii.ArrayBinASCIITest.test_b2a_base64_newline
22
*graalpython.lib-python.3.test.test_binascii.ArrayBinASCIITest.test_base64valid
33
*graalpython.lib-python.3.test.test_binascii.ArrayBinASCIITest.test_crc32
4+
*graalpython.lib-python.3.test.test_binascii.ArrayBinASCIITest.test_crc_hqx
45
*graalpython.lib-python.3.test.test_binascii.ArrayBinASCIITest.test_exceptions
56
*graalpython.lib-python.3.test.test_binascii.ArrayBinASCIITest.test_hex
67
*graalpython.lib-python.3.test.test_binascii.BinASCIITest.test_b2a_base64_newline
78
*graalpython.lib-python.3.test.test_binascii.BinASCIITest.test_base64valid
89
*graalpython.lib-python.3.test.test_binascii.BinASCIITest.test_crc32
10+
*graalpython.lib-python.3.test.test_binascii.BinASCIITest.test_crc_hqx
911
*graalpython.lib-python.3.test.test_binascii.BinASCIITest.test_exceptions
1012
*graalpython.lib-python.3.test.test_binascii.BinASCIITest.test_hex
1113
*graalpython.lib-python.3.test.test_binascii.BytearrayBinASCIITest.test_b2a_base64_newline
1214
*graalpython.lib-python.3.test.test_binascii.BytearrayBinASCIITest.test_base64valid
1315
*graalpython.lib-python.3.test.test_binascii.BytearrayBinASCIITest.test_crc32
16+
*graalpython.lib-python.3.test.test_binascii.BytearrayBinASCIITest.test_crc_hqx
1417
*graalpython.lib-python.3.test.test_binascii.BytearrayBinASCIITest.test_exceptions
1518
*graalpython.lib-python.3.test.test_binascii.BytearrayBinASCIITest.test_hex
1619
*graalpython.lib-python.3.test.test_binascii.ChecksumBigBufferTestCase.test_big_buffer
1720
*graalpython.lib-python.3.test.test_binascii.MemoryviewBinASCIITest.test_b2a_base64_newline
1821
*graalpython.lib-python.3.test.test_binascii.MemoryviewBinASCIITest.test_base64valid
1922
*graalpython.lib-python.3.test.test_binascii.MemoryviewBinASCIITest.test_crc32
23+
*graalpython.lib-python.3.test.test_binascii.MemoryviewBinASCIITest.test_crc_hqx
2024
*graalpython.lib-python.3.test.test_binascii.MemoryviewBinASCIITest.test_exceptions
2125
*graalpython.lib-python.3.test.test_binascii.MemoryviewBinASCIITest.test_hex

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/BinasciiModuleBuiltins.java‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import static com.oracle.graal.python.nodes.PGuards.isAscii;
4848
import static com.oracle.graal.python.util.PythonUtils.TS_ENCODING;
4949
import static com.oracle.graal.python.util.PythonUtils.crc32;
50+
import static com.oracle.graal.python.util.PythonUtils.crcHqx;
5051

5152
import java.nio.ByteBuffer;
5253
import java.util.Arrays;
@@ -408,6 +409,29 @@ protected ArgumentClinicProvider getArgumentClinic() {
408409
}
409410
}
410411

412+
@Builtin(name = "crc_hqx", minNumOfPositionalArgs = 2, parameterNames = {"data", "crc"})
413+
@ArgumentClinic(name = "data", conversion = ArgumentClinic.ClinicConversion.ReadableBuffer)
414+
@ArgumentClinic(name = "crc", conversion = ArgumentClinic.ClinicConversion.Long)
415+
@GenerateNodeFactory
416+
abstract static class CrcHqxNode extends PythonBinaryClinicBuiltinNode {
417+
418+
@Specialization(limit = "3")
419+
static long b2a(VirtualFrame frame, Object buffer, long crc,
420+
@Cached("createFor(this)") IndirectCallData indirectCallData,
421+
@CachedLibrary("buffer") PythonBufferAccessLibrary bufferLib) {
422+
try {
423+
return crcHqx((int) crc, bufferLib.getInternalOrCopiedByteArray(buffer), 0, bufferLib.getBufferLength(buffer));
424+
} finally {
425+
bufferLib.release(buffer, frame, indirectCallData);
426+
}
427+
}
428+
429+
@Override
430+
protected ArgumentClinicProvider getArgumentClinic() {
431+
return BinasciiModuleBuiltinsClinicProviders.CrcHqxNodeClinicProviderGen.INSTANCE;
432+
}
433+
}
434+
411435
@Builtin(name = "hexlify", minNumOfPositionalArgs = 1, parameterNames = {"data", "sep", "bytes_per_sep"})
412436
@ArgumentClinic(name = "data", conversion = ArgumentClinic.ClinicConversion.ReadableBuffer)
413437
@ArgumentClinic(name = "bytes_per_sep", conversion = ArgumentClinic.ClinicConversion.Int, defaultValue = "1")

‎graalpython/com.oracle.graal.python/src/com/oracle/graal/python/util/PythonUtils.java‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -889,6 +889,49 @@ public static long crc32(int initialValue, byte[] bytes, int offset, int length)
889889
0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
890890
};
891891

892+
public static long crcHqx(int initialValue, byte[] bytes, int offset, int length) {
893+
int crc = initialValue & 0xffff;
894+
for (int i = offset; i < length; i++) {
895+
crc = ((crc << 8) & 0xff00) ^ CRC_HQX_TAB[(crc >>> 8) ^ (bytes[i] & 0xff)];
896+
}
897+
return crc;
898+
}
899+
900+
static final int[] CRC_HQX_TAB = new int[]{
901+
0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7,
902+
0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef,
903+
0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6,
904+
0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de,
905+
0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485,
906+
0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d,
907+
0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4,
908+
0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc,
909+
0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823,
910+
0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b,
911+
0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12,
912+
0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a,
913+
0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41,
914+
0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49,
915+
0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70,
916+
0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78,
917+
0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f,
918+
0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067,
919+
0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e,
920+
0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256,
921+
0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d,
922+
0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405,
923+
0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c,
924+
0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634,
925+
0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab,
926+
0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3,
927+
0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a,
928+
0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92,
929+
0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9,
930+
0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1,
931+
0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8,
932+
0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0,
933+
};
934+
892935
/**
893936
* Use as a documentation and safety guard in specializations that are meant to be activated
894937
* only in the uncached case. Those Specializations exist only to allow to generate an uncached

0 commit comments

Comments
 (0)