diff --git a/alliance/src/dreal/src/GSB_parse.h b/alliance/src/dreal/src/GSB_parse.h index 8521bf1a..08e89151 100644 --- a/alliance/src/dreal/src/GSB_parse.h +++ b/alliance/src/dreal/src/GSB_parse.h @@ -46,7 +46,7 @@ # define GSB_PARSE # define GSB_MAX_BUFFER 255 -# define GSB_MAX_KEYWORD 153 +# define GSB_MAX_KEYWORD 74 # define GSB_SEPARATORS_STRING " \t\n" # define GSB_COMMENT_CHAR '#' diff --git a/alliance/src/lynx/src/netlist.c b/alliance/src/lynx/src/netlist.c index 44c5d633..6919f389 100644 --- a/alliance/src/lynx/src/netlist.c +++ b/alliance/src/lynx/src/netlist.c @@ -851,8 +851,18 @@ long LynxBuildLogicalTransistor( FigureRds, LogicalFigure ) ( BulkLayer == RDS_LYNX_TRANSISTOR_EMPTY )) continue; /*4p*/ +#if 0 if ( TransType == NTRANS ) TransType = TRANSN; else TransType = TRANSP; +#endif + switch ( TransType ) { + case NTRANS: TransType = TRANSN; break; + case NTRANS_FAST: TransType = TRANSN_FAST; break; + case NTRANS_HVIO: TransType = TRANSN_HVIO; break; + case PTRANS: TransType = TRANSP; break; + case PTRANS_FAST: TransType = TRANSP_FAST; break; + case PTRANS_HVIO: TransType = TRANSP_HVIO; break; + } for ( Gate = FigureRds->LAYERTAB[ GateLayer ]; Gate != (rdsrec_list *)0; diff --git a/alliance/src/mbk/src/mlo.h b/alliance/src/mbk/src/mlo.h index a01143ba..149fedd9 100644 --- a/alliance/src/mbk/src/mlo.h +++ b/alliance/src/mbk/src/mlo.h @@ -51,11 +51,11 @@ extern "C" { #define TRANSFAST (1 << 1) #define TRANSHVIO (1 << 3) -#define TRANSN_FAST (TRANSN & TRANSFAST) -#define TRANSP_FAST (TRANSP & TRANSFAST) +#define TRANSN_FAST (TRANSN | TRANSFAST) +#define TRANSP_FAST (TRANSP | TRANSFAST) -#define TRANSN_HVIO (TRANSN & TRANSHVIO) -#define TRANSP_HVIO (TRANSP & TRANSHVIO) +#define TRANSN_HVIO (TRANSN | TRANSHVIO) +#define TRANSP_HVIO (TRANSP | TRANSHVIO) #define IsTransP(type) (type & 1) #define IsTransN(type) (!IsTransP(type)) diff --git a/alliance/src/rds/src/rprparse.c b/alliance/src/rds/src/rprparse.c index fa4357b3..257f749c 100644 --- a/alliance/src/rds/src/rprparse.c +++ b/alliance/src/rds/src/rprparse.c @@ -384,10 +384,10 @@ extern long MBK_X_GRID, MBK_Y_GRID, MBK_Y_SLICE, MBK_WIDTH_VSS, MBK_WIDTH_VDD, "NDIF ", "PDIF ", "NTRANS ", - "PTRANS ", "NTRANS_FAST", - "PTRANS_FAST", "NTRANS_HVIO", + "PTRANS ", + "PTRANS_FAST", "PTRANS_HVIO", "POLY ", "POLY2 ",