From ff2f2de04699be55bcd00ea7811c917d2e88a86d Mon Sep 17 00:00:00 2001 From: Tim Edwards Date: Fri, 3 Jan 2020 12:21:39 -0500 Subject: [PATCH] Corrected the dereferencing code from the last commit, where the flag definition had been put in database.h instead of database.h.in, and so was deleted on "make clean". Also, corrected a problem that causes the cif output style to be lost when running DRC-CIF checks if the first output style is the DRC style. --- database/database.h.in | 4 ++++ drc/DRCcif.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/database/database.h.in b/database/database.h.in index 5b9bd777..d3aec04a 100644 --- a/database/database.h.in +++ b/database/database.h.in @@ -391,6 +391,9 @@ typedef struct celldef * with the option "gds readonly true". * CDVISITED indicates that at least one instance of the cell was * already output during a file write. + * CDDEREFERENCE is a flag indicating that when loading or expanding + * children of a cell, the path should be ignored and the cell + * path should be searched for the location. */ #define CDAVAILABLE 0x0001 @@ -408,6 +411,7 @@ typedef struct celldef #define CDPROCESSEDGDS 0x1000 #define CDVENDORGDS 0x2000 #define CDVISITED 0x4000 +#define CDDEREFERENCE 0x8000 /* * Description of an array. diff --git a/drc/DRCcif.c b/drc/DRCcif.c index 3a4a4bbd..477ae23f 100644 --- a/drc/DRCcif.c +++ b/drc/DRCcif.c @@ -527,7 +527,8 @@ drcCifCheck(arg) } if (drcCifValid == FALSE) { - CIFCurStyle = CIFSaveStyle; + if (CIFSaveStyle != NULL) + CIFCurStyle = CIFSaveStyle; return; }