riscv
/
alliance
mirror of https://gitlab.lip6.fr/vlsi-eda/alliance.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

bug hunter

This commit is contained in:
Hugo Clement 2002-06-26 13:28:52 +00:00
parent 8c4bc56cdc
commit 559025396a
2 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
alliance/src/ocr/src/rout/findNPointsPath.c
View File

@ -1,8 +1,11 @@
/* /*
### -------------------------------------------------- ### ### -------------------------------------------------- ###
$Author: hcl $ $Author: hcl $
$Date: 2002/04/25 13:41:31 $ $Date: 2002/06/26 13:28:52 $
$Log: findNPointsPath.c,v $ $Log: findNPointsPath.c,v $
Revision 1.4 2002/06/26 13:28:52 hcl
bug hunter
Revision 1.3 2002/04/25 13:41:31 hcl Revision 1.3 2002/04/25 13:41:31 hcl
New ripup/reroute loop, bug-kill (CALU&TALU). New ripup/reroute loop, bug-kill (CALU&TALU).
@ -89,7 +92,7 @@
#include "ocrAstar.h" #include "ocrAstar.h"
static char *res_id = static char *res_id =
"$Id: findNPointsPath.c,v 1.3 2002/04/25 13:41:31 hcl Exp $"; "$Id: findNPointsPath.c,v 1.4 2002/06/26 13:28:52 hcl Exp $";
#define MAX_HT 500 #define MAX_HT 500
@ -694,6 +697,7 @@ ocrNaturalInt biroute (ocrRoutingParameters *i_pParam,
switch (g_pOption->ALGO) { switch (g_pOption->ALGO) {
case 0: case 0:
#if 0
if (mode == AS_K_EQUI) { if (mode == AS_K_EQUI) {
l_uLength = find_path_astar(i_pParam, i_pGrid, l_uLength = find_path_astar(i_pParam, i_pGrid,
l_pCon1->CON->X, l_pCon1->CON->X,
@ -707,6 +711,7 @@ ocrNaturalInt biroute (ocrRoutingParameters *i_pParam,
mode mode
); );
} else { } else {
#endif
l_uLength = FINDPATH(i_pParam, i_pGrid, l_uLength = FINDPATH(i_pParam, i_pGrid,
l_pCon1->CON->X, l_pCon1->CON->X,
l_pCon1->CON->Y, l_pCon1->CON->Y,
@ -717,7 +722,7 @@ ocrNaturalInt biroute (ocrRoutingParameters *i_pParam,
i_pSignal->INDEX, i_pSignal->INDEX,
i_pSignal i_pSignal
); );
} //}
break; break;
case 1: case 1:
/*display (LEVEL, DEBUG, "\no Launching A*\n");*/ /*display (LEVEL, DEBUG, "\no Launching A*\n");*/
@ -962,8 +967,13 @@ findPathNPoints(ocrRoutingParameters * i_pParam,
// Choix de 2 autres connecteurs // Choix de 2 autres connecteurs
l_bOk = switch (g_pOption->ALGO) {
chooseInternalConnector2(i_pGrid, l_pCon->NEXT); case 1: l_bOk = chooseInternalConnector2(i_pGrid, l_pCon->NEXT);
break;
case 0: l_bOk = chooseInternalConnector(i_pGrid, &l_NewCon, l_pCon->NEXT, 1);
break;
}
if (l_bOk != OCR_OK) { if (l_bOk != OCR_OK) {
@ -978,7 +988,7 @@ findPathNPoints(ocrRoutingParameters * i_pParam,
return OCRNATURALINT_MAX; return OCRNATURALINT_MAX;
} }
l_uLength = biroute (i_pParam, i_pGrid, l_pCon->NEXT, NULL, i_pSignal, AS_K_EQUI); l_uLength = biroute (i_pParam, i_pGrid, l_pCon->NEXT, &l_NewCon, i_pSignal, AS_K_EQUI);
#if 0 #if 0
display(LEVEL, DEBUG, "(%ld,%ld,%d) -> (%ld,%ld,%d)\n", display(LEVEL, DEBUG, "(%ld,%ld,%d) -> (%ld,%ld,%d)\n",
@ -1019,22 +1029,22 @@ findPathNPoints(ocrRoutingParameters * i_pParam,
} }
} }
#if 0 if (g_pOption->ALGO == 0) {
if (l_NewCon.CON->DIST == 1) { if (l_NewCon.CON->DIST == 1) {
l_pVia = createVirtualConnector(l_NewCon.CON->X, l_pVia = createVirtualConnector(l_NewCon.CON->X,
l_NewCon.CON->Y, l_NewCon.CON->Y,
l_NewCon.CON->Z, 0, 0); l_NewCon.CON->Z, 0, 0);
addVirtualConnector(&l_pViaList, l_pVia); addVirtualConnector(&l_pViaList, l_pVia);
}
unifyPoint(i_pGrid, i_pParam,
i_pSignal,
l_NewCon.CON->X, l_NewCon.CON->Y,
(l_NewCon.CON->Z ? l_NewCon.CON->Z -
1 : l_NewCon.CON->Z));
} }
unifyPoint(i_pGrid, i_pParam,
i_pSignal,
l_NewCon.CON->X, l_NewCon.CON->Y,
(l_NewCon.CON->Z ? l_NewCon.CON->Z -
1 : l_NewCon.CON->Z));
#endif
deleteVirtualConnectorList(l_NewCon.VIR_CON_LIST); deleteVirtualConnectorList(l_NewCon.VIR_CON_LIST);
l_pCon = l_pCon->NEXT; l_pCon = l_pCon->NEXT;
l_uLengthTotal += l_uLength; l_uLengthTotal += l_uLength;

6
alliance/src/ocr/src/rout/ocrAstar.cpp
View File

@ -1,9 +1,12 @@
/* /*
### -------------------------------------------------- ### ### -------------------------------------------------- ###
$Author: hcl $ $Author: hcl $
$Date: 2002/06/25 11:44:59 $ $Date: 2002/06/26 13:28:52 $
$Log: ocrAstar.cpp,v $ $Log: ocrAstar.cpp,v $
Revision 1.5 2002/06/26 13:28:52 hcl
bug hunter
Revision 1.4 2002/06/25 11:44:59 hcl Revision 1.4 2002/06/25 11:44:59 hcl
Un core dump en moins... Un core dump en moins...
@ -102,6 +105,7 @@ ocrNaturalInt CUR_SIG_INDEX = 0;
ocrWSegment *ze_best = NULL; ocrWSegment *ze_best = NULL;
ocrWSegment *ze_target = NULL; ocrWSegment *ze_target = NULL;
ocrNaturalInt hsource = 0;
ocrNaturalInt ripup = 1; ocrNaturalInt ripup = 1;