From e8b2385f24a2063057c6856d6dfb19253a2c1a28 Mon Sep 17 00:00:00 2001
From: Stefan Frederik <stefan.schippers@gmail.com>
Date: Sun, 16 Oct 2022 14:21:22 +0200
Subject: [PATCH] update xschemtest hashes, uniquify allocation IDs

---
 src/get_malloc_id.awk | 2 +-
 src/save.c            | 8 ++++----
 src/token.c           | 8 ++++----
 tests/xschemtest.tcl  | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/get_malloc_id.awk b/src/get_malloc_id.awk
index d7da08fc..9d7215a0 100755
--- a/src/get_malloc_id.awk
+++ b/src/get_malloc_id.awk
@@ -64,6 +64,6 @@ xinit.c \
   prev = $1
 }
 END{
-  print ">>>>>>>>>>> FREE  >>>>>>>>> " n " ..."
+  print ">>>>>>> END FREE  >>>>>>>>> " prev + 1 " ..."
 }
 '
diff --git a/src/save.c b/src/save.c
index 2908121d..9237eaae 100644
--- a/src/save.c
+++ b/src/save.c
@@ -3112,16 +3112,16 @@ int load_sym_def(const char *name, FILE *embed_fd)
            int i;
            for(i = 1; i <level; i++) {
              const char *instname = get_tok_value(lcc[i].prop_ptr, "name", 0);
-             my_strcat(1582, &path, instname);
-             my_strcat(1588, &path, "."); 
+             my_strcat(1590, &path, instname);
+             my_strcat(1591, &path, "."); 
            }
          } 
          if(path) new_size += strlen(path);
          dev = get_tok_value(prop_ptr, "name", 0);
          new_size += xctx->tok_size + 21; /* @spice_get_current(<dev>) */
-         my_realloc(1587, &tt[i].txt_ptr, new_size);
+         my_realloc(1592, &tt[i].txt_ptr, new_size);
          my_snprintf(tt[i].txt_ptr, new_size, "@spice_get_current(%s%s)", path ? path : "", dev);
-         my_free(1589, &path);
+         my_free(1593, &path);
          dbg(1, " --> tt[i].txt_ptr=%s\n", tt[i].txt_ptr);
        } 
        ROTATION(rot, flip, 0.0, 0.0, tt[i].x0, tt[i].y0, rx1, ry1);
diff --git a/src/token.c b/src/token.c
index 00366e2b..5243e6fd 100644
--- a/src/token.c
+++ b/src/token.c
@@ -3119,14 +3119,14 @@ const char *translate(int inst, const char* s)
            if(*path == '.') skip++;
            path++;
          }
-         dev = my_malloc(1550, tmp);
+         dev = my_malloc(1598, tmp);
          n = sscanf(token + 19, "%[^)]", dev);
          if(n == 1) {
            strtolower(dev);
            len = strlen(path) + strlen(xctx->inst[inst].instname) +
                  strlen(dev) + 11; /* some extra chars for i(..) wrapper */
            dbg(1, "dev=%s\n", dev);
-           fqdev = my_malloc(1556, len);
+           fqdev = my_malloc(1599, len);
            if(!sim_is_xyce) {
              int prefix, vsource;
              char *ptr = dev;
@@ -3163,9 +3163,9 @@ const char *translate(int inst, const char* s)
              result_pos += len;
            }
            dbg(1, "inst %d, dev=%s, fqdev=%s idx=%d valstr=%s\n", inst,  dev, fqdev, idx, valstr);
-           my_free(1557, &fqdev);
+           my_free(1600, &fqdev);
          } /* if(n == 1) */
-         my_free(1551, &dev);
+         my_free(1601, &dev);
        } /* if(path) */
      } /* if((start_level = sch_waves_loaded()) >= 0 && xctx->graph_annotate_p>=0) */
    }
diff --git a/tests/xschemtest.tcl b/tests/xschemtest.tcl
index f826d401..073cba3a 100644
--- a/tests/xschemtest.tcl
+++ b/tests/xschemtest.tcl
@@ -196,7 +196,7 @@ proc netlist_test {} {
     loading.sch             vhdl       3300682141
     mos_power_ampli.sch     spice      1004049459
     hierarchical_tedax.sch  tedax       998070173
-    LCC_instances.sch       spice      2610855064
+    LCC_instances.sch       spice       268038818
     pcb_test1.sch           tedax      1925087189
     test_doublepin.sch      spice        64707104
     simulate_ff.sch         spice      1321596936