greg/schala
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Comparison operator working

Browse Source
This commit is contained in:
greg 2017-01-14 02:52:52 -08:00
parent afec7e829c
commit 0c7099771f
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compile.schala
View File

@ -1,8 +1,2 @@
a = 1
if a {
a = 42
} else {
a = 23
}
a 8 < 2

7
src/compilation.rs
View File

@ -162,12 +162,15 @@ impl CodeGen for Expression {
Div => simple_binop!(LLVMWrap::BuildUDiv, "divtemp"), Div => simple_binop!(LLVMWrap::BuildUDiv, "divtemp"),
Mod => simple_binop!(LLVMWrap::BuildSRem, "remtemp"), Mod => simple_binop!(LLVMWrap::BuildSRem, "remtemp"),
Less => { Less => {
let pred = LLVMWrap::BuildICmp(data.builder, let pred: LLVMValueRef = LLVMWrap::BuildICmp(data.builder,
LLVMIntPredicate::LLVMIntULT, LLVMIntPredicate::LLVMIntULT,
lhs, lhs,
rhs, rhs,
"tmp"); "tmp");
LLVMWrap::BuildUIToFP(data.builder, pred, int_type, "temp") LLVMWrap::BuildZExt(data.builder, pred, int_type, "temp")
// god damn it this was probably failing because of the int_type
// this assumes everything is a FP
//LLVMWrap::BuildUIToFP(data.builder, pred, int_type, "temp")
} }
_ => panic!("Bad operator {:?}", op), _ => panic!("Bad operator {:?}", op),
} }

12
src/llvm_wrap.rs
View File

@ -171,15 +171,21 @@ pub fn BuildFCmp(builder: LLVMBuilderRef,
unsafe { core::LLVMBuildFCmp(builder, op, lhs, rhs, name.as_ptr()) } unsafe { core::LLVMBuildFCmp(builder, op, lhs, rhs, name.as_ptr()) }
} }
pub fn BuildZExt(builder: LLVMBuilderRef,
val: LLVMValueRef,
dest_type: LLVMTypeRef,
name: &str) -> LLVMValueRef {
let name = CString::new(name).unwrap();
unsafe { core::LLVMBuildZExt(builder, val, dest_type, name.as_ptr()) }
}
pub fn BuildUIToFP(builder: LLVMBuilderRef, pub fn BuildUIToFP(builder: LLVMBuilderRef,
val: LLVMValueRef, val: LLVMValueRef,
dest_type: LLVMTypeRef, dest_type: LLVMTypeRef,
name: &str) -> LLVMValueRef { name: &str) -> LLVMValueRef {
let name = CString::new(name).unwrap(); let name = CString::new(name).unwrap();
unsafe { let p = name.as_ptr(); unsafe { core::LLVMBuildUIToFP(builder, val, dest_type, name.as_ptr()) }
println!("Pointer {:?}", p);
core::LLVMBuildUIToFP(builder, val, dest_type, p) }
} }
pub fn BuildICmp(builder: LLVMBuilderRef, pub fn BuildICmp(builder: LLVMBuilderRef,