mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-19 08:38:14 +01:00
Set up multiple std/crc32 tables
This commit is contained in:
1 parent
ee777d66c5
commit
2aa232576e
3 files changed
+64
-64
No files matched your search
+47
-45
@@ -1609,50 +1609,52 @@ const char* wuffs_crc32__status__string(wuffs_crc32__status s) {
|
||||
|
||||
// ---------------- Private Consts
|
||||
|
||||
static const uint32_t wuffs_crc32__ieee_table[256] = {
|
||||
0, 1996959894, 3993919788, 2567524794, 124634137, 1886057615,
|
||||
3915621685, 2657392035, 249268274, 2044508324, 3772115230, 2547177864,
|
||||
162941995, 2125561021, 3887607047, 2428444049, 498536548, 1789927666,
|
||||
4089016648, 2227061214, 450548861, 1843258603, 4107580753, 2211677639,
|
||||
325883990, 1684777152, 4251122042, 2321926636, 335633487, 1661365465,
|
||||
4195302755, 2366115317, 997073096, 1281953886, 3579855332, 2724688242,
|
||||
1006888145, 1258607687, 3524101629, 2768942443, 901097722, 1119000684,
|
||||
3686517206, 2898065728, 853044451, 1172266101, 3705015759, 2882616665,
|
||||
651767980, 1373503546, 3369554304, 3218104598, 565507253, 1454621731,
|
||||
3485111705, 3099436303, 671266974, 1594198024, 3322730930, 2970347812,
|
||||
795835527, 1483230225, 3244367275, 3060149565, 1994146192, 31158534,
|
||||
2563907772, 4023717930, 1907459465, 112637215, 2680153253, 3904427059,
|
||||
2013776290, 251722036, 2517215374, 3775830040, 2137656763, 141376813,
|
||||
2439277719, 3865271297, 1802195444, 476864866, 2238001368, 4066508878,
|
||||
1812370925, 453092731, 2181625025, 4111451223, 1706088902, 314042704,
|
||||
2344532202, 4240017532, 1658658271, 366619977, 2362670323, 4224994405,
|
||||
1303535960, 984961486, 2747007092, 3569037538, 1256170817, 1037604311,
|
||||
2765210733, 3554079995, 1131014506, 879679996, 2909243462, 3663771856,
|
||||
1141124467, 855842277, 2852801631, 3708648649, 1342533948, 654459306,
|
||||
3188396048, 3373015174, 1466479909, 544179635, 3110523913, 3462522015,
|
||||
1591671054, 702138776, 2966460450, 3352799412, 1504918807, 783551873,
|
||||
3082640443, 3233442989, 3988292384, 2596254646, 62317068, 1957810842,
|
||||
3939845945, 2647816111, 81470997, 1943803523, 3814918930, 2489596804,
|
||||
225274430, 2053790376, 3826175755, 2466906013, 167816743, 2097651377,
|
||||
4027552580, 2265490386, 503444072, 1762050814, 4150417245, 2154129355,
|
||||
426522225, 1852507879, 4275313526, 2312317920, 282753626, 1742555852,
|
||||
4189708143, 2394877945, 397917763, 1622183637, 3604390888, 2714866558,
|
||||
953729732, 1340076626, 3518719985, 2797360999, 1068828381, 1219638859,
|
||||
3624741850, 2936675148, 906185462, 1090812512, 3747672003, 2825379669,
|
||||
829329135, 1181335161, 3412177804, 3160834842, 628085408, 1382605366,
|
||||
3423369109, 3138078467, 570562233, 1426400815, 3317316542, 2998733608,
|
||||
733239954, 1555261956, 3268935591, 3050360625, 752459403, 1541320221,
|
||||
2607071920, 3965973030, 1969922972, 40735498, 2617837225, 3943577151,
|
||||
1913087877, 83908371, 2512341634, 3803740692, 2075208622, 213261112,
|
||||
2463272603, 3855990285, 2094854071, 198958881, 2262029012, 4057260610,
|
||||
1759359992, 534414190, 2176718541, 4139329115, 1873836001, 414664567,
|
||||
2282248934, 4279200368, 1711684554, 285281116, 2405801727, 4167216745,
|
||||
1634467795, 376229701, 2685067896, 3608007406, 1308918612, 956543938,
|
||||
2808555105, 3495958263, 1231636301, 1047427035, 2932959818, 3654703836,
|
||||
1088359270, 936918000, 2847714899, 3736837829, 1202900863, 817233897,
|
||||
3183342108, 3401237130, 1404277552, 615818150, 3134207493, 3453421203,
|
||||
1423857449, 601450431, 3009837614, 3294710456, 1567103746, 711928724,
|
||||
3020668471, 3272380065, 1510334235, 755167117,
|
||||
static const uint32_t wuffs_crc32__ieee_table[1][256] = {
|
||||
{
|
||||
0, 1996959894, 3993919788, 2567524794, 124634137, 1886057615,
|
||||
3915621685, 2657392035, 249268274, 2044508324, 3772115230, 2547177864,
|
||||
162941995, 2125561021, 3887607047, 2428444049, 498536548, 1789927666,
|
||||
4089016648, 2227061214, 450548861, 1843258603, 4107580753, 2211677639,
|
||||
325883990, 1684777152, 4251122042, 2321926636, 335633487, 1661365465,
|
||||
4195302755, 2366115317, 997073096, 1281953886, 3579855332, 2724688242,
|
||||
1006888145, 1258607687, 3524101629, 2768942443, 901097722, 1119000684,
|
||||
3686517206, 2898065728, 853044451, 1172266101, 3705015759, 2882616665,
|
||||
651767980, 1373503546, 3369554304, 3218104598, 565507253, 1454621731,
|
||||
3485111705, 3099436303, 671266974, 1594198024, 3322730930, 2970347812,
|
||||
795835527, 1483230225, 3244367275, 3060149565, 1994146192, 31158534,
|
||||
2563907772, 4023717930, 1907459465, 112637215, 2680153253, 3904427059,
|
||||
2013776290, 251722036, 2517215374, 3775830040, 2137656763, 141376813,
|
||||
2439277719, 3865271297, 1802195444, 476864866, 2238001368, 4066508878,
|
||||
1812370925, 453092731, 2181625025, 4111451223, 1706088902, 314042704,
|
||||
2344532202, 4240017532, 1658658271, 366619977, 2362670323, 4224994405,
|
||||
1303535960, 984961486, 2747007092, 3569037538, 1256170817, 1037604311,
|
||||
2765210733, 3554079995, 1131014506, 879679996, 2909243462, 3663771856,
|
||||
1141124467, 855842277, 2852801631, 3708648649, 1342533948, 654459306,
|
||||
3188396048, 3373015174, 1466479909, 544179635, 3110523913, 3462522015,
|
||||
1591671054, 702138776, 2966460450, 3352799412, 1504918807, 783551873,
|
||||
3082640443, 3233442989, 3988292384, 2596254646, 62317068, 1957810842,
|
||||
3939845945, 2647816111, 81470997, 1943803523, 3814918930, 2489596804,
|
||||
225274430, 2053790376, 3826175755, 2466906013, 167816743, 2097651377,
|
||||
4027552580, 2265490386, 503444072, 1762050814, 4150417245, 2154129355,
|
||||
426522225, 1852507879, 4275313526, 2312317920, 282753626, 1742555852,
|
||||
4189708143, 2394877945, 397917763, 1622183637, 3604390888, 2714866558,
|
||||
953729732, 1340076626, 3518719985, 2797360999, 1068828381, 1219638859,
|
||||
3624741850, 2936675148, 906185462, 1090812512, 3747672003, 2825379669,
|
||||
829329135, 1181335161, 3412177804, 3160834842, 628085408, 1382605366,
|
||||
3423369109, 3138078467, 570562233, 1426400815, 3317316542, 2998733608,
|
||||
733239954, 1555261956, 3268935591, 3050360625, 752459403, 1541320221,
|
||||
2607071920, 3965973030, 1969922972, 40735498, 2617837225, 3943577151,
|
||||
1913087877, 83908371, 2512341634, 3803740692, 2075208622, 213261112,
|
||||
2463272603, 3855990285, 2094854071, 198958881, 2262029012, 4057260610,
|
||||
1759359992, 534414190, 2176718541, 4139329115, 1873836001, 414664567,
|
||||
2282248934, 4279200368, 1711684554, 285281116, 2405801727, 4167216745,
|
||||
1634467795, 376229701, 2685067896, 3608007406, 1308918612, 956543938,
|
||||
2808555105, 3495958263, 1231636301, 1047427035, 2932959818, 3654703836,
|
||||
1088359270, 936918000, 2847714899, 3736837829, 1202900863, 817233897,
|
||||
3183342108, 3401237130, 1404277552, 615818150, 3134207493, 3453421203,
|
||||
1423857449, 601450431, 3009837614, 3294710456, 1567103746, 711928724,
|
||||
3020668471, 3272380065, 1510334235, 755167117,
|
||||
},
|
||||
};
|
||||
|
||||
// ---------------- Private Initializer Prototypes
|
||||
@@ -1701,7 +1703,7 @@ uint32_t wuffs_crc32__ieee_hasher__update(wuffs_crc32__ieee_hasher* self,
|
||||
uint8_t* v_p = i_slice_p.ptr;
|
||||
uint8_t* i_end1_p = i_slice_p.ptr + i_slice_p.len;
|
||||
while (v_p < i_end1_p) {
|
||||
v_s = (wuffs_crc32__ieee_table[((uint8_t)((v_s & 255))) ^ *v_p] ^
|
||||
v_s = (wuffs_crc32__ieee_table[0][((uint8_t)((v_s & 255))) ^ *v_p] ^
|
||||
(v_s >> 8));
|
||||
v_p++;
|
||||
}
|
||||
|
||||
+14
-16
@@ -152,18 +152,9 @@ func (p *parser) parseTopLevelDecl() (*a.Node, error) {
|
||||
p.tm.ByID(id), p.filename, p.line())
|
||||
}
|
||||
p.src = p.src[1:]
|
||||
value := (*a.Expr)(nil)
|
||||
// TODO: parse lists of lists.
|
||||
if p.peek1() == t.IDDollar {
|
||||
value, err = p.parseDollarExpr()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
} else {
|
||||
value, err = p.parseExpr()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
value, err := p.parsePossibleDollarExpr()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if x := p.peek1(); x != t.IDSemicolon {
|
||||
got := p.tm.ByID(x)
|
||||
@@ -854,13 +845,20 @@ func (p *parser) parseVarNode(inIterate bool) (*a.Node, error) {
|
||||
return a.NewVar(op, id, typ, value).Node(), nil
|
||||
}
|
||||
|
||||
func (p *parser) parseDollarExpr() (*a.Expr, error) {
|
||||
func (p *parser) parsePossibleDollarExprNode() (*a.Node, error) {
|
||||
n, err := p.parsePossibleDollarExpr()
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return n.Node(), err
|
||||
}
|
||||
|
||||
func (p *parser) parsePossibleDollarExpr() (*a.Expr, error) {
|
||||
if x := p.peek1(); x != t.IDDollar {
|
||||
got := p.tm.ByID(x)
|
||||
return nil, fmt.Errorf(`parse: expected "$", got %q at %s:%d`, got, p.filename, p.line())
|
||||
return p.parseExpr()
|
||||
}
|
||||
p.src = p.src[1:]
|
||||
args, err := p.parseList(t.IDCloseParen, (*parser).parseExprNode)
|
||||
args, err := p.parseList(t.IDCloseParen, (*parser).parsePossibleDollarExprNode)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
@@ -28,7 +28,7 @@ pub func ieee_hasher.update(x slice base.u8)(checksum base.u32) {
|
||||
var s base.u32 = 0xFFFFFFFF ^ this.state
|
||||
|
||||
iterate[1](p ptr base.u8:in.x) {
|
||||
s = ieee_table[((s & 0xFF) as base.u8) ^ deref p] ^ (s >> 8)
|
||||
s = ieee_table[0][((s & 0xFF) as base.u8) ^ deref p] ^ (s >> 8)
|
||||
}
|
||||
|
||||
this.state = 0xFFFFFFFF ^ s
|
||||
@@ -37,7 +37,7 @@ pub func ieee_hasher.update(x slice base.u8)(checksum base.u32) {
|
||||
|
||||
// The table below was created by script/print-crc32-magic-numbers.go.
|
||||
|
||||
pri const ieee_table array[256] base.u32 = $(
|
||||
pri const ieee_table array[1] array[256] base.u32 = $($(
|
||||
0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
|
||||
0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
|
||||
0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
|
||||
@@ -70,4 +70,4 @@ pri const ieee_table array[256] base.u32 = $(
|
||||
0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
|
||||
0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
|
||||
0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D,
|
||||
)
|
||||
))
|
||||
Reference in new issue
Block a user