From 0796820625b1c3daf74c53cfbb96bda14efa5b1e Mon Sep 17 00:00:00 2001
From: Stefan Rueger <stefan.rueger@urclocks.com>
Date: Fri, 21 Apr 2023 01:58:13 +0100
Subject: [PATCH] Emulate flash NOR-memory for paged write

---
 src/dryrun.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/dryrun.c b/src/dryrun.c
index 7fc2191e..4452b6d0 100644
--- a/src/dryrun.c
+++ b/src/dryrun.c
@@ -164,6 +164,13 @@ static void dryrun_close(PROGRAMMER *pgm) {
 }
 
 
+// Emulate flash NOR-memory
+static void *memand(void *dest, const void *src, size_t n) {
+  for(size_t i=0; i<n; i++)
+    ((char *)dest)[i] &= ((const char *)src)[i];
+  return dest;
+}
+
 static int dryrun_paged_write(const PROGRAMMER *pgm, const AVRPART *p, const AVRMEM *m,
   unsigned int page_size, unsigned int addr, unsigned int n_bytes) {
 
@@ -195,7 +202,7 @@ static int dryrun_paged_write(const PROGRAMMER *pgm, const AVRPART *p, const AVR
 
     for(; addr < end; addr += chunk) {
       chunk = end-addr < page_size? end-addr: page_size;
-      memcpy(dmem->buf+addr, m->buf+addr, chunk);
+      (mchr == 'F'? memand: memcpy)(dmem->buf+addr, m->buf+addr, chunk);
     }
   }