Changeset 258

Timestamp:

11/21/09 10:55:39 (15 years ago)

Author:

walter

Message:

bugzilla 3407

Files:

• trunk/src/e2ir.c (modified) (4 diffs)
• trunk/src/irstate.c (modified) (2 diffs)
• trunk/src/irstate.h (modified) (1 diff)
• trunk/src/mars.c (modified) (3 diffs)
• trunk/src/mars.h (modified) (1 diff)
• trunk/src/win32.mak (modified) (1 diff)

trunk/src/e2ir.c

@@ -2556 +2556 @@
-        printf("elwr\n");
-        elem_print(elwr);
-        printf("eupr\n");
-        elem_print(eupr);
-        printf("enbytes\n");
-        elem_print(enbytes);
-#endif
-        einit = el_combine(n1x, einit);
-        einit = el_combine(einit, elwrx);
-        einit = el_combine(einit, euprx);
-
-        evalue = this->e2->toElem(irs);
-
-#if 0
-        printf("n1\n");
-        elem_print(n1);
-        printf("enbytes\n");
-        elem_print(enbytes);
-#endif
-
-global.params.useArrayBounds
+irs->arrayBoundsCheck()
-        {
-        elem *c1;
-        elem *c2;
-        elem *ea;
-        elem *eb;
-        elem *enbytesx;
-
-        assert(elwr);
-        enbytesx = enbytes;
-        enbytes = el_same(&enbytesx);
-        c1 = el_bin(OPle, TYint, el_copytree(eupr), enbytesx);
-        c2 = el_bin(OPle, TYint, el_copytree(elwr), el_copytree(eupr));
-        c1 = el_bin(OPandand, TYint, c1, c2);
-
-        // Construct: (c1 || ModuleArray(line))
-        Symbol *sassert;
-
-        sassert = irs->blx->module->toModuleArray();
-        ea = el_bin(OPcall,TYvoid,el_var(sassert), el_long(TYint, loc.linnum));
-        eb = el_bin(OPoror,TYvoid,c1,ea);
@@ -2661 +2661 @@
-    {
-        /* It's array1[]=array2[]
-         * which is a memcpy
-         */
-        elem *ep;
-
-        elem *eto = e1->toElem(irs);
-        elem *efrom = e2->toElem(irs);
-
-        unsigned size = t1->nextOf()->size();
-        elem *esize = el_long(TYint, size);
-
-        /* Determine if we need to do postblit
-         */
-        int postblit = 0;
-        if (needsPostblit(t1))
-        postblit = 1;
-
-        assert(e2->type->ty != Tpointer);
-
-global.params.useArrayBounds
+irs->arrayBoundsCheck()
-        {
-        elem *ex = el_same(&eto);
-
-        // Determine if elen is a constant
-        elem *elen;
-        if (eto->Eoper == OPpair &&
-            eto->E1->Eoper == OPconst)
-        {
-            elen = el_copytree(eto->E1);
-        }
-        else
-        {
-            // It's not a constant, so pull it from the dynamic array
-            elen = el_una(OP64_32, TYint, el_copytree(ex));
-        }
-
-        esize = el_bin(OPmul, TYint, elen, esize);
-        elem *epto = array_toPtr(e1->type, ex);
-        elem *epfr = array_toPtr(e2->type, efrom);
-#if 1
@@ -4211 +4211 @@
-{
-    //printf("SliceExp::toElem()\n");
-    Type *t1 = e1->type->toBasetype();
-    elem *e = e1->toElem(irs);
-    if (lwr)
-    {
-    elem *einit = resolveLengthVar(lengthVar, &e, t1);
-
-    int sz = t1->nextOf()->size();
-
-    elem *elwr = lwr->toElem(irs);
-    elem *eupr = upr->toElem(irs);
-
-    elem *elwr2 = el_same(&elwr);
-
-    // Create an array reference where:
-    // length is (upr - lwr)
-    // pointer is (ptr + lwr*sz)
-    // Combine as (length pair ptr)
-
-global.params.useArrayBounds
+irs->arrayBoundsCheck()
-    {
-        // Checks (unsigned compares):
-        //  upr <= array.length
-        //  lwr <= upr
-
-        elem *c1;
-        elem *c2;
-        elem *ea;
-        elem *eb;
-        elem *eupr2;
-        elem *elength;
-
-        if (t1->ty == Tpointer)
-        {
-        // Just do lwr <= upr check
-
-        eupr2 = el_same(&eupr);
-        eupr2->Ety = TYuint;            // make sure unsigned comparison
-        c1 = el_bin(OPle, TYint, elwr2, eupr2);
-        c1 = el_combine(eupr, c1);
@@ -4340 +4340 @@
-        assert(n2->Enumbytes);
-    }
-    elem *valuesize = el_long(TYuint, vsize);   // BUG: should be TYsize_t
-    //printf("valuesize: "); elem_print(valuesize);
-    if (modifiable)
-    {
-        n1 = el_una(OPaddr, TYnptr, n1);
-        s = taa->aaGetSymbol("Get", 1);
-    }
-    else
-    {
-        s = taa->aaGetSymbol("GetRvalue", 1);
-    }
-    //printf("taa->index = %s\n", taa->index->toChars());
-    keyti = taa->index->getInternalTypeInfo(NULL)->toElem(irs);
-    //keyti = taa->index->getTypeInfo(NULL)->toElem(irs);
-    //printf("keyti:\n");
-    //elem_print(keyti);
-    ep = el_params(n2, valuesize, keyti, n1, NULL);
-    e = el_bin(OPcall, TYnptr, el_var(s), ep);
-global.params.useArrayBounds
+irs->arrayBoundsCheck()
-    {
-        elem *ea;
-
-        elem *n = el_same(&e);
-
-        // Construct: ((e || ModuleAssert(line)),n)
-        Symbol *sassert = irs->blx->module->toModuleArray();
-        ea = el_bin(OPcall,TYvoid,el_var(sassert),
-        el_long(TYint, loc.linnum));
-        e = el_bin(OPoror,TYvoid,e,ea);
-        e = el_bin(OPcomma, TYnptr, e, n);
-    }
-    e = el_una(OPind, type->totym(), e);
-    if (tybasic(e->Ety) == TYstruct)
-        e->Enumbytes = type->size();
-    }
-    else
-    {
-    elem *einit = resolveLengthVar(lengthVar, &n1, t1);
-    elem *n2 = e2->toElem(irs);
-
-global.params.useArrayBounds
+irs->arrayBoundsCheck()
-    {
-        elem *elength;
-        elem *n2x;
-        elem *ea;
-
-        if (t1->ty == Tsarray)
-        {   TypeSArray *tsa = (TypeSArray *)t1;
-        dinteger_t length = tsa->dim->toInteger();
-
-        elength = el_long(TYuint, length);
-        goto L1;
-        }
-        else if (t1->ty == Tarray)
-        {
-        elength = n1;
-        n1 = el_same(&elength);
-        elength = el_una(OP64_32, TYuint, elength);
-        L1:
-        n2x = n2;
-        n2 = el_same(&n2x);

trunk/src/irstate.c

@@ -1 +1 @@
-
-// Compiler implementation of the D programming language
-8
+9
-// All Rights Reserved
-// written by Walter Bright
-// http://www.digitalmars.com
-
-#include <stdio.h>
-
+#include "mars.h"
+#include "mtype.h"
+#include "declaration.h"
-#include "irstate.h"
-
-IRState::IRState(IRState *irs, Statement *s)
-{
-    prev = irs;
-    statement = s;
-    symbol = NULL;
-    breakBlock = NULL;
-    contBlock = NULL;
-    switchBlock = NULL;
-    defaultBlock = NULL;
-    ident = NULL;
-    ehidden = NULL;
-    startaddress = NULL;
-    if (irs)
-    {
-    m = irs->m;
-    shidden = irs->shidden;
-    sclosure = irs->sclosure;
-    sthis = irs->sthis;
@@ -145 +148 @@
-
-    for (bc = this; bc; bc = bc->prev)
-    {
-    if (bc->defaultBlock)
-        return bc->defaultBlock;
-    }
-    return NULL;
-}
-
-FuncDeclaration *IRState::getFunc()
-{
-    IRState *bc;
-
-    for (bc = this; bc->prev; bc = bc->prev)
-    {
-    }
-    return (FuncDeclaration *)(bc->symbol);
-}
-
-
+/**********************
+ * Return !=0 if do array bounds checking
+ */
+int IRState::arrayBoundsCheck()
+{
+    int result = global.params.useArrayBounds;
+
+    if (result == 1)
+    {   // For safe functions only
+    result = 0;
+    FuncDeclaration *fd = getFunc();
+    if (fd)
+    {   Type *t = fd->type;
+        if (t->ty == Tfunction && ((TypeFunction *)t)->trust == TRUSTsafe)
+        result = 1;
+    }
+    }
+    return result;
+}

trunk/src/irstate.h

@@ -35 +35 @@
-    Symbol *sclosure;       // pointer to closure instance
-    Blockx *blx;
-    Array *deferToObj;      // array of Dsymbol's to run toObjFile(int multiobj) on later
-    elem *ehidden;      // transmit hidden pointer to CallExp::toElem()
-    Symbol *startaddress;
-
-    block *breakBlock;
-    block *contBlock;
-    block *switchBlock;
-    block *defaultBlock;
-
-    IRState(IRState *irs, Statement *s);
-    IRState(IRState *irs, Dsymbol *s);
-    IRState(Module *m, Dsymbol *s);
-
-    block *getBreakBlock(Identifier *ident);
-    block *getContBlock(Identifier *ident);
-    block *getSwitchBlock();
-    block *getDefaultBlock();
-    FuncDeclaration *getFunc();
+    int arrayBoundsCheck();
-};
-
-#endif /* DMD_CONTEXT_H */

trunk/src/mars.c

@@ -219 +219 @@
-  -d             allow deprecated features\n\
-  -debug         compile in debug code\n\
-  -debug=level   compile in debug code <= level\n\
-  -debug=ident   compile in debug code identified by ident\n\
-  -debuglib=name    set symbolic debug library to name\n\
-  -defaultlib=name  set default library to name\n\
-  -deps=filename write module dependencies to filename\n\
-  -g             add symbolic debug info\n\
-  -gc            add symbolic debug info, pretend to be C\n\
-  -H             generate 'header' file\n\
-  -Hddirectory   write 'header' file to directory\n\
-  -Hffilename    write 'header' file to filename\n\
-  --help         print help\n\
-  -Ipath         where to look for imports\n\
-  -ignore        ignore unsupported pragmas\n\
-  -inline        do function inlining\n\
-  -Jpath         where to look for string imports\n\
-  -Llinkerflag   pass linkerflag to link\n\
-  -lib           generate library rather than object files\n\
-  -man           open web browser on manual page\n\
+  -noboundscheck turns off array bounds checking for all functions\n\
-  -nofloat       do not emit reference to floating point\n\
-  -O             optimize\n\
-  -o-            do not write object file\n\
-  -odobjdir      write object & library files to directory objdir\n\
-  -offilename    name output file to filename\n\
-  -op            do not strip paths from source file\n\
-  -profile   profile runtime performance of generated code\n\
-  -quiet         suppress unnecessary messages\n\
-  -release   compile release version\n\
-  -run srcfile args...   run resulting program, passing args\n\
-  -safe          safe memory model\n\
-  -unittest      compile in unit tests\n\
-  -v             verbose\n\
-  -version=level compile in version code >= level\n\
-  -version=ident compile in version code identified by ident\n\
-  -vtls          list all variables going into thread local storage\n\
-  -w             enable warnings\n\
-  -X             generate JSON file\n\
-  -Xffilename    write JSON file to filename\n\
-");
-}
-
-int main(int argc, char *argv[])
-{
-    int i;
-    Array files;
-    Array libmodules;
-    char *p;
-    Module *m;
-    int status = EXIT_SUCCESS;
-    int argcstart = argc;
-    int setdebuglib = 0;
+    char noboundscheck = 0;
-
-    // Check for malformed input
-    if (argc < 1 || !argv)
-    {
-      Largs:
-    error("missing or null command line arguments");
-    fatal();
-    }
-    for (i = 0; i < argc; i++)
-    {
-    if (!argv[i])
-        goto Largs;
-    }
-
-    if (response_expand(&argc,&argv))   // expand response files
-    error("can't open response file");
-
-    files.reserve(argc - 1);
-
-    // Set default values
-    global.params.argv0 = argv[0];
-    global.params.link = 1;
-    global.params.useAssert = 1;
-    global.params.useInvariants = 1;
-    global.params.useIn = 1;
-    global.params.useOut = 1;
-1;
+2;  // default to all functions
-    global.params.useSwitchError = 1;
-    global.params.useInline = 0;
-    global.params.obj = 1;
-    global.params.Dversion = 2;
-    global.params.quiet = 1;
-
-    global.params.linkswitches = new Array();
-    global.params.libfiles = new Array();
-    global.params.objfiles = new Array();
-    global.params.ddocfiles = new Array();
-
-#if TARGET_WINDOS
-    global.params.defaultlibname = "phobos";
-#elif TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_SOLARIS
-    global.params.defaultlibname = "phobos2";
-#elif TARGET_NET
-#else
-#error "fix this"
-#endif
-
@@ -513 +514 @@
-            case 0:
-            break;
-
-            default:
-            goto Lerror;
-        }
-        }
-        else if (strcmp(p + 1, "ignore") == 0)
-        global.params.ignoreUnsupportedPragmas = 1;
-        else if (strcmp(p + 1, "inline") == 0)
-        global.params.useInline = 1;
-        else if (strcmp(p + 1, "lib") == 0)
-        global.params.lib = 1;
-        else if (strcmp(p + 1, "nofloat") == 0)
-        global.params.nofloat = 1;
-        else if (strcmp(p + 1, "quiet") == 0)
-        global.params.quiet = 1;
-        else if (strcmp(p + 1, "release") == 0)
-        global.params.release = 1;
-#if DMDV2
-safe
-global.params.safe = 1;        // now ignored
+noboundscheck
+noboundscheck = 1;
-#endif
-        else if (strcmp(p + 1, "unittest") == 0)
-        global.params.useUnitTests = 1;
-        else if (p[1] == 'I')
-        {
-        if (!global.params.imppath)
-            global.params.imppath = new Array();
-        global.params.imppath->push(p + 2);
-        }
-        else if (p[1] == 'J')
-        {
-        if (!global.params.fileImppath)
-            global.params.fileImppath = new Array();
-        global.params.fileImppath->push(p + 2);
-        }
-        else if (memcmp(p + 1, "debug", 5) == 0 && p[6] != 'l')
-        {
-        // Parse:
-        //  -debug
-        //  -debug=number
@@ -709 +710 @@
-    {
-    fatal();
-    }
-    if (files.dim == 0)
-    {   usage();
-    return EXIT_FAILURE;
-    }
-
-    if (!setdebuglib)
-    global.params.debuglibname = global.params.defaultlibname;
-
-#if TARGET_OSX
-    global.params.pic = 1;
-#endif
-
-    if (global.params.release)
-    {   global.params.useInvariants = 0;
-    global.params.useIn = 0;
-    global.params.useOut = 0;
-    global.params.useAssert = 0;
+    global.params.useArrayBounds = 1;
+    global.params.useSwitchError = 0;
+    }
+    if (noboundscheck)
-    global.params.useArrayBounds = 0;
-    global.params.useSwitchError = 0;
-    }
-
-    if (global.params.run)
-    global.params.quiet = 1;
-
-    if (global.params.useUnitTests)
-    global.params.useAssert = 1;
-
-    if (!global.params.obj || global.params.lib)
-    global.params.link = 0;
-
-    if (global.params.link)
-    {
-    global.params.exefile = global.params.objname;
-    global.params.oneobj = 1;
-    if (global.params.objname)
-    {
-        /* Use this to name the one object file with the same
-         * name as the exe file.
-         */
-        global.params.objname = FileName::forceExt(global.params.objname, global.obj_ext)->toChars();

trunk/src/mars.h

@@ -123 +123 @@
-    char oneobj;    // write one object file instead of multiple ones
-    char trace;     // insert profiling hooks
-    char quiet;     // suppress non-error messages
-    char verbose;   // verbose compile
-    char vtls;      // identify thread local variables
-    char symdebug;  // insert debug symbolic information
-    char optimize;  // run optimizer
-    char cpu;       // target CPU
-    char isX86_64;  // generate X86_64 bit code
-    char isLinux;   // generate code for linux
-    char isOSX;     // generate code for Mac OSX
-    char isWindows; // generate code for Windows
-    char isFreeBSD; // generate code for FreeBSD
-    char isSolaris; // generate code for Solaris
-    char scheduler; // which scheduler to use
-    char useDeprecated; // allow use of deprecated features
-    char useAssert; // generate runtime code for assert()'s
-    char useInvariants; // generate class invariant checks
-    char useIn;     // generate precondition checks
-    char useOut;    // generate postcondition checks
-
+
+
+
+
-    char useSwitchError; // check for switches without a default
-    char useUnitTests;  // generate unittest code
-    char useInline; // inline expand functions
-    char release;   // build release version
-    char preservePaths; // !=0 means don't strip path from source file
-    char warnings;  // enable warnings
-    char pic;       // generate position-independent-code for shared libs
-    char cov;       // generate code coverage data
-    char nofloat;   // code should not pull in floating point support
-    char Dversion;  // D version number
-    char ignoreUnsupportedPragmas;  // rather than error on them
-    char safe;      // enforce safe memory model
-
-    char *argv0;    // program name
-    Array *imppath; // array of char*'s of where to look for import modules
-    Array *fileImppath; // array of char*'s of where to look for file import modules
-    char *objdir;   // .obj/.lib file output directory
-    char *objname;  // .obj file output name
-    char *libname;  // .lib file output name
-
-    char doDocComments; // process embedded documentation comments
-    char *docdir;   // write documentation file to docdir directory
-    char *docname;  // write documentation file to docname
-    Array *ddocfiles;   // macro include files for Ddoc
-
-    char doHdrGeneration;   // process embedded documentation comments
-    char *hdrdir;       // write 'header' file to docdir directory
-    char *hdrname;      // write 'header' file to docname
-
-    char doXGeneration;     // write JSON file
-    char *xfilename;        // write JSON file to xfilename
-

trunk/src/win32.mak

@@ -244 +244 @@
-
-cod1.obj : $C\rtlsym.h $C\cod1.c
-    $(CC) -c $(MFLAGS) $C\cod1
-
-cod2.obj : $C\rtlsym.h $C\cod2.c
-    $(CC) -c $(MFLAGS) $C\cod2
-
-cod3.obj : $C\rtlsym.h $C\cod3.c
-    $(CC) -c $(MFLAGS) $C\cod3
-
-cod4.obj : $C\cod4.c
-    $(CC) -c $(MFLAGS) $C\cod4
-
-cod5.obj : $C\cod5.c
-    $(CC) -c $(MFLAGS) $C\cod5
-
-code.obj : $C\code.c
-    $(CC) -c $(MFLAGS) $C\code
-
-irstate.obj : irstate.h irstate.c
-
+-I$(ROOT) 
-
-csymbol.obj : $C\symbol.c
-    $(CC) -c $(MFLAGS) $C\symbol -ocsymbol.obj
-
-debug.obj : $C\debug.c
-    $(CC) -c $(MFLAGS) -I. $C\debug
-
-dt.obj : $C\dt.h $C\dt.c
-    $(CC) -c $(MFLAGS) $C\dt
-
-ee.obj : $C\ee.c
-    $(CC) -c $(MFLAGS) $C\ee
-
-eh.obj : $C\cc.h $C\code.h $C\type.h $C\dt.h eh.c
-    $(CC) -c $(MFLAGS) eh
-
-el.obj : $C\rtlsym.h $C\el.h $C\el.c
-    $(CC) -c $(MFLAGS) $C\el
-
-evalu8.obj : $C\evalu8.c