Updated the version to go along with the merge of pull requests

475, 476, and 477 (first ones for mac OS and arch Linux support
on github;  the last to modify recent code changes to work with
the last code merge for eliminating the one-off freeMagic().

.github/workflows/main-aarch64.yml

@@ -16,6 +16,7 @@ jobs:
       - uses: actions/checkout@v4
       - name: Get Dependencies
         run: |
+          sudo apt-get update
           sudo apt-get install -y tcl-dev tk-dev libcairo-dev
       - name: Build
         run: |

.github/workflows/main-macos.yml

@@ -10,8 +10,8 @@ on:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  simple_build_macos13:
-    runs-on: macos-13
+  simple_build_macos15:
+    runs-on: macos-15-intel # only and last supported intel MacOS
     timeout-minutes: 45 # x86_64 seems non-SSD based (slower)
     steps:
       - name: Checkout
@@ -235,10 +235,10 @@ jobs:
           cp *.mak dist/BUILD-INFO/
           cp *.LOG dist/BUILD-INFO/
 
-      - name: Upload archive magic-macos13
+      - name: Upload archive magic-macos15
         uses: actions/upload-artifact@v4
         with:
-          name: magic-macos13
+          name: magic-macos15
           path: |
             ${{ github.workspace }}/dist
 

VERSION

@@ -1 +1 @@
-8.3.583
+8.3.584

calma/CalmaWrite.c

@@ -2432,6 +2432,7 @@ calmaProcessBoundary(
 		freeMagic1(&mm1, lbref);
 		lbref = lbref->lb_next;
 	    }
+	    freeMagic1(&mm1, lbref);
 	    freeMagic1_end(&mm1);
 	}
     }

calma/CalmaWriteZ.c

@@ -1867,6 +1867,7 @@ calmaProcessBoundaryZ(
 		freeMagic1(&mm1, lbref);
 		lbref = lbref->lb_next;
 	    }
+	    freeMagic1(&mm1, lbref);
 	    freeMagic1_end(&mm1);
 	}
     }

ext2sim/ext2sim.c

@@ -814,7 +814,10 @@ main(
 	EFVisitDevs(simmergeVisit, PTR2CD(NULL));
 	TxPrintf("Devices merged: %d\n", esDevsMerged);
 	esFMIndex = 0;
-	for (p = devMergeList; p != NULL; p = p->next) freeMagic((char *)p);
+	free_magic1_t mm1 = freeMagic1_init();
+	for (p = devMergeList; p != NULL; p = p->next)
+	    freeMagic1(&mm1, (char *)p);
+	freeMagic1_end(&mm1);
     }
 
     EFVisitDevs(simdevVisit, PTR2CD(NULL));

ext2spice/ext2spice.c

@@ -1347,7 +1347,10 @@ main(
 	{
 	    const devMerge *p;
 
-	  for ( p = devMergeList ; p != NULL ; p=p->next ) freeMagic((char *)p);
+	    free_magic1_t mm1 = freeMagic1_init();
+	    for (p = devMergeList; p != NULL; p = p->next)
+		freeMagic1(&mm1, (char *)p);
+	    freeMagic1_end(&mm1);
 	}
     } else if ( esDistrJunct )
      	EFVisitDevs(devDistJunctVisit, (ClientData) NULL);

extract/ExtArray.c

@@ -95,6 +95,7 @@ extOutputGeneratedLabels(parentUse, f)
 
     parentDef = parentUse->cu_def;
 
+    free_magic1_t mm1 = freeMagic1_init();
     while ((lab = parentDef->cd_labels) != NULL)
     {
 	if ((lab->lab_flags & LABEL_GENERATE) == 0) return;
@@ -106,9 +107,10 @@ extOutputGeneratedLabels(parentUse, f)
 	for (n = 0; n < ExtCurStyle->exts_numResistClasses; n++)
 	    fprintf(f, " 0 0");
 	putc('\n', f);
-	freeMagic(lab);
+	freeMagic1(&mm1, lab);
 	parentDef->cd_labels = lab->lab_next;
     }
+    freeMagic1_end(&mm1);
 }
 
 #endif

extract/ExtBasic.c

@@ -2776,8 +2776,12 @@ extOutputDevices(def, transList, outFile)
 			/* Free the lists */
 
 			for (i = 0; i < n; i++)
+			{
+			    free_magic1_t mm1 = freeMagic1_init();
 			    for (lb = extSpecialBounds[i]; lb != NULL; lb = lb->b_next)
-				freeMagic((char *)lb);
+				freeMagic1(&mm1, (char *)lb);
+			    freeMagic1_end(&mm1);
+			}
 			freeMagic((char *)extSpecialBounds);
 
 			/* Put the region list back the way we found it: */