get rid of typeof

Author: MyskYko

src/misc/btor/btor2mem.h

@@ -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_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_DELETE(ptr) (free (ptr))
@@ -90,7 +77,7 @@ btorsim_strdup (const char *str)
   char *res = 0;
   if (str)
   {
-    BTOR2_NEWN (res, strlen (str) + 1);
+    res = (char *) btorsim_malloc ((strlen (str) + 1) * sizeof (char));
     strcpy (res, str);
   }
   return res;

src/misc/btor/btor2parser.c

@@ -1260,7 +1260,7 @@ check_state_init (Btor2Parser *bfr, int64_t state_id, int64_t init_id)
   memset (cache, 0, size);
 
   BTOR2_INIT_STACK (stack);
-  BTOR2_PUSH_STACK (stack, init_id);
+  BTOR2_PUSH_STACK (int64_t, stack, init_id);
   do
   {
     id = BTOR2_POP_STACK (stack);
@@ -1282,7 +1282,7 @@ check_state_init (Btor2Parser *bfr, int64_t state_id, int64_t init_id)
                       id);
       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));
 
   free (cache);

src/misc/btor/btor2stack.h

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