fix displayed VAT addresses in the VAT View dock.

In the VAT iteration, the vat pointer variable kept being decreased,
but that was also the one that was used on the GUI side, so it kept
"pointing" to addresses too low (after the variable in question).

Author: adriweb

core/vat.c

@@ -289,7 +289,7 @@ static uint8_t calc_tokenized_var_version(const calc_var_t *var) {
 
 void vat_search_init(calc_var_t *var) {
     memset(var, 0, sizeof *var);
-    var->vat = 0xD3FFFF;
+    var->originalVat = var->vat = 0xD3FFFF;
 }
 
 bool vat_search_next(calc_var_t *var) {
@@ -302,6 +302,7 @@ bool vat_search_next(calc_var_t *var) {
     if (!var->vat || var->vat < userMem || var->vat <= OPBase || var->vat > symTable) {
         return false; /* some sanity check failed */
     }
+    var->originalVat = var->vat;
     var->type1    = mem_peek_byte(var->vat--);
     var->type     = (calc_var_type_t)(var->type1 & 0x3F);
     var->type2    = mem_peek_byte(var->vat--);

core/vat.h

@@ -57,7 +57,7 @@ extern const char *calc_var_type_names[0x40];
 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;
+    uint32_t originalVat, vat, address;
     uint8_t type1, type2, version, namelen, name[9], *data;
     calc_var_type_t type;
     uint16_t size;

gui/qt/debugger.cpp

@@ -2394,7 +2394,7 @@ void MainWindow::osUpdate() {
     vat_search_init(&var);
     while (vat_search_next(&var)) {
         QTableWidgetItem *varAddr = new QTableWidgetItem(int2hex(var.address, 6));
-        QTableWidgetItem *varVatAddr = new QTableWidgetItem(int2hex(var.vat, 6));
+        QTableWidgetItem *varVatAddr = new QTableWidgetItem(int2hex(var.originalVat, 6));
         QTableWidgetItem *varSize = new QTableWidgetItem(int2hex(var.size, 4));
         QTableWidgetItem *varName = new QTableWidgetItem(QString(calc_var_name_to_utf8(var.name, var.namelen, var.named)));
         QTableWidgetItem *varType = new QTableWidgetItem(QString(calc_var_type_names[var.type]));