aboutsummaryrefslogtreecommitdiff
path: root/qtmips_machine
diff options
context:
space:
mode:
authorFanda Vacek <fanda.vacek@gmail.com>2019-01-25 21:26:52 +0100
committerPavel Pisa <pisa@cmp.felk.cvut.cz>2019-02-09 20:54:45 +0100
commit1437aaf0e56b6edf5807c3f9915fe614b945c16f (patch)
treeab1f099b7c3e7f72951dc4a2afe21adbfffc600c /qtmips_machine
parent737fc7e309ff02c4bb02568fec82cb8215d7bb99 (diff)
downloadqtmips-1437aaf0e56b6edf5807c3f9915fe614b945c16f.tar.gz
qtmips-1437aaf0e56b6edf5807c3f9915fe614b945c16f.tar.bz2
qtmips-1437aaf0e56b6edf5807c3f9915fe614b945c16f.zip
Correct build for LLVM.
Diffstat (limited to 'qtmips_machine')
-rw-r--r--qtmips_machine/core.cpp20
-rw-r--r--qtmips_machine/tests/tests.pro2
2 files changed, 11 insertions, 11 deletions
diff --git a/qtmips_machine/core.cpp b/qtmips_machine/core.cpp
index 35f64af..30d01bb 100644
--- a/qtmips_machine/core.cpp
+++ b/qtmips_machine/core.cpp
@@ -177,21 +177,21 @@ struct Core::dtDecode Core::decode(const struct dtFetch &dt) {
return {
.inst = dt.inst,
- .memread = flags & IMF_MEMREAD,
- .memwrite = flags & IMF_MEMWRITE,
- .alusrc = flags & IMF_ALUSRC,
+ .memread = !!(flags & IMF_MEMREAD),
+ .memwrite = !!(flags & IMF_MEMWRITE),
+ .alusrc = !!(flags & IMF_ALUSRC),
.regd = regd,
.regd31 = regd31,
.regwrite = regwrite,
- .alu_req_rs = flags & IMF_ALU_REQ_RS,
- .alu_req_rt = flags & IMF_ALU_REQ_RT,
+ .alu_req_rs = !!(flags & IMF_ALU_REQ_RS),
+ .alu_req_rt = !!(flags & IMF_ALU_REQ_RT),
.bjr_req_rs = bjr_req_rs,
.bjr_req_rt = bjr_req_rt,
- .branch = flags & IMF_BRANCH,
- .jump = flags & IMF_JUMP,
- .bj_not = flags & IMF_BJ_NOT,
- .bgt_blez = flags & IMF_BGTZ_BLEZ,
- .nb_skip_ds = flags & IMF_NB_SKIP_DS,
+ .branch = !!(flags & IMF_BRANCH),
+ .jump = !!(flags & IMF_JUMP),
+ .bj_not = !!(flags & IMF_BJ_NOT),
+ .bgt_blez = !!(flags & IMF_BGTZ_BLEZ),
+ .nb_skip_ds = !!(flags & IMF_NB_SKIP_DS),
.forward_m_d_rs = false,
.forward_m_d_rt = false,
.aluop = alu_op,
diff --git a/qtmips_machine/tests/tests.pro b/qtmips_machine/tests/tests.pro
index 63792b0..ec7a129 100644
--- a/qtmips_machine/tests/tests.pro
+++ b/qtmips_machine/tests/tests.pro
@@ -14,7 +14,7 @@ DOLAR=$
unix: LIBS += \
-Wl,-rpath,\'$${DOLAR}$${DOLAR}ORIGIN/../lib\' \
- --enable-new-dtags \
+ # --enable-new-dtags \
INCLUDEPATH += $$PWD/..
DEPENDPATH += $$PWD/..