From 27fec4e77c8d116deb90398400f5f2a1eb5cf785 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Tue, 5 Nov 2013 10:22:22 +0100 Subject: [PATCH] Fixed sign handling in const eval of sshl and sshr --- kernel/calc.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kernel/calc.cc b/kernel/calc.cc index 2e9be437c..efb09c398 100644 --- a/kernel/calc.cc +++ b/kernel/calc.cc @@ -286,13 +286,17 @@ RTLIL::Const RTLIL::const_shr(const RTLIL::Const &arg1, const RTLIL::Const &arg2 return const_shift(arg1_ext, arg2, false, +1, result_len); } -RTLIL::Const RTLIL::const_sshl(const RTLIL::Const &arg1, const RTLIL::Const &arg2, bool, bool, int result_len) +RTLIL::Const RTLIL::const_sshl(const RTLIL::Const &arg1, const RTLIL::Const &arg2, bool signed1, bool signed2, int result_len) { + if (!signed1) + return const_shl(arg1, arg2, signed1, signed2, result_len); return const_shift(arg1, arg2, true, -1, result_len); } -RTLIL::Const RTLIL::const_sshr(const RTLIL::Const &arg1, const RTLIL::Const &arg2, bool, bool, int result_len) +RTLIL::Const RTLIL::const_sshr(const RTLIL::Const &arg1, const RTLIL::Const &arg2, bool signed1, bool signed2, int result_len) { + if (!signed1) + return const_shr(arg1, arg2, signed1, signed2, result_len); return const_shift(arg1, arg2, true, +1, result_len); } -- 2.30.2