From 4027c8442a93bddd193f6046cf4041df0d76373c Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Wed, 29 Sep 2004 21:40:46 +0000 Subject: [PATCH] Rename all layers name from "L_ALUx", and "L_VIAx" to "ALUx" and "VIAx", "L_CONT" becomes "VIAP". --- alliance/src/sea/etc/cmos.lef | 192 ++++++++++++++--------------- alliance/src/sea/src/DEF_actions.c | 46 +++---- alliance/src/sea/src/DEF_drive.c | 10 +- alliance/src/sea/src/LEF_drive.c | 26 ++-- alliance/src/sea/src/MAC_drive.c | 14 +-- alliance/src/sea/src/util_LEFDEF.c | 50 ++++---- 6 files changed, 170 insertions(+), 168 deletions(-) diff --git a/alliance/src/sea/etc/cmos.lef b/alliance/src/sea/etc/cmos.lef index 0536bda4..37aae66a 100644 --- a/alliance/src/sea/etc/cmos.lef +++ b/alliance/src/sea/etc/cmos.lef @@ -1,5 +1,5 @@ # -# $Id: cmos.lef,v 1.4 2003/04/07 14:38:38 jpc Exp $ +# $Id: cmos.lef,v 1.5 2004/09/29 21:40:39 jpc Exp $ # # /------------------------------------------------------------------\ # | | @@ -30,17 +30,17 @@ UNITS END UNITS -LAYER L_POLY +LAYER POLY TYPE MASTERSLICE ; -END L_POLY +END POLY -LAYER L_CONT +LAYER VIAP TYPE CUT ; -END L_CONT +END VIAP -LAYER L_ALU1 +LAYER ALU1 TYPE ROUTING ; WIDTH 2.00 ; SPACING 3.00 ; @@ -48,15 +48,15 @@ LAYER L_ALU1 DIRECTION VERTICAL ; CAPACITANCE CPERSQDIST 0.000032 ; RESISTANCE RPERSQ 0.100000 ; -END L_ALU1 +END ALU1 -LAYER L_VIA1 +LAYER VIA1 TYPE CUT ; -END L_VIA1 +END VIA1 -LAYER L_ALU2 +LAYER ALU2 TYPE ROUTING ; WIDTH 2.00 ; SPACING 3.00 ; @@ -64,15 +64,15 @@ LAYER L_ALU2 DIRECTION HORIZONTAL ; CAPACITANCE CPERSQDIST 0.000032 ; RESISTANCE RPERSQ 0.100000 ; -END L_ALU2 +END ALU2 -LAYER L_VIA2 +LAYER VIA2 TYPE CUT ; -END L_VIA2 +END VIA2 -LAYER L_ALU3 +LAYER ALU3 TYPE ROUTING ; WIDTH 2.00 ; SPACING 3.00 ; @@ -80,15 +80,15 @@ LAYER L_ALU3 DIRECTION VERTICAL ; CAPACITANCE CPERSQDIST 0.000032 ; RESISTANCE RPERSQ 0.100000 ; -END L_ALU3 +END ALU3 -LAYER L_VIA3 +LAYER VIA3 TYPE CUT ; -END L_VIA3 +END VIA3 -LAYER L_ALU4 +LAYER ALU4 TYPE ROUTING ; WIDTH 2.00 ; SPACING 3.00 ; @@ -96,15 +96,15 @@ LAYER L_ALU4 DIRECTION HORIZONTAL ; CAPACITANCE CPERSQDIST 0.000032 ; RESISTANCE RPERSQ 0.100000 ; -END L_ALU4 +END ALU4 -LAYER L_VIA4 +LAYER VIA4 TYPE CUT ; -END L_VIA4 +END VIA4 -LAYER L_ALU5 +LAYER ALU5 TYPE ROUTING ; WIDTH 2.00 ; SPACING 3.00 ; @@ -112,15 +112,15 @@ LAYER L_ALU5 DIRECTION VERTICAL ; CAPACITANCE CPERSQDIST 0.000032 ; RESISTANCE RPERSQ 0.100000 ; -END L_ALU5 +END ALU5 -LAYER L_VIA5 +LAYER VIA5 TYPE CUT ; -END L_VIA5 +END VIA5 -LAYER L_ALU6 +LAYER ALU6 TYPE ROUTING ; WIDTH 2.00 ; SPACING 3.00 ; @@ -128,130 +128,130 @@ LAYER L_ALU6 DIRECTION HORIZONTAL ; CAPACITANCE CPERSQDIST 0.000032 ; RESISTANCE RPERSQ 0.100000 ; -END L_ALU6 +END ALU6 #VIA CONT_POLY DEFAULT -# LAYER L_POLY ; +# LAYER POLY ; # RECT -1.50 -1.50 1.50 1.50 ; -# LAYER L_CONT ; +# LAYER VIAP ; # RECT -0.50 -0.50 0.50 0.50 ; -# LAYER L_ALU1 ; +# LAYER ALU1 ; # RECT -1.00 -1.00 1.00 1.00 ; #END CONT_POLY VIA CONT_VIA DEFAULT - LAYER L_ALU1 ; + LAYER ALU1 ; RECT -1.00 -1.00 1.00 1.00 ; - LAYER L_VIA1 ; + LAYER VIA1 ; RECT -0.50 -0.50 0.50 0.50 ; - LAYER L_ALU2 ; + LAYER ALU2 ; RECT -1.00 -1.00 1.00 1.00 ; END CONT_VIA VIA CONT_VIA2 DEFAULT - LAYER L_ALU3 ; + LAYER ALU3 ; RECT -1.00 -1.00 1.00 1.00 ; - LAYER L_VIA2 ; + LAYER VIA2 ; RECT -0.50 -0.50 0.50 0.50 ; - LAYER L_ALU2 ; + LAYER ALU2 ; RECT -1.00 -1.00 1.00 1.00 ; END CONT_VIA2 VIA CONT_VIA3 DEFAULT - LAYER L_ALU4 ; + LAYER ALU4 ; RECT -1.00 -1.00 1.00 1.00 ; - LAYER L_VIA3 ; + LAYER VIA3 ; RECT -0.50 -0.50 0.50 0.50 ; - LAYER L_ALU3 ; + LAYER ALU3 ; RECT -1.00 -1.00 1.00 1.00 ; END CONT_VIA3 VIA CONT_VIA4 DEFAULT - LAYER L_ALU5 ; + LAYER ALU5 ; RECT -1.00 -1.00 1.00 1.00 ; - LAYER L_VIA4 ; + LAYER VIA4 ; RECT -0.50 -0.50 0.50 0.50 ; - LAYER L_ALU4 ; + LAYER ALU4 ; RECT -1.00 -1.00 1.00 1.00 ; END CONT_VIA4 VIA CONT_VIA5 DEFAULT - LAYER L_ALU6 ; + LAYER ALU6 ; RECT -1.00 -1.00 1.00 1.00 ; - LAYER L_VIA5 ; + LAYER VIA5 ; RECT -0.50 -0.50 0.50 0.50 ; - LAYER L_ALU5 ; + LAYER ALU5 ; RECT -1.00 -1.00 1.00 1.00 ; END CONT_VIA5 VIARULE TURN_ALU1 GENERATE - LAYER L_ALU1 ; + LAYER ALU1 ; DIRECTION vertical ; - LAYER L_ALU1 ; + LAYER ALU1 ; DIRECTION horizontal ; END TURN_ALU1 VIARULE TURN_ALU2 GENERATE - LAYER L_ALU2 ; + LAYER ALU2 ; DIRECTION vertical ; - LAYER L_ALU2 ; + LAYER ALU2 ; DIRECTION horizontal ; END TURN_ALU2 VIARULE TURN_ALU3 GENERATE - LAYER L_ALU3 ; + LAYER ALU3 ; DIRECTION vertical ; - LAYER L_ALU3 ; + LAYER ALU3 ; DIRECTION horizontal ; END TURN_ALU3 VIARULE TURN_ALU4 GENERATE - LAYER L_ALU4 ; + LAYER ALU4 ; DIRECTION vertical ; - LAYER L_ALU4 ; + LAYER ALU4 ; DIRECTION horizontal ; END TURN_ALU4 VIARULE TURN_ALU5 GENERATE - LAYER L_ALU5 ; + LAYER ALU5 ; DIRECTION vertical ; - LAYER L_ALU5 ; + LAYER ALU5 ; DIRECTION horizontal ; END TURN_ALU5 VIARULE TURN_ALU6 GENERATE - LAYER L_ALU6 ; + LAYER ALU6 ; DIRECTION vertical ; - LAYER L_ALU6 ; + LAYER ALU6 ; DIRECTION horizontal ; END TURN_ALU6 #VIARULE VIA1_HV -# LAYER L_ALU1 ; +# LAYER ALU1 ; # DIRECTION VERTICAL ; # OVERHANG 0.50 ; # METALOVERHANG 0.50 ; # -# LAYER L_ALU2 ; +# LAYER ALU2 ; # DIRECTION HORIZONTAL ; # OVERHANG 0.50 ; # METALOVERHANG 0.50 ; @@ -261,12 +261,12 @@ END TURN_ALU6 # # #VIARULE VIA2_VH -# LAYER L_ALU2 ; +# LAYER ALU2 ; # DIRECTION HORIZONTAL ; # OVERHANG 0.50 ; # METALOVERHANG 0.50 ; # -# LAYER L_ALU3 ; +# LAYER ALU3 ; # DIRECTION VERTICAL ; # OVERHANG 0.50 ; # METALOVERHANG 0.50 ; @@ -276,12 +276,12 @@ END TURN_ALU6 # # #VIARULE VIA3_VH -# LAYER L_ALU3 ; +# LAYER ALU3 ; # DIRECTION HORIZONTAL ; # OVERHANG 0.50 ; # METALOVERHANG 0.50 ; # -# LAYER L_ALU4 ; +# LAYER ALU4 ; # DIRECTION VERTICAL ; # OVERHANG 0.50 ; # METALOVERHANG 0.50 ; @@ -291,123 +291,123 @@ END TURN_ALU6 VIARULE genVIA1_HV GENERATE - LAYER L_ALU1 ; + LAYER ALU1 ; DIRECTION VERTICAL ; OVERHANG 0.50 ; METALOVERHANG 0.50 ; - LAYER L_ALU2 ; + LAYER ALU2 ; DIRECTION HORIZONTAL ; OVERHANG 0.50 ; METALOVERHANG 0.50 ; - LAYER L_VIA1 ; + LAYER VIA1 ; RECT -0.50 -0.50 0.50 0.50 ; SPACING 3.00 BY 3.00 ; END genVIA1_HV VIARULE genVIA1_VH GENERATE - LAYER L_ALU1 ; + LAYER ALU1 ; DIRECTION HORIZONTAL ; OVERHANG 0.50 ; METALOVERHANG 0.50 ; - LAYER L_ALU2 ; + LAYER ALU2 ; DIRECTION VERTICAL ; OVERHANG 0.50 ; METALOVERHANG 0.50 ; - LAYER L_VIA1 ; + LAYER VIA1 ; RECT -0.50 -0.50 0.50 0.50 ; SPACING 3.00 BY 3.00 ; END genVIA1_VH VIARULE genVIA2_VH GENERATE - LAYER L_ALU2 ; + LAYER ALU2 ; DIRECTION HORIZONTAL ; OVERHANG 0.50 ; METALOVERHANG 0.50 ; - LAYER L_ALU3 ; + LAYER ALU3 ; DIRECTION VERTICAL ; OVERHANG 0.50 ; METALOVERHANG 0.50 ; - LAYER L_VIA2 ; + LAYER VIA2 ; RECT -0.50 -0.50 0.50 0.50 ; SPACING 3.00 BY 3.00 ; END genVIA2_VH VIARULE genVIA2_HV GENERATE - LAYER L_ALU2 ; + LAYER ALU2 ; DIRECTION VERTICAL ; OVERHANG 0.50 ; METALOVERHANG 0.50 ; - LAYER L_ALU3 ; + LAYER ALU3 ; DIRECTION HORIZONTAL ; OVERHANG 0.50 ; METALOVERHANG 0.50 ; - LAYER L_VIA2 ; + LAYER VIA2 ; RECT -0.50 -0.50 0.50 0.50 ; SPACING 3.00 BY 3.00 ; END genVIA2_HV VIARULE genVIA3_VH GENERATE - LAYER L_ALU3 ; + LAYER ALU3 ; DIRECTION HORIZONTAL ; OVERHANG 0.50 ; METALOVERHANG 0.50 ; - LAYER L_ALU4 ; + LAYER ALU4 ; DIRECTION VERTICAL ; OVERHANG 0.50 ; METALOVERHANG 0.50 ; - LAYER L_VIA3 ; + LAYER VIA3 ; RECT -0.50 -0.50 0.50 0.50 ; SPACING 3.00 BY 3.00 ; END genVIA3_VH VIARULE genVIA3_HV GENERATE - LAYER L_ALU3 ; + LAYER ALU3 ; DIRECTION VERTICAL ; OVERHANG 0.50 ; METALOVERHANG 0.50 ; - LAYER L_ALU4 ; + LAYER ALU4 ; DIRECTION HORIZONTAL ; OVERHANG 0.50 ; METALOVERHANG 0.50 ; - LAYER L_VIA3 ; + LAYER VIA3 ; RECT -0.50 -0.50 0.50 0.50 ; SPACING 3.00 BY 3.00 ; END genVIA3_HV SPACING - SAMENET L_CONT L_CONT 3.00 ; - SAMENET L_VIA1 L_VIA1 3.00 ; - SAMENET L_VIA2 L_VIA2 3.00 ; - SAMENET L_CONT L_VIA1 3.00 STACK ; - SAMENET L_VIA1 L_VIA2 3.00 STACK ; - SAMENET L_VIA2 L_VIA3 3.00 STACK ; - SAMENET L_VIA3 L_VIA4 3.00 STACK ; - SAMENET L_VIA4 L_VIA5 3.00 STACK ; - SAMENET L_POLY L_POLY 3.00 ; - SAMENET L_ALU1 L_ALU1 3.00 STACK ; - SAMENET L_ALU2 L_ALU2 3.00 STACK ; - SAMENET L_ALU3 L_ALU3 3.00 STACK ; - SAMENET L_ALU4 L_ALU4 3.00 STACK ; - SAMENET L_ALU5 L_ALU5 3.00 STACK ; - SAMENET L_ALU6 L_ALU6 3.00 ; + SAMENET VIAP VIAP 3.00 ; + SAMENET VIA1 VIA1 3.00 ; + SAMENET VIA2 VIA2 3.00 ; + SAMENET VIAP VIA1 3.00 STACK ; + SAMENET VIA1 VIA2 3.00 STACK ; + SAMENET VIA2 VIA3 3.00 STACK ; + SAMENET VIA3 VIA4 3.00 STACK ; + SAMENET VIA4 VIA5 3.00 STACK ; + SAMENET POLY POLY 3.00 ; + SAMENET ALU1 ALU1 3.00 STACK ; + SAMENET ALU2 ALU2 3.00 STACK ; + SAMENET ALU3 ALU3 3.00 STACK ; + SAMENET ALU4 ALU4 3.00 STACK ; + SAMENET ALU5 ALU5 3.00 STACK ; + SAMENET ALU6 ALU6 3.00 ; END SPACING diff --git a/alliance/src/sea/src/DEF_actions.c b/alliance/src/sea/src/DEF_actions.c index 2cb742cf..dedb6af8 100644 --- a/alliance/src/sea/src/DEF_actions.c +++ b/alliance/src/sea/src/DEF_actions.c @@ -1,6 +1,6 @@ /* - * $Id: DEF_actions.c,v 1.3 2003/06/26 17:00:39 jpc Exp $ + * $Id: DEF_actions.c,v 1.4 2004/09/29 21:40:46 jpc Exp $ * * /----------------------------------------------------------------\ * | | @@ -424,6 +424,7 @@ extern void def_pin_start(char *pin_name, char *net_name) extern void def_pin_options() { char *netName; + char *pinName; char orientCon; long xCon, yCon, widthCon, lengthCon, fakeCon; long xR1 , yR1 , xR2 , yR2; @@ -435,18 +436,19 @@ extern void def_pin_options() netName = LV_tPin[LV_numPins - 1].netName; + pinName = LV_tPin[LV_numPins - 1].pinName; /* Process the logical terminal. */ if (LV_pLoFig) { /* The logical terminal/signal pair must be created only once. */ - if (!findlocon (LV_pLoFig, netName)) { + if (!findlocon (LV_pLoFig, pinName)) { pLoSig = addlosig (LV_pLoFig, LV_mSig++, - addchain (NULL, (void*)netName), + addchain (NULL, (void*)pinName), EXTERNAL); - addlocon (LV_pLoFig, netName, pLoSig, LV_direction); + addlocon (LV_pLoFig, pinName, pLoSig, LV_direction); } } @@ -1601,25 +1603,25 @@ static void DEF_pinxyflat(apX_flat, apY_flat, aX, aY, aX_ins, aY_ins, aT) static void LEF2MBK_setData() { - setDataLayer (0, "L_ALU1", ALU1, CALU1, MBKSCALE(1)); - setDataLayer (1, "L_ALU2", ALU2, CALU2, MBKSCALE(2)); - setDataLayer (2, "L_ALU3", ALU3, CALU3, MBKSCALE(2)); - setDataLayer (3, "L_ALU4", ALU4, CALU4, MBKSCALE(2)); - setDataLayer (4, "L_ALU5", ALU5, CALU5, MBKSCALE(2)); - setDataLayer (5, "L_ALU6", ALU6, CALU6, MBKSCALE(2)); - setDataLayer (6, "L_ALU7", ALU7, CALU7, MBKSCALE(2)); - setDataLayer (7, "L_ALU8", ALU8, CALU8, MBKSCALE(2)); - setDataLayer (8, "L_ALU9", ALU9, CALU9, MBKSCALE(2)); + setDataLayer (0, "ALU1", ALU1, CALU1, MBKSCALE(1)); + setDataLayer (1, "ALU2", ALU2, CALU2, MBKSCALE(2)); + setDataLayer (2, "ALU3", ALU3, CALU3, MBKSCALE(2)); + setDataLayer (3, "ALU4", ALU4, CALU4, MBKSCALE(2)); + setDataLayer (4, "ALU5", ALU5, CALU5, MBKSCALE(2)); + setDataLayer (5, "ALU6", ALU6, CALU6, MBKSCALE(2)); + setDataLayer (6, "ALU7", ALU7, CALU7, MBKSCALE(2)); + setDataLayer (7, "ALU8", ALU8, CALU8, MBKSCALE(2)); + setDataLayer (8, "ALU9", ALU9, CALU9, MBKSCALE(2)); - setDataCut (0, "L_CONT", CONT_POLY); - setDataCut (1, "L_VIA1", CONT_VIA); - setDataCut (2, "L_VIA2", CONT_VIA2); - setDataCut (3, "L_VIA3", CONT_VIA3); - setDataCut (4, "L_VIA4", CONT_VIA4); - setDataCut (5, "L_VIA5", CONT_VIA5); - setDataCut (6, "L_VIA6", CONT_VIA6); - setDataCut (7, "L_VIA7", CONT_VIA7); - setDataCut (8, "L_VIA8", CONT_VIA8); + setDataCut (0, "VIAP", CONT_POLY); + setDataCut (1, "VIA1", CONT_VIA); + setDataCut (2, "VIA2", CONT_VIA2); + setDataCut (3, "VIA3", CONT_VIA3); + setDataCut (4, "VIA4", CONT_VIA4); + setDataCut (5, "VIA5", CONT_VIA5); + setDataCut (6, "VIA6", CONT_VIA6); + setDataCut (7, "VIA7", CONT_VIA7); + setDataCut (8, "VIA8", CONT_VIA8); } diff --git a/alliance/src/sea/src/DEF_drive.c b/alliance/src/sea/src/DEF_drive.c index 385d98ab..b1395c7c 100644 --- a/alliance/src/sea/src/DEF_drive.c +++ b/alliance/src/sea/src/DEF_drive.c @@ -1,5 +1,5 @@ /* - * $Id: DEF_drive.c,v 1.10 2003/06/26 17:00:39 jpc Exp $ + * $Id: DEF_drive.c,v 1.11 2004/09/29 21:40:46 jpc Exp $ * * /----------------------------------------------------------------\ * | | @@ -103,11 +103,11 @@ static struct track_s *LV_track; static struct blockage_s *LV_blockage; static struct authtable *LV_htTerm; - static char routingLayers3[256] = "L_ALU1 L_ALU2 L_ALU3"; + static char routingLayers3[256] = "ALU1 ALU2 ALU3"; static char routingLayers4[256] = - "L_ALU1 L_ALU2 L_ALU3 L_ALU4"; + "ALU1 ALU2 ALU3 ALU4"; static char routingLayers6[256] = - "L_ALU1 L_ALU2 L_ALU3 L_ALU4 L_ALU5 L_ALU6"; + "ALU1 ALU2 ALU3 ALU4 ALU5 ALU6"; /* ------------------------------------------------------------------ @@ -995,7 +995,7 @@ static void fprintBLOCKAGE() fprintf (DEF_FILE, "\n NEW "); fprintf (DEF_FILE, - "L_ALU%ld %ld + SHAPE BLOCKAGEWIRE ( %ld %ld ) ( %ld * )", + "ALU%ld %ld + SHAPE BLOCKAGEWIRE ( %ld %ld ) ( %ld * )", layer, pBlockage->height, pBlockage->x, diff --git a/alliance/src/sea/src/LEF_drive.c b/alliance/src/sea/src/LEF_drive.c index 9a5e40a4..e8da9060 100644 --- a/alliance/src/sea/src/LEF_drive.c +++ b/alliance/src/sea/src/LEF_drive.c @@ -1,5 +1,5 @@ /* - * $Id: LEF_drive.c,v 1.3 2003/04/07 14:38:42 jpc Exp $ + * $Id: LEF_drive.c,v 1.4 2004/09/29 21:40:46 jpc Exp $ * * /----------------------------------------------------------------\ * | | @@ -385,18 +385,18 @@ static char *LAYERtoa(acLAYER) char acLAYER; { switch(acLAYER) { - case ALU1: return("L_ALU1"); - case ALU2: return("L_ALU2"); - case ALU3: return("L_ALU3"); - case ALU4: return("L_ALU4"); - case ALU5: return("L_ALU5"); - case ALU6: return("L_ALU6"); - case CALU1: return("L_ALU1"); - case CALU2: return("L_ALU2"); - case CALU3: return("L_ALU3"); - case CALU4: return("L_ALU4"); - case CALU5: return("L_ALU5"); - case CALU6: return("L_ALU6"); + case ALU1: return("ALU1"); + case ALU2: return("ALU2"); + case ALU3: return("ALU3"); + case ALU4: return("ALU4"); + case ALU5: return("ALU5"); + case ALU6: return("ALU6"); + case CALU1: return("ALU1"); + case CALU2: return("ALU2"); + case CALU3: return("ALU3"); + case CALU4: return("ALU4"); + case CALU5: return("ALU5"); + case CALU6: return("ALU6"); } return((char*)NULL); diff --git a/alliance/src/sea/src/MAC_drive.c b/alliance/src/sea/src/MAC_drive.c index 42ccd95f..c9da7f1f 100644 --- a/alliance/src/sea/src/MAC_drive.c +++ b/alliance/src/sea/src/MAC_drive.c @@ -1,5 +1,5 @@ /* - * $Id: MAC_drive.c,v 1.5 2003/06/26 17:00:39 jpc Exp $ + * $Id: MAC_drive.c,v 1.6 2004/09/29 21:40:46 jpc Exp $ * * /----------------------------------------------------------------\ * | | @@ -106,8 +106,8 @@ extern void macPlace(apPhfig, apLofig, macName, aPower, aFlags) if (aFlags & F_MAC_IOC) { fprintf (MAC_FILE, " FILENAME \"%s.ioc\"\n", apLofig->NAME); } - fprintf (MAC_FILE, " TOPBOTTOMLAYER L_ALU3\n"); - fprintf (MAC_FILE, " RIGHTLEFTLAYER L_ALU2\n"); + fprintf (MAC_FILE, " TOPBOTTOMLAYER ALU3\n"); + fprintf (MAC_FILE, " RIGHTLEFTLAYER ALU2\n"); fprintf (MAC_FILE, " ;\n\n"); @@ -192,8 +192,8 @@ extern void macRoute(apPhfig, apLofig, macName, aPower, aFlags) /* if (aFlags & F_MAC_IOC) { */ /* fprintf (MAC_FILE, " FILENAME %s.ioc\n", apLofig->NAME); */ /* } */ -/* fprintf (MAC_FILE, " TOPBOTTOMLAYER L_ALU2\n"); */ -/* fprintf (MAC_FILE, " RIGHTLEFTLAYER L_ALU2\n"); */ +/* fprintf (MAC_FILE, " TOPBOTTOMLAYER ALU2\n"); */ +/* fprintf (MAC_FILE, " RIGHTLEFTLAYER ALU2\n"); */ /* fprintf (MAC_FILE, " ;\n\n"); */ /* } */ @@ -202,7 +202,7 @@ extern void macRoute(apPhfig, apLofig, macName, aPower, aFlags) /* Special routing : ALU1 horizontal stripes. */ fprintf (MAC_FILE, " SROUTE FOLLOWPINS\n"); fprintf (MAC_FILE, " NET vdd NET vss\n"); - fprintf (MAC_FILE, " LAYER L_ALU1 WIDTH 600 FILL DIRECTION HORIZONTAL\n"); + fprintf (MAC_FILE, " LAYER ALU1 WIDTH 600 FILL DIRECTION HORIZONTAL\n"); fprintf (MAC_FILE, " AREA (%ld %ld) (%ld %ld)\n", MBK2DEF_length (apPhfig->XAB1), MBK2DEF_length (apPhfig->YAB1), @@ -215,7 +215,7 @@ extern void macRoute(apPhfig, apLofig, macName, aPower, aFlags) if (findphmodel (apPhfig, namealloc ("powmid_x0"))) { fprintf (MAC_FILE, " SROUTE FOLLOWPINS\n"); fprintf (MAC_FILE, " NET vdd NET vss\n"); - fprintf (MAC_FILE, " LAYER L_ALU3 WIDTH 1200 FILL DIRECTION VERTICAL\n"); + fprintf (MAC_FILE, " LAYER ALU3 WIDTH 1200 FILL DIRECTION VERTICAL\n"); fprintf (MAC_FILE, " AREA (%ld %ld) (%ld %ld)\n", MBK2DEF_length (apPhfig->XAB1), MBK2DEF_length (apPhfig->YAB1), diff --git a/alliance/src/sea/src/util_LEFDEF.c b/alliance/src/sea/src/util_LEFDEF.c index 3e5389a6..288f5f42 100644 --- a/alliance/src/sea/src/util_LEFDEF.c +++ b/alliance/src/sea/src/util_LEFDEF.c @@ -1,5 +1,5 @@ /* - * $Id: util_LEFDEF.c,v 1.2 2002/09/30 16:21:19 czo Exp $ + * $Id: util_LEFDEF.c,v 1.3 2004/09/29 21:40:46 jpc Exp $ * * /----------------------------------------------------------------\ * | | @@ -576,30 +576,30 @@ extern char *DEF_layer2a(aLayer) __DBG (fprintf (stderr, "layer id %d\n", (int)aLayer); ) switch (aLayer) { - case ALU1: layerName = "L_ALU1"; break; - case ALU2: layerName = "L_ALU2"; break; - case ALU3: layerName = "L_ALU3"; break; - case ALU4: layerName = "L_ALU4"; break; - case ALU5: layerName = "L_ALU5"; break; - case ALU6: layerName = "L_ALU6"; break; - case ALU7: layerName = "L_ALU7"; break; - case ALU8: layerName = "L_ALU8"; break; - case CALU1: layerName = "L_ALU1"; break; - case CALU2: layerName = "L_ALU2"; break; - case CALU3: layerName = "L_ALU3"; break; - case CALU4: layerName = "L_ALU4"; break; - case CALU5: layerName = "L_ALU5"; break; - case CALU6: layerName = "L_ALU6"; break; - case CALU7: layerName = "L_ALU7"; break; - case CALU8: layerName = "L_ALU8"; break; - case CONT_VIA: layerName = "L_VIA1"; break; - case CONT_VIA2: layerName = "L_VIA2"; break; - case CONT_VIA3: layerName = "L_VIA3"; break; - case CONT_VIA4: layerName = "L_VIA4"; break; - case CONT_VIA5: layerName = "L_VIA5"; break; - case CONT_VIA6: layerName = "L_VIA6"; break; - case CONT_VIA7: layerName = "L_VIA7"; break; - default: layerName = "L_MBK_ERROR"; break; + case ALU1: layerName = "ALU1"; break; + case ALU2: layerName = "ALU2"; break; + case ALU3: layerName = "ALU3"; break; + case ALU4: layerName = "ALU4"; break; + case ALU5: layerName = "ALU5"; break; + case ALU6: layerName = "ALU6"; break; + case ALU7: layerName = "ALU7"; break; + case ALU8: layerName = "ALU8"; break; + case CALU1: layerName = "ALU1"; break; + case CALU2: layerName = "ALU2"; break; + case CALU3: layerName = "ALU3"; break; + case CALU4: layerName = "ALU4"; break; + case CALU5: layerName = "ALU5"; break; + case CALU6: layerName = "ALU6"; break; + case CALU7: layerName = "ALU7"; break; + case CALU8: layerName = "ALU8"; break; + case CONT_VIA: layerName = "VIA1"; break; + case CONT_VIA2: layerName = "VIA2"; break; + case CONT_VIA3: layerName = "VIA3"; break; + case CONT_VIA4: layerName = "VIA4"; break; + case CONT_VIA5: layerName = "VIA5"; break; + case CONT_VIA6: layerName = "VIA6"; break; + case CONT_VIA7: layerName = "VIA7"; break; + default: layerName = "LAYER_MBK_ERROR"; break; } return (layerName);