aboutsummaryrefslogtreecommitdiff
path: root/qtmips_gui/programmodel.cpp
diff options
context:
space:
mode:
authorPavel Pisa <pisa@cmp.felk.cvut.cz>2019-07-02 15:00:17 +0200
committerPavel Pisa <pisa@cmp.felk.cvut.cz>2019-07-02 15:00:17 +0200
commitdce00ea47fd4100df97349fd2bf998169b05b74a (patch)
treec493de54f5f0309b5af893e4b9e8fa8c34cdf9a6 /qtmips_gui/programmodel.cpp
parentcf97513e757cdd25e6b1dd1fd584e4ec13d93cb1 (diff)
downloadqtmips-dce00ea47fd4100df97349fd2bf998169b05b74a.tar.gz
qtmips-dce00ea47fd4100df97349fd2bf998169b05b74a.tar.bz2
qtmips-dce00ea47fd4100df97349fd2bf998169b05b74a.zip
Change instruction parsing to allow multiple words pseudo-operations.
Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Diffstat (limited to 'qtmips_gui/programmodel.cpp')
-rw-r--r--qtmips_gui/programmodel.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/qtmips_gui/programmodel.cpp b/qtmips_gui/programmodel.cpp
index 64dffb8..0f3341f 100644
--- a/qtmips_gui/programmodel.cpp
+++ b/qtmips_gui/programmodel.cpp
@@ -274,8 +274,7 @@ bool ProgramModel::setData(const QModelIndex & index, const QVariant & value, in
mem->write_word(address, data);
break;
case 3:
- data = machine::Instruction::from_string(value.toString(), &ok, address).data();
- if (!ok)
+ if (machine::Instruction::code_from_string(&data, 4, value.toString(), address) < 0)
return false;
mem->write_word(address, data);
break;