revert removal of superfluous 'extern'

.. for functions based on review comments
This commit is contained in:
Kamyar Mohajerani 2021-11-17 11:53:04 -05:00
parent 5def9e0ffc
commit 879711def3
10 changed files with 88 additions and 88 deletions

View File

@ -1,6 +1,7 @@
#ifndef _FLATTEN_H
#define _FLATTEN_H
void flattenCell(char *name, int file);
extern int UniquePins(char *name, int filenum);
extern void flattenCell(char *name, int file);
#endif /* _FLATTEN_H */
#endif /* _FLATTEN_H */

View File

@ -15,40 +15,40 @@ struct hashdict {
};
void InitializeHashTable(struct hashdict *dict, int size);
int RecurseHashTable(struct hashdict *dict,
extern void InitializeHashTable(struct hashdict *dict, int size);
extern int RecurseHashTable(struct hashdict *dict,
int (*func)(struct hashlist *elem));
int RecurseHashTableValue(struct hashdict *dict,
extern int RecurseHashTableValue(struct hashdict *dict,
int (*func)(struct hashlist *elem, int), int);
struct nlist *RecurseHashTablePointer(struct hashdict *dict,
extern struct nlist *RecurseHashTablePointer(struct hashdict *dict,
struct nlist *(*func)(struct hashlist *elem, void *),
void *pointer);
void HashDelete(char *name, struct hashdict *dict);
void HashIntDelete(char *name, int value, struct hashdict *dict);
void HashKill(struct hashdict *dict);
extern void HashDelete(char *name, struct hashdict *dict);
extern void HashIntDelete(char *name, int value, struct hashdict *dict);
extern void HashKill(struct hashdict *dict);
int CountHashTableEntries(struct hashlist *p);
int CountHashTableBinsUsed(struct hashlist *p);
extern int CountHashTableEntries(struct hashlist *p);
extern int CountHashTableBinsUsed(struct hashlist *p);
/* these functions return a pointer to a hash list element */
struct hashlist *HashInstall(char *name, struct hashdict *dict);
struct hashlist *HashPtrInstall(char *name, void *ptr,
extern struct hashlist *HashInstall(char *name, struct hashdict *dict);
extern struct hashlist *HashPtrInstall(char *name, void *ptr,
struct hashdict *dict);
struct hashlist *HashIntPtrInstall(char *name, int value, void *ptr,
extern struct hashlist *HashIntPtrInstall(char *name, int value, void *ptr,
struct hashdict *dict);
struct hashlist *HashInt2PtrInstall(char *name, int c, void *ptr,
extern struct hashlist *HashInt2PtrInstall(char *name, int c, void *ptr,
struct hashdict *dict);
/* these functions return the ->ptr field of a struct hashlist */
void *HashLookup(char *s, struct hashdict *dict);
void *HashIntLookup(char *s, int i, struct hashdict *dict);
void *HashInt2Lookup(char *s, int c, struct hashdict *dict);
void *HashFirst(struct hashdict *dict);
void *HashNext(struct hashdict *dict);
extern void *HashLookup(char *s, struct hashdict *dict);
extern void *HashIntLookup(char *s, int i, struct hashdict *dict);
extern void *HashInt2Lookup(char *s, int c, struct hashdict *dict);
extern void *HashFirst(struct hashdict *dict);
extern void *HashNext(struct hashdict *dict);
unsigned long hashnocase(char *s, int hashsize);
unsigned long my_hash(char *s, int hashsize);
extern unsigned long hashnocase(char *s, int hashsize);
extern unsigned long my_hash(char *s, int hashsize);
extern int (*matchfunc)(char *, char *);
/* matchintfunc() compares based on the name and the first */

View File

@ -18,59 +18,59 @@ extern int InterruptPending;
/* Exported procedures */
void PrintElementClasses(struct ElementClass *EC, int type, int dolist);
void PrintNodeClasses(struct NodeClass *NC, int type, int dolist);
void SummarizeNodeClasses(struct NodeClass *NC);
void PrintPropertyResults(int do_list);
void PrintCoreStats(void);
void ResetState(void);
void CreateTwoLists(char *name1, int file1, char *name2, int file2,
extern void PrintElementClasses(struct ElementClass *EC, int type, int dolist);
extern void PrintNodeClasses(struct NodeClass *NC, int type, int dolist);
extern void SummarizeNodeClasses(struct NodeClass *NC);
extern void PrintPropertyResults(int do_list);
extern void PrintCoreStats(void);
extern void ResetState(void);
extern void CreateTwoLists(char *name1, int file1, char *name2, int file2,
int dolist);
int Iterate(void);
int VerifyMatching(void);
void PrintAutomorphisms(void);
int ResolveAutomorphisms(void);
void PermuteAutomorphisms(void);
int Permute(void);
int PermuteSetup(char *model, int filenum, char *pin1, char *pin2);
int PermuteForget(char *model, int filenum, char *pin1, char *pin2);
int EquivalenceElements(char *name1, int file1, char *name2, int file2);
int EquivalenceNodes(char *name1, int file1, char *name2, int file2);
int EquivalenceClasses(char *name1, int file1, char *name2, int file2);
int IgnoreClass(char *name, int file, unsigned char type);
int MatchPins(struct nlist *tp1, struct nlist *tp2, int dolist);
int PropertyOptimize(struct objlist *ob, struct nlist *tp, int run,
extern int Iterate(void);
extern int VerifyMatching(void);
extern void PrintAutomorphisms(void);
extern int ResolveAutomorphisms(void);
extern void PermuteAutomorphisms(void);
extern int Permute(void);
extern int PermuteSetup(char *model, int filenum, char *pin1, char *pin2);
extern int PermuteForget(char *model, int filenum, char *pin1, char *pin2);
extern int EquivalenceElements(char *name1, int file1, char *name2, int file2);
extern int EquivalenceNodes(char *name1, int file1, char *name2, int file2);
extern int EquivalenceClasses(char *name1, int file1, char *name2, int file2);
extern int IgnoreClass(char *name, int file, unsigned char type);
extern int MatchPins(struct nlist *tp1, struct nlist *tp2, int dolist);
extern int PropertyOptimize(struct objlist *ob, struct nlist *tp, int run,
int series, int comb);
int CreateCompareQueue(char *, int, char *, int);
int GetCompareQueueTop(char **, int *, char **, int *);
int PeekCompareQueueTop(char **, int *, char **, int *);
void RemoveCompareQueue();
extern int CreateCompareQueue(char *, int, char *, int);
extern int GetCompareQueueTop(char **, int *, char **, int *);
extern int PeekCompareQueueTop(char **, int *, char **, int *);
extern void RemoveCompareQueue();
void PrintIllegalClasses();
void PrintIllegalNodeClasses();
void PrintIllegalElementClasses();
extern void PrintIllegalClasses();
extern void PrintIllegalNodeClasses();
extern void PrintIllegalElementClasses();
void DumpNetwork(struct objlist *ob, int cidx);
void DumpNetworkAll(char *name, int file);
extern void DumpNetwork(struct objlist *ob, int cidx);
extern void DumpNetworkAll(char *name, int file);
void RegroupDataStructures();
void FormatIllegalElementClasses();
void FormatIllegalNodeClasses();
int ResolveAutomorphsByProperty();
int ResolveAutomorphsByPin();
void SummarizeElementClasses(struct ElementClass *EC);
int remove_group_tags(struct objlist *ob);
extern void RegroupDataStructures();
extern void FormatIllegalElementClasses();
extern void FormatIllegalNodeClasses();
extern int ResolveAutomorphsByProperty();
extern int ResolveAutomorphsByPin();
extern void SummarizeElementClasses(struct ElementClass *EC);
extern int remove_group_tags(struct objlist *ob);
#ifdef TCL_NETGEN
int EquivalentNode();
int EquivalentElement();
extern int EquivalentNode();
extern int EquivalentElement();
void enable_interrupt();
void disable_interrupt();
extern void enable_interrupt();
extern void disable_interrupt();
Tcl_Obj *ListNodeClasses(int legal);
Tcl_Obj *ListElementClasses(int legal);
extern Tcl_Obj *ListNodeClasses(int legal);
extern Tcl_Obj *ListElementClasses(int legal);
#endif

View File

@ -18,8 +18,6 @@
#define HORIZONTAL 1
#define VERTICAL 2
int UniquePins(char *name, int filenum);
/* netgen.c */
extern void ReopenCellDef(char *name, int file);
extern void CellDef(char *name, int file);

View File

@ -179,7 +179,7 @@ char *strsave(char *s)
int match(char *st1, char *st2)
{
if (0==strncmp(st1,st2,PATH_MAX)) return(1);
if (0==strcmp(st1,st2)) return(1);
else return(0);
}

View File

@ -312,18 +312,18 @@ extern void GarbageCollect(void);
extern void InitGarbageCollection(void);
extern void AddToGarbageList(struct objlist *head);
void DeleteProperties(struct keyvalue **topptr);
void AddProperty(struct keyvalue **topptr, char *key, char *value);
void AddScaledProperty(struct keyvalue **topptr, char *key, char *value, double scale);
void DeleteProperties(struct keyvalue **topptr);
struct objlist *LinkProperties(char *model, struct keyvalue *topptr);
extern void DeleteProperties(struct keyvalue **topptr);
extern void AddProperty(struct keyvalue **topptr, char *key, char *value);
extern void AddScaledProperty(struct keyvalue **topptr, char *key, char *value, double scale);
extern void DeleteProperties(struct keyvalue **topptr);
extern struct objlist *LinkProperties(char *model, struct keyvalue *topptr);
void ClassDelete(char *class, int file);
void RemoveShorted(char *class, int file);
void CellRehash(char *name, char *newname, int file);
extern void ClassDelete(char *class, int file);
extern void RemoveShorted(char *class, int file);
extern void CellRehash(char *name, char *newname, int file);
/* defined in netgen.c */
int ConvertStringToInteger(char *string, int *ival);
extern int ConvertStringToInteger(char *string, int *ival);
#ifdef HAVE_MALLINFO
void PrintMemoryStats(void);

View File

@ -1,8 +1,8 @@
#ifndef _TECH_H
#define _TECH_H
int ActelLibPresent(void);
void ActelLib(void);
void VerilogTop(char *name, int fnum, char *filename);
extern int ActelLibPresent(void);
extern void ActelLib(void);
extern void VerilogTop(char *name, int fnum, char *filename);
#endif /* _TECH_H */
#endif /* _TECH_H */

View File

@ -1,10 +1,10 @@
#ifndef _XILINX_H
#define _XILINX_H
void xilinx_sym(struct nlist *nl, struct objlist *gob);
void Xilinx(char *cellname, char *filename);
int xilinxCell(char *cell);
int XilinxLibPresent(void);
void XilinxLib(void);
extern void xilinx_sym(struct nlist *nl, struct objlist *gob);
extern void Xilinx(char *cellname, char *filename);
extern int xilinxCell(char *cell);
extern int XilinxLibPresent(void);
extern void XilinxLib(void);
#endif /* _XILINX_H */
#endif /* _XILINX_H */

View File

@ -9,7 +9,7 @@ EXTRA_LIBS = ${MAIN_EXTRA_LIBS}
DFLAGS += -DNETGEN_DATE="\"`date`\""
LIBS += -lm
CLEANS += netgen.sh netgen.tcl netgenexec${EXEEXT}
CFLAGS += -I${NETGENDIR}/base -I./base
CFLAGS += -I${NETGENDIR}/base
TCL_FILES = \
$(DESTDIR)${INSTALL_TCLDIR}/tkcon.tcl \

View File

@ -34,6 +34,7 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "hash.h"
#include "xilinx.h"
#include "tech.h"
#include "flatten.h"
#ifndef TRUE
#define TRUE 1