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

Changed the "gds nodatestamp" option to "gds datestamp" and added 

"gds datestamp <value>" as an option to force a specific datestamp
on the GDS output.  This is a third option beyond the previous two
which were either to use the current time or to write zero.  The
new option allows an entire library to get a common timestamp, for
example, related to a PDK version number.  The "gds nodatestamp"
option has been retained for backwards compatibility.
This commit is contained in:
Tim Edwards 2022-01-21 10:26:29 -05:00
parent c2755a061f
commit 5629c2a6cd
4 changed files with 124 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@ -1 +1 @@
8.3.259
8.3.260

18
calma/CalmaWrite.c
View File

@ -59,7 +59,7 @@ bool CalmaDoLabels = TRUE; /* If FALSE, don't output labels with GDS-II */
bool CalmaDoLower = TRUE; /* If TRUE, allow lowercase labels. */
bool CalmaFlattenArrays = FALSE; /* If TRUE, output arrays as individual uses */
bool CalmaAddendum = FALSE; /* If TRUE, do not output readonly cell defs */
bool CalmaNoDateStamp = FALSE; /* If TRUE, output zero for creation date stamp */
time_t *CalmaDateStamp = NULL; /* If non-NULL, output this for creation date stamp */
bool CalmaAllowUndefined = FALSE; /* If TRUE, allow calls to undefined cells */
/* Experimental stuff---not thoroughly tested (as of Sept. 2007)! */
@ -435,8 +435,8 @@ calmaDumpStructure(def, outf, calmaDefHash, filename)
/* Output structure begin */
calmaOutRH(28, CALMA_BGNSTR, CALMA_I2, outf);
if (CalmaNoDateStamp)
calmaOutDate(time((time_t *) 0), outf);
if (CalmaDateStamp != NULL)
calmaOutDate(*CalmaDateStamp, outf);
else
calmaOutDate(def->cd_timestamp, outf);
calmaOutDate(time((time_t *) 0), outf);
@ -1003,8 +1003,8 @@ calmaProcessDef(def, outf, do_library)
/* Output structure header */
calmaOutRH(28, CALMA_BGNSTR, CALMA_I2, outf);
if (CalmaNoDateStamp)
calmaOutDate(time((time_t *) 0), outf);
if (CalmaDateStamp != NULL)
calmaOutDate(*CalmaDateStamp, outf);
else
calmaOutDate(def->cd_timestamp, outf);
calmaOutDate(time((time_t *) 0), outf);
@ -1168,8 +1168,8 @@ calmaOutFunc(def, f, cliprect)
/* Output structure begin */
calmaOutRH(28, CALMA_BGNSTR, CALMA_I2, f);
if (CalmaNoDateStamp)
calmaOutDate(time((time_t *) 0), f);
if (CalmaDateStamp != NULL)
calmaOutDate(*CalmaDateStamp, f);
else
calmaOutDate(def->cd_timestamp, f);
calmaOutDate(time((time_t *) 0), f);
@ -2973,8 +2973,8 @@ calmaOutHeader(rootDef, f)
/* Beginning of library */
calmaOutRH(28, CALMA_BGNLIB, CALMA_I2, f);
if (CalmaNoDateStamp)
calmaOutDate(time((time_t *) 0), f);
if (CalmaDateStamp != NULL)
calmaOutDate(*CalmaDateStamp, f);
else
calmaOutDate(rootDef->cd_timestamp, f);
calmaOutDate(time((time_t *) 0), f);

2
calma/calma.h
View File

@ -32,7 +32,7 @@ extern bool CalmaDoLibrary;
extern bool CalmaDoLower;
extern bool CalmaAddendum;
extern bool CalmaNoDuplicates;
extern bool CalmaNoDateStamp;
extern time_t *CalmaDateStamp;
extern bool CalmaUnique;
extern bool CalmaMaskHints;
extern bool CalmaMergeTiles;

137
commands/CmdCD.c
View File

@ -92,26 +92,27 @@ bool cmdDumpParseArgs();
#define CALMA_ADDENDUM 1
#define CALMA_ARRAYS 2
#define CALMA_CONTACTS 3
#define CALMA_DRCCHECK 4
#define CALMA_FLATTEN 5
#define CALMA_FLATGLOB 6
#define CALMA_ORDERING 7
#define CALMA_LABELS 8
#define CALMA_LIBRARY 9
#define CALMA_LOWER 10
#define CALMA_MASKHINTS 11
#define CALMA_MERGE 12
#define CALMA_NO_STAMP 13
#define CALMA_NO_DUP 14
#define CALMA_READ 15
#define CALMA_READONLY 16
#define CALMA_RESCALE 17
#define CALMA_WARNING 18
#define CALMA_WRITE 19
#define CALMA_POLYS 20
#define CALMA_PATHS 21
#define CALMA_UNDEFINED 22
#define CALMA_UNIQUE 23
#define CALMA_DATESTAMP 4
#define CALMA_DRCCHECK 5
#define CALMA_FLATTEN 6
#define CALMA_FLATGLOB 7
#define CALMA_ORDERING 8
#define CALMA_LABELS 9
#define CALMA_LIBRARY 10
#define CALMA_LOWER 11
#define CALMA_MASKHINTS 12
#define CALMA_MERGE 13
#define CALMA_NO_STAMP 14
#define CALMA_NO_DUP 15
#define CALMA_READ 16
#define CALMA_READONLY 17
#define CALMA_RESCALE 18
#define CALMA_WARNING 19
#define CALMA_WRITE 20
#define CALMA_POLYS 21
#define CALMA_PATHS 22
#define CALMA_UNDEFINED 23
#define CALMA_UNIQUE 24
#define CALMA_WARN_HELP CIF_WARN_END /* undefined by CIF module */
@ -139,6 +140,7 @@ CmdCalma(w, cmd)
"addendum [yes|no] output only cells that are not type \"readonly\"",
"arrays [yes|no] output arrays as individual subuses (like in CIF)",
"contacts [yes|no] optimize output by arraying contacts as subcells",
"datestamp [yes|value] use current time or value as the creation date stamp",
"drccheck [yes|no] mark all cells as needing DRC checking",
"flatten [yes|no|limit] flatten simple cells (e.g., contacts) on input",
"flatglob [<name>|none] flatten cells by name with glob patterning",
@ -646,13 +648,24 @@ CmdCalma(w, cmd)
return;
case CALMA_NO_STAMP:
/* CALMA_DATESTAMP is the current implementation. */
/* CALMA_NO_STAMP is retained for backwards-compatibility. */
if (cmd->tx_argc == 2)
{
#ifdef MAGIC_WRAPPER
Tcl_SetObjResult(magicinterp, Tcl_NewBooleanObj(CalmaNoDateStamp));
if (CalmaDateStamp == NULL)
Tcl_SetObjResult(magicinterp, Tcl_NewBooleanObj(FALSE));
else if (*CalmaDateStamp == 0)
Tcl_SetObjResult(magicinterp, Tcl_NewBooleanObj(TRUE));
else
Tcl_SetObjResult(magicinterp, Tcl_NewStringObj("fixed", -1));
#else
TxPrintf("Structures will contain a %s header creation date stamp.\n",
(CalmaNoDateStamp) ? "zero" : "valid");
if (CalmaDateStamp != NULL)
TxPrintf("Structures will contain a header creation date "
"stamp of %ld.\n", (long)(*CalmaDateStamp));
else
TxPrintf("Structures will contain a default header creation date "
"stamp.\n");
#endif
return;
}
@ -662,7 +675,25 @@ CmdCalma(w, cmd)
option = Lookup(cmd->tx_argv[2], cmdCalmaYesNo);
if (option < 0)
goto wrongNumArgs;
CalmaNoDateStamp = (option < 4) ? FALSE : TRUE;
/* yes|no: If "yes", then set date stamp to zero. If "no", then
* leave date stamp pointer NULL, and current date will be used for
* the timestamp.
*/
if (option >= 4)
{
if (CalmaDateStamp == NULL)
CalmaDateStamp = (time_t *)mallocMagic(sizeof(time_t));
*CalmaDateStamp = (time_t)0;
}
else
{
if (CalmaDateStamp != NULL)
{
freeMagic((char *)CalmaDateStamp);
CalmaDateStamp = (time_t *)NULL;
}
}
return;
case CALMA_PATHS:
@ -729,6 +760,64 @@ CmdCalma(w, cmd)
CIFWarningLevel = CIF_WARN_LIMIT;
return;
case CALMA_DATESTAMP:
/* CALMA_NO_STAMP is retained for backwards-compatibility. */
if (cmd->tx_argc == 2)
{
#ifdef MAGIC_WRAPPER
if (CalmaDateStamp != NULL)
Tcl_SetObjResult(magicinterp, Tcl_NewIntObj(*CalmaDateStamp));
else
Tcl_SetObjResult(magicinterp, Tcl_NewStringObj("default", -1));
#else
if (CalmaDateStamp != NULL)
TxPrintf("Structures will contain a header creation date "
"stamp of %ld.\n", (long)(*CalmaDateStamp));
else
TxPrintf("Structures will contain a default header creation date "
"stamp.\n");
#endif
return;
}
else if (cmd->tx_argc != 3)
goto wrongNumArgs;
option = Lookup(cmd->tx_argv[2], cmdCalmaYesNo);
if (option >= 0)
{
/* option yes|no: "yes" means set date stamp pointer to NULL
* and use current date as the timestamp. "no" means set the
* date stamp to zero.
*/
if (option >= 4)
{
if (CalmaDateStamp != NULL)
{
freeMagic((char *)CalmaDateStamp);
CalmaDateStamp = (time_t *)NULL;
}
}
else
{
if (CalmaDateStamp == NULL)
CalmaDateStamp = (time_t *)mallocMagic(sizeof(time_t));
*CalmaDateStamp = (time_t)0;
}
}
else if (StrIsInt(cmd->tx_argv[2]))
{
/* Otherwise, if value is an integer, use it for the date stamp */
if (CalmaDateStamp == NULL)
CalmaDateStamp = (time_t *)mallocMagic(sizeof(time_t));
*CalmaDateStamp = atoi(cmd->tx_argv[2]);
}
else
{
TxError("Unrecognizable date stamp \"%s\".\n", cmd->tx_argv[2]);
goto wrongNumArgs;
}
return;
case CALMA_WARNING:
if (cmd->tx_argc == 2)
{