catdog2/scully
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix load/store related stuff and verify functions ...

Browse Source
This commit is contained in:
Markus Hauschild
2013-06-01 20:45:22 +02:00
parent 2456d999d6
commit 1cc00cc850
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/AST/CodeGenVisitor.cpp
View File

@@ -1,4 +1,5 @@
#include "AST/CodeGenVisitor.h" #include "AST/CodeGenVisitor.h"
#include "llvm/Analysis/Verifier.h"
#include <iostream> #include <iostream>
CodeGenVisitor::CodeGenVisitor(llvm::Module* module, llvm::FunctionPassManager *fpm) { CodeGenVisitor::CodeGenVisitor(llvm::Module* module, llvm::FunctionPassManager *fpm) {
@@ -55,10 +56,10 @@ void CodeGenVisitor::visit(BinOpExpression* e) {
value_ = builder_->CreateSDiv(lhs, rhs, "divtmp"); value_ = builder_->CreateSDiv(lhs, rhs, "divtmp");
break; break;
case BinOp::EQUALS: case BinOp::EQUALS:
value_ = builder_->CreateICmpEQ(lhs, rhs, "eqtmp"); value_ = builder_->CreateICmpEQ(lhs, rhs, "cmptmp");
break; break;
case BinOp::LESS: case BinOp::LESS:
value_ = builder_->CreateICmpSLT(lhs, rhs, "eqtmp"); value_ = builder_->CreateICmpSLT(lhs, rhs, "cmptmp");
break; break;
default: default:
// TODO error // TODO error
@@ -84,7 +85,6 @@ void CodeGenVisitor::visit(ForStatement* e)
value_ = 0; value_ = 0;
e->getInit()->accept(this); e->getInit()->accept(this);
e->getCond()->accept(this); e->getCond()->accept(this);
llvm::Function* f = builder_->GetInsertBlock()->getParent(); llvm::Function* f = builder_->GetInsertBlock()->getParent();
@@ -93,22 +93,18 @@ void CodeGenVisitor::visit(ForStatement* e)
builder_->CreateBr(loopBB); builder_->CreateBr(loopBB);
builder_->SetInsertPoint(loopBB); builder_->SetInsertPoint(loopBB);
value_ = 0; value_ = 0;
e->getStmt()->accept(this); e->getStmt()->accept(this);
if (value_ == 0) { if (value_ == 0) {
// throw err // throw err
} }
value_ = 0; value_ = 0;
e->getStep()->accept(this); e->getStep()->accept(this);
if (value_ == 0) { if (value_ == 0) {
// throw err // throw err
} }
value_ = 0; value_ = 0;
e->getCond()->accept(this); e->getCond()->accept(this);
if (value_ == 0) { if (value_ == 0) {
@@ -204,7 +200,13 @@ void CodeGenVisitor::visit(FunctionDefinition* e) {
// build code for the statements // build code for the statements
e->getSl()->accept(this); e->getSl()->accept(this);
// TODO we might want to call verifyFunction ... f->dump();
// validate generated code
llvm::verifyFunction(*f);
// optimize function
//fpm_->run(*f);
value_ = f; value_ = f;
} }
@@ -291,6 +293,7 @@ void CodeGenVisitor::visit(StatementList* e) {
} }
void CodeGenVisitor::visit(ValueList* e) { void CodeGenVisitor::visit(ValueList* e) {
// NOT USED
} }
void CodeGenVisitor::visit(VariableDefinition* e) { void CodeGenVisitor::visit(VariableDefinition* e) {
@@ -301,7 +304,13 @@ void CodeGenVisitor::visit(VariableDefinition* e) {
} }
void CodeGenVisitor::visit(LoadExpression *e) { void CodeGenVisitor::visit(LoadExpression *e) {
value_ = getNamedValue(e->getId()); llvm::Value* v = getNamedValue(e->getId());
if (!v) {
throw "unknown variable name";
}
value_ = builder_->CreateLoad(v, e->getId());
} }
void CodeGenVisitor::JIT(Expression* e) { void CodeGenVisitor::JIT(Expression* e) {