draft

Author: trdthg

src/assembler/simpleasm.cpp

@@ -520,7 +520,9 @@ bool SimpleAsm::process_line(
         return false;
     }
     uint32_t *p = inst;
+    printf("address: {%x} -> start_line: {%d}, size: {%d}", address, line_number, size);
     for (size_t l = 0; l < size; l += 4) {
+        addressToLine.insert(address, line_number);
         if (!fatal_occured) { mem->write_u32(address, *(p++), ae::INTERNAL); }
         address += 4;
     }

src/assembler/simpleasm.h

@@ -48,8 +48,7 @@ class SimpleAsm : public QObject {
     ~SimpleAsm() override;
 
 public:
-    static uint64_t
-    string_to_uint64(const QString &str, int base, int *chars_taken = nullptr);
+    static uint64_t string_to_uint64(const QString &str, int base, int *chars_taken = nullptr);
     void clear();
     void setup(
         machine::FrontendMemory *mem,
@@ -61,8 +60,7 @@ class SimpleAsm : public QObject {
         const QString &filename = "",
         int line_number = 0,
         QString *error_ptr = nullptr);
-    virtual bool
-    process_file(const QString &filename, QString *error_ptr = nullptr);
+    virtual bool process_file(const QString &filename, QString *error_ptr = nullptr);
     bool finish(QString *error_ptr = nullptr);
 
 protected:
@@ -76,6 +74,9 @@ class SimpleAsm : public QObject {
     SymbolTableDb *symtab {};
     machine::Address address {};
 
+public:
+    QMap<machine::Address, int> addressToLine = {};
+
 private:
     QStringList include_stack;
     machine::FrontendMemory *mem {};

src/gui/mainwindow/mainwindow.cpp

@@ -300,6 +300,9 @@ void MainWindow::create_core(
     connect(machine.data(), &machine::Machine::status_change, this, &MainWindow::machine_status);
     connect(machine.data(), &machine::Machine::program_exit, this, &MainWindow::machine_exit);
     connect(machine.data(), &machine::Machine::program_trap, this, &MainWindow::machine_trap);
+    connect(
+        machine.data()->core(), &machine::Core::highlight_editor, this,
+        &MainWindow::hightlightByAddress);
     // Connect signal from break to machine pause
     connect(
         machine->core(), &machine::Core::stop_on_exception_reached, machine.data(),
@@ -334,6 +337,12 @@ void MainWindow::new_machine() {
     ndialog->show();
 }
 
+void MainWindow::hightlightByAddress(machine::Address addr) {
+    auto lineNum = lineToAddress.value(addr);
+    printf("hightlightByAddress addr: %x, block: %d\n", addr, lineNum);
+    editor_tabs->get_current_editor()->highlightBlock(lineNum);
+}
+
 void MainWindow::machine_reload(bool force_memory_reset, bool force_elf_load) {
     if (machine == nullptr) { return new_machine(); }
     bool load_executable = force_elf_load || machine->executable_loaded();
@@ -414,7 +423,7 @@ void MainWindow::reset_state_##NAME() {
 
 SHOW_HANDLER(registers, Qt::TopDockWidgetArea, true)
 SHOW_HANDLER(program, Qt::LeftDockWidgetArea, true)
-SHOW_HANDLER(memory, Qt::RightDockWidgetArea, true )
+SHOW_HANDLER(memory, Qt::RightDockWidgetArea, true)
 SHOW_HANDLER(cache_program, Qt::RightDockWidgetArea, false)
 SHOW_HANDLER(cache_data, Qt::RightDockWidgetArea, false)
 SHOW_HANDLER(cache_level2, Qt::RightDockWidgetArea, false)
@@ -632,7 +641,7 @@ void MainWindow::message_selected(
 }
 
 bool SimpleAsmWithEditorCheck::process_file(const QString &filename, QString *error_ptr) {
-    EditorTab* tab = mainwindow->editor_tabs->find_tab_by_filename(filename);
+    EditorTab *tab = mainwindow->editor_tabs->find_tab_by_filename(filename);
     if (tab == nullptr) { return Super::process_file(filename, error_ptr); }
     SrcEditor *editor = tab->get_editor();
     QTextDocument *doc = editor->document();
@@ -759,6 +768,8 @@ void MainWindow::compile_source() {
     }
     if (!sasm.finish()) { error_occured = true; }
 
+    lineToAddress = sasm.addressToLine;
+
     if (error_occured) { show_messages(); }
 }
 

src/gui/mainwindow/mainwindow.h

@@ -60,6 +60,7 @@ class MainWindow : public QMainWindow {
 
 public slots:
     // Actions signals
+    void hightlightByAddress(machine::Address addr);
     void new_machine();
     void machine_reload(bool force_memory_reset = false, bool force_elf_load = false);
     void print_action();
@@ -115,6 +116,9 @@ public slots:
 protected:
     void closeEvent(QCloseEvent *cancel) override;
 
+public:
+    QMap<machine::Address, int> lineToAddress = {};
+
 private:
     Box<Ui::MainWindow> ui {};
 

src/gui/windows/editor/srceditor.cpp

@@ -289,3 +289,22 @@ void SrcEditor::insertFromMimeData(const QMimeData *source) {
 bool SrcEditor::canInsertFromMimeData(const QMimeData *source) const {
     return source->hasText();
 }
+
+void SrcEditor::highlightBlock(int blockNum) {
+    QList<QTextEdit::ExtraSelection> extraSelections;
+
+    if (!isReadOnly()) {
+        QTextEdit::ExtraSelection selection;
+
+        QColor lineColor = QColor(Qt::yellow).lighter(160);
+        selection.format.setBackground(lineColor);
+        selection.format.setProperty(QTextFormat::FullWidthSelection, true);
+        QTextBlock block = document()->findBlockByLineNumber(blockNum - 1);
+        selection.cursor = QTextCursor(block);
+        selection.cursor.movePosition(
+            QTextCursor::EndOfBlock, QTextCursor::KeepAnchor, block.length());
+        extraSelections.append(selection);
+    }
+
+    setExtraSelections(extraSelections);
+}

src/gui/windows/editor/srceditor.h

@@ -42,6 +42,7 @@ class SrcEditor : public QPlainTextEdit {
 
 public slots:
     void setShowLineNumbers(bool visible);
+    void highlightBlock(int line_num);
 
 private slots:
     void updateMargins(int newBlockCount);

src/machine/core.cpp

@@ -49,6 +49,8 @@ Core::Core(Registers *regs,
 }
 
 void Core::step(bool skip_break) {
+    emit highlight_editor(regs->read_pc());
+
     state.cycle_count++;
     do_step(skip_break);
     emit step_done(state);

src/machine/core.h

@@ -93,6 +93,7 @@ class Core : public QObject {
 signals:
     void stop_on_exception_reached();
     void step_done(const CoreState &);
+    void highlight_editor(Address addr);
 
 protected:
     virtual void do_step(bool skip_break) = 0;