Changeset 699:ed9a9e6dd1cc

Timestamp:

10/13/08 11:28:39 (3 months ago)

Author:

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

branch:

default

Message:

Started changing target triple stuff, part of fixing #97

Files:

• config.guess (added)
• dmd/mars.c (modified) (8 diffs)
• dmd/mars.h (modified) (2 diffs)
• gen/toir.cpp (modified) (2 diffs)
• gen/toobj.cpp (modified) (5 diffs)
• premake.lua (modified) (2 diffs)

dmd/mars.c

@@ -830 +830 @@
-        global.params.is64bit = false;
-        global.params.cpu = ARCHx86;
-
-
+
-        if (global.params.useInlineAsm) {
-            VersionCondition::addPredefinedGlobalIdent("LLVM_InlineAsm_X86");
@@ -841 +840 @@
-        global.params.is64bit = true;
-        global.params.cpu = ARCHx86_64;
-
-
+
-    }
-    else if (strcmp(global.params.llvmArch,"ppc32")==0) {
@@ -849 +847 @@
-        global.params.is64bit = false;
-        global.params.cpu = ARCHppc;
-
-
+
-    }
-    else if (strcmp(global.params.llvmArch,"ppc64")==0) {
@@ -857 +854 @@
-        global.params.is64bit = true;
-        global.params.cpu = ARCHppc_64;
-
-
+
-    }
-    else {
@@ -889 +885 @@
-    VersionCondition::addPredefinedGlobalIdent("Win32");
-    VersionCondition::addPredefinedGlobalIdent("mingw32");
-    global.params.tt_os = "-pc-mingw32";
-    break;
-
@@ -895 +890 @@
-    VersionCondition::addPredefinedGlobalIdent("linux");
-    VersionCondition::addPredefinedGlobalIdent("Posix");
-    global.params.tt_os = "-pc-linux-gnu";
-    break;
-
@@ -901 +895 @@
-    VersionCondition::addPredefinedGlobalIdent("darwin");
-    VersionCondition::addPredefinedGlobalIdent("Posix");
-    global.params.tt_os = "-pc-darwin-gnu";
-    break;
-
@@ -913 +906 @@
-    }
-
+    if (!global.params.targetTriple)
+        global.params.targetTriple = DEFAULT_TARGET_TRIPLE;
+
+    Logger::println("Target triple: %s", global.params.targetTriple);
-
-    // Initialization

dmd/mars.h

@@ -143 +143 @@
-    char *llvmArch;
-    char forceBE;
-    char *tt_arch;
-    char *tt_os;
-    char *data_layout;
-    char output_ll;
-    char output_bc;
@@ -155 +152 @@
-    char fqnNames; // use fully qualified object names
-    char noDefaultLib;
+
+    // target stuff
+    char *targetTriple;
-};
-

gen/toir.cpp

@@ -472 +472 @@
-        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");
+    }
-
-    Logger::println("performing normal assignment");
@@ -482 +491 @@
-        return l;
-
-#if 0
-    if (type->toBasetype()->ty == Tstruct && e2->type->isintegral())
-    { 
-        // handle struct = 0; 
-        return l; 
-    } 
-    else 
-    { 
-        return r;
-    }
-#else
-    return r;
-#endif
-}
-

gen/toobj.cpp

@@ -60 +60 @@
-
-// fwd decl
-
+TargetMachine &Target, llvm::
-void assemble(const llvm::sys::Path& asmpath, const llvm::sys::Path& objpath, char** envp);
-
@@ -103 +103 @@
-
-    // set target stuff
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    // debug info
@@ -223 +247 @@
-        {
-            llvm::raw_fd_ostream out(spath.c_str(), err);
-
+Target, 
-        }
-
@@ -252 +276 @@
-
-// based on llc code, University of Illinois Open Source License
-
+TargetMachine &Target, llvm::
-{
-    using namespace llvm;
-
-    std::string Err;
-
-    const TargetMachineRegistry::entry* MArch;
-    MArch = TargetMachineRegistry::getClosestStaticTargetForModule(m, Err);
-    if (MArch == 0) {
-        error("error auto-selecting target for module '%s'", Err.c_str());
-        fatal();
-    }
-
-    SubtargetFeatures Features;
-//TODO: Features?
-//    Features.setCPU(MCPU);
-//    for (unsigned i = 0; i != MAttrs.size(); ++i)
-//      Features.AddFeature(MAttrs[i]);
-
-    //FIXME: Only set this if required?
-    TargetMachine::setRelocationModel(Reloc::PIC_);
-
-    std::auto_ptr<TargetMachine> target(MArch->CtorFn(m, Features.getString()));
-    assert(target.get() && "Could not allocate target machine!");
-    TargetMachine &Target = *target.get();
-
-    // Build up all of the passes that we want to do to the module.
-    ExistingModuleProvider Provider(&m);
-    FunctionPassManager Passes(&Provider);
-
-
+
-    Passes.add(new TargetData(*Target.getTargetData()));
-
@@ -306 +307 @@
-
-    // release module from module provider so we can delete it ourselves
+    std::string Err;
-    llvm::Module* rmod = Provider.releaseModule(&Err);
-    assert(rmod);

premake.lua

@@ -20 +20 @@
-if OS == "windows" then
-    POSIX = 0
+end
+
+
+-- guess the host machine description
+-- also allow overriding it
+
+addoption("target-override", "Override the default target machine");
+
+TRIPLE = "";
+if options["target-override"] then
+    TRIPLE = options["target-override"]
+else
+    local p = io.popen("./config.guess")
+    TRIPLE = p:read()
-end
-
@@ -66 +80 @@
-    "DMDV1="..DMDV1,
-    "POSIX="..POSIX,
+    "DEFAULT_TARGET_TRIPLE=\\\""..TRIPLE.."\\\"",
-}
-package.config.Release.defines = { "LLVMD_NO_LOGGER" }