]> git.sesse.net Git - pistorm/blobdiff - platforms/amiga/rtg/rtg.c
Fix masked FillRect, add buptest bus tester
[pistorm] / platforms / amiga / rtg / rtg.c
index 737de8a8ffb7403d0c9c4e18195fdd41782f9c00..9f440bbc4920eb9b30d349495a0698499dffa962 100644 (file)
@@ -7,11 +7,13 @@
 #include "rtg.h"
 #include "../../../config_file/config_file.h"
 
-static uint8_t rtg_u8[4];
-static uint16_t rtg_x[3], rtg_y[3];
-static uint16_t rtg_format;
-static uint32_t rtg_address[2];
-static uint32_t rtg_rgb[2];
+uint8_t rtg_u8[4];
+uint16_t rtg_x[8], rtg_y[8];
+uint16_t rtg_user[8];
+uint16_t rtg_format;
+uint32_t rtg_address[8];
+uint32_t rtg_address_adj[8];
+uint32_t rtg_rgb[8];
 
 static uint8_t display_enabled = 0xFF;
 
@@ -22,12 +24,15 @@ uint16_t rtg_offset_x, rtg_offset_y;
 
 uint8_t *rtg_mem; // FIXME
 
-uint32_t framebuffer_addr;
-uint32_t framebuffer_addr_adj;
+uint32_t framebuffer_addr = 0;
+uint32_t framebuffer_addr_adj = 0;
 
 static void handle_rtg_command(uint32_t cmd);
 static struct timespec f1, f2;
 
+uint8_t realtime_graphics_debug = 0;
+extern int cpu_emulation_running;
+
 static const char *op_type_names[OP_TYPE_NUM] = {
     "BYTE",
     "WORD",
@@ -43,7 +48,7 @@ static const char *rtg_format_names[RTGFMT_NUM] = {
 };
 
 int init_rtg_data() {
-    rtg_mem = calloc(1, 32 * SIZE_MEGA);
+    rtg_mem = calloc(1, 40 * SIZE_MEGA);
     if (!rtg_mem) {
         printf("Failed to allocate RTG video memory.\n");
         return 0;
@@ -58,7 +63,7 @@ void rtg_update_screen();
 unsigned int rtg_read(uint32_t address, uint8_t mode) {
     //printf("%s read from RTG: %.8X\n", op_type_names[mode], address);
     if (address >= PIGFX_REG_SIZE) {
-        if (rtg_mem) {
+        if (rtg_mem && (address - PIGFX_REG_SIZE) < PIGFX_UPPER) {
             switch (mode) {
                 case OP_TYPE_BYTE:
                     return (rtg_mem[address - PIGFX_REG_SIZE]);
@@ -91,10 +96,15 @@ struct timespec diff(struct timespec start, struct timespec end)
     return temp;
 }
 
+#define CHKREG(a, b) case a: b = value; break;
+
 void rtg_write(uint32_t address, uint32_t value, uint8_t mode) {
     //printf("%s write to RTG: %.8X (%.8X)\n", op_type_names[mode], address, value);
     if (address >= PIGFX_REG_SIZE) {
-        if (rtg_mem) {
+        /*if ((address - PIGFX_REG_SIZE) < framebuffer_addr) {// || (address - PIGFX_REG_SIZE) > framebuffer_addr + ((rtg_display_width << rtg_display_format) * rtg_display_height)) {
+            printf("Write to RTG memory outside frame buffer %.8X (%.8X).\n", (address - PIGFX_REG_SIZE), framebuffer_addr);
+        }*/
+        if (rtg_mem && (address - PIGFX_REG_SIZE) < PIGFX_UPPER) {
             switch (mode) {
                 case OP_TYPE_BYTE:
                     rtg_mem[address - PIGFX_REG_SIZE] = value;
@@ -114,43 +124,27 @@ void rtg_write(uint32_t address, uint32_t value, uint8_t mode) {
         switch (mode) {
             case OP_TYPE_BYTE:
                 switch (address) {
-                    case RTG_U81:
-                        rtg_u8[0] = value;
-                        break;
-                    case RTG_U82:
-                        rtg_u8[1] = value;
-                        break;
-                    case RTG_U83:
-                        rtg_u8[2] = value;
-                        break;
-                    case RTG_U84:
-                        rtg_u8[3] = value;
-                        break;
+                    CHKREG(RTG_U81, rtg_u8[0]);
+                    CHKREG(RTG_U82, rtg_u8[1]);
+                    CHKREG(RTG_U83, rtg_u8[2]);
+                    CHKREG(RTG_U84, rtg_u8[3]);
                 }
                 break;
             case OP_TYPE_WORD:
                 switch (address) {
-                    case RTG_X1:
-                        rtg_x[0] = value;
-                        break;
-                    case RTG_X2:
-                        rtg_x[1] = value;
-                        break;
-                    case RTG_X3:
-                        rtg_x[2] = value;
-                        break;
-                    case RTG_Y1:
-                        rtg_y[0] = value;
-                        break;
-                    case RTG_Y2:
-                        rtg_y[1] = value;
-                        break;
-                    case RTG_Y3:
-                        rtg_y[2] = value;
-                        break;
-                    case RTG_FORMAT:
-                        rtg_format = value;
-                        break;
+                    CHKREG(RTG_X1, rtg_x[0]);
+                    CHKREG(RTG_X2, rtg_x[1]);
+                    CHKREG(RTG_X3, rtg_x[2]);
+                    CHKREG(RTG_X4, rtg_x[3]);
+                    CHKREG(RTG_X5, rtg_x[4]);
+                    CHKREG(RTG_Y1, rtg_y[0]);
+                    CHKREG(RTG_Y2, rtg_y[1]);
+                    CHKREG(RTG_Y3, rtg_y[2]);
+                    CHKREG(RTG_Y4, rtg_y[3]);
+                    CHKREG(RTG_Y5, rtg_y[4]);
+                    CHKREG(RTG_U1, rtg_user[0]);
+                    CHKREG(RTG_U2, rtg_user[1]);
+                    CHKREG(RTG_FORMAT, rtg_format);
                     case RTG_COMMAND:
                         handle_rtg_command(value);
                         break;
@@ -160,16 +154,16 @@ void rtg_write(uint32_t address, uint32_t value, uint8_t mode) {
                 switch (address) {
                     case RTG_ADDR1:
                         rtg_address[0] = value;
+                        rtg_address_adj[0] = value - (PIGFX_RTG_BASE + PIGFX_REG_SIZE);
                         break;
                     case RTG_ADDR2:
                         rtg_address[1] = value;
+                        rtg_address_adj[1] = value - (PIGFX_RTG_BASE + PIGFX_REG_SIZE);
                         break;
-                    case RTG_RGB1:
-                        rtg_rgb[0] = value;
-                        break;
-                    case RTG_RGB2:
-                        rtg_rgb[1] = value;
-                        break;
+                    CHKREG(RTG_ADDR3, rtg_address[2]);
+                    CHKREG(RTG_ADDR4, rtg_address[3]);
+                    CHKREG(RTG_RGB1, rtg_rgb[0]);
+                    CHKREG(RTG_RGB2, rtg_rgb[1]);
                 }
                 break;
         }
@@ -178,6 +172,8 @@ void rtg_write(uint32_t address, uint32_t value, uint8_t mode) {
     return;
 }
 
+#define gdebug(a) if (realtime_graphics_debug) { printf(a); m68k_end_timeslice(); cpu_emulation_running = 0; }
+
 static void handle_rtg_command(uint32_t cmd) {
     //printf("Handling RTG command %d (%.8X)\n", cmd, cmd);
     switch (cmd) {
@@ -195,9 +191,9 @@ static void handle_rtg_command(uint32_t cmd) {
                 framebuffer_addr_adj = framebuffer_addr + (rtg_offset_x << rtg_display_format) + (rtg_offset_y * rtg_pitch);
                 rtg_total_rows = rtg_y[1];
             }
-            printf("Set RTG mode:\n");
-            printf("%dx%d pixels\n", rtg_display_width, rtg_display_height);
-            printf("Pixel format: %s\n", rtg_format_names[rtg_display_format]);
+            //printf("Set RTG mode:\n");
+            //printf("%dx%d pixels\n", rtg_display_width, rtg_display_height);
+            //printf("Pixel format: %s\n", rtg_format_names[rtg_display_format]);
             break;
         case RTGCMD_SETPAN:
             //printf("Command: SetPan.\n");
@@ -206,9 +202,9 @@ static void handle_rtg_command(uint32_t cmd) {
             rtg_pitch = (rtg_x[0] << rtg_display_format);
             framebuffer_addr = rtg_address[0] - (PIGFX_RTG_BASE + PIGFX_REG_SIZE);
             framebuffer_addr_adj = framebuffer_addr + (rtg_offset_x << rtg_display_format) + (rtg_offset_y * rtg_pitch);
-            printf("Set panning to $%.8X (%.8X)\n", framebuffer_addr, rtg_address[0]);
-            printf("(Panned: $%.8X)\n", framebuffer_addr_adj);
-            printf("Offset X/Y: %d/%d\n", rtg_offset_x, rtg_offset_y);
+            //printf("Set panning to $%.8X (%.8X)\n", framebuffer_addr, rtg_address[0]);
+            //printf("(Panned: $%.8X)\n", framebuffer_addr_adj);
+            //printf("Offset X/Y: %d/%d\n", rtg_offset_x, rtg_offset_y);
             printf("Pitch: %d (%d bytes)\n", rtg_x[0], rtg_pitch);
             break;
         case RTGCMD_SETCLUT: {
@@ -225,8 +221,8 @@ static void handle_rtg_command(uint32_t cmd) {
             break;
         case RTGCMD_ENABLE:
         case RTGCMD_SETSWITCH:
-            printf("RTG SetSwitch %s\n", ((rtg_x[0]) & 0x01) ? "enabled" : "disabled");
-            printf("LAL: %.4X\n", rtg_x[0]);
+            //printf("RTG SetSwitch %s\n", ((rtg_x[0]) & 0x01) ? "enabled" : "disabled");
+            //printf("LAL: %.4X\n", rtg_x[0]);
             if (display_enabled != ((rtg_x[0]) & 0x01)) {
                 display_enabled = ((rtg_x[0]) & 0x01);
                 if (display_enabled) {
@@ -237,45 +233,54 @@ static void handle_rtg_command(uint32_t cmd) {
             }
             break;
         case RTGCMD_FILLRECT:
-            rtg_fillrect(rtg_x[0], rtg_y[0], rtg_x[1], rtg_y[1], rtg_rgb[0], rtg_x[2], rtg_format, 0xFF);
-            break;
-    }
-}
-
-void rtg_fillrect(uint16_t x, uint16_t y, uint16_t w, uint16_t h, uint32_t color, uint16_t pitch, uint16_t format, uint8_t mask) {
-    if (mask || pitch) {}
-    uint8_t *dptr = &rtg_mem[framebuffer_addr + (x << format) + (y * rtg_pitch)];
-    //printf("FillRect: %d,%d to %d,%d C%.8X, p:%d dp: %d m:%.2X\n", x, y, x+w, y+h, color, pitch, rtg_pitch, mask);
-    switch(format) {
-        case RTGFMT_8BIT: {
-            //printf("Incoming 8-bit color: %.8X\n", color);
-            for (int xs = 0; xs < w; xs++) {
-                dptr[xs] = color & 0xFF;
+            if (rtg_u8[0] == 0xFF || rtg_format != RTGFMT_8BIT) {
+                rtg_fillrect_solid(rtg_x[0], rtg_y[0], rtg_x[1], rtg_y[1], rtg_rgb[0], rtg_x[2], rtg_format);
+                gdebug("FillRect Solid\n");
             }
-            break;
-        }
-        case RTGFMT_RBG565: {
-            //printf("Incoming raw 16-bit color: %.8X\n", htobe32(color));
-            color = htobe16((color & 0xFFFF));
-            //printf("Incoming 16-bit color: %.8X\n", color);
-            uint16_t *ptr = (uint16_t *)dptr;
-            for (int xs = 0; xs < w; xs++) {
-                ptr[xs] = color;
+            else {
+                rtg_fillrect(rtg_x[0], rtg_y[0], rtg_x[1], rtg_y[1], rtg_rgb[0], rtg_x[2], rtg_format, rtg_u8[0]);
+                gdebug("FillRect Masked\n");
             }
             break;
-        }
-        case RTGFMT_RGB32: {
-            color = htobe32(color);
-            //printf("Incoming 32-bit color: %.8X\n", color);
-            uint32_t *ptr = (uint32_t *)dptr;
-            for (int xs = 0; xs < w; xs++) {
-                ptr[xs] = color;
+        case RTGCMD_INVERTRECT:
+            rtg_invertrect(rtg_x[0], rtg_y[0], rtg_x[1], rtg_y[1], rtg_x[2], rtg_format, rtg_u8[0]);
+            gdebug("InvertRect\n");
+            break;
+        case RTGCMD_BLITRECT:
+            if (rtg_u8[0] == 0xFF || rtg_format != RTGFMT_8BIT) {
+                rtg_blitrect_solid(rtg_x[0], rtg_y[0], rtg_x[1], rtg_y[1], rtg_x[2], rtg_y[2], rtg_x[3], rtg_format);
+                gdebug("BlitRect Solid\n");
+            }
+            else {
+                rtg_blitrect(rtg_x[0], rtg_y[0], rtg_x[1], rtg_y[1], rtg_x[2], rtg_y[2], rtg_x[3], rtg_format, rtg_u8[0]);
+                gdebug("BlitRect Masked\n");
             }
             break;
-        }
-    }
-    for (int ys = 1; ys < h; ys++) {
-        dptr += rtg_pitch;
-        memcpy(dptr, (void *)(size_t)(dptr - rtg_pitch), (w << format));
+        case RTGCMD_BLITRECT_NOMASK_COMPLETE:
+            rtg_blitrect_nomask_complete(rtg_x[0], rtg_y[0], rtg_x[1], rtg_y[1], rtg_x[2], rtg_y[2], rtg_x[3], rtg_x[4], rtg_address[0], rtg_address[1], rtg_format, rtg_u8[0]);
+            gdebug("BlitRectNoMaskComplete\n");
+            break;
+        case RTGCMD_BLITPATTERN:
+            rtg_blitpattern(rtg_x[0], rtg_y[0], rtg_x[1], rtg_y[1], rtg_address[0], rtg_rgb[0], rtg_rgb[1], rtg_x[3], rtg_format, rtg_x[2], rtg_y[2], rtg_u8[0], rtg_u8[1], rtg_u8[2]);
+            gdebug("BlitPattern\n");
+            return;
+        case RTGCMD_BLITTEMPLATE:
+            rtg_blittemplate(rtg_x[0], rtg_y[0], rtg_x[1], rtg_y[1], rtg_address[0], rtg_rgb[0], rtg_rgb[1], rtg_x[3], rtg_x[4], rtg_format, rtg_x[2], rtg_u8[0], rtg_u8[1]);
+            gdebug("BlitTemplate\n");
+            break;
+        case RTGCMD_DRAWLINE:
+            if (rtg_u8[0] == 0xFF && rtg_y[2] == 0xFFFF)
+                rtg_drawline_solid(rtg_x[0], rtg_y[0], rtg_x[1], rtg_y[1], rtg_x[2], rtg_rgb[0], rtg_x[3], rtg_format);
+            else
+                rtg_drawline(rtg_x[0], rtg_y[0], rtg_x[1], rtg_y[1], rtg_x[2], rtg_y[2], rtg_x[4], rtg_rgb[0], rtg_rgb[1],  rtg_x[3], rtg_format, rtg_u8[0], rtg_u8[1]);
+            gdebug("DrawLine\n");
+            break;
+        case RTGCMD_P2C:
+            rtg_p2c(rtg_x[0], rtg_y[0], rtg_x[1], rtg_y[1], rtg_x[2], rtg_y[2], rtg_u8[1], rtg_u8[2], rtg_u8[0], (rtg_user[0] >> 0x8), rtg_x[4], (uint8_t *)&rtg_mem[rtg_address_adj[1]]);
+            //rtg_p2c_broken(rtg_x[0], rtg_y[0], rtg_x[1], rtg_y[1], rtg_x[2], rtg_y[2], rtg_x[3], rtg_u8[0], rtg_u8[1], rtg_u8[2], rtg_user[0]);
+            gdebug("Planar2Chunky\n");
+            break;
+        case RTGCMD_P2D:
+            break;
     }
 }