Changeset 1453:f35a9a77d256

Timestamp:

06/01/09 13:58:21 (3 years ago)

Author:

Robert Clipsham <robert@octarineparrot.com>

branch:

default

Message:

More tweaks.

Files:

• .hgignore (modified) (1 diff)
• CMakeLists.txt (modified) (2 diffs)
• bin/ldmd2 (added)
• dmd2/idgen (modified) (previous)
• dmd2/impcnvgen (modified) (previous)
• gen/classes.cpp (modified) (2 diffs)
• gen/toobj.cpp (modified) (1 diff)
• ir/irclass.cpp (modified) (1 diff)

.hgignore

@@ -9 +9 @@
-*.s
-*.so
+*.swp
-*.rej
-Makefile

CMakeLists.txt

@@ -71 +71 @@
-    set(DMDFE_PATH dmd)
-    set(LDC_EXE ldc)
+    set(LDMD_EXE ldmd)
-    add_definitions(-DDMDV1)
-elseif(D_VERSION EQUAL 2)
-    set(DMDFE_PATH dmd2)
-    set(LDC_EXE ldc2)
+    set(LDMD_EXE ldmd2)
-    add_definitions(-DDMDV2)
-else(D_VERSION EQUAL 1)
@@ -231 +233 @@
-
-install(TARGETS ${LDC_EXE} DESTINATION bin)
-ldmd
+${LDMD_EXE}
-install(FILES ${PROJECT_BINARY_DIR}/bin/${LDC_EXE}.conf DESTINATION ${CONF_INST_DIR})
-install(FILES ${PROJECT_BINARY_DIR}/bin/${LDC_EXE}.rebuild.conf DESTINATION ${CONF_INST_DIR})

gen/classes.cpp

@@ -673 +673 @@
-//         void *destructor;
-//         void *invariant;        // class invariant
+//         version(D_Version2)
+//          void *xgetMembers; 
-//         uint flags;
-//         void *deallocator;
@@ -691 +693 @@
-    ClassDeclaration* cinfo = ClassDeclaration::classinfo;
-
+#if DMDV2
+    if (cinfo->fields.dim != 13)
+#else
-    if (cinfo->fields.dim != 12)
+#endif
-    {
-        error("object.d ClassInfo class is incorrect");

gen/toobj.cpp

@@ -621 +621 @@
-    }
-    // check for patch
+#if DMDV2
+    else if (moduleinfo->fields.dim != 10)
+#else
-    else if (moduleinfo->fields.dim != 9)
+#endif
-    {
-        error("object.d ModuleInfo class is incorrect");

ir/irclass.cpp

@@ -179 +179 @@
-    constVtbl = llvm::ConstantStruct::get(constants, false);
-
-    // sanity check
-#if 0
- 
- 
+
+
-#endif
-
-    assert(constVtbl->getType() == type->irtype->isClass()->getVtbl() &&
-        "vtbl initializer type mismatch");