Changeset 579

Timestamp:

07/17/10 05:30:24 (2 years ago)

Author:

walter

Message:

hello world now works for 64

Files:

• branches/dmd-1.x/src/backend/cgcod.c (modified) (3 diffs)
• branches/dmd-1.x/src/backend/cod1.c (modified) (11 diffs)
• branches/dmd-1.x/src/backend/cod2.c (modified) (1 diff)
• branches/dmd-1.x/src/backend/cod3.c (modified) (10 diffs)
• branches/dmd-1.x/src/backend/el.h (modified) (1 diff)
• branches/dmd-1.x/src/backend/elfobj.c (modified) (4 diffs)
• branches/dmd-1.x/src/backend/symbol.c (modified) (2 diffs)
• branches/dmd-1.x/src/backend/ty.h (modified) (1 diff)
• branches/dmd-1.x/src/e2ir.c (modified) (6 diffs)
• branches/dmd-1.x/src/msc.c (modified) (1 diff)
• trunk/src/backend/cgcod.c (modified) (3 diffs)
• trunk/src/backend/cod1.c (modified) (11 diffs)
• trunk/src/backend/cod2.c (modified) (1 diff)
• trunk/src/backend/cod3.c (modified) (10 diffs)
• trunk/src/backend/el.h (modified) (1 diff)
• trunk/src/backend/elfobj.c (modified) (4 diffs)
• trunk/src/backend/symbol.c (modified) (2 diffs)
• trunk/src/backend/ty.h (modified) (1 diff)
• trunk/src/e2ir.c (modified) (7 diffs)
• trunk/src/msc.c (modified) (1 diff)

branches/dmd-1.x/src/backend/cgcod.c

@@ -140 +140 @@
-        BYTEREGS = value;
-    }
+    if (I64)
+        ALLREGS = mAX|mBX|mCX|mDX|mSI|mDI| mR8|mR9|mR10|mR11|mR12|mR13|mR14|mR15;
-#endif
-    allregs = ALLREGS;
@@ -1913 +1915 @@
-#ifdef DEBUG
-            WRTYxx(tym);
-l
+
-                file,line,regcon.mvar,msavereg,*pretregs,*preg,tym);
-#endif
@@ -2478 +2480 @@
-  {
-#if DEBUG
-l
+
-#endif
-        assert(0);

branches/dmd-1.x/src/backend/cod1.c

@@ -15 +15 @@
-#include        <stdio.h>
-#include        <string.h>
+#include        <stdlib.h>
-#include        <time.h>
-#include        "cc.h"
@@ -327 +328 @@
-    code *cs2 = *crestore;
-
+    //printf("gensaverestore2(%x)\n", regm);
-    regm &= mBP | mES | ALLREGS;
-    for (int i = 0; regm; i++)
@@ -1666 +1668 @@
-#ifdef DEBUG
-  if (!(regm & (mBP | ALLREGS)))
-l
+
-            regm,tym,saveflag);
-#endif
@@ -2310 +2312 @@
-  keepmsk = 0;
-  if (OTbinary(e->Eoper))               // if parameters
-
-
-
-
-
+
+
-        {
+            c = cat(c, params(e->E2,2));   // push parameters
+        }
+        else if (I32)
+        {
+            unsigned stackalign = REGSIZE;
-            tym_t tyf = tybasic(e->E1->Ety);
-
-
+bytes 
-            switch (tyf)
-            {   case TYf16func:
@@ -2366 +2370 @@
-            {   case TYf16func:
-                    stackalign = 2;
-break
+goto Ldefault2
-                case TYmfunc:   // last parameter goes into ECX
-                    preg = CX;
@@ -2373 +2377 @@
-                    preg = AX;
-                    goto L1;
-
-                L1:
-
+
+
-                    for (ep = e->E2; ep->Eoper == OPparam; ep = en)
-                    {
@@ -2381 +2385 @@
-                        en = ep->E2;
-                        freenode(ep);
-                        ep = en;
-                    }
-                    if (tyf == TYjfunc &&
@@ -2395 +2398 @@
-                    // preg is the register to put the parameter ep in
-                    keepmsk = mask[preg];       // don't change preg when evaluating func address
-
+gm_t re
-                    if (ep->Eoper == OPstrthis)
-                    {   code *c2;
@@ -2412 +2415 @@
-                    }
-                    goto Lret;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    else
@@ -2435 +2562 @@
-Lret:
-    cgstate.stackclean--;
-
+
+
+
-    {
-        if (numpara != stackpush - stackpushsave)
@@ -2441 +2570 @@
-        assert(numpara == stackpush - stackpushsave);
-    }
-    else
-        numpara = stackpush - stackpushsave;
-    return cat(c,funccall(e,numpara,numalign,pretregs,keepmsk));
-}

branches/dmd-1.x/src/backend/cod2.c

@@ -3736 +3736 @@
-
-  cs.Iflags = 0;
-I64 ? REX_W : 
+
-  cs.Irex = rex;
-  assert(e->Eoper == OPvar || e->Eoper == OPrelconst);

branches/dmd-1.x/src/backend/cod3.c

@@ -1172 +1172 @@
-
-code *prolog()
-   code *c;
+
-    SYMIDX si;
-    unsigned reg;
-    regm_t topush;
-    tym_t tym;
-    tym_t tyf;
-    char enter;
-    char pushds;
-    unsigned farfunc;
-    unsigned Foffset;
-    unsigned xlocalsize;     // amount to subtract from ESP to make room for locals
-    int pushalloc;
-    unsigned pushallocreg;
-    char guessneedframe;
@@ -1192 +1186 @@
-    EBPtoESP = -REGSIZE;
-    hasframe = 0;
-
+char 
-    BPoff = 0;
-
-
-
-
-
+ode *c
+int 
+m_t ty
+_t tym
+unsigned 
-    pushallocreg = (tyf == TYmfunc) ? CX : AX;
-    if (config.flags & CFGalwaysframe || funcsym_p->Sfunc->Fflags3 & Ffakeeh)
@@ -1264 +1258 @@
-    localsize = -Toff;
-
-
+regm_t 
-    int npush = 0;                      // number of registers that need saving
-    for (regm_t x = topush; x; x >>= 1)
@@ -1346 +1340 @@
-    }
-
-
-
+
-    {   int wflags;
-        int segreg;
-
+#if SCPP
-        // alloca() can't be because the 'special' parameter won't be at
-        // a known offset from BP.
-        if (usedalloca == 1)
-            synerr(EM_alloca_win);      // alloca() can't be in Windows functions
+#endif
-
-        wflags = config.wflags;
@@ -1406 +1401 @@
-    }
-    else
-#endif
-    if (needframe)                      // if variables or parameters
-    {
@@ -1660 +1654 @@
-    {   reg = findreg(topush);
-        topush &= ~mask[reg];
-
+
+
+
-        EBPtoESP += REGSIZE;
-#if ELFOBJ || MACHOBJ
@@ -1913 +1909 @@
-    while (topop)
-    {   if (topop & regm)
-reg
+(reg & 7)
-            if (reg & 8)
-                code_orrex(c, REX_B);
@@ -4348 +4344 @@
-void addtofixlist(symbol *s,targ_size_t soffset,int seg,targ_size_t val,int flags)
-{       fixlist *ln;
-6
+8
-        int numbytes;
-
@@ -4884 +4880 @@
-                case FLconst:
-                case FLoffset:
-l
+
-                    break;
-                case FLblock:
@@ -4919 +4915 @@
-        {
-            case FLconst:
-l
+
-                break;
-            case FLblock:

branches/dmd-1.x/src/backend/el.h

@@ -44 +44 @@
-    unsigned char Ecount;       // # of parents of this elem - 1,
-                                // always 0 until CSE elimination is done
+    unsigned char Eflags;
+    #define EFLAGS_variadic 1   // variadic function call
+
-    union eve EV;               // variants for each type of elem
-    union

branches/dmd-1.x/src/backend/elfobj.c

@@ -2719 +2719 @@
-void obj_moduleinfo(Symbol *scc)
-{
+//    if (I64) return;          // for now, until Phobos64 works
+
-    int codeOffset, refOffset;
-
@@ -2735 +2737 @@
-        SegData[seg]->SDbuf->writezeros(NPTRSIZE);
-        SegData[seg]->SDoffset += NPTRSIZE;
-
-
+
-    }
-
@@ -2764 +2765 @@
-        buf->writeByte(0xC3); /* ret */
-
-
+
+
+
+
+
-
-        /* movl ModuleReference*, %eax */
-        buf->writeByte(0xB8);
-        buf->write32(refOffset);
-2
+off + 1
-
-        /* movl _Dmodule_ref, %ecx */
-        buf->writeByte(0xB9);
-        buf->write32(0);
-7
+off + 6
-
-        buf->writeByte(0x8B); buf->writeByte(0x11); /* movl (%ecx), %edx */
@@ -2780 +2785 @@
-        buf->writeByte(0x89); buf->writeByte(0x01); /* movl %eax, (%ecx) */
-
-buf->writeByte(0x61); /* popad */
+if (I32) buf->writeByte(0x61); // POPAD
-        buf->writeByte(0xC3); /* ret */
-        SegData[seg]->SDoffset = buf->size();

branches/dmd-1.x/src/backend/symbol.c

@@ -364 +364 @@
-void symbol_func(symbol *s)
-{
+    //printf("symbol_func(%s, x%x)\n", s->Sident, fregsaved);
-    symbol_debug(s);
-    s->Sfl = FLfunc;
@@ -370 +371 @@
-    // BUG: do interrupt functions really save BP?
-    #define mBP 0x20
+    // Note that fregsaved may not be set yet
-    s->Sregsaved = (s->Stype && tybasic(s->Stype->Tty) == TYifunc) ? mBP : fregsaved;
-    s->Sseg = UNKNOWN;          // don't know what segment it is in

branches/dmd-1.x/src/backend/ty.h

@@ -198 +198 @@
-#define tyreal(ty)      (tytab[(ty) & 0xFF] & TYFLreal)
-
+// Fits into 64 bit register
+#define ty64reg(ty)     (tytab[(ty) & 0xFF] & (TYFLintegral | TYFLptr))
+
-#ifndef tyshort
-/* Types that are chars or shorts       */

branches/dmd-1.x/src/e2ir.c

@@ -281 +281 @@
-    }
-    else if (ep)
-
+
+
+
+
-    else
-
+
+
+
+
-
-    if (retmethod == RETstack)
@@ -1774 +1780 @@
-                           NULL);
-            e = el_bin(OPcall, TYdarray, el_var(rtlsym[RTLSYM_ARRAYCATNT]), ep);
+            e->Eflags |= EFLAGS_variadic;
-#else
-            ep = el_params(
@@ -1781 +1788 @@
-                           NULL);
-            e = el_bin(OPcall, TYdarray, el_var(rtlsym[RTLSYM_ARRAYCATN]), ep);
+            e->Eflags |= EFLAGS_variadic;
-#endif
-        }
@@ -4218 +4226 @@
-    // call _d_arrayliteralT(ti, dim, ...)
-    e = el_bin(OPcall,TYnptr,el_var(rtlsym[RTLSYM_ARRAYLITERALT]),e);
+    e->Eflags |= EFLAGS_variadic;
-#else
-    e = el_param(e, el_long(TYint, tb->next->size()));
@@ -4223 +4232 @@
-    // call _d_arrayliteral(size, dim, ...)
-    e = el_bin(OPcall,TYnptr,el_var(rtlsym[RTLSYM_ARRAYLITERAL]),e);
+    e->Eflags |= EFLAGS_variadic;
-#endif
-    if (tb->ty == Tarray)
@@ -4271 +4281 @@
-    // call _d_assocarrayliteralT(ti, dim, ...)
-    e = el_bin(OPcall,TYnptr,el_var(rtlsym[RTLSYM_ASSOCARRAYLITERALT]),e);
+    e->Eflags |= EFLAGS_variadic;
-
-    el_setLoc(e,loc);

branches/dmd-1.x/src/msc.c

@@ -41 +41 @@
-void out_config_init()
-{
+    //printf("out_config_init()\n");
-    Param *params = &global.params;
-

trunk/src/backend/cgcod.c

@@ -140 +140 @@
-        BYTEREGS = value;
-    }
+    if (I64)
+        ALLREGS = mAX|mBX|mCX|mDX|mSI|mDI| mR8|mR9|mR10|mR11|mR12|mR13|mR14|mR15;
-#endif
-    allregs = ALLREGS;
@@ -1913 +1915 @@
-#ifdef DEBUG
-            WRTYxx(tym);
-l
+
-                file,line,regcon.mvar,msavereg,*pretregs,*preg,tym);
-#endif
@@ -2478 +2480 @@
-  {
-#if DEBUG
-l
+
-#endif
-        assert(0);

trunk/src/backend/cod1.c

@@ -15 +15 @@
-#include        <stdio.h>
-#include        <string.h>
+#include        <stdlib.h>
-#include        <time.h>
-#include        "cc.h"
@@ -327 +328 @@
-    code *cs2 = *crestore;
-
+    //printf("gensaverestore2(%x)\n", regm);
-    regm &= mBP | mES | ALLREGS;
-    for (int i = 0; regm; i++)
@@ -1666 +1668 @@
-#ifdef DEBUG
-  if (!(regm & (mBP | ALLREGS)))
-l
+
-            regm,tym,saveflag);
-#endif
@@ -2310 +2312 @@
-  keepmsk = 0;
-  if (OTbinary(e->Eoper))               // if parameters
-
-
-
-
-
+
+
-        {
+            c = cat(c, params(e->E2,2));   // push parameters
+        }
+        else if (I32)
+        {
+            unsigned stackalign = REGSIZE;
-            tym_t tyf = tybasic(e->E1->Ety);
-
-
+bytes 
-            switch (tyf)
-            {   case TYf16func:
@@ -2366 +2370 @@
-            {   case TYf16func:
-                    stackalign = 2;
-break
+goto Ldefault2
-                case TYmfunc:   // last parameter goes into ECX
-                    preg = CX;
@@ -2373 +2377 @@
-                    preg = AX;
-                    goto L1;
-
-                L1:
-
+
+
-                    for (ep = e->E2; ep->Eoper == OPparam; ep = en)
-                    {
@@ -2381 +2385 @@
-                        en = ep->E2;
-                        freenode(ep);
-                        ep = en;
-                    }
-                    if (tyf == TYjfunc &&
@@ -2395 +2398 @@
-                    // preg is the register to put the parameter ep in
-                    keepmsk = mask[preg];       // don't change preg when evaluating func address
-
+gm_t re
-                    if (ep->Eoper == OPstrthis)
-                    {   code *c2;
@@ -2412 +2415 @@
-                    }
-                    goto Lret;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    else
@@ -2435 +2562 @@
-Lret:
-    cgstate.stackclean--;
-
+
+
+
-    {
-        if (numpara != stackpush - stackpushsave)
@@ -2441 +2570 @@
-        assert(numpara == stackpush - stackpushsave);
-    }
-    else
-        numpara = stackpush - stackpushsave;
-    return cat(c,funccall(e,numpara,numalign,pretregs,keepmsk));
-}

trunk/src/backend/cod2.c

@@ -3736 +3736 @@
-
-  cs.Iflags = 0;
-I64 ? REX_W : 
+
-  cs.Irex = rex;
-  assert(e->Eoper == OPvar || e->Eoper == OPrelconst);

trunk/src/backend/cod3.c

@@ -1172 +1172 @@
-
-code *prolog()
-   code *c;
+
-    SYMIDX si;
-    unsigned reg;
-    regm_t topush;
-    tym_t tym;
-    tym_t tyf;
-    char enter;
-    char pushds;
-    unsigned farfunc;
-    unsigned Foffset;
-    unsigned xlocalsize;     // amount to subtract from ESP to make room for locals
-    int pushalloc;
-    unsigned pushallocreg;
-    char guessneedframe;
@@ -1192 +1186 @@
-    EBPtoESP = -REGSIZE;
-    hasframe = 0;
-
+char 
-    BPoff = 0;
-
-
-
-
-
+ode *c
+int 
+m_t ty
+_t tym
+unsigned 
-    pushallocreg = (tyf == TYmfunc) ? CX : AX;
-    if (config.flags & CFGalwaysframe || funcsym_p->Sfunc->Fflags3 & Ffakeeh)
@@ -1264 +1258 @@
-    localsize = -Toff;
-
-
+regm_t 
-    int npush = 0;                      // number of registers that need saving
-    for (regm_t x = topush; x; x >>= 1)
@@ -1346 +1340 @@
-    }
-
-
-
+
-    {   int wflags;
-        int segreg;
-
+#if SCPP
-        // alloca() can't be because the 'special' parameter won't be at
-        // a known offset from BP.
-        if (usedalloca == 1)
-            synerr(EM_alloca_win);      // alloca() can't be in Windows functions
+#endif
-
-        wflags = config.wflags;
@@ -1406 +1401 @@
-    }
-    else
-#endif
-    if (needframe)                      // if variables or parameters
-    {
@@ -1660 +1654 @@
-    {   reg = findreg(topush);
-        topush &= ~mask[reg];
-
+
+
+
-        EBPtoESP += REGSIZE;
-#if ELFOBJ || MACHOBJ
@@ -1913 +1909 @@
-    while (topop)
-    {   if (topop & regm)
-reg
+(reg & 7)
-            if (reg & 8)
-                code_orrex(c, REX_B);
@@ -4348 +4344 @@
-void addtofixlist(symbol *s,targ_size_t soffset,int seg,targ_size_t val,int flags)
-{       fixlist *ln;
-6
+8
-        int numbytes;
-
@@ -4884 +4880 @@
-                case FLconst:
-                case FLoffset:
-l
+
-                    break;
-                case FLblock:
@@ -4919 +4915 @@
-        {
-            case FLconst:
-l
+
-                break;
-            case FLblock:

trunk/src/backend/el.h

@@ -44 +44 @@
-    unsigned char Ecount;       // # of parents of this elem - 1,
-                                // always 0 until CSE elimination is done
+    unsigned char Eflags;
+    #define EFLAGS_variadic 1   // variadic function call
+
-    union eve EV;               // variants for each type of elem
-    union

trunk/src/backend/elfobj.c

@@ -2719 +2719 @@
-void obj_moduleinfo(Symbol *scc)
-{
+//    if (I64) return;          // for now, until Phobos64 works
+
-    int codeOffset, refOffset;
-
@@ -2735 +2737 @@
-        SegData[seg]->SDbuf->writezeros(NPTRSIZE);
-        SegData[seg]->SDoffset += NPTRSIZE;
-
-
+
-    }
-
@@ -2764 +2765 @@
-        buf->writeByte(0xC3); /* ret */
-
-
+
+
+
+
+
-
-        /* movl ModuleReference*, %eax */
-        buf->writeByte(0xB8);
-        buf->write32(refOffset);
-2
+off + 1
-
-        /* movl _Dmodule_ref, %ecx */
-        buf->writeByte(0xB9);
-        buf->write32(0);
-7
+off + 6
-
-        buf->writeByte(0x8B); buf->writeByte(0x11); /* movl (%ecx), %edx */
@@ -2780 +2785 @@
-        buf->writeByte(0x89); buf->writeByte(0x01); /* movl %eax, (%ecx) */
-
-buf->writeByte(0x61); /* popad */
+if (I32) buf->writeByte(0x61); // POPAD
-        buf->writeByte(0xC3); /* ret */
-        SegData[seg]->SDoffset = buf->size();

trunk/src/backend/symbol.c

@@ -364 +364 @@
-void symbol_func(symbol *s)
-{
+    //printf("symbol_func(%s, x%x)\n", s->Sident, fregsaved);
-    symbol_debug(s);
-    s->Sfl = FLfunc;
@@ -370 +371 @@
-    // BUG: do interrupt functions really save BP?
-    #define mBP 0x20
+    // Note that fregsaved may not be set yet
-    s->Sregsaved = (s->Stype && tybasic(s->Stype->Tty) == TYifunc) ? mBP : fregsaved;
-    s->Sseg = UNKNOWN;          // don't know what segment it is in

trunk/src/backend/ty.h

@@ -198 +198 @@
-#define tyreal(ty)      (tytab[(ty) & 0xFF] & TYFLreal)
-
+// Fits into 64 bit register
+#define ty64reg(ty)     (tytab[(ty) & 0xFF] & (TYFLintegral | TYFLptr))
+
-#ifndef tyshort
-/* Types that are chars or shorts       */

trunk/src/e2ir.c

@@ -287 +287 @@
-    }
-    else if (ep)
- 
+{
-         * as the return value is stored through the hidden parameter, which
-         * is a side effect.
@@ -293 +293 @@
-        e = el_bin((tf->ispure && tf->isnothrow && (retmethod != RETstack)) ?
-                OPcallns : OPcall,tyret,ec,ep);
+        if (tf->varargs)
+            e->Eflags |= EFLAGS_variadic;
+    }
-    else
- 
+{
-                OPucallns : OPucall,tyret,ec);
+        if (tf->varargs)
+            e->Eflags |= EFLAGS_variadic;
+    }
-
-    if (retmethod == RETstack)
@@ -2078 +2084 @@
-                           NULL);
-            e = el_bin(OPcall, TYdarray, el_var(rtlsym[RTLSYM_ARRAYCATNT]), ep);
+            e->Eflags |= EFLAGS_variadic;
-#else
-            ep = el_params(
@@ -2085 +2092 @@
-                           NULL);
-            e = el_bin(OPcall, TYdarray, el_var(rtlsym[RTLSYM_ARRAYCATN]), ep);
+            e->Eflags |= EFLAGS_variadic;
-#endif
-        }
@@ -4563 +4571 @@
-    // call _d_arrayliteralT(ti, dim, ...)
-    e = el_bin(OPcall,TYnptr,el_var(rtlsym[RTLSYM_ARRAYLITERALT]),e);
+    e->Eflags |= EFLAGS_variadic;
-#else
-    e = el_param(e, el_long(TYint, tb->next->size()));
@@ -4568 +4577 @@
-    // call _d_arrayliteral(size, dim, ...)
-    e = el_bin(OPcall,TYnptr,el_var(rtlsym[RTLSYM_ARRAYLITERAL]),e);
+    e->Eflags |= EFLAGS_variadic;
-#endif
-    if (tb->ty == Tarray)
@@ -4637 +4647 @@
-    // call _d_assocarrayliteralT(ti, dim, ...)
-    e = el_bin(OPcall,TYnptr,el_var(rtlsym[RTLSYM_ASSOCARRAYLITERALT]),e);
+    e->Eflags |= EFLAGS_variadic;
-
-    el_setLoc(e,loc);

trunk/src/msc.c

@@ -41 +41 @@
-void out_config_init()
-{
+    //printf("out_config_init()\n");
-    Param *params = &global.params;
-