Improved Receive Variables list

core/debug/debug.c

@@ -76,7 +76,9 @@ void debug_open(int reason, uint32_t data) {
                     (mem_peek_byte(DBG_BASIC_CMDFLAGS) & DBG_BASIC_CMDEXEC_BIT)) {
 
                     // check current pc for instruction "bit 1,(iy+$36)"
-                    if(*(uint32_t*)phys_mem_ptr(cpu.registers.PC - 4, 4) == 0x4E36CBFD) {
+                    static const uint8_t instr[] = { 0xFD, 0xCB, 0x36, 0x4E };
+                    const void *ptr = phys_mem_ptr(cpu.registers.PC - sizeof(instr), sizeof(instr));
+                    if(ptr && !memcmp(ptr, instr, sizeof(instr))) {
                         reason = DBG_BASIC_CURPC_WRITE;
                     }
                 } else {

core/vat.c

@@ -31,7 +31,7 @@ const char *calc_var_type_names[0x40] = {
     "Temp Program",
     "Group",
     "Real Fraction",
-    "Unknown #1",
+    "Mixed Fraction",
     "Image",
     "Complex Fraction",
     "Real Radical",
@@ -40,14 +40,17 @@ const char *calc_var_type_names[0x40] = {
     "Complex Pi Fraction",
     "Real Pi",
     "Real Pi Fraction",
-    "Unknown #2",
+    "Unknown #1",
     "Operating System",
     "Flash App",
     "Certificate",
-    "Unknown #3",
+    "AppID List",
     "Certificate Memory",
-    "Unknown #4",
+    "Unit Certificate",
     "Clock",
+    "Unknown #2",
+    "Unknown #3",
+    "Unknown #4",
     "Unknown #5",
     "Unknown #6",
     "Unknown #7",
@@ -65,11 +68,8 @@ const char *calc_var_type_names[0x40] = {
     "Unknown #19",
     "Unknown #20",
     "Unknown #21",
-    "Unknown #22",
-    "Unknown #23",
-    "Unknown #24",
     "Flash License",
-    "Unknown #25",
+    "Unknown #22",
 };
 
 static char hex_char(uint8_t nibble) {
@@ -81,7 +81,7 @@ static void hex_byte(char **dest, uint8_t byte) {
     *(*dest)++ = hex_char(byte >> 0);
 }
 
-const char *calc_var_name_to_utf8(uint8_t name[8], uint8_t namelen, bool named) {
+const char *calc_var_name_to_utf8(const uint8_t name[8], uint8_t namelen, bool named) {
     static char buffer[26];
     char *dest = buffer;
     uint8_t i = 0;
@@ -426,19 +426,63 @@ bool vat_search_next(calc_var_t *var) {
 }
 
 bool vat_search_find(const calc_var_t *target, calc_var_t *result) {
-    /* Ignore linked formula when comparing list names */
-    bool isList = calc_var_is_list(target);
     vat_search_init(result);
     while (vat_search_next(result)) {
-        if (result->type == target->type &&
-            result->namelen == target->namelen &&
-            !memcmp(result->name, target->name, target->namelen - isList)) {
+        if (0 == calc_var_compare_names(target, result)) {
             return true;
         }
     }
     return false;
 }
 
+int calc_var_compare_names(const calc_var_t *left, const calc_var_t *right) {
+    bool leftIsAns = !left->named & (left->name[0] == 0x72);
+    bool rightIsAns = !right->named & (right->name[0] == 0x72);
+    if (leftIsAns || rightIsAns) {
+        return leftIsAns - rightIsAns;
+    }
+    /* Ignore linked formula when comparing list names */
+    uint8_t leftNameLen = left->namelen - calc_var_is_list(left);
+    uint8_t rightNameLen = right->namelen - calc_var_is_list(right);
+    int cmp = memcmp(left->name, right->name, leftNameLen < rightNameLen ? leftNameLen : rightNameLen);
+    if (cmp != 0) {
+        return cmp;
+    }
+    cmp = leftNameLen - rightNameLen;
+    if (cmp != 0) {
+        return cmp;
+    }
+    if (likely(left->type == right->type)) {
+        return 0;
+    }
+    return calc_var_normalized_type(left->type) - calc_var_normalized_type(right->type);
+}
+
+calc_var_type_t calc_var_normalized_type(calc_var_type_t type) {
+    switch (type) {
+        case CALC_VAR_TYPE_REAL:
+        case CALC_VAR_TYPE_REAL_FRAC:
+        case CALC_VAR_TYPE_MIXED_FRAC:
+        case CALC_VAR_TYPE_REAL_RADICAL:
+        case CALC_VAR_TYPE_REAL_PI:
+        case CALC_VAR_TYPE_REAL_PI_FRAC:
+        case CALC_VAR_TYPE_CPLX:
+        case CALC_VAR_TYPE_CPLX_FRAC:
+        case CALC_VAR_TYPE_CPLX_RADICAL:
+        case CALC_VAR_TYPE_CPLX_PI:
+        case CALC_VAR_TYPE_CPLX_PI_FRAC:
+            return CALC_VAR_TYPE_REAL;
+        case CALC_VAR_TYPE_REAL_LIST:
+        case CALC_VAR_TYPE_CPLX_LIST:
+            return CALC_VAR_TYPE_REAL_LIST;
+        case CALC_VAR_TYPE_PROG:
+        case CALC_VAR_TYPE_PROT_PROG:
+            return CALC_VAR_TYPE_PROG;
+        default:
+            return type;
+    }
+}
+
 bool calc_var_is_list(const calc_var_t *var) {
     return var && (var->type == CALC_VAR_TYPE_REAL_LIST || var->type == CALC_VAR_TYPE_CPLX_LIST);
 }

core/vat.h

@@ -54,7 +54,7 @@ typedef enum calc_var_type {
 } calc_var_type_t;
 
 extern const char *calc_var_type_names[0x40];
-const char *calc_var_name_to_utf8(uint8_t name[8], uint8_t namelen, bool named);
+const char *calc_var_name_to_utf8(const uint8_t name[8], uint8_t namelen, bool named);
 
 typedef struct calc_var {
     uint32_t vat, address;
@@ -68,6 +68,8 @@ void vat_search_init(calc_var_t *);
 bool vat_search_next(calc_var_t *);
 bool vat_search_find(const calc_var_t *, calc_var_t *);
 
+int calc_var_compare_names(const calc_var_t *, const calc_var_t *);
+calc_var_type_t calc_var_normalized_type(calc_var_type_t);
 bool calc_var_is_list(const calc_var_t *);
 bool calc_var_is_prog(const calc_var_t *);
 bool calc_var_is_asmprog(const calc_var_t *);

gui/qt/CEmu.pro

@@ -269,6 +269,7 @@ SOURCES += \
     tivars_lib_cpp/src/TypeHandlers/STH_ExactRadical.cpp \
     tivars_lib_cpp/src/TypeHandlers/STH_ExactPi.cpp \
     tivars_lib_cpp/src/TypeHandlers/STH_FP.cpp \
+    vartablemodel.cpp \
     visualizerwidget.cpp \
     debugger/visualizerdisplaywidget.cpp \
     memorywidget.cpp \
@@ -368,6 +369,7 @@ HEADERS  += \
     tivars_lib_cpp/src/TIVarType.h \
     tivars_lib_cpp/src/TIVarTypes.h \
     tivars_lib_cpp/src/TypeHandlers/TypeHandlers.h \
+    vartablemodel.h \
     visualizerwidget.h \
     debugger/visualizerdisplaywidget.h \
     archive/extractor.h \

gui/qt/CMakeLists.txt

@@ -197,6 +197,7 @@ set(CEmu_Sources
     tivars_lib_cpp/src/TypeHandlers/TypeHandlers.h
     tivars_lib_cpp/src/tivarslib_utils.cpp tivars_lib_cpp/src/tivarslib_utils.h
     utils.cpp utils.h
+    vartablemodel.cpp vartablemodel.h
     visualizerwidget.cpp visualizerwidget.h
     ${CEmu_Resources}
 )

gui/qt/basicdebugger.cpp

@@ -56,8 +56,6 @@ void MainWindow::debugBasic(bool enable) {
 
     // disable other debugger / var list
     ui->buttonSend->setEnabled(!enable);
-    ui->buttonReceiveFiles->setEnabled(!enable);
-    ui->buttonReceiveFile->setEnabled(!enable);
     ui->buttonResendFiles->setEnabled(!enable);
     ui->buttonRun->setEnabled(!enable);
 }
@@ -79,7 +77,7 @@ void MainWindow::debugBasicDisable() {
 void MainWindow::debugBasicToggle() {
     bool state = guiDebugBasic;
 
-    if (guiDebug || guiReceive || guiSend) {
+    if (guiDebug || guiSend) {
         return;
     }
 
@@ -388,6 +386,10 @@ MainWindow::debug_basic_status_t MainWindow::debugBasicUpdate(bool force) {
         return DBG_BASIC_NO_EXECUTING_PRGM;
     }
 
+    if (guiReceive) {
+        varShow();
+    }
+
     const int begPC = static_cast<int>(mem_peek_long(DBG_BASIC_BEGPC));
     const int curPC = static_cast<int>(mem_peek_long(DBG_BASIC_CURPC));
     const int endPC = static_cast<int>(mem_peek_long(DBG_BASIC_ENDPC));

gui/qt/debugger.cpp

@@ -638,11 +638,7 @@
     ui->fpStack->setEnabled(state && m_normalOs);
 
     ui->buttonSend->setEnabled(!state);
-    ui->buttonRefreshList->setEnabled(!state);
-    ui->emuVarView->setEnabled(!state);
     ui->buttonResendFiles->setEnabled(!state);
-    ui->buttonReceiveFiles->setEnabled(!state && guiReceive);
-    ui->buttonReceiveFile->setEnabled(!state && guiReceive);
 
     QList<QDockWidget*> docks = findChildren<QDockWidget*>();
     foreach (QDockWidget* dock, docks) {
@@ -676,10 +672,6 @@
         return;
     }
 
-    if (guiReceive) {
-        varToggle();
-    }
-
     if (state) {
         debugSync();
         debugDisable();
@@ -870,6 +862,10 @@
     disasmUpdateAddr(m_prevDisasmAddr = cpu.registers.PC, true);
 
     memUpdate();
+
+    if (guiReceive) {
+        varShow();
+    }
 }
 
 // ------------------------------------------------
@@ -2023,7 +2019,7 @@
     if (memWidget == Q_NULLPTR) {
         for (HexWidget *edit : ui->debugMemoryWidget->findChildren<HexWidget*>()) {
             uint32_t offset = address - edit->getBase();
             if (offset < edit->getSize()) {
                 edit->setOffset(offset);
                 memWidget = edit;
                 didGoto = true;
@@ -2210,7 +2206,7 @@
         if (name == QStringLiteral("rregView"))
             t = QStringLiteral("r:\t") + val;
 
         QToolTip::showText(static_cast<QMouseEvent*>(e)->globalPos(), t, widget, widget->rect());
     }
     return QMainWindow::eventFilter(obj, e);
 }