Iniziata odissea per la compilazione

Author: JackHack96

CMakeLists.txt

@@ -1,8 +1,6 @@
 cmake_minimum_required(VERSION 3.5)
 project(sis)
 
-set(CMAKE_C_STANDARD 90)
-
 include_directories(sis/include)
 
 add_subdirectory(blif2vst)

TODO.md

@@ -355,6 +355,8 @@ static void io_unget(int, io_t *);
 
 int io_get(io_t *);
 
+int io_token(io_t *source);
+
 static int io_getc(io_t *);
 
 int io_error(io_t *, char *);

sis/include/astg_core.h sis/astg/astg_core.h

@@ -5,7 +5,7 @@
 
 #ifdef SIS
 
-#include <astg_int.h>
+#include "astg_int.h"
 
 #include "astg_core.h"
 #include "astg_int.h"

sis/astg/astg_core1.c

@@ -113,6 +113,8 @@ typedef void (*astg_daemon)(astg_graph *, astg_graph *);
 #define args args
 #endif
 
+int astg_write(astg_graph *stg, astg_bool hide_places, FILE *stream);
+
 astg_vertex_enum astg_v_type(astg_vertex *);
 
 char *astg_v_name(astg_vertex *);

sis/include/astg_int.h sis/astg/astg_int.h

@@ -8,7 +8,7 @@
 #include "bwd_int.h"
 #include "sis.h"
 #include <math.h>
-#include <retime_int.h>
+#include "../retime/retime_int.h"
 
 /* hacked from sim/interpret.c */
 #define SIM_SLOT simulation

sis/include/bwd_int.h sis/astg/bwd_int.h

@@ -3,7 +3,7 @@
 #ifndef BDDUSER_H
 #define BDDUSER_H
 
-#include <memuser.h>
+#include "../mem/memuser.h"
 #include <stdio.h>
 
 #if defined(__STDC__)

sis/astg/bwd_lp.c

@@ -4,8 +4,8 @@
 #include "util.h" /* includes math.h */
 
 #include "bdd.h" /* UCB interface to CMU */
-#include "bddint.h" /* CMU internal routines; for use in bdd_get_branches() and for BDD_POINTER */
-#include "bdduser.h" /* CMU exported routines */
+#include "../bdd_cmu/bddint.h" /* CMU internal routines; for use in bdd_get_branches() and for BDD_POINTER */
+#include "../bdd_cmu/bdduser.h" /* CMU exported routines */
 
 static void pop_cube_stack();
 

sis/include/min_delay_int.h sis/astg/min_delay_int.h

@@ -15,9 +15,9 @@
 #include "util.h" /* includes math.h */
 
 #include "bdd.h"     /* UCB interface to CMU */
-#include "bddint.h"  /* CMU internal routines; for use in bdd_get_node() */
-#include "bdduser.h" /* CMU exported routines */
-#include "memuser.h"
+#include "../bdd_cmu/bddint.h"  /* CMU internal routines; for use in bdd_get_node() */
+#include "../bdd_cmu/bdduser.h" /* CMU exported routines */
+#include "../mem/memuser.h"
 
 /*
  * Function to construct a bdd_t.

sis/include/si_int.h sis/astg/si_int.h

@@ -1,5 +1,3 @@
-{
-
 /*
  * The purpose of this package is the computation of node and network delays
  * in SIS.  Delays are returned as delay_time_t structures, which contain two
@@ -12,10 +10,6 @@
  */
 #include "delay_int.h"
 
-void
-
-void
-
 #include "tdc_int.h"
 #include "sis.h"
 #include <setjmp.h>

sis/include/atpg_int.h sis/atpg/atpg_int.h

@@ -179,8 +179,7 @@ bool setp_full(register pset a, register int size) {
 }
 
 /* setp_equal -- check if the set "a" equals set "b" */
-bool setp_equal(register pset a, register pset b);
-
+bool setp_equal(register pset a, register pset b)
 {
 register int i = LOOP(a);
 do

sis/include/fast_avl.h sis/atpg/fast_avl.h

@@ -117,7 +117,7 @@ int gl_gen_complex_gates(int level, int s, int p, tree_node_type_t root_type, tr
     return nforms;
 }
 
-int gl_generate_complex_gates(int level, s, p, tree_node_t ***forms) {
+int gl_generate_complex_gates(int level, int s, int p, tree_node_t ***forms) {
     int         num1, num2, i;
     tree_node_t **forms1, **forms2;
 

sis/include/sat_int.h sis/atpg/sat_int.h

@@ -26,29 +26,29 @@ typedef struct array_t {
   int index;    // combined index and locking flag.
 } array_t;
 
-extern array_t *array_do_alloc(int size, int number);
+array_t *array_do_alloc(int size, int number);
 
 /**
  * Create a duplicate copy of an array.
  */
-extern array_t *array_dup(array_t *);
+array_t *array_dup(array_t *old);
 
 /**
  * Returns a new array which consists of the elements from array1
  * followed by the elements of array2.
  */
-extern array_t *array_join(array_t *, array_t *);
+array_t *array_join(array_t *array1, array_t *array2);
 
 /**
  * Deallocate an array.  Freeing the individual elements of the
  * array is the responsibility of the user.
  */
-extern void array_free(array_t *);
+void array_free(array_t *array);
 
 /**
  * Appends the elements of array2 to the end of array1.
  */
-extern void array_append(array_t *, array_t *);
+void array_append(array_t *array1, array_t *array2);
 
 /**
  * Sort the elements of an array.  `compare' is defined as:
@@ -60,7 +60,7 @@ extern void array_append(array_t *, array_t *);
  * 	and should return -1 if obj1 < obj2, 0 if obj1 == obj2, or 1
  * 	if obj1 > obj2.
  */
-extern void array_sort(array_t *, int (*)());
+void array_sort(array_t *array, int (*compare)());
 
 /**
  * Compare adjacent elements of the array, and delete any duplicates.
@@ -82,13 +82,13 @@ extern void array_sort(array_t *, int (*)());
  *
  * and frees the given array element.
  */
-extern void array_uniq(array_t *, int (*)(), void (*)());
+void array_uniq(array_t *array, int (*compare)(), void (*free_func)());
 
-extern int array_abort(array_t *, int);
+int array_abort(array_t *a, int i);
 
-extern int array_resize(array_t *, int);
+int array_resize(array_t *array, int new_size);
 
-extern char *array_do_data(array_t *);
+char *array_do_data(array_t *array);
 
 extern unsigned int array_global_index;
 

sis/include/bddint.h sis/bdd_cmu/bdd_cmu/bddint.h

@@ -19,7 +19,7 @@
 #include "var_set.h"
 #include "array.h"
 #include "st.h"
-#include "bdduser.h"
+#include "../bdd_cmu/bdd_cmu/bdduser.h"
 
 #ifndef TRUE
 #define TRUE 1

sis/include/bdduser.h sis/bdd_cmu/bdd_cmu/bdduser.h

@@ -5,7 +5,7 @@
 #define LIMIT 5000
 
 #include "sparse.h"
-#include "astg_int.h"
+#include "../astg/astg_int.h"
 
 /* each dichotomy is a contatenation of two sets - one for the lhs and
  *  one for the rhs */

sis/bdd_cmu/bdd_port/bdditer.c

@@ -6,26 +6,24 @@
 #ifdef COMBINATIONAL
     #undef COMBINATIONAL
 #endif
-typedef enum {
-    ACTIVE_HIGH,
-    ACTIVE_LOW,
-    RISING_EDGE,
-    FALLING_EDGE,
-    COMBINATIONAL,
-    ASYNCH,
-    UNKNOWN
-} latch_synch_t;
-
-typedef struct {
-    node_t                 *latch_input;          /* must be a PRIMARY_OUTPUT */
-    node_t                 *latch_output;         /* must be a PRIMARY_INPUT */
-    int                    initial_value;            /* initial or reset state */
-    int                    current_value;            /* current state */
-    latch_synch_t          synch_type;     /* type of latch */
-    struct lib_gate_struct *gate; /* Reference to the library implementation */
-    node_t                 *control;              /* Pointer to the controlling gate */
-    char                   *undef1;                 /* undefined 1, for the programer's use */
-} latch_t;
+
+typedef enum latch_synch_enum latch_synch_t;
+enum latch_synch_enum {
+    ACTIVE_HIGH, ACTIVE_LOW, RISING_EDGE, FALLING_EDGE, COMBINATIONAL,
+    ASYNCH, UNKNOWN
+};
+
+typedef struct latch_struct latch_t;
+struct latch_struct {
+    node_t *latch_input;	/* must be a PRIMARY_OUTPUT */
+    node_t *latch_output;	/* must be a PRIMARY_INPUT */
+    int initial_value;		/* initial or reset state */
+    int current_value;		/* current state */
+    latch_synch_t synch_type;	/* type of latch */
+    struct lib_gate_struct *gate;		/* Reference to the library implementation */
+    node_t *control;		/* Pointer to the controlling gate */
+    char *undef1;		/* undefined 1, for the programer's use */
+};
 
 extern latch_t *latch_alloc(void);
 

sis/bdd_cmu/bdd_port/bddport.c

@@ -28,14 +28,12 @@ struct lib_class_struct {
     char        *name;              /* reserved for future use */
 };
 
-#ifdef SIS
 /* sequential support */
 typedef struct latch_time_struct latch_time_t;
 struct latch_time_struct {
     double setup;
     double hold;
 };
-#endif
 
 typedef struct lib_gate_struct lib_gate_t;
 struct lib_gate_struct {
@@ -46,14 +44,12 @@ struct lib_gate_struct {
     int         symmetric;        /* it is more or less symmetric WRT input pins */
     lib_class_t *class_p; /* pointer back to the class */
 
-#ifdef SIS
     /* sequential support */
     int          type;      /* type of gate -- lib_gate_type returns latch_synch_t */
     int          latch_pin; /* index for the latch output pin (-1 if none) */
     latch_time_t **latch_time_info; /* setup/hold times */
     delay_pin_t  *clock_delay;       /* delay from clock to output */
     char         *control_name;             /* name of the clock pin */
-#endif
 };
 
 /* normal library functions */
@@ -85,7 +81,6 @@ extern int lib_gate_num_in(lib_gate_t *);
 
 extern int lib_gate_num_out(lib_gate_t *);
 
-#ifdef SIS
 /* sequential support */
 #define lib_gate_type(g)                                                       \
   (((g) == NIL(lib_gate_t)) ? UNKNOWN : (latch_synch_t)(g)->type)
@@ -95,21 +90,11 @@ extern int lib_gate_num_out(lib_gate_t *);
 #define lib_gate_clock_delay(g)                                                \
   (((g) == NIL(lib_gate_t)) ? NIL(delay_pin_t) : (g)->clock_delay)
 
-extern lib_gate_t *lib_choose_smallest_latch(library_t *library, char *string, latch_synch_t latch_type)
-
-#endif
-
-#ifdef SIS
+extern lib_gate_t *lib_choose_smallest_latch(library_t *library, char *string, latch_synch_t latch_type);
 
 extern lib_class_t *lib_get_class_by_type(network_t *, library_t *,
                                           latch_synch_t);
 
-#else
-
-extern lib_class_t *lib_get_class_by_type(network_t *, library_t *);
-
-#endif
-
 /* for mapped nodes/networks */
 extern lib_gate_t *lib_gate_of(node_t *);