Supporting out of order signal names in AIGER reader.

alanminko · alanminko · commit feefa0f5134a · 2025-03-12T20:12:28.000-07:00
diff --git a/src/aig/gia/giaAiger.c b/src/aig/gia/giaAiger.c
@@ -406,41 +406,41 @@ Gia_Man_t * Gia_AigerReadFromMemory( char * pContents, int nFileSize, int fGiaSi
                 if ( *pType == 'i' )
                 {
                     if ( vNamesIn == NULL )
-                        vNamesIn = Vec_PtrAlloc( nInputs + nLatches );
-                    if ( Vec_PtrSize(vNamesIn) != iTerm )
+                        vNamesIn = Vec_PtrStart( nInputs );
+                    if ( Vec_PtrSize(vNamesIn) <= iTerm )
                     {
                         fError = 1;
                         break;
                     }
-                    Vec_PtrPush( vNamesIn, Abc_UtilStrsav(pName) );
+                    Vec_PtrWriteEntry( vNamesIn, iTerm, Abc_UtilStrsav(pName) );
                 }
                 else if ( *pType == 'o' )
                 {
                     if ( vNamesOut == NULL )
-                        vNamesOut = Vec_PtrAlloc( nOutputs + nLatches );
-                    if ( Vec_PtrSize(vNamesOut) != iTerm )
+                        vNamesOut = Vec_PtrStart( nOutputs );
+                    if ( Vec_PtrSize(vNamesOut) <= iTerm )
                     {
                         fError = 1;
                         break;
                     }
-                    Vec_PtrPush( vNamesOut, Abc_UtilStrsav(pName) );
+                    Vec_PtrWriteEntry( vNamesOut, iTerm,  Abc_UtilStrsav(pName) );
                 }
                 else if ( *pType == 'l' )
                 {
                     char Buffer[1000];
                     assert( strlen(pName) < 995 );
                     sprintf( Buffer, "%s_in", pName );
                     if ( vNamesRegIn == NULL )
-                        vNamesRegIn = Vec_PtrAlloc( nLatches );
+                        vNamesRegIn = Vec_PtrStart( nLatches );
                     if ( vNamesRegOut == NULL )
-                        vNamesRegOut = Vec_PtrAlloc( nLatches );
-                    if ( Vec_PtrSize(vNamesRegIn) != iTerm )
+                        vNamesRegOut = Vec_PtrStart( nLatches );
+                    if ( Vec_PtrSize(vNamesRegIn) <= iTerm )
                     {
                         fError = 1;
                         break;
                     }
-                    Vec_PtrPush( vNamesRegIn,  Abc_UtilStrsav(Buffer) );
-                    Vec_PtrPush( vNamesRegOut, Abc_UtilStrsav(pName) );
+                    Vec_PtrWriteEntry( vNamesRegIn,  iTerm, Abc_UtilStrsav(Buffer) );
+                    Vec_PtrWriteEntry( vNamesRegOut, iTerm, Abc_UtilStrsav(pName) );
                 }
                 else if ( *pType == 'n' )
                 {

Original file line number	Diff line number	Diff line change
`@@ -406,41 +406,41 @@ Gia_Man_t * Gia_AigerReadFromMemory( char * pContents, int nFileSize, int fGiaSi`
`406`	`406`	`if ( *pType == 'i' )`
`407`	`407`	`{`
`408`	`408`	`if ( vNamesIn == NULL )`
`409`		`- vNamesIn = Vec_PtrAlloc( nInputs + nLatches );`
`410`		`- if ( Vec_PtrSize(vNamesIn) != iTerm )`
	`409`	`+ vNamesIn = Vec_PtrStart( nInputs );`
	`410`	`+ if ( Vec_PtrSize(vNamesIn) <= iTerm )`
`411`	`411`	`{`
`412`	`412`	`fError = 1;`
`413`	`413`	`break;`
`414`	`414`	`}`
`415`		`- Vec_PtrPush( vNamesIn, Abc_UtilStrsav(pName) );`
	`415`	`+ Vec_PtrWriteEntry( vNamesIn, iTerm, Abc_UtilStrsav(pName) );`
`416`	`416`	`}`
`417`	`417`	`else if ( *pType == 'o' )`
`418`	`418`	`{`
`419`	`419`	`if ( vNamesOut == NULL )`
`420`		`- vNamesOut = Vec_PtrAlloc( nOutputs + nLatches );`
`421`		`- if ( Vec_PtrSize(vNamesOut) != iTerm )`
	`420`	`+ vNamesOut = Vec_PtrStart( nOutputs );`
	`421`	`+ if ( Vec_PtrSize(vNamesOut) <= iTerm )`
`422`	`422`	`{`
`423`	`423`	`fError = 1;`
`424`	`424`	`break;`
`425`	`425`	`}`
`426`		`- Vec_PtrPush( vNamesOut, Abc_UtilStrsav(pName) );`
	`426`	`+ Vec_PtrWriteEntry( vNamesOut, iTerm, Abc_UtilStrsav(pName) );`
`427`	`427`	`}`
`428`	`428`	`else if ( *pType == 'l' )`
`429`	`429`	`{`
`430`	`430`	`char Buffer[1000];`
`431`	`431`	`assert( strlen(pName) < 995 );`
`432`	`432`	`sprintf( Buffer, "%s_in", pName );`
`433`	`433`	`if ( vNamesRegIn == NULL )`
`434`		`- vNamesRegIn = Vec_PtrAlloc( nLatches );`
	`434`	`+ vNamesRegIn = Vec_PtrStart( nLatches );`
`435`	`435`	`if ( vNamesRegOut == NULL )`
`436`		`- vNamesRegOut = Vec_PtrAlloc( nLatches );`
`437`		`- if ( Vec_PtrSize(vNamesRegIn) != iTerm )`
	`436`	`+ vNamesRegOut = Vec_PtrStart( nLatches );`
	`437`	`+ if ( Vec_PtrSize(vNamesRegIn) <= iTerm )`
`438`	`438`	`{`
`439`	`439`	`fError = 1;`
`440`	`440`	`break;`
`441`	`441`	`}`
`442`		`- Vec_PtrPush( vNamesRegIn, Abc_UtilStrsav(Buffer) );`
`443`		`- Vec_PtrPush( vNamesRegOut, Abc_UtilStrsav(pName) );`
	`442`	`+ Vec_PtrWriteEntry( vNamesRegIn, iTerm, Abc_UtilStrsav(Buffer) );`
	`443`	`+ Vec_PtrWriteEntry( vNamesRegOut, iTerm, Abc_UtilStrsav(pName) );`
`444`	`444`	`}`
`445`	`445`	`else if ( *pType == 'n' )`
`446`	`446`	`{`