--- a/gen/tollvm.c	Sat Sep 01 22:26:33 2007 +0200
+++ b/gen/tollvm.c	Mon Sep 03 17:34:30 2007 +0200
@@ -13,11 +13,12 @@
 #include "declaration.h"
 #include "init.h"
 
-#include "tollvm.h"
-#include "irstate.h"
-#include "logger.h"
-#include "runtime.h"
-#include "elem.h"
+#include "gen/tollvm.h"
+#include "gen/irstate.h"
+#include "gen/logger.h"
+#include "gen/runtime.h"
+#include "gen/elem.h"
+#include "gen/arrays.h"
 
 const llvm::Type* LLVM_DtoType(Type* t)
 {
@@ -312,57 +313,6 @@
     return llvm::StructType::get(types);
 }
 
-//////////////////////////////////////////////////////////////////////////////////////////
-
-llvm::StructType* LLVM_DtoArrayType(Type* t)
-{
-    assert(t->next);
-    const llvm::Type* at = LLVM_DtoType(t->next);
-    const llvm::Type* arrty;
-
-    /*if (t->ty == Tsarray) {
-        TypeSArray* tsa = (TypeSArray*)t;
-        assert(tsa->dim->type->isintegral());
-        arrty = llvm::ArrayType::get(at,tsa->dim->toUInteger());
-    }
-    else {
-        arrty = llvm::ArrayType::get(at,0);
-    }*/
-    if (at == llvm::Type::VoidTy) {
-        at = llvm::Type::Int8Ty;
-    }
-    arrty = llvm::PointerType::get(at);
-
-    std::vector<const llvm::Type*> members;
-    if (global.params.is64bit)
-        members.push_back(llvm::Type::Int64Ty);
-    else
-        members.push_back(llvm::Type::Int32Ty);
-
-    members.push_back(arrty);
-
-    return llvm::StructType::get(members);
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////
-
-llvm::ArrayType* LLVM_DtoStaticArrayType(Type* t)
-{
-    if (t->llvmType)
-        return llvm::cast<llvm::ArrayType>(t->llvmType);
-
-    assert(t->ty == Tsarray);
-    assert(t->next);
-
-    const llvm::Type* at = LLVM_DtoType(t->next);
-
-    TypeSArray* tsa = (TypeSArray*)t;
-    assert(tsa->dim->type->isintegral());
-    llvm::ArrayType* arrty = llvm::ArrayType::get(at,tsa->dim->toUInteger());
-
-    tsa->llvmType = arrty;
-    return arrty;
-}
 
 //////////////////////////////////////////////////////////////////////////////////////////
 
@@ -391,7 +341,7 @@
 //////////////////////////////////////////////////////////////////////////////////////////
 
 // llvm.memset.i32
-static llvm::Function* LLVM_DeclareMemSet32()
+llvm::Function* LLVM_DeclareMemSet32()
 {
     static llvm::Function* _func = 0;
     if (_func == 0) {
@@ -402,7 +352,7 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////
 
-static llvm::Function* LLVM_DeclareMemSet64()
+llvm::Function* LLVM_DeclareMemSet64()
 {
     static llvm::Function* _func = 0;
     if (_func == 0) {
@@ -414,7 +364,7 @@
 //////////////////////////////////////////////////////////////////////////////////////////
 
 // llvm.memcpy.i32
-static llvm::Function* LLVM_DeclareMemCpy32()
+llvm::Function* LLVM_DeclareMemCpy32()
 {
     static llvm::Function* _func = 0;
     if (_func == 0) {
@@ -426,7 +376,7 @@
 //////////////////////////////////////////////////////////////////////////////////////////
 
 // llvm.memcpy.i64
-static llvm::Function* LLVM_DeclareMemCpy64()
+llvm::Function* LLVM_DeclareMemCpy64()
 {
     static llvm::Function* _func = 0;
     if (_func == 0) {
@@ -556,32 +506,7 @@
     return llvm::ConstantStruct::get(structtype, inits);
 }
 
-//////////////////////////////////////////////////////////////////////////////////////////
 
-llvm::Value* LLVM_DtoNullArray(llvm::Value* v)
-{
-    assert(gIR);
-    d_uns64 n = (global.params.is64bit) ? 16 : 8;
-
-    llvm::Type* i8p_ty = llvm::PointerType::get(llvm::Type::Int8Ty);
-
-    llvm::Value* arr = new llvm::BitCastInst(v,i8p_ty,"tmp",gIR->scopebb());
-
-    llvm::Function* fn = LLVM_DeclareMemSet32();
-    std::vector<llvm::Value*> llargs;
-    llargs.resize(4);
-    llargs[0] = arr;
-    llargs[1] = llvm::ConstantInt::get(llvm::Type::Int8Ty, 0, false);
-    llargs[2] = llvm::ConstantInt::get(llvm::Type::Int32Ty, n, false);
-    llargs[3] = llvm::ConstantInt::get(llvm::Type::Int32Ty, 0, false);
-
-    //Logger::cout() << *fn << '|' << *fn->getType() << '\n';
-    //Logger::cout() << "to null array call: " << *llargs[0] << '|' << *llargs[1] << '|' << *llargs[2] << '|' << *llargs[3] << '\n';
-
-    llvm::Value* ret = new llvm::CallInst(fn, llargs.begin(), llargs.end(), "", gIR->scopebb());
-
-    return ret;
-}
 
 //////////////////////////////////////////////////////////////////////////////////////////
 
@@ -632,216 +557,7 @@
     return new llvm::CallInst(fn, llargs.begin(), llargs.end(), "", gIR->scopebb());
 }
 
-//////////////////////////////////////////////////////////////////////////////////////////
 
-llvm::Value* LLVM_DtoArrayAssign(llvm::Value* dst, llvm::Value* src)
-{
-    assert(gIR);
-    if (dst->getType() == src->getType())
-    {
-        d_uns64 n = (global.params.is64bit) ? 16 : 8;
-
-        llvm::Type* arrty = llvm::PointerType::get(llvm::Type::Int8Ty);
-
-        llvm::Value* dstarr = new llvm::BitCastInst(dst,arrty,"tmp",gIR->scopebb());
-        llvm::Value* srcarr = new llvm::BitCastInst(src,arrty,"tmp",gIR->scopebb());
-
-        llvm::Function* fn = LLVM_DeclareMemCpy32();
-        std::vector<llvm::Value*> llargs;
-        llargs.resize(4);
-        llargs[0] = dstarr;
-        llargs[1] = srcarr;
-        llargs[2] = llvm::ConstantInt::get(llvm::Type::Int32Ty, n, false);
-        llargs[3] = llvm::ConstantInt::get(llvm::Type::Int32Ty, 0, false);
-
-        return new llvm::CallInst(fn, llargs.begin(), llargs.end(), "", gIR->scopebb());
-    }
-    else
-    {
-        if (!llvm::isa<llvm::ArrayType>(src->getType()->getContainedType(0)))
-        {
-            Logger::cout() << "invalid: " << *src << '\n';
-            assert(0);
-        }
-        const llvm::ArrayType* arrty = llvm::cast<llvm::ArrayType>(src->getType()->getContainedType(0));
-        llvm::Type* dstty = llvm::PointerType::get(arrty->getElementType());
-
-        llvm::Value* zero = llvm::ConstantInt::get(llvm::Type::Int32Ty, 0, false);
-        llvm::Value* one = llvm::ConstantInt::get(llvm::Type::Int32Ty, 1, false);
-
-        llvm::Value* dstlen = new llvm::GetElementPtrInst(dst,zero,zero,"tmp",gIR->scopebb());
-        llvm::Value* srclen = llvm::ConstantInt::get(LLVM_DtoSize_t(), arrty->getNumElements(), false);
-        new llvm::StoreInst(srclen, dstlen, gIR->scopebb());
-
-        llvm::Value* dstptr = new llvm::GetElementPtrInst(dst,zero,one,"tmp",gIR->scopebb());
-        llvm::Value* srcptr = new llvm::BitCastInst(src,dstty,"tmp",gIR->scopebb());
-        new llvm::StoreInst(srcptr, dstptr, gIR->scopebb());
-    }
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////
-
-void LLVM_DtoArrayInit(llvm::Value* l, llvm::Value* r)
-{
-    const llvm::PointerType* ptrty = llvm::cast<llvm::PointerType>(l->getType());
-    if (llvm::isa<llvm::ArrayType>(ptrty->getContainedType(0)))
-    {
-        const llvm::ArrayType* arrty = llvm::cast<llvm::ArrayType>(ptrty->getContainedType(0));
-        llvm::Value* zero = llvm::ConstantInt::get(llvm::Type::Int32Ty, 0, false);
-
-        std::vector<llvm::Value*> args;
-        args.resize(3);
-        args[0] = new llvm::GetElementPtrInst(l,zero,zero,"tmp",gIR->scopebb());
-        args[1] = llvm::ConstantInt::get(LLVM_DtoSize_t(), arrty->getNumElements(), false);
-        args[2] = r;
-        
-        const char* funcname = NULL;
-        
-        if (llvm::isa<llvm::PointerType>(arrty->getElementType())) {
-            funcname = "_d_array_init_pointer";
-            
-            const llvm::Type* dstty = llvm::PointerType::get(llvm::PointerType::get(llvm::Type::Int8Ty));
-            if (args[0]->getType() != dstty)
-                args[0] = new llvm::BitCastInst(args[0],dstty,"tmp",gIR->scopebb());
-            
-            const llvm::Type* valty = llvm::PointerType::get(llvm::Type::Int8Ty);
-            if (args[2]->getType() != valty)
-                args[2] = new llvm::BitCastInst(args[2],valty,"tmp",gIR->scopebb());
-        }
-        else if (r->getType() == llvm::Type::Int1Ty) {
-            funcname = "_d_array_init_i1";
-        }
-        else if (r->getType() == llvm::Type::Int8Ty) {
-            funcname = "_d_array_init_i8";
-        }
-        else if (r->getType() == llvm::Type::Int16Ty) {
-            funcname = "_d_array_init_i16";
-        }
-        else if (r->getType() == llvm::Type::Int32Ty) {
-            funcname = "_d_array_init_i32";
-        }
-        else if (r->getType() == llvm::Type::Int64Ty) {
-            funcname = "_d_array_init_i64";
-        }
-        else if (r->getType() == llvm::Type::FloatTy) {
-            funcname = "_d_array_init_float";
-        }
-        else if (r->getType() == llvm::Type::DoubleTy) {
-            funcname = "_d_array_init_double";
-        }
-        else {
-            assert(0);
-        }
-        
-        Logger::cout() << *args[0] << '|' << *args[2] << '\n';
-        
-        llvm::Function* fn = LLVM_D_GetRuntimeFunction(gIR->module, funcname);
-        assert(fn);
-        llvm::CallInst* call = new llvm::CallInst(fn, args.begin(), args.end(), "", gIR->scopebb());
-        call->setCallingConv(llvm::CallingConv::C);
-        
-        Logger::println("array init call ok");
-    }
-    else if (llvm::isa<llvm::StructType>(ptrty->getContainedType(0)))
-    {
-        assert(0 && "Only static arrays support initialisers atm");
-    }
-    else
-    assert(0);
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////
-
-void LLVM_DtoSetArray(llvm::Value* arr, llvm::Value* dim, llvm::Value* ptr)
-{
-    const llvm::StructType* st = llvm::cast<llvm::StructType>(arr->getType()->getContainedType(0));
-    //const llvm::PointerType* pt = llvm::cast<llvm::PointerType>(r->getType());
-    
-    llvm::Value* zero = llvm::ConstantInt::get(llvm::Type::Int32Ty, 0, false);
-    llvm::Value* one = llvm::ConstantInt::get(llvm::Type::Int32Ty, 1, false);
-
-    llvm::Value* arrdim = new llvm::GetElementPtrInst(arr,zero,zero,"tmp",gIR->scopebb());
-    new llvm::StoreInst(dim, arrdim, gIR->scopebb());
-    
-    llvm::Value* arrptr = new llvm::GetElementPtrInst(arr,zero,one,"tmp",gIR->scopebb());
-    new llvm::StoreInst(ptr, arrptr, gIR->scopebb());
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////
-llvm::Constant* LLVM_DtoArrayInitializer(ArrayInitializer* arrinit)
-{
-    Logger::println("arr init begin");
-    assert(arrinit->type->ty == Tsarray);
-    TypeSArray* t = (TypeSArray*)arrinit->type;
-    integer_t tdim = t->dim->toInteger();
-
-    std::vector<llvm::Constant*> inits(tdim, 0);
-
-    const llvm::Type* elemty = LLVM_DtoType(arrinit->type->next);
-
-    assert(arrinit->index.dim == arrinit->value.dim);
-    for (int i=0,j=0; i < tdim; ++i)
-    {
-        Initializer* init = 0;
-        Expression* idx = (Expression*)arrinit->index.data[j];
-
-        if (idx)
-        {
-            integer_t k = idx->toInteger();
-            if (i == k)
-            {
-                init = (Initializer*)arrinit->value.data[j];
-                assert(init);
-                ++j;
-            }
-        }
-        else
-        {
-            init = (Initializer*)arrinit->value.data[j];
-            ++j;
-        }
-
-        llvm::Constant* v = 0;
-
-        if (!init)
-        {
-            elem* e = t->next->defaultInit()->toElem(gIR);
-            v = llvm::cast<llvm::Constant>(e->val);
-            delete e;
-        }
-        else if (ExpInitializer* ex = init->isExpInitializer())
-        {
-            elem* e = ex->exp->toElem(gIR);
-            v = llvm::cast<llvm::Constant>(e->val);
-            delete e;
-        }
-        else if (StructInitializer* si = init->isStructInitializer())
-        {
-            v = LLVM_DtoStructInitializer(si);
-        }
-        else if (ArrayInitializer* ai = init->isArrayInitializer())
-        {
-            v = LLVM_DtoArrayInitializer(ai);
-        }
-        else if (init->isVoidInitializer())
-        {
-            v = llvm::UndefValue::get(elemty);
-        }
-        else
-        assert(v);
-
-        inits[i] = v;
-    }
-
-    llvm::ArrayType* arrty = LLVM_DtoStaticArrayType(t);
-    return llvm::ConstantArray::get(arrty, inits);
-}
-
-//////////////////////////////////////////////////////////////////////////////////////////
-void LLVM_DtoArrayCopy(elem* dst, elem* src)
-{
-    assert(0);
-}
 
 //////////////////////////////////////////////////////////////////////////////////////////