Changeset 703:06576ece1a1b

Timestamp:

10/13/08 17:19:32 (3 months ago)

Author:

Tomas Lindquist Olsen <tomas.l.olsen@gmail.com>

branch:

default

Message:

Changed premake.lua to work with mingw.
Implemented array operations, not perfect but ok for tonight. closes #89

Files:

• dmd/arrayop.c (modified) (3 diffs)
• dmd/declaration.h (modified) (1 diff)
• dmd/func.c (modified) (1 diff)
• dmd/module.h (modified) (1 diff)
• gen/toir.cpp (modified) (1 diff)
• gen/tollvm.cpp (modified) (1 diff)
• premake.lua (modified) (1 diff)
• tests/mini/arrayops1.d (added)
• tests/mini/arrayops2.d (added)
• tests/mini/arrayops3.d (added)
• tests/mini/arrayops4.d (added)

dmd/arrayop.c

@@ -29 +29 @@
-#include "init.h"
-
-// FIXME
-int binary(const char *p , const char **tab, int high)
-{
-    assert(0);
-}
-
-/**************************************
- * Hash table of array op functions already generated or known about.
- */
-
-StringTable arrayfuncs;
-
-/***********************************
@@ -47 +36 @@
-Expression *BinExp::arrayOp(Scope *sc)
-{
-    // FIXME
-    error("array operations not yet implemented");
-    fatal();
-
-    Expressions *arguments = new Expressions();
-
@@ -76 +61 @@
-    /* Look up name in hash table
-     */
-
+sc->module->
-    FuncDeclaration *fd = (FuncDeclaration *)sv->ptrvalue;
-    if (!fd)
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-

dmd/declaration.h

@@ -652 +652 @@
-    typedef std::map<const char*, LabelStatement*> LabelMap;
-    LabelMap labmap;
+
+    // if this is an array operation it gets a little special attention
+    bool isArrayOp;
-};
-

dmd/func.c

@@ -78 +78 @@
-    nrvo_var = NULL;
-    shidden = NULL;
+
+    // LDC
+    isArrayOp = false;
-}
-

dmd/module.h

@@ -176 +176 @@
-    
-    bool llvmForceLogging;
+
+    // array ops emitted in this module already
+    StringTable arrayfuncs;
-};
-

gen/toir.cpp

@@ -471 +471 @@
-        DtoAssign(loc, &arrval, slice);
-        return newlen;
-    }
-    else if (e1->op == TOKslice && !ismemset &&
-        (e2->op == TOKadd || e2->op == TOKmin ||
-        e2->op == TOKmul || e2->op == TOKdiv ||
-        e2->op == TOKmod || e2->op == TOKxor ||
-        e2->op == TOKand || e2->op == TOKor  ||
-        e2->op == TOKtilde || e2->op == TOKneg))
-    {
-        assert(0 && "array op assignment is TODO");
-    }
-

gen/tollvm.cpp

@@ -281 +281 @@
-        TypeFunction* ft = (TypeFunction*)fdecl->type;
-
+        // array operations are always internal
+        if (fdecl->isArrayOp)
+            return llvm::GlobalValue::InternalLinkage;
-        // intrinsics are always external
-        if (fdecl->llvmInternal == LLVMintrinsic)

premake.lua

@@ -32 +32 @@
-    TRIPLE = options["target-override"]
-else
-./
+sh 
-    TRIPLE = p:read()
-end