fix table storage issue

Author: Christian Kudera

src/main/java/armify/services/DeviceApplyService.java

@@ -1,6 +1,7 @@
 package armify.services;
 
 
+import armify.domain.MMIOAccessEntry;
 import ghidra.framework.store.LockException;
 import ghidra.program.model.address.Address;
 import ghidra.program.model.address.AddressOverflowException;
@@ -45,6 +46,9 @@ public void apply(Program program, String deviceName) {
             reset(program);
         }
 
+        // Backup current MMIO Accesses
+        List<MMIOAccessEntry> mmioAccesses = storage.loadMMIOAccesses(program);
+
         int tx = program.startTransaction("Apply device " + deviceName);
         boolean commit = false;
         try {
@@ -105,11 +109,14 @@ public void apply(Program program, String deviceName) {
                 } catch (CodeUnitInsertionException ex) {
                     Msg.error(this, "Can't create data", ex);
                 }
+            }
+            
+            // Restore MMIO accesses after memory blocks were changed
+            storage.saveMMIOAccesses(program, mmioAccesses);
 
-                storage.setAppliedDeviceName(program, deviceName);
+            storage.setAppliedDeviceName(program, deviceName);
 
-                commit = true;
-            }
+            commit = true;
         } finally {
             program.endTransaction(tx, commit);
         }
@@ -120,6 +127,9 @@ public void reset(Program program) {
             return;
         }
 
+        // Backup current MMIO Accesses
+        List<MMIOAccessEntry> mmioAccesses = storage.loadMMIOAccesses(program);
+
         int tx = program.startTransaction("ARMify reset");
         boolean commit = false;
         try {
@@ -176,7 +186,10 @@ public void reset(Program program) {
                 Msg.error(this, "Can't recreate default peripheral block", ex);
             }
 
-            // 5. Clear the stored device name
+            // 5. Restore MMIO accesses after memory blocks were changed
+            storage.saveMMIOAccesses(program, mmioAccesses);
+
+            // 6. Clear the stored device name
             storage.setAppliedDeviceName(program, null);
             commit = true;
         } finally {