From c4efaa81d4bf498c721db5cdbf932e7a3bcb0cae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Tue, 21 Nov 2017 22:37:59 +0100 Subject: Implement tests for few more arithmetic instructions --- qtmips_machine/alu.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'qtmips_machine/alu.cpp') diff --git a/qtmips_machine/alu.cpp b/qtmips_machine/alu.cpp index 85bc804..912ccf5 100644 --- a/qtmips_machine/alu.cpp +++ b/qtmips_machine/alu.cpp @@ -8,15 +8,15 @@ std::uint32_t alu_operate(enum AluOp operation, std::uint32_t s, std::uint32_t t case ALU_OP_SRL: return t >> sa; case ALU_OP_SRA: - // TODO is this correct implementation? (Shouldn't we be masking top most bit?) - return (t >> sa) | (t & 0x80000000); + // TODO is this correct implementation? (Should we be masking top most bit?) + return ((t & 0x7fffffff) >> sa) | (t & 0x80000000); case ALU_OP_SLLV: return t << s; case ALU_OP_SRLV: return t >> s; case ALU_OP_SRAV: - // TODO is this correct implementation? (Shouldn't we be masking top most bit?) - return (t >> s) | (t & 0x80000000); + // TODO is this correct implementation? (Should we be masking top most bit?) + return ((t & 0x7fffffff) >> s) | (t & 0x80000000); case ALU_OP_ADD: if (s > (0xFFFFFFFF - t)) throw QTMIPS_EXCEPTION(Overflow, "ADD operation overflow/underflow", QString::number(s) + QString(" + ") + QString::number(t)); -- cgit v1.2.3