Browse Source

Clean up logic for `<<` and `>>` behaviour

gingerBill 4 years ago
parent
commit
c2794b62a9
2 changed files with 8 additions and 8 deletions
  1. 4 4
      src/ir.cpp
  2. 4 4
      src/llvm_backend.cpp

+ 4 - 4
src/ir.cpp

@@ -4630,8 +4630,8 @@ handle_op:
 
 			irValue *bits = right;
 
-			irValue *max = ir_value_constant(type, exact_value_i64(8*type_size_of(type) - 1));
-			irValue *less_equal_width = ir_emit(proc, ir_instr_binary_op(proc, Token_LtEq, bits, max, t_llvm_bool));
+			irValue *max = ir_value_constant(type, exact_value_i64(8*type_size_of(type)));
+			irValue *less_equal_width = ir_emit(proc, ir_instr_binary_op(proc, Token_Lt, bits, max, t_llvm_bool));
 
 
 			irValue *zero = ir_value_constant(type, exact_value_i64(0));
@@ -4646,8 +4646,8 @@ handle_op:
 
 			irValue *bits = right;
 
-			irValue *max = ir_value_constant(type, exact_value_i64(8*type_size_of(type) - 1));
-			irValue *less_equal_width = ir_emit(proc, ir_instr_binary_op(proc, Token_LtEq, bits, max, t_llvm_bool));
+			irValue *max = ir_value_constant(type, exact_value_i64(8*type_size_of(type)));
+			irValue *less_equal_width = ir_emit(proc, ir_instr_binary_op(proc, Token_Lt, bits, max, t_llvm_bool));
 
 			bits = ir_emit_select(proc, less_equal_width, bits, max);
 			return ir_emit(proc, ir_instr_binary_op(proc, op, left, bits, type));

+ 4 - 4
src/llvm_backend.cpp

@@ -5826,9 +5826,9 @@ handle_op:
 			LLVMValueRef lhsval = lhs.value;
 			LLVMValueRef bits = rhs.value;
 
-			LLVMValueRef max = LLVMConstInt(lb_type(p->module, rhs.type), 8*type_size_of(lhs.type) - 1, false);
+			LLVMValueRef max = LLVMConstInt(lb_type(p->module, rhs.type), 8*type_size_of(lhs.type), false);
 
-			LLVMValueRef less_equal_width = LLVMBuildICmp(p->builder, LLVMIntULE, bits, max, "");
+			LLVMValueRef less_equal_width = LLVMBuildICmp(p->builder, LLVMIntULT, bits, max, "");
 
 			res.value = LLVMBuildShl(p->builder, lhsval, bits, "");
 			LLVMValueRef zero = LLVMConstNull(lb_type(p->module, lhs.type));
@@ -5842,9 +5842,9 @@ handle_op:
 			LLVMValueRef bits = rhs.value;
 			bool is_unsigned = is_type_unsigned(type);
 
-			LLVMValueRef max = LLVMConstInt(lb_type(p->module, rhs.type), 8*type_size_of(lhs.type) - 1, false);
+			LLVMValueRef max = LLVMConstInt(lb_type(p->module, rhs.type), 8*type_size_of(lhs.type), false);
 
-			LLVMValueRef less_equal_width = LLVMBuildICmp(p->builder, LLVMIntULE, bits, max, "");
+			LLVMValueRef less_equal_width = LLVMBuildICmp(p->builder, LLVMIntULT, bits, max, "");
 
 			bits = LLVMBuildSelect(p->builder, less_equal_width, bits, max, "");
 			if (is_unsigned) {