Apply asie's patch 5 for PPU fixes and cleanup

2 files changed, 8 insertions, 23 deletions

diff --git a/src/uxn/devices/ppu.c b/src/uxn/devices/ppu.c
index 61e4d26..726b510 100644
--- a/src/uxn/devices/ppu.c
+++ b/src/uxn/devices/ppu.c
@@ -142,7 +142,7 @@ static Uint32 unpack_icon_lut_flipx[256] = {
     0x11111111
 };
 
-static u32 dirty_tiles[20] = {0};
+static u32 dirty_tiles[21] = {0};
 
 void
 putcolors(Ppu *p, Uint8 *addr) {
@@ -162,9 +162,7 @@ putcolors(Ppu *p, Uint8 *addr) {
 IWRAM_CODE
 void
 putpixel(Ppu *p, Uint32 *layer, Uint16 x, Uint16 y, Uint8 color) {
-    if(x >= 30 * 8 || y >= 20 * 8) {
-        return;
-    }
+    if (x >= SCREEN_WIDTH || y >= SCREEN_HEIGHT) return;
     size_t tile_x = x / 8;
     size_t tile_y = y / 8;
     size_t start_col = x % 8;
@@ -179,7 +177,6 @@ IWRAM_CODE
 void
 puticn(Ppu *p, Uint32 *layer, Uint16 x, Uint16 y, Uint8 *sprite, Uint8 color, Uint8 flipx, Uint8 flipy) {
         Uint8 sprline;
-        Uint8 xrightedge = x < ((32 - 1) * 8);
         Uint16 v;
         Uint32 dirtyflag = (1 << (x >> 3)) | (1 << ((x + 7) >> 3));
 
@@ -203,7 +200,7 @@ puticn(Ppu *p, Uint32 *layer, Uint16 x, Uint16 y, Uint8 *sprite, Uint8 color, Ui
                         data |= (u64)(lut_expand[sprline ^ 0xFF] * (color >> 2)) << shift;
 
                         layerptr[0] = (layerptr[0] & mask) | data;
-                        if (xrightedge) layerptr[8] = (layerptr[8] & (mask >> 32)) | (data >> 32);
+                        layerptr[8] = (layerptr[8] & (mask >> 32)) | (data >> 32);
 
                         if (((y + v) & 7) == 7) layerptr += (32 - 1) * 8;
                 }
@@ -216,7 +213,7 @@ puticn(Ppu *p, Uint32 *layer, Uint16 x, Uint16 y, Uint8 *sprite, Uint8 color, Ui
                         u64 data = (u64)(lut_expand[sprline] * (color & 3)) << shift;
 
                         layerptr[0] = (layerptr[0] & mask) | data;
-                        if (xrightedge) layerptr[8] = (layerptr[8] & (mask >> 32)) | (data >> 32);
+                        layerptr[8] = (layerptr[8] & (mask >> 32)) | (data >> 32);
 
                         if (((y + v) & 7) == 7) layerptr += (32 - 1) * 8;
                 }
@@ -231,7 +228,6 @@ void
 putchr(Ppu *p, Uint32 *layer, Uint16 x, Uint16 y, Uint8 *sprite, Uint8 color,
         Uint8 flipx, Uint8 flipy) {
         Uint8 sprline1, sprline2;
-        Uint8 xrightedge = x < ((32 - 1) * 8);
         Uint16 v;
         Uint32 dirtyflag = (1 << (x >> 3)) | (1 << ((x + 7) >> 3));
 
@@ -260,7 +256,7 @@ putchr(Ppu *p, Uint32 *layer, Uint16 x, Uint16 y, Uint8 *sprite, Uint8 color,
                 u64 data = ((u64) (data32 & 0x33333333)) << shift;
 
                 layerptr[0] = (layerptr[0] & mask) | data;
-                if (xrightedge) layerptr[8] = (layerptr[8] & (mask >> 32)) | (data >> 32);
+                layerptr[8] = (layerptr[8] & (mask >> 32)) | (data >> 32);
 
                 if (((y + v) & 7) == 7) layerptr += (32 - 1) * 8;
         }
@@ -325,8 +321,8 @@ initppu(Ppu *p, Uint8 hor, Uint8 ver, Uint8 pad) {
     DMA_DST(3) = p->bg;
     DMA_CTRL(3) = tile_clear_ctrl;
 
-    p->fg = (u32*) (MEM_VRAM + (56 * 1024));
-    p->bg = (u32*) (MEM_VRAM + (76 * 1024));
+    p->fg = (u32*) (MEM_VRAM + (56 * 1024)); //   0-20K front, 32K-52K back
+    p->bg = (u32*) (MEM_VRAM + (76 * 1024)); // 56K-76K front, 76K-96K back
     DMA_DST(3) = p->fg;
     DMA_CTRL(3) = tile_clear_ctrl;
     DMA_DST(3) = p->bg;
diff --git a/src/uxn/uxn.c b/src/uxn/uxn.c
index 8e76660..53f7983 100644
--- a/src/uxn/uxn.c
+++ b/src/uxn/uxn.c
@@ -16,21 +16,12 @@ WITH REGARD TO THIS SOFTWARE.
 /* clang-format off */
 
 static inline void   push8(Stack *s, Uint8 a) {
-#ifdef CPU_ERROR_CHECKING
-        if (s->ptr == 0xff) { s->error = 2; return; }
-#endif
         s->dat[s->ptr++] = a;
 }
 static inline Uint8  pop8_keep(Stack *s) {
-#ifdef CPU_ERROR_CHECKING
-        if (s->kptr == 0) { s->error = 1; return 0; }
-#endif
         return s->dat[--s->kptr];
 }
 static inline Uint8  pop8_nokeep(Stack *s) {
-#ifdef CPU_ERROR_CHECKING
-        if (s->ptr == 0) { s->error = 1; return 0; }
-#endif
         return s->dat[--s->ptr];
 }
 static inline void   devpoke8(Device *d, Uint8 a, Uint8 b) { d->dat[a & 0xf] = b; d->talk(d, a & 0x0f, 1); }
@@ -55,7 +46,7 @@ IWRAM_CODE
 static inline void
 opcuxn(Uxn *u, Uint8 instr)
 {
-#ifdef CPU_ERROR_CHECKING
+#if 1
         // With CPU error checking enabled, the codebase becomes too large to fit in ITCM.
         // Therefore, we take some concessions.
         if (instr & 0x40) {
@@ -155,8 +146,6 @@ int
 evaluxn(Uxn *u, Uint16 vec)
 {
         u->ram.ptr = vec;
-        u->wst.error = 0;
-        u->rst.error = 0;
         while(u->ram.ptr) {
             opcuxn(u, u->ram.dat[u->ram.ptr++]);
     }