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

There's some segfault happening in LLVMBuildUIToFP

Browse Source
This commit is contained in:
greg 2017-01-14 01:23:14 -08:00
parent a6773d59bd
commit afec7e829c
2 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/compilation.rs
View File

@ -3,6 +3,8 @@ extern crate llvm_sys;
use std::collections::HashMap; use std::collections::HashMap;
use self::llvm_sys::prelude::*; use self::llvm_sys::prelude::*;
use self::llvm_sys::{LLVMIntPredicate, LLVMRealPredicate};
use parser::{AST, Statement, Function, Expression, BinOp}; use parser::{AST, Statement, Function, Expression, BinOp};
use llvm_wrap as LLVMWrap; use llvm_wrap as LLVMWrap;
@ -149,16 +151,24 @@ impl CodeGen for Expression {
let lhs = left.codegen(data); let lhs = left.codegen(data);
let rhs = right.codegen(data); let rhs = right.codegen(data);
macro_rules! simple_binop { macro_rules! simple_binop {
($fnname: expr) => { ($fnname: expr, $name: expr) => {
$fnname(data.builder, lhs, rhs, "temp") $fnname(data.builder, lhs, rhs, $name)
} }
} }
match *op { match *op {
Add => simple_binop!(LLVMWrap::BuildAdd), Add => simple_binop!(LLVMWrap::BuildAdd, "addtemp"),
Sub => simple_binop!(LLVMWrap::BuildSub), Sub => simple_binop!(LLVMWrap::BuildSub, "subtemp"),
Mul => simple_binop!(LLVMWrap::BuildMul), Mul => simple_binop!(LLVMWrap::BuildMul, "multemp"),
Div => simple_binop!(LLVMWrap::BuildUDiv), Div => simple_binop!(LLVMWrap::BuildUDiv, "divtemp"),
Mod => simple_binop!(LLVMWrap::BuildSRem), Mod => simple_binop!(LLVMWrap::BuildSRem, "remtemp"),
Less => {
let pred = LLVMWrap::BuildICmp(data.builder,
LLVMIntPredicate::LLVMIntULT,
lhs,
rhs,
"tmp");
LLVMWrap::BuildUIToFP(data.builder, pred, int_type, "temp")
}
_ => panic!("Bad operator {:?}", op), _ => panic!("Bad operator {:?}", op),
} }
} }
@ -171,7 +181,7 @@ impl CodeGen for Expression {
let condition_value = test.codegen(data); let condition_value = test.codegen(data);
let is_nonzero = let is_nonzero =
LLVMWrap::BuildICmp(data.builder, LLVMWrap::BuildICmp(data.builder,
llvm_sys::LLVMIntPredicate::LLVMIntNE, LLVMIntPredicate::LLVMIntNE,
condition_value, condition_value,
zero, zero,
"is_nonzero"); "is_nonzero");

22
src/llvm_wrap.rs
View File

@ -2,7 +2,7 @@
#![allow(dead_code)] #![allow(dead_code)]
extern crate llvm_sys; extern crate llvm_sys;
use self::llvm_sys::LLVMIntPredicate; use self::llvm_sys::{LLVMIntPredicate, LLVMRealPredicate};
use self::llvm_sys::prelude::*; use self::llvm_sys::prelude::*;
use self::llvm_sys::core; use self::llvm_sys::core;
use std::ptr; use std::ptr;
@ -162,6 +162,26 @@ pub fn AddIncoming(phi: LLVMValueRef, incoming_values: *mut LLVMValueRef, incomi
unsafe { core::LLVMAddIncoming(phi, incoming_values, incoming_blocks, count) } unsafe { core::LLVMAddIncoming(phi, incoming_values, incoming_blocks, count) }
} }
pub fn BuildFCmp(builder: LLVMBuilderRef,
op: LLVMRealPredicate,
lhs: LLVMValueRef,
rhs: LLVMValueRef,
name: &str) -> LLVMValueRef {
let name = CString::new(name).unwrap();
unsafe { core::LLVMBuildFCmp(builder, op, lhs, rhs, name.as_ptr()) }
}
pub fn BuildUIToFP(builder: LLVMBuilderRef,
val: LLVMValueRef,
dest_type: LLVMTypeRef,
name: &str) -> LLVMValueRef {
let name = CString::new(name).unwrap();
unsafe { let p = name.as_ptr();
println!("Pointer {:?}", p);
core::LLVMBuildUIToFP(builder, val, dest_type, p) }
}
pub fn BuildICmp(builder: LLVMBuilderRef, pub fn BuildICmp(builder: LLVMBuilderRef,
op: LLVMIntPredicate, op: LLVMIntPredicate,
lhs: LLVMValueRef, lhs: LLVMValueRef,