updated alingments from 8 (for a test) back to 4. added -diag binary suffix, combined sprite and tile mask testing

Author: tschrapel

.vscode/settings.json

@@ -44,6 +44,9 @@
         "cstdint": "c",
         "array": "c",
         "string": "c",
-        "string_view": "c"
+        "string_view": "c",
+        "pico.h": "c",
+        "platform.h": "c",
+        "gpu.h": "c"
     }
 }

src/CMakeLists.txt

@@ -9,7 +9,7 @@ set(PICO9918_PCB_MINOR_VER 4)
 
 set(PICO9918_SCANLINES 0)
 set(PICO9918_NO_SPLASH 0)
-set(PICO9918_DIAG      0)
+set(PICO9918_DIAG      1)
 
 # end compile-time options
 
@@ -31,6 +31,9 @@ if (${PICO9918_SCANLINES})
   set(PICO9918_BINARY_SUFFIX ${PICO9918_BINARY_SUFFIX}-sl)
 endif()
 
+if (${PICO9918_DIAG})
+  set(PICO9918_BINARY_SUFFIX ${PICO9918_BINARY_SUFFIX}-diag)
+endif()
 
 set(PROGRAM pico9918${PICO9918_BINARY_SUFFIX})
 

src/main.c

@@ -138,9 +138,9 @@ static uint8_t nextValue = 0;     /* TMS9918A read-ahead value */
 static bool currentInt = false;   /* current interrupt state */
 static uint8_t currentStatus = 0x1f; /* current status register value */
 
-static __attribute__((section(".scratch_y.buffer"))) uint32_t bg; 
+static __attribute__((section(".scratch_y.buffer"))) uint32_t __aligned(4) bg; 
 
-static __attribute__((section(".scratch_x.buffer"))) uint8_t __aligned(8) tmsScanlineBuffer[TMS9918_PIXELS_X + 8];
+static __attribute__((section(".scratch_x.buffer"))) uint8_t __aligned(4) tmsScanlineBuffer[TMS9918_PIXELS_X + 8];
 
 const uint tmsWriteSm = 0;
 const uint tmsReadSm = 1;

src/vga/vga.c

@@ -79,7 +79,7 @@ uint32_t __aligned(8) syncDataPorch[4];   // vertical porch
 uint32_t __aligned(8) syncDataSync[4];    // vertical sync
 
 #if VGA_NO_MALLOC
-__attribute__((section(".scratch_y.lookup"))) uint16_t __aligned(8) rgbDataBuffer[2 + VGA_SCANLINE_TIME_DEBUG][VIRTUAL_PIXELS_X] = { 0 };   // two scanline buffers (odd and even)
+__attribute__((section(".scratch_y.lookup"))) uint16_t __aligned(4) rgbDataBuffer[2 + VGA_SCANLINE_TIME_DEBUG][VIRTUAL_PIXELS_X] = { 0 };   // two scanline buffers (odd and even)
 #else
 #include <stdlib.h>
 uint16_t* __aligned(8) rgbDataBuffer[2 + VGA_SCANLINE_TIME_DEBUG] = { 0 };                          // two scanline buffers (odd and even)