From b91c03d0e7210db289e359b002137dfb9791c394 Mon Sep 17 00:00:00 2001
From: stefanrueger <stefan.rueger@urclocks.com>
Date: Sat, 12 Aug 2023 23:26:42 +0100
Subject: [PATCH] Add memories on -p*/i if needed

---
 src/developer_opts.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/developer_opts.c b/src/developer_opts.c
index 5f60784a..7c4a4555 100644
--- a/src/developer_opts.c
+++ b/src/developer_opts.c
@@ -850,10 +850,12 @@ static void dev_part_strct(const AVRPART *p, bool tsv, const AVRPART *base, bool
 
     if(injct)
       for(size_t i=0; i<sizeof meminj/sizeof*meminj; i++)
-        if(meminj[i].mcu)
-          if(str_casematch(meminj[i].mcu, p->desc) && str_match(meminj[i].mem, m->desc))
+        if(meminj[i].mcu && str_casematch(meminj[i].mcu, p->desc))
+          if(str_match(meminj[i].mem, m->desc)) {
             dev_part_strct_entry(tsv, ".ptmm", p->desc, m->desc,
               meminj[i].var, cfg_strdup("meminj", meminj[i].value), NULL);
+            meminj[i].mcu = NULL;
+          }
 
     if(!tsv) {
       dev_cout(m->comments, ";", 0, 0);
@@ -882,13 +884,25 @@ static void dev_part_strct(const AVRPART *p, bool tsv, const AVRPART *base, bool
     }
   }
 
-  if(injct)
+  if(injct) {
     for(size_t i=0; i<sizeof ptinj/sizeof*ptinj; i++)
       if(ptinj[i].mcu)
         if(str_casematch(ptinj[i].mcu, p->desc))
           dev_part_strct_entry(tsv, ".pt", p->desc, NULL,
             ptinj[i].var, cfg_strdup("ptinj", ptinj[i].value), NULL);
 
+    for(size_t i=0; i<sizeof meminj/sizeof*meminj; i++)
+      if(meminj[i].mcu && str_casematch(meminj[i].mcu, p->desc)) {
+        if(!tsv)
+          dev_info("    memory \"%s\"\n", meminj[i].mem);
+        dev_part_strct_entry(tsv, ".ptmm", p->desc, meminj[i].mem,
+          meminj[i].var, cfg_strdup("meminj", meminj[i].value), NULL);
+        meminj[i].mcu = NULL;
+        if(!tsv)
+          dev_info("    ;\n");
+      }
+  }
+
   if(!tsv) {
     dev_cout(p->comments, ";", 0, 0);
     dev_info(";\n");