Skip to content

Commit ed2c609

Browse files
igg0cyrillos
igg0
authored and
cyrillos
committed
output/coff: Support for COMDAT sections
Signed-off-by: "Glücksmann, Igor" <igor.glucksmann@avast.com> Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
1 parent 4b5224b commit ed2c609

File tree

7 files changed

+275
-23
lines changed

7 files changed

+275
-23
lines changed

‎Makefile.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ LIBOBJ_NW = stdlib/snprintf.$(O) stdlib/vsnprintf.$(O) stdlib/strlcpy.$(O) \
108108
\
109109
nasmlib/ver.$(O) \
110110
nasmlib/alloc.$(O) nasmlib/asprintf.$(O) nasmlib/errfile.$(O) \
111-
nasmlib/crc64.$(O) nasmlib/md5c.$(O) \
111+
nasmlib/crc32.$(O) nasmlib/crc64.$(O) nasmlib/md5c.$(O) \
112112
nasmlib/string.$(O) nasmlib/nctype.$(O) \
113113
nasmlib/file.$(O) nasmlib/mmap.$(O) nasmlib/ilog2.$(O) \
114114
nasmlib/realpath.$(O) nasmlib/path.$(O) \

‎Mkfiles/msvc.mak‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ LIBOBJ_NW = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) \
7272
\
7373
nasmlib\ver.$(O) \
7474
nasmlib\alloc.$(O) nasmlib\asprintf.$(O) nasmlib\errfile.$(O) \
75-
nasmlib\crc64.$(O) nasmlib\md5c.$(O) \
75+
nasmlib\crc32.$(O) nasmlib\crc64.$(O) nasmlib\md5c.$(O) \
7676
nasmlib\string.$(O) nasmlib\nctype.$(O) \
7777
nasmlib\file.$(O) nasmlib\mmap.$(O) nasmlib\ilog2.$(O) \
7878
nasmlib\realpath.$(O) nasmlib\path.$(O) \

‎Mkfiles/openwcom.mak‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ LIBOBJ_NW = stdlib\snprintf.$(O) stdlib\vsnprintf.$(O) stdlib\strlcpy.$(O) &
6161
&
6262
nasmlib\ver.$(O) &
6363
nasmlib\alloc.$(O) nasmlib\asprintf.$(O) nasmlib\errfile.$(O) &
64-
nasmlib\crc64.$(O) nasmlib\md5c.$(O) &
64+
nasmlib\crc32.$(O) nasmlib\crc64.$(O) nasmlib\md5c.$(O) &
6565
nasmlib\string.$(O) nasmlib\nctype.$(O) &
6666
nasmlib\file.$(O) nasmlib\mmap.$(O) nasmlib\ilog2.$(O) &
6767
nasmlib\realpath.$(O) nasmlib\path.$(O) &

‎include/hashtbl.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ static inline uint64_t crc64_byte(uint64_t crc, uint8_t v)
7979
return crc64_tab[(uint8_t)(v ^ crc)] ^ (crc >> 8);
8080
}
8181

82+
uint32_t crc32b(uint32_t crc, const void *data, size_t len);
83+
8284
void **hash_find(struct hash_table *head, const char *string,
8385
struct hash_insert *insert);
8486
void **hash_findb(struct hash_table *head, const void *key, size_t keylen,

‎nasmlib/crc32.c‎

Lines changed: 115 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,115 @@
1+
/* ----------------------------------------------------------------------- *
2+
*
3+
* Copyright 1996-2021 The NASM Authors - All Rights Reserved
4+
* See the file AUTHORS included with the NASM distribution for
5+
* the specific copyright holders.
6+
*
7+
* Redistribution and use in source and binary forms, with or without
8+
* modification, are permitted provided that the following
9+
* conditions are met:
10+
*
11+
* * Redistributions of source code must retain the above copyright
12+
* notice, this list of conditions and the following disclaimer.
13+
* * Redistributions in binary form must reproduce the above
14+
* copyright notice, this list of conditions and the following
15+
* disclaimer in the documentation and/or other materials provided
16+
* with the distribution.
17+
*
18+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
19+
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
20+
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
21+
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
22+
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
23+
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
24+
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
25+
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
26+
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
27+
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
28+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
29+
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
30+
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
31+
*
32+
* ----------------------------------------------------------------------- */
33+
34+
#include "compiler.h"
35+
#include "hashtbl.h"
36+
37+
const uint32_t crc32_tab[256] = {
38+
0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
39+
0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
40+
0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
41+
0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
42+
0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
43+
0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
44+
0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
45+
0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
46+
0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
47+
0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
48+
0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
49+
0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
50+
0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
51+
0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
52+
0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
53+
0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
54+
0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
55+
0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
56+
0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
57+
0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
58+
0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
59+
0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
60+
0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
61+
0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
62+
0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
63+
0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
64+
0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
65+
0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
66+
0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
67+
0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
68+
0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
69+
0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
70+
0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
71+
0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
72+
0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
73+
0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
74+
0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
75+
0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
76+
0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
77+
0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
78+
0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
79+
0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
80+
0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
81+
0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
82+
0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
83+
0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
84+
0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
85+
0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
86+
0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
87+
0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
88+
0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
89+
0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
90+
0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
91+
0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
92+
0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
93+
0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
94+
0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
95+
0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
96+
0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
97+
0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
98+
0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
99+
0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
100+
0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
101+
0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
102+
};
103+
104+
uint32_t crc32b(uint32_t crc, const void *data, size_t len)
105+
{
106+
register const uint8_t *p = data;
107+
register uint32_t hashval = crc;
108+
109+
while (len--)
110+
{
111+
hashval = (hashval >> 8) ^ crc32_tab[(hashval ^ *p++) & 0xff];
112+
}
113+
114+
return hashval;
115+
};

0 commit comments

Comments
 (0)