ed/Odin
1
0
Fork 0
mirror of https://github.com/Ed94/Odin.git synced 2026-08-06 15:48:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change >> behaviour in LLVM to prevent stupid UB

Browse Source
This commit is contained in:
gingerBill
2021-03-30 20:38:04 +01:00
parent fbd01660ee
commit 3359d0323a
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ir.cpp
+3 -4
View File
@@ -4642,7 +4642,6 @@ handle_op:
irValue *bit_size = ir_value_constant(type, exact_value_i64(8*type_size_of(type))); irValue *bit_size = ir_value_constant(type, exact_value_i64(8*type_size_of(type)));
irValue *width_test = ir_emit(proc, ir_instr_binary_op(proc, Token_Lt, bits, bit_size, t_llvm_bool)); irValue *width_test = ir_emit(proc, ir_instr_binary_op(proc, Token_Lt, bits, bit_size, t_llvm_bool));
irValue *zero = ir_value_constant(type, exact_value_i64(0)); irValue *zero = ir_value_constant(type, exact_value_i64(0));
irValue *res = ir_emit(proc, ir_instr_binary_op(proc, op, left, bits, type)); irValue *res = ir_emit(proc, ir_instr_binary_op(proc, op, left, bits, type));
return ir_emit_select(proc, width_test, res, zero); return ir_emit_select(proc, width_test, res, zero);
@@ -4656,11 +4655,11 @@ handle_op:
irValue *bits = right; irValue *bits = right;
irValue *bit_size = ir_value_constant(type, exact_value_i64(8*type_size_of(type))); irValue *bit_size = ir_value_constant(type, exact_value_i64(8*type_size_of(type)));
irValue *max = ir_value_constant(type, exact_value_i64(8*type_size_of(type)-1));
irValue *width_test = ir_emit(proc, ir_instr_binary_op(proc, Token_Lt, bits, bit_size, t_llvm_bool)); irValue *width_test = ir_emit(proc, ir_instr_binary_op(proc, Token_Lt, bits, bit_size, t_llvm_bool));
bits = ir_emit_select(proc, width_test, bits, max); irValue *zero = ir_value_constant(type, exact_value_i64(0));
return ir_emit(proc, ir_instr_binary_op(proc, op, left, bits, type)); irValue *res = ir_emit(proc, ir_instr_binary_op(proc, op, left, bits, type));
return ir_emit_select(proc, width_test, res, zero);
} }
case Token_AndNot: { case Token_AndNot: {
src/llvm_backend.cpp
+4 -4
View File
@@ -6600,7 +6600,6 @@ handle_op:
LLVMValueRef bits = rhs.value; LLVMValueRef bits = rhs.value;
LLVMValueRef bit_size = LLVMConstInt(lb_type(p->module, rhs.type), 8*type_size_of(lhs.type), false); LLVMValueRef bit_size = LLVMConstInt(lb_type(p->module, rhs.type), 8*type_size_of(lhs.type), false);
LLVMValueRef max = LLVMConstInt(lb_type(p->module, rhs.type), 8*type_size_of(lhs.type)-1, false);
LLVMValueRef width_test = LLVMBuildICmp(p->builder, LLVMIntULT, bits, bit_size, ""); LLVMValueRef width_test = LLVMBuildICmp(p->builder, LLVMIntULT, bits, bit_size, "");
@@ -6617,16 +6616,17 @@ handle_op:
bool is_unsigned = is_type_unsigned(type); bool is_unsigned = is_type_unsigned(type);
LLVMValueRef bit_size = LLVMConstInt(lb_type(p->module, rhs.type), 8*type_size_of(lhs.type), false); LLVMValueRef bit_size = LLVMConstInt(lb_type(p->module, rhs.type), 8*type_size_of(lhs.type), false);
LLVMValueRef max = LLVMConstInt(lb_type(p->module, rhs.type), 8*type_size_of(lhs.type)-1, false);
LLVMValueRef width_test = LLVMBuildICmp(p->builder, LLVMIntULT, bits, bit_size, ""); LLVMValueRef width_test = LLVMBuildICmp(p->builder, LLVMIntULT, bits, bit_size, "");
bits = LLVMBuildSelect(p->builder, width_test, bits, max, "");
if (is_unsigned) { if (is_unsigned) {
res.value = LLVMBuildLShr(p->builder, lhs.value, bits, ""); res.value = LLVMBuildLShr(p->builder, lhsval, bits, "");
} else { } else {
res.value = LLVMBuildAShr(p->builder, lhsval, bits, ""); res.value = LLVMBuildAShr(p->builder, lhsval, bits, "");
} }
LLVMValueRef zero = LLVMConstNull(lb_type(p->module, lhs.type));
res.value = LLVMBuildSelect(p->builder, width_test, res.value, zero, "");
return res; return res;
} }
case Token_AndNot: case Token_AndNot: