aboutsummaryrefslogtreecommitdiff
path: root/qtmips_machine/instruction.h
diff options
context:
space:
mode:
authorPavel Pisa <pisa@cmp.felk.cvut.cz>2019-07-03 08:44:32 +0200
committerPavel Pisa <pisa@cmp.felk.cvut.cz>2019-07-03 08:44:32 +0200
commitb2d8910f3f60b50bf3fc359dfa37a4da2414cd2f (patch)
treef7771569179b78ead87386601024923f5ad22de2 /qtmips_machine/instruction.h
parent7e10c3ff8149a8d25431807fe15a73fe40cfdc5b (diff)
downloadqtmips-b2d8910f3f60b50bf3fc359dfa37a4da2414cd2f.tar.gz
qtmips-b2d8910f3f60b50bf3fc359dfa37a4da2414cd2f.tar.bz2
qtmips-b2d8910f3f60b50bf3fc359dfa37a4da2414cd2f.zip
Allow spaces in middle of assembler arguments and report errors.
Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Diffstat (limited to 'qtmips_machine/instruction.h')
-rw-r--r--qtmips_machine/instruction.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/qtmips_machine/instruction.h b/qtmips_machine/instruction.h
index 101d82f..03b8f65 100644
--- a/qtmips_machine/instruction.h
+++ b/qtmips_machine/instruction.h
@@ -149,13 +149,13 @@ public:
QString to_str(std::int32_t inst_addr = 0) const;
static ssize_t code_from_string(std::uint32_t *code, size_t buffsize,
- QString inst_base, QVector<QString> &inst_fields,
+ QString inst_base, QStringList &inst_fields, QString &error,
std::uint32_t inst_addr = 0,
RelocExpressionList *reloc = nullptr,
int line = 0, bool pseudo_opt = false, int options = 0);
static ssize_t code_from_string(std::uint32_t *code, size_t buffsize,
- QString str, std::uint32_t inst_addr = 0,
+ QString str, QString &error, std::uint32_t inst_addr = 0,
RelocExpressionList *reloc = nullptr,
int line = 0, bool pseudo_opt = false, int options = 0);