Merge branch 'cli-updates-revided'

Author: ppisa

src/cli/main.cpp

@@ -52,10 +52,13 @@ void create_parser(QCommandLineParser &p) {
                   "all registers.",
                   "REG" });
     p.addOption({ "dump-to-json", "Configure reportor dump to json file.", "FNAME" });
+    p.addOption({ "only-dump", "Do not start the processor." });
+    p.addOption({ "disable-console-dump", "Configure reporter not to dump to console." });
     p.addOption({ { "dump-registers", "d-regs" }, "Dump registers state at program exit." });
     p.addOption({ "dump-cache-stats", "Dump cache statistics at program exit." });
     p.addOption({ "dump-cycles", "Dump number of CPU cycles till program end." });
     p.addOption({ "dump-range", "Dump memory range.", "START,LENGTH,FNAME" });
+    p.addOption({ "dump-symbol-table", "Dump the symbol table." });
     p.addOption({ "load-range", "Load memory range.", "START,FNAME" });
     p.addOption({ "expect-fail", "Expect that program causes CPU trap and fail if it doesn't." });
     p.addOption({ "fail-match",
@@ -139,7 +142,7 @@ void configure_cache(CacheConfig &cacheconf, const QStringList &cachearg, const
             cacheconf.set_write_policy(CacheConfig::WP_THROUGH_ALLOC);
         } else {
             fprintf(
-                stderr, "Write policy for  %s  cache is incorrect (correct wb/wt/wtna/wta). \n",
+                stderr, "Write policy for %s cache is incorrect (correct wb/wt/wtna/wta).\n",
                 qPrintable(which));
             exit(EXIT_FAILURE);
         }
@@ -161,7 +164,7 @@ void parse_u32_option(
             (config.*setter)(value);
         } else {
             fprintf(
-                stderr, "Value of option %s is not a valid unsigned integer.",
+                stderr, "Value of option %s is not a valid unsigned integer.\n",
                 qPrintable(option_name));
             exit(EXIT_FAILURE);
         }
@@ -291,9 +294,13 @@ void configure_reporter(QCommandLineParser &p, Reporter &r, const SymbolTable *s
         r.dump_format = (DumpFormat)(r.dump_format | DumpFormat::JSON);
         r.dump_file_json = p.value("dump-to-json");
     }
+    if (p.isSet("disable-console-dump")) {
+        r.dump_format = (DumpFormat)(r.dump_format & ~(DumpFormat::CONSOLE));
+    }
     if (p.isSet("dump-registers")) { r.enable_regs_reporting(); }
     if (p.isSet("dump-cache-stats")) { r.enable_cache_stats(); }
     if (p.isSet("dump-cycles")) { r.enable_cycles_reporting(); }
+    if (p.isSet("dump-symbol-table")) { r.enable_symbol_table_reporting(); }
 
     QStringList fail = p.values("fail-match");
     for (const auto & i : fail) {
@@ -542,6 +549,11 @@ int main(int argc, char *argv[]) {
 
     load_ranges(machine, p.values("load-range"));
 
-    machine.play();
+    if (p.isSet("only-dump")) {
+        QMetaObject::invokeMethod(&machine, &Machine::program_exit, Qt::QueuedConnection);
+    } else {
+        // QTimer::singleShot(0, &machine, &Machine::play); alternative
+        QMetaObject::invokeMethod(&machine, &Machine::play, Qt::QueuedConnection);
+    }
     return QCoreApplication::exec();
 }

src/cli/reporter.cpp

@@ -84,7 +84,9 @@ void Reporter::machine_trap(SimulatorException &e) {
 }
 
 void Reporter::report() {
-    if (e_regs | e_cycles | e_cycles | e_fail) { printf("Machine state report:\n"); }
+    if (dump_format & DumpFormat::CONSOLE) {
+        if (e_regs | e_cycles | e_cycles | e_fail) { printf("Machine state report:\n"); }
+    }
 
     if (e_regs) { report_regs(); }
     if (e_cache_stats) { report_caches(); }
@@ -106,15 +108,35 @@ void Reporter::report() {
         report_range(range);
     }
 
+    if (e_symtab) {
+        QJsonObject symtab_json = {};
+
+        for (const auto &name : machine->symbol_table()->names()) {
+            SymbolValue sym_val;
+            machine->symbol_table()->name_to_value(sym_val, name);
+            QString value = QString::asprintf(machine->core()->get_xlen() == Xlen::_32 ? "0x%08" PRIx64 : "0x%016" PRIx64, sym_val);
+            if (dump_format & DumpFormat::JSON) {
+                symtab_json[name] = value;
+            }
+            if (dump_format & DumpFormat::CONSOLE) {
+                printf("SYM[%s]: %s\n", qPrintable(name), qPrintable(value));
+            }
+        }
+
+        if (dump_format & DumpFormat::JSON) {
+            dump_data_json["symbols"] = symtab_json;
+        }
+    }
+
     if (dump_format & DumpFormat::JSON) {
         QFile file(dump_file_json);
         QByteArray bytes = QJsonDocument(dump_data_json).toJson(QJsonDocument::Indented);
         if (file.open(QIODevice::WriteOnly)) {
             file.write(bytes);
             file.close();
-            printf("JSON object written to file");
+            printf("JSON object written to file\n");
         } else {
-            printf("Could not open file for writing");
+            printf("Could not open file for writing\n");
         }
     }
 }

src/cli/reporter.h

@@ -31,6 +31,7 @@ class Reporter : public QObject {
     void enable_regs_reporting() { e_regs = true; };
     void enable_cache_stats() { e_cache_stats = true; };
     void enable_cycles_reporting() { e_cycles = true; };
+    void enable_symbol_table_reporting() { e_symtab = true; };
 
     enum FailReason {
         FR_NONE = 0,
@@ -63,6 +64,7 @@ private slots:
     bool e_regs = false;
     bool e_cache_stats = false;
     bool e_cycles = false;
+    bool e_symtab = false;
     FailReason e_fail = FR_NONE;
 
     void report();

src/machine/memory/backend/lcddisplay.cpp

@@ -76,7 +76,7 @@ bool LcdDisplay::write_raw_pixel(Offset destination, uint16_t value) {
     Q_ASSERT((destination & 1U) == 0); // uint16_t aligned
 
     if (destination + 1 >= get_fb_size_bytes()) {
-        printf("WARNING: LCD display - read out of range.");
+        printf("WARNING: LCD display - read out of range.\n");
         return false;
     }
 

src/os_emulation/ossyscall.cpp

@@ -1052,7 +1052,7 @@ int OsSyscallExceptionHandler::do_sys_openat(
 
     result = 0;
     if (int64_t(a1) != TARGET_AT_FDCWD) {
-        printf("Unimplemented openat argument a1 %" PRId64, a1);
+        printf("Unimplemented openat argument a1 %" PRId64 "\n", a1);
         if (unknown_syscall_stop) { emit core->stop_on_exception_reached(); }
         return TARGET_ENOSYS;
     }