]> git.sesse.net Git - pistorm/blobdiff - platforms/amiga/pistorm-dev/pistorm-dev.c
Fix PiStorm dev memcpy, correct extern gayle_emulation_enabled type
[pistorm] / platforms / amiga / pistorm-dev / pistorm-dev.c
index 30c0dfb1492c42e61c6d6c6853c5baed414d11e6..84cafa1a04c81fc01e6d1b61a00a243f6a30a953 100644 (file)
@@ -3,6 +3,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 
 #include "pistorm-dev.h"
 #include "pistorm-dev-enums.h"
 #include "platforms/amiga/piscsi/piscsi.h"
 #include "platforms/amiga/net/pi-net.h"
 
+#include <linux/reboot.h>
+#include <sys/reboot.h>
+#include <endian.h>
+
 #define DEBUG_PISTORM_DEVICE
 
 #ifdef DEBUG_PISTORM_DEVICE
 #define DEBUG printf
 
-#define PIDEV_SWREV 0x0105
-
 static const char *op_type_names[4] = {
     "BYTE",
     "WORD",
@@ -29,25 +32,29 @@ static const char *op_type_names[4] = {
 #define DEBUG(...)
 #endif
 
+#define PIDEV_SWREV 0x0105
+
 extern uint32_t pistorm_dev_base;
 extern uint32_t do_reset;
 
 extern void adjust_ranges_amiga(struct emulator_config *cfg);
-extern uint8_t rtg_enabled, rtg_on, pinet_enabled, piscsi_enabled, load_new_config;
+extern uint8_t rtg_enabled, rtg_on, pinet_enabled, piscsi_enabled, load_new_config, end_signal;
 extern struct emulator_config *cfg;
+extern int cpu_emulation_running;
 
 char cfg_filename[256] = "default.cfg";
 char tmp_string[256];
 
-static uint8_t pi_byte[8];
-static uint16_t pi_word[4];
-static uint32_t pi_longword[4];
-static uint32_t pi_string[4];
+static uint8_t pi_byte[32];
+static uint16_t pi_word[32];
+static uint32_t pi_longword[32];
+static uint32_t pi_string[32];
+static uint32_t pi_ptr[32];
 
-static uint32_t pi_dbg_val[4];
-static uint32_t pi_dbg_string[4];
+static uint32_t pi_dbg_val[32];
+static uint32_t pi_dbg_string[32];
 
-static uint32_t pi_cmd_result = 0;
+static uint32_t pi_cmd_result = 0, shutdown_confirm = 0xFFFFFFFF;
 
 int32_t grab_amiga_string(uint32_t addr, uint8_t *dest, uint32_t str_max_len) {
     int32_t r = get_mapped_item_by_address(cfg, addr);
@@ -56,7 +63,7 @@ int32_t grab_amiga_string(uint32_t addr, uint8_t *dest, uint32_t str_max_len) {
     if (r == -1) {
         DEBUG("[GRAB_AMIGA_STRING] No mapped range found for address $%.8X. Grabbing string data over the bus.\n", addr);
         do {
-            dest[index] = read8(addr + index);
+            dest[index] = (unsigned char)m68k_read_memory_8(addr + index);
             index++;
         } while (dest[index - 1] != 0x00 && index < str_max_len);
     }
@@ -75,6 +82,36 @@ int32_t grab_amiga_string(uint32_t addr, uint8_t *dest, uint32_t str_max_len) {
     return (int32_t)strlen((const char*)dest);
 }
 
+int32_t amiga_transfer_file(uint32_t addr, char *filename) {
+    FILE *in = fopen(filename, "rb");
+    if (in == NULL) {
+        DEBUG("[AMIGA_TRANSFER_FILE] Failed to open file %s for reading.\n", filename);
+        return -1;
+    }
+    fseek(in, 0, SEEK_END);
+
+    int32_t r = get_mapped_item_by_address(cfg, addr);
+    uint32_t filesize = ftell(in);
+
+    fseek(in, 0, SEEK_SET);
+    if (r == -1) {
+        DEBUG("[GRAB_AMIGA_STRING] No mapped range found for address $%.8X. Transferring file data over the bus.\n", addr);
+        uint8_t tmp_read = 0;
+
+        for (uint32_t i = 0; i < filesize; i++) {
+            tmp_read = (uint8_t)fgetc(in);
+            m68k_write_memory_8(addr + i, tmp_read);
+        }
+    } else {
+        uint8_t *dst = cfg->map_data[r] + (addr - cfg->map_offset[r]);
+        fread(dst, filesize, 1, in);
+    }
+    fclose(in);
+    DEBUG("[AMIGA_TRANSFER_FILE] Copied %d bytes to address $%.8X.\n", filesize, addr);
+
+    return 0;
+}
+
 char *get_pistorm_devcfg_filename() {
     return cfg_filename;
 }
@@ -106,22 +143,182 @@ void handle_pistorm_dev_write(uint32_t addr_, uint32_t val, uint8_t type) {
             pi_byte[addr - PI_BYTE1] = (val & 0xFF);
             break;
         case PI_WORD1: case PI_WORD2: case PI_WORD3: case PI_WORD4:
-            DEBUG("[PISTORM-DEV] Set WORD %d to %d ($%.4X)\n", (addr - PI_WORD1) / 2, (val & 0xFFFF), (val & 0xFFFF));
+            //DEBUG("[PISTORM-DEV] Set WORD %d to %d ($%.4X)\n", (addr - PI_WORD1) / 2, (val & 0xFFFF), (val & 0xFFFF));
             pi_word[(addr - PI_WORD1) / 2] = (val & 0xFFFF);
             break;
+        case PI_WORD5: case PI_WORD6: case PI_WORD7: case PI_WORD8:
+        case PI_WORD9: case PI_WORD10: case PI_WORD11: case PI_WORD12:
+            //DEBUG("[PISTORM-DEV] Set WORD %d to %d ($%.4X)\n", (addr - PI_WORD5) / 2, (val & 0xFFFF), (val & 0xFFFF));
+            pi_word[(addr - PI_WORD5) / 2] = (val & 0xFFFF);
+            break;
         case PI_LONGWORD1: case PI_LONGWORD2: case PI_LONGWORD3: case PI_LONGWORD4:
-            DEBUG("[PISTORM-DEV] Set LONGWORD %d to %d ($%.8X)\n", (addr - PI_LONGWORD1) / 4, val, val);
+            //DEBUG("[PISTORM-DEV] Set LONGWORD %d to %d ($%.8X)\n", (addr - PI_LONGWORD1) / 4, val, val);
             pi_longword[(addr - PI_LONGWORD1) / 4] = val;
             break;
         case PI_STR1: case PI_STR2: case PI_STR3: case PI_STR4:
             DEBUG("[PISTORM-DEV] Set STRING POINTER %d to $%.8X\n", (addr - PI_STR1) / 4, val);
             pi_string[(addr - PI_STR1) / 4] = val;
             break;
+        case PI_PTR1: case PI_PTR2: case PI_PTR3: case PI_PTR4:
+            //DEBUG("[PISTORM-DEV] Set DATA POINTER %d to $%.8X\n", (addr - PI_PTR1) / 4, val);
+            pi_ptr[(addr - PI_PTR1) / 4] = val;
+            break;
+
+        case PI_CMD_TRANSFERFILE:
+            DEBUG("[PISTORM-DEV] Write to TRANSFERFILE.\n");
+            if (pi_string[0] == 0 || grab_amiga_string(pi_string[0], (uint8_t *)tmp_string, 255) == -1)  {
+                printf("[PISTORM-DEV] No or invalid filename for TRANSFERFILE. Aborting.\n");
+                pi_cmd_result = PI_RES_INVALIDVALUE;
+            } else if (pi_ptr[0] == 0) {
+                printf("[PISTORM-DEV] Null pointer specified for TRANSFERFILE destination. Aborting.\n");
+                pi_cmd_result = PI_RES_INVALIDVALUE;
+            } else {
+                if (amiga_transfer_file(pi_ptr[0], tmp_string) == -1) {
+                    pi_cmd_result = PI_RES_FAILED;
+                } else {
+                    pi_cmd_result = PI_RES_OK;
+                }
+            }
+            pi_string[0] = 0;
+            pi_ptr[0] = 0;
+            break;
+        case PI_CMD_MEMCPY_Q:
+            DEBUG("CopyMemQuick.\n");
+            if ((pi_ptr[0] & 0x03) != 0) {
+                DEBUG("[!!!PISTORM-DEV] CopyMemQuick src not aligned: %.8X\n", pi_ptr[0]);
+            }
+            if (pi_ptr[1] & 0x03) {
+                DEBUG("[!!!PISTORM-DEV] CopyMemQuick dst not aligned: %.8X\n", pi_ptr[1]);
+            }
+            if (val & 0x03) {
+                DEBUG("[!!!PISTORM-DEV] CopyMemQuick size not aligned: %.8X\n", val);
+            }
+            // Fallthrough
+        case PI_CMD_MEMCPY:
+            //DEBUG("[PISTORM-DEV} Write to MEMCPY: %d (%.8X)\n", val, val);
+            if (pi_ptr[0] == 0 || pi_ptr[1] == 0) {
+                printf("[PISTORM-DEV] MEMCPY from/to null pointer not allowed. Aborting.\n");
+                pi_cmd_result = PI_RES_INVALIDVALUE;
+            } else if (val == 0) {
+                printf("[PISTORM-DEV] MEMCPY called with size 0. Aborting.\n");
+                pi_cmd_result = PI_RES_INVALIDVALUE;
+            } else {
+                //DEBUG("[PISTORM-DEV] Copy %d bytes from $%.8X to $%.8X\n", val, pi_ptr[0], pi_ptr[1]);
+                int32_t src = get_mapped_item_by_address(cfg, pi_ptr[0]);
+                int32_t dst = get_mapped_item_by_address(cfg, pi_ptr[1]);
+                if (cfg->map_type[dst] == MAPTYPE_ROM)
+                    break;
+                if (dst != -1 && src != -1) {
+                    uint8_t *src_ptr = &cfg->map_data[src][(pi_ptr[0] - cfg->map_offset[src])];
+                    uint8_t *dst_ptr = &cfg->map_data[dst][(pi_ptr[1] - cfg->map_offset[dst])];
+                    memcpy(dst_ptr, src_ptr, val);
+                } else {
+                    uint8_t tmp = 0;
+                    uint16_t tmps = 0;
+                    for (uint32_t i = 0; i < val; i++) {
+                        while (i + 2 < val) {
+                            if (src == -1) tmps = (uint16_t)htobe16(m68k_read_memory_16(pi_ptr[0] + i));
+                            else memcpy(&tmps, &cfg->map_data[src][pi_ptr[0] - cfg->map_offset[src] + i], 2);
 
+                            if (dst == -1) m68k_write_memory_16(pi_ptr[1] + i, be16toh(tmps));
+                            else memcpy(&cfg->map_data[dst][pi_ptr[1] - cfg->map_offset[dst] + i], &tmps, 2);
+                            i += 2;
+                        }
+                        if (src == -1) tmp = (uint8_t)m68k_read_memory_8(pi_ptr[0] + i);
+                        else tmp = cfg->map_data[src][pi_ptr[0] - cfg->map_offset[src] + i];
+                        
+                        if (dst == -1) m68k_write_memory_8(pi_ptr[1] + i, tmp);
+                        else cfg->map_data[dst][pi_ptr[1] - cfg->map_offset[dst] + i] = tmp;
+                    }
+                }
+                //DEBUG("[PISTORM-DEV] Copied %d bytes from $%.8X to $%.8X\n", val, pi_ptr[0], pi_ptr[1]);
+            }
+            break;
+        case PI_CMD_MEMSET:
+            //DEBUG("[PISTORM-DEV} Write to MEMSET: %d (%.8X)\n", val, val);
+            if (pi_ptr[0] == 0) {
+                printf("[PISTORM-DEV] MEMSET with null pointer not allowed. Aborting.\n");
+                pi_cmd_result = PI_RES_INVALIDVALUE;
+            } else if (val == 0) {
+                printf("[PISTORM-DEV] MEMSET called with size 0. Aborting.\n");
+                pi_cmd_result = PI_RES_INVALIDVALUE;
+            } else {
+                int32_t dst = get_mapped_item_by_address(cfg, pi_ptr[0]);
+                if (cfg->map_type[dst] == MAPTYPE_ROM)
+                    break;
+                if (dst != -1) {
+                    uint8_t *dst_ptr = &cfg->map_data[dst][(pi_ptr[0] - cfg->map_offset[dst])];
+                    memset(dst_ptr, pi_byte[0], val);
+                } else {
+                    for (uint32_t i = 0; i < val; i++) {
+                        m68k_write_memory_8(pi_ptr[0] + i, pi_byte[0]);
+                    }
+                }
+            }
+            break;
+        case PI_CMD_COPYRECT:
+        case PI_CMD_COPYRECT_EX:
+            if (pi_ptr[0] == 0 || pi_ptr[1] == 0) {
+                printf("[PISTORM-DEV] COPYRECT/EX from/to null pointer not allowed. Aborting.\n");
+                pi_cmd_result = PI_RES_INVALIDVALUE;
+            } else if (pi_word[2] == 0 || pi_word[3] == 0) {
+                printf("[PISTORM-DEV] COPYRECT/EX called with a width/height of 0. Aborting.\n");
+                pi_cmd_result = PI_RES_INVALIDVALUE;
+            } else {
+                int32_t src = get_mapped_item_by_address(cfg, pi_ptr[0]);
+                int32_t dst = get_mapped_item_by_address(cfg, pi_ptr[1]);
+
+                if (addr != PI_CMD_COPYRECT_EX) {
+                    // Clear out the src/dst coordinates in case something else set them previously.
+                    pi_word[4] = pi_word[5] = pi_word[6] = pi_word[7] = 0;
+                }
+
+                if (dst != -1 && src != -1) {
+                    uint8_t *src_ptr = &cfg->map_data[src][(pi_ptr[0] - cfg->map_offset[src])];
+                    uint8_t *dst_ptr = &cfg->map_data[dst][(pi_ptr[1] - cfg->map_offset[dst])];
+
+                    if (addr == PI_CMD_COPYRECT_EX) {
+                        // Adjust pointers in the case of available src/dst coordinates.
+                        src_ptr += pi_word[4] + (pi_word[5] * pi_word[0]);
+                        dst_ptr += pi_word[6] + (pi_word[7] * pi_word[1]);
+                    }
+
+                    for (int i = 0; i < pi_word[3]; i++) {
+                        memcpy(dst_ptr, src_ptr, pi_word[2]);
+
+                        src_ptr += pi_word[0];
+                        dst_ptr += pi_word[1];
+                    }
+                } else {
+                    uint32_t src_offset = 0, dst_offset = 0;
+                    uint8_t tmp = 0;
+
+                    if (addr == PI_CMD_COPYRECT_EX) {
+                        src_offset += pi_word[4] + (pi_word[5] * pi_word[0]);
+                        dst_offset += pi_word[6] + (pi_word[7] * pi_word[1]);
+                    }
+
+                    for (uint32_t y = 0; y < pi_word[3]; y++) {
+                        for (uint32_t x = 0; x < pi_word[2]; x++) {
+                            if (src == -1) tmp = (unsigned char)m68k_read_memory_8(pi_ptr[0] + src_offset + x);
+                            else tmp = cfg->map_data[src][(pi_ptr[0] + src_offset + x) - cfg->map_offset[src]];
+                            
+                            if (dst == -1) m68k_write_memory_8(pi_ptr[1] + dst_offset + x, tmp);
+                            else cfg->map_data[dst][(pi_ptr[1] + dst_offset + x) - cfg->map_offset[dst]] = tmp;
+                        }
+                        src_offset += pi_word[0];
+                        dst_offset += pi_word[1];
+                    }
+                }
+            }
+            break;
+
+        case PI_CMD_SHOWFPS: rtg_show_fps((uint8_t)val); break;
+        case PI_CMD_PALETTEDEBUG: rtg_palette_debug((uint8_t)val); break;
         case PI_CMD_RTGSTATUS:
             DEBUG("[PISTORM-DEV] Write to RTGSTATUS: %d\n", val);
             if (val == 1 && !rtg_enabled) {
-                init_rtg_data();
+                init_rtg_data(cfg);
                 rtg_enabled = 1;
                 pi_cmd_result = PI_RES_OK;
             } else if (val == 0 && rtg_enabled) {
@@ -186,11 +383,11 @@ void handle_pistorm_dev_write(uint32_t addr_, uint32_t val, uint8_t type) {
                     } else {
                         FILE *tmp = fopen(tmp_string, "rb");
                         if (tmp == NULL) {
-                            printf("[PISTORM-DEV] Failed to open file %s for PISCSI drive mapping. Aborting.\n", cfg_filename);
+                            printf("[PISTORM-DEV] Failed to open file %s for PISCSI drive mapping. Aborting.\n", tmp_string);
                             pi_cmd_result = PI_RES_FILENOTFOUND;
                         } else {
                             fclose(tmp);
-                            printf("[PISTORM-DEV] Attempting to map file %s as PISCSI drive %d...\n", cfg_filename, pi_word[0]);
+                            printf("[PISTORM-DEV] Attempting to map file %s as PISCSI drive %d...\n", tmp_string, pi_word[0]);
                             piscsi_unmap_drive(pi_word[0]);
                             piscsi_map_drive(tmp_string, pi_word[0]);
                             pi_cmd_result = PI_RES_OK;
@@ -236,7 +433,7 @@ void handle_pistorm_dev_write(uint32_t addr_, uint32_t val, uint8_t type) {
             } else {
                 FILE *tmp = fopen(tmp_string, "rb");
                 if (tmp == NULL) {
-                    printf("[PISTORM-DEV] Failed to open file %s for KICKROM mapping. Aborting.\n", cfg_filename);
+                    printf("[PISTORM-DEV] Failed to open file %s for KICKROM mapping. Aborting.\n", tmp_string);
                     pi_cmd_result = PI_RES_FILENOTFOUND;
                 } else {
                     fclose(tmp);
@@ -246,7 +443,7 @@ void handle_pistorm_dev_write(uint32_t addr_, uint32_t val, uint8_t type) {
                         free(cfg->map_id[index]);
                         cfg->map_type[index] = MAPTYPE_NONE;
                         // Dirty hack, I am sleepy and lazy.
-                        add_mapping(cfg, MAPTYPE_ROM, cfg->map_offset[index], cfg->map_size[index], 0, tmp_string, "kickstart");
+                        add_mapping(cfg, MAPTYPE_ROM, cfg->map_offset[index], cfg->map_size[index], 0, tmp_string, "kickstart", 0);
                         pi_cmd_result = PI_RES_OK;
                         do_reset = 1;
                     } else {
@@ -266,7 +463,7 @@ void handle_pistorm_dev_write(uint32_t addr_, uint32_t val, uint8_t type) {
             } else {
                 FILE *tmp = fopen(tmp_string, "rb");
                 if (tmp == NULL) {
-                    printf("[PISTORM-DEV] Failed to open file %s for EXTROM mapping. Aborting.\n", cfg_filename);
+                    printf("[PISTORM-DEV] Failed to open file %s for EXTROM mapping. Aborting.\n", tmp_string);
                     pi_cmd_result = PI_RES_FILENOTFOUND;
                 } else {
                     fclose(tmp);
@@ -276,7 +473,7 @@ void handle_pistorm_dev_write(uint32_t addr_, uint32_t val, uint8_t type) {
                         free(cfg->map_id[index]);
                         cfg->map_type[index] = MAPTYPE_NONE;
                         // Dirty hack, I am tired and lazy.
-                        add_mapping(cfg, MAPTYPE_ROM, cfg->map_offset[index], cfg->map_size[index], 0, tmp_string, "extended");
+                        add_mapping(cfg, MAPTYPE_ROM, cfg->map_offset[index], cfg->map_size[index], 0, tmp_string, "extended", 0);
                         pi_cmd_result = PI_RES_OK;
                         do_reset = 1;
                     } else {
@@ -293,6 +490,23 @@ void handle_pistorm_dev_write(uint32_t addr_, uint32_t val, uint8_t type) {
             DEBUG("[PISTORM-DEV] System reset called, code %d\n", (val & 0xFFFF));
             do_reset = 1;
             break;
+        case PI_CMD_SHUTDOWN:
+            DEBUG("[PISTORM-DEV] Shutdown requested. Confirm by replying with return value to CONFIRMSHUTDOWN.\n");
+            shutdown_confirm = rand() % 0xFFFF;
+            pi_cmd_result = shutdown_confirm;
+            break;
+        case PI_CMD_CONFIRMSHUTDOWN:
+            if (val != shutdown_confirm) {
+                DEBUG("[PISTORM-DEV] Attempted shutdown with wrong shutdown confirm value. Not shutting down.\n");
+                shutdown_confirm = 0xFFFFFFFF;
+                pi_cmd_result = PI_RES_FAILED;
+            } else {
+                printf("[PISTORM-DEV] Shutting down the PiStorm. Good night, fight well, until we meet again.\n");
+                reboot(LINUX_REBOOT_CMD_POWER_OFF);
+                pi_cmd_result = PI_RES_OK;
+                end_signal = 1;
+            }
+            break;
         case PI_CMD_SWITCHCONFIG:
             DEBUG("[PISTORM-DEV] Config switch called, command: ");
             switch (val) {
@@ -342,6 +556,31 @@ uint32_t handle_pistorm_dev_read(uint32_t addr_, uint8_t type) {
     uint32_t addr = (addr_ & 0xFFFF);
 
     switch((addr)) {
+        case PI_CMD_FILESIZE:
+            DEBUG("[PISTORM-DEV] %s read from FILESIZE.\n", op_type_names[type]);
+            if (pi_string[0] == 0 || grab_amiga_string(pi_string[0], (uint8_t *)tmp_string, 255) == -1)  {
+                DEBUG("[PISTORM-DEV] Failed to grab string for FILESIZE command. Aborting.\n");
+                pi_cmd_result = PI_RES_FAILED;
+                pi_longword[0] = 0;
+                return 0;
+            } else {
+                FILE *tmp = fopen(tmp_string, "rb");
+                if (tmp == NULL) {
+                    DEBUG("[PISTORM-DEV] Failed to open file %s for FILESIZE command. Aborting.\n", tmp_string);
+                    pi_longword[0] = 0;
+                    pi_cmd_result = PI_RES_FILENOTFOUND;
+                } else {
+                    fseek(tmp, 0, SEEK_END);
+                    pi_longword[0] = ftell(tmp);
+                    DEBUG("[PISTORM-DEV] Returning file size for file %s: %d bytes.\n", tmp_string, pi_longword[0]);
+                    fclose(tmp);
+                    pi_cmd_result = PI_RES_OK;
+                }
+            }
+            pi_string[0] = 0;
+            return pi_longword[0];
+            break;
+
         case PI_CMD_HWREV:
             // Probably replace this with some read from the CPLD to get a simple hardware revision.
             DEBUG("[PISTORM-DEV] %s Read from HWREV\n", op_type_names[type]);
@@ -363,6 +602,9 @@ uint32_t handle_pistorm_dev_read(uint32_t addr_, uint8_t type) {
             DEBUG("[PISTORM-DEV] %s Read from PISCSI_CTRL\n", op_type_names[type]);
             return piscsi_enabled;
             break;
+        case PI_CMD_GET_FB:
+            //DEBUG("[PISTORM-DEV] %s read from GET_FB: %.8X\n", op_type_names[type], rtg_get_fb());
+            return rtg_get_fb();
 
         case PI_DBG_VAL1: case PI_DBG_VAL2: case PI_DBG_VAL3: case PI_DBG_VAL4:
         case PI_DBG_VAL5: case PI_DBG_VAL6: case PI_DBG_VAL7: case PI_DBG_VAL8:
@@ -379,13 +621,18 @@ uint32_t handle_pistorm_dev_read(uint32_t addr_, uint8_t type) {
             DEBUG("[PISTORM-DEV] Read WORD %d (%d / $%.4X)\n", (addr - PI_WORD1) / 2, pi_word[(addr - PI_WORD1) / 2], pi_word[(addr - PI_WORD1) / 2]);
             return pi_word[(addr - PI_WORD1) / 2];
             break;
+        case PI_WORD5: case PI_WORD6: case PI_WORD7: case PI_WORD8: 
+        case PI_WORD9: case PI_WORD10: case PI_WORD11: case PI_WORD12: 
+            DEBUG("[PISTORM-DEV] Read WORD %d (%d / $%.4X)\n", (addr - PI_WORD5) / 2, pi_word[(addr - PI_WORD5) / 2], pi_word[(addr - PI_WORD5) / 2]);
+            return pi_word[(addr - PI_WORD5) / 2];
+            break;
         case PI_LONGWORD1: case PI_LONGWORD2: case PI_LONGWORD3: case PI_LONGWORD4:
             DEBUG("[PISTORM-DEV] Read LONGWORD %d (%d / $%.8X)\n", (addr - PI_LONGWORD1) / 4, pi_longword[(addr - PI_LONGWORD1) / 4], pi_longword[(addr - PI_LONGWORD1) / 4]);
             return pi_longword[(addr - PI_LONGWORD1) / 4];
             break;
 
         case PI_CMDRESULT:
-            DEBUG("[PISTORM-DEV] %s Read from CMDRESULT\n", op_type_names[type]);
+            //DEBUG("[PISTORM-DEV] %s Read from CMDRESULT: %d\n", op_type_names[type], pi_cmd_result);
             return pi_cmd_result;
             break;