Changeset 395

Timestamp:

02/21/10 21:21:56 (6 months ago)

Author:

walter

Message:

asserts to use ModuleInfo?

Files:

• trunk/src/backend/rtlsym.h (modified) (2 diffs)
• trunk/src/glue.c (modified) (3 diffs)
• trunk/src/module.h (modified) (1 diff)
• trunk/src/s2ir.c (modified) (1 diff)
• trunk/src/toobj.c (modified) (1 diff)

trunk/src/backend/rtlsym.h

@@ -45 +45 @@
-SYMBOL_MARS(MONITOR_HANDLER, FLfunc,FREGSAVED,"_d_monitor_handler", 0, 0) \
-SYMBOL_MARS(MONITOR_PROLOG,  FLfunc,FREGSAVED,"_d_monitor_prolog",0,t) \
-SYMBOL_MARS(MONITOR_EPILOG,  FLfunc,FREGSAVED,"_d_monitor_epilog",0,t) \
-SYMBOL_MARS(DCOVER,      FLfunc,FREGSAVED,"_d_cover_register", 0, t) \
-SYMBOL_MARS(DASSERT,         FLfunc,FREGSAVED,"_d_assert", SFLexit, t) \
+SYMBOL_MARS(DASSERTM,        FLfunc,FREGSAVED,"_d_assertm", SFLexit, t) \
-SYMBOL_MARS(DASSERT_MSG,     FLfunc,FREGSAVED,"_d_assert_msg", SFLexit, t) \
-SYMBOL_MARS(DARRAY,      FLfunc,FREGSAVED,"_d_array_bounds", SFLexit, t) \
-SYMBOL_MARS(DINVARIANT,      FLfunc,FREGSAVED,"D9invariant12_d_invariantFC6ObjectZv", 0, tsdlib) \
-SYMBOL_MARS(_DINVARIANT,     FLfunc,FREGSAVED,"_D9invariant12_d_invariantFC6ObjectZv", 0, tsdlib) \
-SYMBOL_MARS(MEMCPY,      FLfunc,FREGSAVED,"memcpy",    0, t) \
@@ -66 +67 @@
-SYMBOL_MARS(CRITICALENTER, FLfunc,FREGSAVED,"_d_criticalenter",0, t) \
-SYMBOL_MARS(CRITICALEXIT,  FLfunc,FREGSAVED,"_d_criticalexit",0, t) \
-SYMBOL_MARS(SWITCH_STRING, FLfunc,FREGSAVED,"_d_switch_string", 0, t) \
-SYMBOL_MARS(SWITCH_USTRING,FLfunc,FREGSAVED,"_d_switch_ustring", 0, t) \
-SYMBOL_MARS(SWITCH_DSTRING,FLfunc,FREGSAVED,"_d_switch_dstring", 0, t) \
-0
+SFLexit
-SYMBOL_MARS(DHIDDENFUNC,   FLfunc,FREGSAVED,"_d_hidden_func", 0, t) \
-SYMBOL_MARS(NEWCLASS,      FLfunc,FREGSAVED,"_d_newclass", 0, t) \
-SYMBOL_MARS(NEWARRAYT,     FLfunc,FREGSAVED,"_d_newarrayT", 0, t) \
-SYMBOL_MARS(NEWARRAYIT,    FLfunc,FREGSAVED,"_d_newarrayiT", 0, t) \
-SYMBOL_MARS(NEWARRAYMT,    FLfunc,FREGSAVED,"_d_newarraymT", 0, t) \

trunk/src/glue.c

@@ -469 +469 @@
-    Symbol *ma = i ? marray : massert;
-
-    if (ma)
-    {
-        elem *elinnum;
-        elem *efilename;
-
-        localgot = NULL;
-
-        // Call dassert(filename, line)
-        // Get sole parameter, linnum
@@ -491 +490 @@
-        symbol_add(sp);
-
-        elinnum = el_var(sp);
-        }
-
-filename = toEmodulename(
-
-
+lem *efilename = el_ptr(toSymbol()
+
+M
-        e = el_bin(OPcall, TYvoid, e, el_param(elinnum, efilename));
-
-        block *b = block_calloc();
-        b->BC = BCret;
-        b->Belem = e;
@@ -1157 +1156 @@
-
-/**************************************
- * Generate elem that is a pointer to the module file name.
- */
-
-elem *Module::toEmodulename()
-{
-   elem *efilename;
-
-    // Get filename
-    if (needModuleInfo())
-    {   Symbol *si;
-
-    /* Class ModuleInfo is defined in std.moduleinfo.
-     * The module name will be at nameoffset from the start of it.
-     */
-
-    si = toSymbol();
-
-    //printf("nameoffset = x%x\n", nameoffset);
-    assert(nameoffset >= 4);
-
-    efilename = el_ptr(si);
-    efilename = el_bin(OPadd, TYnptr, efilename, el_long(TYsize_t, nameoffset));
-    efilename = el_pair(TYdarray, el_long(TYsize_t, namelen), efilename);
-    }
-    else // generate our own filename
-    {
-    efilename = toEfilename();
-    }
-    return efilename;
-}
-
-elem *Module::toEfilename()
-{   elem *efilename;
-
-    if (!sfilename)
-    {

trunk/src/module.h

@@ -168 +168 @@
-    Symbol *toModuleArray();    // get module array bounds function
-
-
-    static Symbol *gencritsec();
-    elem *toEfilename();
-    elem *toEmodulename();
-
-    Symbol *toSymbol();
-    void genmoduleinfo();
-
-    Module *isModule() { return this; }

trunk/src/s2ir.c

@@ -1150 +1150 @@
-    block_next(blx,BCgoto,NULL);
-}
-
-void SwitchErrorStatement::toIR(IRState *irs)
-{
-    elem *e;
-    elem *elinnum;
-    elem *efilename;
-    Blockx *blx = irs->blx;
-
-    //printf("SwitchErrorStatement::toIR()\n");
-
-filename = blx->module->toEmodulename(
-
-
+lem *efilename = el_ptr(blx->module->toSymbol()
+em *el
+lem *e
-    block_appendexp(blx->curblock, e);
-}
-
-/**************************************
- */

trunk/src/toobj.c

@@ -171 +171 @@
-    // Put out module name as a 0-terminated string, to save bytes
-    nameoffset = dt_size(dt);
-    const char *name = toPrettyChars();
-    namelen = strlen(name);
-    dtnbytes(&dt, namelen + 1, name);
+    //printf("nameoffset = x%x\n", nameoffset);
-#else
-    /* The layout is:
-       {
-        void **vptr;
-        monitor_t monitor;