Load the source board from extra memory during editor copy block. (#495)

* Load the source board from extra memory during editor copy block.
* Enable extra memory hacks in sanitizer CI builds.
* Fix annoying clang warning.

.github/workflows/main.yml

@@ -304,7 +304,7 @@ jobs:
         run: sudo apt update && sudo apt install -y --no-install-recommends $MZXDEPS_DEBIAN_SDL2
       - uses: actions/checkout@v4
       - name: Configure
-        run: ./config.sh --platform unix-devel --enable-asan
+        run: ./config.sh --platform unix-devel --enable-asan --enable-extram
       - name: Build
         run: $MZX_MAKE
       - name: Run tests
@@ -327,7 +327,7 @@ jobs:
 #          wget https://github.com/AliceLR/megazeux-dependencies/releases/download/v2.93c/megazeux-dependencies-2.93c-r0-linux-msan.tar.xz;
 #          tar -xJf megazeux-dependencies-*-linux-msan.tar.xz)
 #      - name: Configure
-#        run: ./config.sh --platform unix-devel --prefix scripts/deps/linux-msan/x86_64 --enable-msan --disable-sdl --disable-libpng --disable-x11
+#        run: ./config.sh --platform unix-devel --prefix scripts/deps/linux-msan/x86_64 --enable-msan --disable-sdl --disable-libpng --disable-x11 --enable-extram
 #      - name: Build
 #        run: $MZX_MAKE V=1
 #      - name: Run tests
@@ -344,7 +344,7 @@ jobs:
         run: sudo apt update && sudo apt install -y --no-install-recommends $MZXDEPS_DEBIAN_SDL2
       - uses: actions/checkout@v4
       - name: Configure
-        run: ./config.sh --platform unix-devel --enable-ubsan
+        run: ./config.sh --platform unix-devel --enable-ubsan --enable-extram
       - name: Build
         run: $MZX_MAKE
       - name: Run tests

docs/changelog.txt

@@ -36,6 +36,8 @@ USERS
 + Fixed sai.frag not being installed by "make install" or
   distributed with Unix-style packages for Linux/BSD/Darwin.
 + Fixed the board editor show thing hotkeys (broken by 2.93b).
++ Fixed a crash that would occur in builds using extra memory
+  hacks (DOS) when copying blocks between boards in the editor.
 
 DEVELOPERS
 

src/editor/block.c

@@ -32,6 +32,7 @@
 #include "../core.h"
 #include "../data.h"
 #include "../event.h"
+#include "../extmem.h"
 #include "../mzm.h"
 #include "../robot.h"
 #include "../window.h"
@@ -416,6 +417,7 @@ void do_block_command(struct world *mzx_world, struct block_info *block,
   int block_height = block->height;
   int dest_block_width = block_width;
   int dest_block_height = block_height;
+  boolean loaded_src_board = false;
 
   if(block->command == BLOCK_CMD_NONE)
     return;
@@ -425,6 +427,11 @@ void do_block_command(struct world *mzx_world, struct block_info *block,
   {
     case EDIT_BOARD:
       if(block->src_board == NULL) break;
+      if(block->src_board != mzx_world->current_board)
+      {
+        retrieve_board_from_extram(block->src_board);
+        loaded_src_board = true;
+      }
       src_board = block->src_board;
       src_char = NULL;
       src_color = src_board->level_color;
@@ -732,6 +739,10 @@ void do_block_command(struct world *mzx_world, struct block_info *block,
 
     update_undo_frame(dest_history);
   }
+
+  // TODO: it might be better to keep it in regular memory for repeat copies.
+  if(loaded_src_board)
+    store_board_to_extram(src_board);
 }
 
 //--------------------------

src/extmem.c

@@ -990,7 +990,8 @@ static boolean retrieve_buffer_from_extram(struct extram_data *data,
   ptr = platform_extram_retrieve(block, len);
   if(!ptr)
   {
-    debug("--EXTRAM-- failed to retrieve buffer %p from non-mapped platform RAM.\n", *src);
+    debug("--EXTRAM-- failed to retrieve buffer %p from non-mapped platform RAM.\n",
+     (void *)*src);
     goto err;
   }
   block = ptr;