Trace names of resident programs.

Author: sergev

machine.cpp

@@ -182,9 +182,18 @@ void Machine::print_calls_returns()
     if (after_call | after_return) {
         auto &out = get_trace_stream();
 
-        out << "---------------------------------------------------\n";
+        out << "---------------------------------------------------";
 
-        // TODO: print name of the routine at PC.
+        // Print name of routine at new address.
+        std::string name;
+        bool at_start{};
+        if (find_resident_name(cpu.get_pc(), name, at_start)) {
+            if (!at_start) {
+                out << " back to";
+            }
+            out << " " << name;
+        }
+        out << "\n";
     }
 }
 
@@ -356,6 +365,11 @@ void Machine::drum_io(char op, unsigned drum_unit, unsigned zone, unsigned secto
         }
     } else {
         drums[drum_unit]->memory_to_drum(zone, sector, addr, nwords);
+
+        if (debug_instructions && drum_unit == 020 && zone == 0 && nwords == 1024) {
+            // Load the table of resident programs, for tracing.
+            load_resident_directory(addr);
+        }
     }
 }
 
@@ -795,6 +809,47 @@ void Machine::print_iso_string(std::ostream &out, unsigned addr)
     out << '\n';
 }
 
+//
+// Load the table of resident programs, for tracing.
+//
+void Machine::load_resident_directory(unsigned base)
+{
+    resident_name.clear();
+    resident_addr.clear();
+    for (unsigned offset = 0; offset < PAGE_NWORDS/4; offset += 2) {
+        Word name = memory.load(base + offset);
+        if (name == 0) {
+            break;
+        }
+        unsigned address = memory.load(base + offset + 1) & 077777;
+
+        resident_name[address] = word_text_string(name);
+        resident_addr.insert(address);
+    }
+    std::cout << "      Load " << resident_name.size() << " names from TRP\n";
+}
+
+//
+// Find name of resident routine, by address.
+// Set at_start to true when address matches the start of the routine.
+//
+bool Machine::find_resident_name(unsigned addr, std::string &name, bool &at_start)
+{
+    // Find the next resident program after given address.
+    auto it = resident_addr.upper_bound(addr);
+    if (it == resident_addr.begin()) {
+        // No residents at all.
+        return false;
+    }
+
+    // Get start address of the resident.
+    unsigned start = *std::prev(it); // Largest element <= addr
+
+    name = resident_name[start];
+    at_start = (addr == start);
+    return true;
+}
+
 //
 // Load boot code for Monitoring System Dubna.
 //

machine.h

@@ -28,6 +28,8 @@
 #include <chrono>
 #include <memory>
 #include <vector>
+#include <set>
+#include <unordered_map>
 
 #include "disk.h"
 #include "drum.h"
@@ -77,6 +79,12 @@ class Machine {
     // Enable system load list from the start.
     bool system_load_list_flag{};
 
+    // Get name of a resident program by address.
+    std::unordered_map<unsigned, std::string> resident_name;
+
+    // Addresses of resident programs.
+    std::multiset<unsigned> resident_addr;
+
     // Trace output.
     static std::ofstream trace_stream;
 
@@ -227,6 +235,13 @@ class Machine {
     // Load binary program (overlay).
     void boot_overlay(const std::string &filename, unsigned file_offset, const std::string &path = "");
 
+    // Load the table of resident programs, for tracing.
+    void load_resident_directory(unsigned addr);
+
+    // Find name of resident routine, by address.
+    // Set at_start to true when address matches the start of the routine.
+    bool find_resident_name(unsigned addr, std::string &name, bool &at_start);
+
     //
     // Trace methods.
     //