aboutsummaryrefslogtreecommitdiff
path: root/qtmips_machine/alu.cpp
diff options
context:
space:
mode:
authorPavel Pisa <pisa@cmp.felk.cvut.cz>2019-02-05 12:46:08 +0100
committerPavel Pisa <pisa@cmp.felk.cvut.cz>2019-02-05 12:46:08 +0100
commite9ffa56110da05a6938ad690872cdac6d48fd586 (patch)
tree22da4ca26d3cfe6e7277b92843209300b5a99e09 /qtmips_machine/alu.cpp
parentfc343acc4d81d06e5cba92b74de3565b6d12dfcf (diff)
downloadqtmips-e9ffa56110da05a6938ad690872cdac6d48fd586.tar.gz
qtmips-e9ffa56110da05a6938ad690872cdac6d48fd586.tar.bz2
qtmips-e9ffa56110da05a6938ad690872cdac6d48fd586.zip
Reorganize PC handling and implement full REGIMM decode.
Signed-off-by: Pavel Pisa <pisa@cmp.felk.cvut.cz>
Diffstat (limited to 'qtmips_machine/alu.cpp')
-rw-r--r--qtmips_machine/alu.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/qtmips_machine/alu.cpp b/qtmips_machine/alu.cpp
index 83e73bb..fa9b7d2 100644
--- a/qtmips_machine/alu.cpp
+++ b/qtmips_machine/alu.cpp
@@ -134,8 +134,8 @@ std::uint32_t machine::alu_operate(enum AluOp operation, std::uint32_t s, std::u
return (s < t) ? 1 : 0;
case ALU_OP_LUI:
return t << 16;
- case ALU_OP_PASS_S: // Pass s argument without change for JAL
- return s;
+ case ALU_OP_PASS_T: // Pass s argument without change for JAL
+ return t;
default:
throw QTMIPS_EXCEPTION(UnsupportedAluOperation, "Unknown ALU operation", QString::number(operation, 16));
}