Files
guru/sci-electronics/yosys/files/yosys-0.31-abc-c++17-fix.patch
2024-04-30 16:00:57 +08:00

227 lines
8.0 KiB
Diff

--- yosys-yosys-0.31/abc/src/misc/zlib/trees.c 2023-06-28 02:10:24.000000000 -0700
+++ yosys-yosys-0.31/abc/src/misc/zlib/trees.c 2023-07-18 08:56:03.335795722 -0700
@@ -1144,7 +1144,7 @@
*/
local unsigned bi_reverse(unsigned code, int len)
{
- register unsigned res = 0;
+ unsigned res = 0;
do {
res |= code & 1;
code >>= 1, res <<= 1;
--- yosys-yosys-0.31/abc/src/misc/zlib/crc32.c 2023-06-28 02:10:24.000000000 -0700
+++ yosys-yosys-0.31/abc/src/misc/zlib/crc32.c 2023-07-18 08:55:38.138798430 -0700
@@ -269,8 +269,8 @@
/* ========================================================================= */
local unsigned long crc32_little(unsigned long crc, const unsigned char FAR *buf, unsigned len)
{
- register u4 c;
- register const u4 FAR *buf4;
+ u4 c;
+ const u4 FAR *buf4;
c = (u4)crc;
c = ~c;
@@ -306,8 +306,8 @@
/* ========================================================================= */
local unsigned long crc32_big(unsigned long crc, const unsigned char FAR *buf, unsigned len)
{
- register u4 c;
- register const u4 FAR *buf4;
+ u4 c;
+ const u4 FAR *buf4;
c = REV((u4)crc);
c = ~c;
--- yosys-yosys-0.31/abc/src/misc/zlib/deflate.c 2023-06-28 02:10:24.000000000 -0700
+++ yosys-yosys-0.31/abc/src/misc/zlib/deflate.c 2023-07-18 08:55:10.870801362 -0700
@@ -1027,9 +1027,9 @@
local uInt longest_match(deflate_state *s, IPos cur_match)
{
unsigned chain_length = s->max_chain_length;/* max hash chain length */
- register Bytef *scan = s->window + s->strstart; /* current string */
- register Bytef *match; /* matched string */
- register int len; /* length of current match */
+ Bytef *scan = s->window + s->strstart; /* current string */
+ Bytef *match; /* matched string */
+ int len; /* length of current match */
int best_len = s->prev_length; /* best match length so far */
int nice_match = s->nice_match; /* stop if match long enough */
IPos limit = s->strstart > (IPos)MAX_DIST(s) ?
@@ -1044,13 +1044,13 @@
/* Compare two bytes at a time. Note: this is not always beneficial.
* Try with and without -DUNALIGNED_OK to check.
*/
- register Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
- register ush scan_start = *(ushf*)scan;
- register ush scan_end = *(ushf*)(scan+best_len-1);
+ Bytef *strend = s->window + s->strstart + MAX_MATCH - 1;
+ ush scan_start = *(ushf*)scan;
+ ush scan_end = *(ushf*)(scan+best_len-1);
#else
- register Bytef *strend = s->window + s->strstart + MAX_MATCH;
- register Byte scan_end1 = scan[best_len-1];
- register Byte scan_end = scan[best_len];
+ Bytef *strend = s->window + s->strstart + MAX_MATCH;
+ Byte scan_end1 = scan[best_len-1];
+ Byte scan_end = scan[best_len];
#endif
/* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
@@ -1173,10 +1173,10 @@
*/
local uInt longest_match(deflate_state *s, IPos cur_match)
{
- register Bytef *scan = s->window + s->strstart; /* current string */
- register Bytef *match; /* matched string */
- register int len; /* length of current match */
- register Bytef *strend = s->window + s->strstart + MAX_MATCH;
+ Bytef *scan = s->window + s->strstart; /* current string */
+ Bytef *match; /* matched string */
+ int len; /* length of current match */
+ Bytef *strend = s->window + s->strstart + MAX_MATCH;
/* The code is optimized for HASH_BITS >= 8 and MAX_MATCH-2 multiple of 16.
* It is easy to get rid of this optimization if necessary.
@@ -1261,8 +1261,8 @@
*/
local void fill_window(deflate_state *s)
{
- register unsigned n, m;
- register Posf *p;
+ unsigned n, m;
+ Posf *p;
unsigned more; /* Amount of free space at the end of the window. */
uInt wsize = s->w_size;
--- yosys-yosys-0.31/abc/src/misc/extra/extraUtilUtil.c 2023-06-28 02:10:24.000000000 -0700
+++ yosys-yosys-0.31/abc/src/misc/extra/extraUtilUtil.c 2023-07-18 08:53:09.857814372 -0700
@@ -97,8 +97,8 @@
***********************************************************************/
int Extra_UtilGetopt( int argc, char *argv[], const char *optstring )
{
- register int c;
- register const char *place;
+ int c;
+ const char *place;
globalUtilOptarg = NULL;
--- yosys-yosys-0.31/abc/src/misc/bzlib/compress.c 2023-06-28 02:10:24.000000000 -0700
+++ yosys-yosys-0.31/abc/src/misc/bzlib/compress.c 2023-07-18 08:54:26.994806079 -0700
@@ -190,15 +190,15 @@
zPend = 0;
}
{
- register UChar rtmp;
- register UChar* ryy_j;
- register UChar rll_i;
+ UChar rtmp;
+ UChar* ryy_j;
+ UChar rll_i;
rtmp = yy[1];
yy[1] = yy[0];
ryy_j = &(yy[1]);
rll_i = ll_i;
while ( rll_i != rtmp ) {
- register UChar rtmp2;
+ UChar rtmp2;
ryy_j++;
rtmp2 = rtmp;
rtmp = *ryy_j;
@@ -360,8 +360,8 @@
if (nGroups == 6 && 50 == ge-gs+1) {
/*--- fast track the common case ---*/
- register UInt32 cost01, cost23, cost45;
- register UInt16 icv;
+ UInt32 cost01, cost23, cost45;
+ UInt16 icv;
cost01 = cost23 = cost45 = 0;
# define BZ_ITER(nn) \
--- yosys-yosys-0.31/abc/src/bdd/cudd/cuddSat.c 2023-06-28 02:10:24.000000000 -0700
+++ yosys-yosys-0.31/abc/src/bdd/cudd/cuddSat.c 2023-07-18 08:59:43.372772066 -0700
@@ -279,7 +279,7 @@
DdNode * f,
int * length)
{
- register DdNode *F;
+ DdNode *F;
st__table *visited;
DdNode *sol;
cuddPathPair *rootPair;
@@ -351,7 +351,7 @@
DdNode * f,
int * weight)
{
- register DdNode *F;
+ DdNode *F;
st__table *visited;
cuddPathPair *my_pair;
int complement, cost;
--- yosys-yosys-0.31/abc/src/bdd/cudd/cuddSplit.c 2023-06-28 02:10:24.000000000 -0700
+++ yosys-yosys-0.31/abc/src/bdd/cudd/cuddSplit.c 2023-07-18 08:59:42.987772107 -0700
@@ -638,8 +638,8 @@
{
DdNode *N,*Nv,*Nnv;
- register double min_v,min_nv;
- register double min_N;
+ double min_v,min_nv;
+ double min_N;
double *pmin;
double *dummy;
--- yosys-yosys-0.31/abc/src/bdd/cudd/cuddCache.c 2023-06-28 02:10:24.000000000 -0700
+++ yosys-yosys-0.31/abc/src/bdd/cudd/cuddCache.c 2023-07-18 08:58:14.403781631 -0700
@@ -229,7 +229,7 @@
{
int posn;
unsigned hash;
- register DdCache *entry;
+ DdCache *entry;
ptruint uf, ug, uh;
ptruint ufc, ugc, uhc;
@@ -283,7 +283,7 @@
{
int posn;
unsigned hash;
- register DdCache *entry;
+ DdCache *entry;
hash = ddCHash2_(op,cuddF2L(f),cuddF2L(g));
// posn = ddCHash2(op,cuddF2L(f),cuddF2L(g),table->cacheShift);
@@ -328,7 +328,7 @@
{
int posn;
unsigned hash;
- register DdCache *entry;
+ DdCache *entry;
hash = ddCHash2_(op,cuddF2L(f),cuddF2L(f));
// posn = ddCHash2(op,cuddF2L(f),cuddF2L(f),table->cacheShift);
--- yosys-yosys-0.31/abc/src/bdd/cudd/cuddBddIte.c 2023-06-28 02:10:24.000000000 -0700
+++ yosys-yosys-0.31/abc/src/bdd/cudd/cuddBddIte.c 2023-07-18 08:58:13.834781692 -0700
@@ -1203,8 +1203,8 @@
unsigned int * topgp,
unsigned int * tophp)
{
- register DdNode *F, *G, *H, *r, *f, *g, *h;
- register unsigned int topf, topg, toph;
+ DdNode *F, *G, *H, *r, *f, *g, *h;
+ unsigned int topf, topg, toph;
DdNode *one = dd->one;
int comple, change;
@@ -1305,7 +1305,7 @@
unsigned int * topgp,
unsigned int * tophp)
{
- register DdNode *r, *f, *g, *h;
+ DdNode *r, *f, *g, *h;
int comple, change;
f = *fp;