aboutsummaryrefslogtreecommitdiff
path: root/qtmips_gui
diff options
context:
space:
mode:
Diffstat (limited to 'qtmips_gui')
-rw-r--r--qtmips_gui/fixmatheval.cpp2
-rw-r--r--qtmips_gui/fixmatheval.h2
-rw-r--r--qtmips_gui/mainwindow.cpp93
-rw-r--r--qtmips_gui/srceditor.cpp7
-rw-r--r--qtmips_gui/srceditor.h1
5 files changed, 91 insertions, 14 deletions
diff --git a/qtmips_gui/fixmatheval.cpp b/qtmips_gui/fixmatheval.cpp
index 8672cbc..f695e30 100644
--- a/qtmips_gui/fixmatheval.cpp
+++ b/qtmips_gui/fixmatheval.cpp
@@ -186,7 +186,7 @@ FmeExpression::FmeExpression() : FmeNode(0) {
root = nullptr;
}
-bool FmeExpression::parse(QString &expression, QString &error) {
+bool FmeExpression::parse(const QString &expression, QString &error) {
delete root;
int base_prio = 100;
root = nullptr;
diff --git a/qtmips_gui/fixmatheval.h b/qtmips_gui/fixmatheval.h
index 7712530..3312bfa 100644
--- a/qtmips_gui/fixmatheval.h
+++ b/qtmips_gui/fixmatheval.h
@@ -112,7 +112,7 @@ class FmeExpression : public FmeNode {
public:
FmeExpression();
virtual ~FmeExpression();
- virtual bool parse(QString &expression, QString &error);
+ virtual bool parse(const QString &expression, QString &error);
virtual bool eval(FmeValue &value, FmeSymbolDb *symdb, QString &error) override;
virtual bool insert(FmeNode *node) override;
virtual FmeNode *child() override;
diff --git a/qtmips_gui/mainwindow.cpp b/qtmips_gui/mainwindow.cpp
index 3301367..58a0173 100644
--- a/qtmips_gui/mainwindow.cpp
+++ b/qtmips_gui/mainwindow.cpp
@@ -567,7 +567,25 @@ bool SymbolTableDb::getValue(fixmatheval::FmeValue &value, QString name) {
return true;
}
+static std::uint64_t string_to_uint64(QString str, int base,
+ int *chars_taken = nullptr) {
+ int i;
+ std::int64_t val;
+ char *p, *r;
+ char cstr[str.count() + 1];
+ for (i = 0; i < str.count(); i++)
+ cstr[i] = str.at(i).toLatin1();
+ cstr[i] = 0;
+ p = cstr;
+ val = std::strtoll(p, &r, base);
+ if (chars_taken != nullptr)
+ *chars_taken = r - p;
+ return val;
+}
+
void MainWindow::compile_source() {
+ SymbolTableDb symtab(machine->symbol_table());
+ int error_line = 0;
if (current_srceditor == nullptr)
return;
if (machine == nullptr) {
@@ -586,7 +604,6 @@ void MainWindow::compile_source() {
machine::RelocExpressionList reloc;
int ln = 1;
- bool ok = true;
for ( QTextBlock block = doc->begin(); block.isValid(); block = block.next(), ln++) {
int pos;
QString label = "";
@@ -606,14 +623,53 @@ void MainWindow::compile_source() {
}
if (line.isEmpty())
continue;
+ QString op = line.split(" ").at(0).toUpper();
+ if (op == ".ORG") {
+ bool ok;
+ QString error;
+ fixmatheval::FmeExpression expression;
+ fixmatheval::FmeValue value;
+ ok = expression.parse(line.mid(op.size()), error);
+ if (ok)
+ ok = expression.eval(value, &symtab, error);
+ if (!ok) {
+ error_line = ln;
+ editor->setCursorToLine(error_line);
+ QMessageBox::critical(this, "QtMips Error",
+ tr("line %1 .orig %2 parse error.")
+ .arg(QString::number(ln), line));
+ break;
+ }
+ address = value;
+ continue;
+ }
+ if (op == ".WORD") {
+ QString error;
+ foreach (QString s, line.mid(op.size()).split(",")) {
+ s = s.simplified();
+ std::uint32_t val = 0;
+ int chars_taken;
+ val = string_to_uint64(s, 0, &chars_taken);
+ if (chars_taken != s.size()) {
+ val = 0;
+ reloc.append(new machine::RelocExpression(address, s, 0,
+ -0xffffffff, 0xffffffff, 0, 32, 0, ln, 0));
+ }
+ mem->write_word(address, val);
+ address += 4;
+ }
+ continue;
+ }
+
std::uint32_t inst[2] = {0, 0};
ssize_t size = machine::Instruction::code_from_string(inst, 8, line,
address, &reloc, ln, true);
if (size < 0) {
+ error_line = ln;
+ editor->setCursorToLine(error_line);
QMessageBox::critical(this, "QtMips Error",
- tr("line %1 instruction %2 parse error.")
- .arg(QString::number(ln), line));
- ok = false;
+ tr("line %1 instruction %2 parse error.")
+ .arg(QString::number(ln), line));
break;
}
std::uint32_t *p = inst;
@@ -622,28 +678,41 @@ void MainWindow::compile_source() {
address += 4;
}
}
- SymbolTableDb symtab(machine->symbol_table());
foreach(machine::RelocExpression *r, reloc) {
QString error;
fixmatheval::FmeExpression expression;
- if (ok && !expression.parse(r->expression, error)) {
- QMessageBox::critical(this, "QtMips Error",
+ if (!expression.parse(r->expression, error)) {
+ if (!error_line) {
+ error_line = r->line;
+ editor->setCursorToLine(error_line);
+ QMessageBox::critical(this, "QtMips Error",
tr("expression parse error %1 at line %2, expression %3.")
.arg(error, QString::number(r->line), expression.dump()));
- ok = false;
+ }
} else {
fixmatheval::FmeValue value;
- if (ok && !expression.eval(value, &symtab, error)) {
- QMessageBox::critical(this, "QtMips Error",
+ if (!expression.eval(value, &symtab, error)) {
+ if (!error_line) {
+ error_line = r->line;
+ editor->setCursorToLine(error_line);
+ QMessageBox::critical(this, "QtMips Error",
tr("expression evalution error %1 at line %2 , expression %3.")
.arg(error, QString::number(r->line), expression.dump()));
- ok = false;
+ }
} else {
if (false)
QMessageBox::information(this, "QtMips info",
expression.dump() + " -> " + QString::number(value));
machine::Instruction inst(mem->read_word(r->location, true));
- inst.update(value, r);
+ if (!inst.update(value, r)) {
+ if (!error_line) {
+ error_line = r->line;
+ editor->setCursorToLine(error_line);
+ QMessageBox::critical(this, "QtMips Error",
+ tr("instruction update error %1 at line %2, expression %3.")
+ .arg(error, QString::number(r->line), expression.dump()));
+ }
+ }
mem->write_word(r->location, inst.data());
}
}
diff --git a/qtmips_gui/srceditor.cpp b/qtmips_gui/srceditor.cpp
index 79e16e9..2f4d3a6 100644
--- a/qtmips_gui/srceditor.cpp
+++ b/qtmips_gui/srceditor.cpp
@@ -36,6 +36,8 @@
#include <QFile>
#include <QFileInfo>
#include <QTextDocumentWriter>
+#include <QTextCursor>
+#include <QTextBlock>
#include "srceditor.h"
@@ -87,3 +89,8 @@ bool SrcEditor::saveFile(QString filename) {
}
return success;
}
+
+void SrcEditor::setCursorToLine(int ln) {
+ QTextCursor cursor(document()->findBlockByLineNumber(ln-1));
+ setTextCursor(cursor);
+}
diff --git a/qtmips_gui/srceditor.h b/qtmips_gui/srceditor.h
index 4deeb5f..a727f99 100644
--- a/qtmips_gui/srceditor.h
+++ b/qtmips_gui/srceditor.h
@@ -51,6 +51,7 @@ public:
QString title();
bool loadFile(QString filename);
bool saveFile(QString filename = "");
+ void setCursorToLine(int ln);
private:
QString fname;
QString tname;
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-30 14:29:26 +0000