Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix comparing two unsigned types #488

Merged
merged 3 commits into from
Dec 29, 2023
Merged

Fix comparing two unsigned types #488

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a01abf6
Fix comparing two unsigned types
Akuli Dec 26, 2023
f7c0a33
Make self-hosted consistent (no way to test it yet)
Akuli Dec 26, 2023
7b87461
Update tests/should_succeed/compare_bytes.jou
Akuli Dec 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion self_hosted/create_llvm_ir.jou
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ class AstToIR:
assert False

if lhs_type->is_integer_type() and rhs_type->is_integer_type():
is_signed = lhs_type->kind == TypeKind::SignedInteger and rhs_type->kind == TypeKind::SignedInteger
is_signed = lhs_type->kind == TypeKind::SignedInteger or rhs_type->kind == TypeKind::SignedInteger
if op == AstExpressionKind::Add:
return LLVMBuildAdd(self->builder, lhs, rhs, "add")
if op == AstExpressionKind::Subtract:
Expand Down
6 changes: 3 additions & 3 deletions src/codegen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,11 +392,11 @@ static void codegen_instruction(const struct State *st, const CfInstruction *ins
setdest(LLVMBuildFCmp(st->builder, LLVMRealOEQ, getop(0), getop(1), "num_eq"));
break;
case CF_NUM_LT:
if (is_integer_type(ins->operands[0]->type))
// TODO: unsigned less than
if (ins->operands[0]->type->kind == TYPE_UNSIGNED_INTEGER && ins->operands[1]->type->kind == TYPE_UNSIGNED_INTEGER)
setdest(LLVMBuildICmp(st->builder, LLVMIntULT, getop(0), getop(1), "num_lt"));
else if (is_integer_type(ins->operands[0]->type) && is_integer_type(ins->operands[1]->type))
setdest(LLVMBuildICmp(st->builder, LLVMIntSLT, getop(0), getop(1), "num_lt"));
else
// TODO: signed less than
setdest(LLVMBuildFCmp(st->builder, LLVMRealOLT, getop(0), getop(1), "num_lt"));
break;
}
Expand Down
18 changes: 18 additions & 0 deletions tests/should_succeed/compare_bytes.jou
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import "stdlib/io.jou"


def main() -> int:
Akuli marked this conversation as resolved.
Show resolved Hide resolved
a = 0 as byte
b = 100 as byte
c = 200 as byte

printf("%d %d %d\n", a < b, b < b, c < b) # Output: 1 0 0
printf("%d %d %d\n", a > b, b > b, c > b) # Output: 0 0 1

printf("%d %d %d\n", a <= b, b <= b, c <= b) # Output: 1 1 0
printf("%d %d %d\n", a >= b, b >= b, c >= b) # Output: 0 1 1

printf("%d %d %d\n", a == b, b == b, c == b) # Output: 0 1 0
printf("%d %d %d\n", a != b, b != b, c != b) # Output: 1 0 1

return 0