luke
/
abc
mirror of https://github.com/YosysHQ/abc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix compilation errors

This commit is contained in:
MyskYko 2026-01-04 13:37:42 -08:00
parent 7721495458
commit db9275bfbc
3 changed files with 24 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/misc/btor/btor2mem.h
View File

@ -25,21 +25,8 @@ ABC_NAMESPACE_HEADER_START
/*------------------------------------------------------------------------*/ /*------------------------------------------------------------------------*/
#define BTOR2_NEWN(ptr, nelems) \
((ptr) = (typeof(ptr)) btorsim_malloc ((nelems) * sizeof *(ptr)))
#define BTOR2_CNEWN(ptr, nelems) \
((ptr) = (typeof(ptr)) btorsim_calloc ((nelems), sizeof *(ptr)))
#define BTOR2_CLRN(ptr, nelems) (memset ((ptr), 0, (nelems) * sizeof *(ptr))) #define BTOR2_CLRN(ptr, nelems) (memset ((ptr), 0, (nelems) * sizeof *(ptr)))
#define BTOR2_REALLOC(p, n) \
((p) = (typeof(p)) btorsim_realloc ((p), ((n) * sizeof *(p))))
#define BTOR2_NEW(ptr) BTOR2_NEWN ((ptr), 1)
#define BTOR2_CNEW(ptr) BTOR2_CNEWN ((ptr), 1)
#define BTOR2_CLR(ptr) BTOR2_CLRN ((ptr), 1) #define BTOR2_CLR(ptr) BTOR2_CLRN ((ptr), 1)
#define BTOR2_DELETE(ptr) (free (ptr)) #define BTOR2_DELETE(ptr) (free (ptr))
@ -90,7 +77,7 @@ btorsim_strdup (const char *str)
char *res = 0; char *res = 0;
if (str) if (str)
{ {
BTOR2_NEWN (res, strlen (str) + 1); res = (char *) btorsim_malloc ((strlen (str) + 1) * sizeof (char));
strcpy (res, str); strcpy (res, str);
} }
return res; return res;

34
src/misc/btor/btor2parser.c
View File

@ -68,7 +68,7 @@ btor2parser_strdup (const char *str)
{ {
assert (str); assert (str);
char *res = btor2parser_malloc (strlen (str) + 1); char *res = (char *)btor2parser_malloc (strlen (str) + 1);
strcpy (res, str); strcpy (res, str);
return res; return res;
} }
@ -76,7 +76,7 @@ btor2parser_strdup (const char *str)
Btor2Parser * Btor2Parser *
btor2parser_new () btor2parser_new ()
{ {
Btor2Parser *res = btor2parser_malloc (sizeof *res); Btor2Parser *res = (Btor2Parser *)btor2parser_malloc (sizeof *res);
memset (res, 0, sizeof *res); memset (res, 0, sizeof *res);
return res; return res;
} }
@ -158,7 +158,7 @@ perr_bfr (Btor2Parser *bfr, const char *fmt, ...)
va_end (ap); va_end (ap);
buf[1023] = '\0'; buf[1023] = '\0';
bfr->error = btor2parser_malloc (strlen (buf) + 28); bfr->error = (char *)btor2parser_malloc (strlen (buf) + 28);
sprintf (bfr->error, "line %" PRId64 ": %s", bfr->lineno, buf); sprintf (bfr->error, "line %" PRId64 ": %s", bfr->lineno, buf);
return 0; return 0;
} }
@ -169,7 +169,7 @@ pushc_bfr (Btor2Parser *bfr, int32_t ch)
if (bfr->nbuf >= bfr->szbuf) if (bfr->nbuf >= bfr->szbuf)
{ {
bfr->szbuf = bfr->szbuf ? 2 * bfr->szbuf : 1; bfr->szbuf = bfr->szbuf ? 2 * bfr->szbuf : 1;
bfr->buf = btor2parser_realloc (bfr->buf, bfr->szbuf * sizeof *bfr->buf); bfr->buf = (char *)btor2parser_realloc (bfr->buf, bfr->szbuf * sizeof *bfr->buf);
} }
bfr->buf[bfr->nbuf++] = ch; bfr->buf[bfr->nbuf++] = ch;
} }
@ -181,7 +181,7 @@ pusht_bfr (Btor2Parser *bfr, Btor2Line *l)
{ {
bfr->sztable = bfr->sztable ? 2 * bfr->sztable : 1; bfr->sztable = bfr->sztable ? 2 * bfr->sztable : 1;
bfr->table = bfr->table =
btor2parser_realloc (bfr->table, bfr->sztable * sizeof *bfr->table); (Btor2Line **)btor2parser_realloc (bfr->table, bfr->sztable * sizeof *bfr->table);
} }
bfr->table[bfr->ntable++] = l; bfr->table[bfr->ntable++] = l;
} }
@ -401,13 +401,13 @@ new_line_bfr (Btor2Parser *bfr,
Btor2Line *res; Btor2Line *res;
assert (0 < id); assert (0 < id);
assert (bfr->ntable <= id); assert (bfr->ntable <= id);
res = btor2parser_malloc (sizeof *res); res = (Btor2Line *)btor2parser_malloc (sizeof *res);
memset (res, 0, sizeof (*res)); memset (res, 0, sizeof (*res));
res->id = id; res->id = id;
res->lineno = lineno; res->lineno = lineno;
res->tag = tag; res->tag = tag;
res->name = name; res->name = name;
res->args = btor2parser_malloc (sizeof (int64_t) * 3); res->args = (int64_t *)btor2parser_malloc (sizeof (int64_t) * 3);
memset (res->args, 0, sizeof (int64_t) * 3); memset (res->args, 0, sizeof (int64_t) * 3);
while (bfr->ntable < id) pusht_bfr (bfr, 0); while (bfr->ntable < id) pusht_bfr (bfr, 0);
assert (bfr->ntable == id); assert (bfr->ntable == id);
@ -617,7 +617,7 @@ check_sorts_bfr (Btor2Parser *bfr, Btor2Line *l)
break; break;
/* [u:l] -> u - l + 1 */ /* [u:l] -> u - l + 1 */
case BTOR2_TAG_slice: case BTOR2_TAG_slice: {
assert (l->nargs == 1); assert (l->nargs == 1);
if (!check_sort_bitvec (bfr, l, args)) return 0; if (!check_sort_bitvec (bfr, l, args)) return 0;
/* NOTE: this cast is safe since l->args[1] and l->args[2] contains /* NOTE: this cast is safe since l->args[1] and l->args[2] contains
@ -631,7 +631,7 @@ check_sorts_bfr (Btor2Parser *bfr, Btor2Line *l)
l->name, l->name,
upper - lower + 1); upper - lower + 1);
break; break;
}
/* 1 x 1 -> 1 */ /* 1 x 1 -> 1 */
case BTOR2_TAG_iff: case BTOR2_TAG_iff:
case BTOR2_TAG_implies: case BTOR2_TAG_implies:
@ -706,7 +706,7 @@ check_sorts_bfr (Btor2Parser *bfr, Btor2Line *l)
break; break;
case BTOR2_TAG_sext: case BTOR2_TAG_sext:
case BTOR2_TAG_uext: case BTOR2_TAG_uext: {
assert (l->nargs == 1); assert (l->nargs == 1);
if (!check_sort_bitvec (bfr, l, args)) return 0; if (!check_sort_bitvec (bfr, l, args)) return 0;
/* NOTE: this cast is safe since l->args[1] contains the extension /* NOTE: this cast is safe since l->args[1] contains the extension
@ -719,7 +719,7 @@ check_sorts_bfr (Btor2Parser *bfr, Btor2Line *l)
l->name, l->name,
ext); ext);
break; break;
}
case BTOR2_TAG_read: case BTOR2_TAG_read:
assert (l->nargs == 2); assert (l->nargs == 2);
if (args[0]->sort.tag != BTOR2_TAG_SORT_array) if (args[0]->sort.tag != BTOR2_TAG_SORT_array)
@ -1000,7 +1000,7 @@ mult_unbounded_bin_str (const char *a, const char *b)
alen = strlen (a); alen = strlen (a);
blen = strlen (b); blen = strlen (b);
rlen = alen + blen; rlen = alen + blen;
res = btor2parser_malloc (rlen + 1); res = (char *)btor2parser_malloc (rlen + 1);
res[rlen] = 0; res[rlen] = 0;
for (r = res; r < res + blen; r++) *r = '0'; for (r = res; r < res + blen; r++) *r = '0';
@ -1058,7 +1058,7 @@ add_unbounded_bin_str (const char *a, const char *b)
rlen = (alen < blen) ? blen : alen; rlen = (alen < blen) ? blen : alen;
rlen++; rlen++;
res = btor2parser_malloc (rlen + 1); res = (char *)btor2parser_malloc (rlen + 1);
p = a + alen; p = a + alen;
q = b + blen; q = b + blen;
@ -1256,11 +1256,11 @@ check_state_init (Btor2Parser *bfr, int64_t state_id, int64_t init_id)
// 'init_id' is the highest id we will see when traversing down // 'init_id' is the highest id we will see when traversing down
size_t size = (labs (init_id) + 1) * sizeof (char); size_t size = (labs (init_id) + 1) * sizeof (char);
cache = btor2parser_malloc (size); cache = (char *)btor2parser_malloc (size);
memset (cache, 0, size); memset (cache, 0, size);
BTOR2_INIT_STACK (stack); BTOR2_INIT_STACK (stack);
BTOR2_PUSH_STACK (stack, init_id); BTOR2_PUSH_STACK (int64_t, stack, init_id);
do do
{ {
id = BTOR2_POP_STACK (stack); id = BTOR2_POP_STACK (stack);
@ -1282,7 +1282,7 @@ check_state_init (Btor2Parser *bfr, int64_t state_id, int64_t init_id)
id); id);
break; break;
} }
for (i = 0; i < line->nargs; i++) BTOR2_PUSH_STACK (stack, line->args[i]); for (i = 0; i < line->nargs; i++) BTOR2_PUSH_STACK (int64_t, stack, line->args[i]);
} while (!BTOR2_EMPTY_STACK (stack)); } while (!BTOR2_EMPTY_STACK (stack));
free (cache); free (cache);
@ -1342,7 +1342,7 @@ parse_justice_bfr (Btor2Parser *bfr, Btor2Line *l)
{ {
uint32_t nargs; uint32_t nargs;
if (!parse_pos_number_bfr (bfr, &nargs)) return 0; if (!parse_pos_number_bfr (bfr, &nargs)) return 0;
l->args = btor2parser_realloc (l->args, sizeof (int64_t) * nargs); l->args = (int64_t *)btor2parser_realloc (l->args, sizeof (int64_t) * nargs);
l->nargs = nargs; l->nargs = nargs;
if (!parse_args (bfr, l, nargs)) return 0; if (!parse_args (bfr, l, nargs)) return 0;
return 1; return 1;

12
src/misc/btor/btor2stack.h
View File

@ -53,28 +53,28 @@ BTOR2_DECLARE_STACK (BtorVoidPtr, void *);
BTOR2_INIT_STACK ((stack)); \ BTOR2_INIT_STACK ((stack)); \
} while (0) } while (0)
#define BTOR2_ENLARGE(p, o, n) \ #define BTOR2_ENLARGE(T, p, o, n) \
do \ do \
{ \ { \
size_t internaln = (o) ? 2 * (o) : 1; \ size_t internaln = (o) ? 2 * (o) : 1; \
BTOR2_REALLOC ((p), internaln); \ (p) = (T *) btorsim_realloc ((p), ((internaln) * sizeof (T))); \
(n) = internaln; \ (n) = internaln; \
} while (0) } while (0)
#define BTOR2_ENLARGE_STACK(stack) \ #define BTOR2_ENLARGE_STACK(T, stack) \
do \ do \
{ \ { \
size_t old_size = BTOR2_SIZE_STACK (stack), new_size; \ size_t old_size = BTOR2_SIZE_STACK (stack), new_size; \
size_t old_count = BTOR2_COUNT_STACK (stack); \ size_t old_count = BTOR2_COUNT_STACK (stack); \
BTOR2_ENLARGE ((stack).start, old_size, new_size); \ BTOR2_ENLARGE (T, (stack).start, old_size, new_size); \
(stack).top = (stack).start + old_count; \ (stack).top = (stack).start + old_count; \
(stack).end = (stack).start + new_size; \ (stack).end = (stack).start + new_size; \
} while (0) } while (0)
#define BTOR2_PUSH_STACK(stack, elem) \ #define BTOR2_PUSH_STACK(T, stack, elem) \
do \ do \
{ \ { \
if (BTOR2_FULL_STACK ((stack))) BTOR2_ENLARGE_STACK ((stack)); \ if (BTOR2_FULL_STACK ((stack))) BTOR2_ENLARGE_STACK (T, (stack)); \
*((stack).top++) = (elem); \ *((stack).top++) = (elem); \
} while (0) } while (0)