Changeset 619

Timestamp:

08/17/10 19:39:11 (14 years ago)

Author:

walter

Message:

more 64 bits

Files:

• branches/dmd-1.x/src/backend/cgcod.c (modified) (3 diffs)
• branches/dmd-1.x/src/backend/cod1.c (modified) (3 diffs)
• branches/dmd-1.x/src/backend/cod3.c (modified) (2 diffs)
• branches/dmd-1.x/src/backend/ptrntab.c (modified) (3 diffs)
• branches/dmd-1.x/src/mtype.c (modified) (1 diff)
• branches/dmd-1.x/src/mtype.h (modified) (1 diff)
• trunk/src/backend/cgcod.c (modified) (3 diffs)
• trunk/src/backend/cod1.c (modified) (3 diffs)
• trunk/src/backend/cod3.c (modified) (2 diffs)
• trunk/src/backend/ptrntab.c (modified) (3 diffs)
• trunk/src/mtype.c (modified) (1 diff)
• trunk/src/mtype.h (modified) (1 diff)

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

@@ -124 +124 @@
-
-    //printf("codgen('%s')\n",funcsym_p->Sident);
-
-    cgreg_init();
-    csmax = 64;
-    csextab = (struct CSE *) util_calloc(sizeof(struct CSE),csmax);
-    functy = tybasic(funcsym_p->ty());
-#if TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_SOLARIS
-    if (0 && config.flags3 & CFG3pic)
-    {
-        ALLREGS = ALLREGS_INIT_PIC;
-        BYTEREGS = BYTEREGS_INIT_PIC;
-    }
-    else
-    {
-        regm_t value = BYTEREGS_INIT;
-        ALLREGS = ALLREGS_INIT;
-        BYTEREGS = value;
-    }
-    if (I64)
-
+
+
+
-#endif
-    allregs = ALLREGS;
-    if (0 && config.flags3 & CFG3pic)
-        allregs &= ~mBX;
-    pass = PASSinit;
-
-tryagain:
-    #ifdef DEBUG
-    if (debugr)
-        printf("------------------ PASS%s -----------------\n",
-            (pass == PASSinit) ? "init" : ((pass == PASSreg) ? "reg" : "final"));
-    #endif
-    lastretregs = last2retregs = last3retregs = last4retregs = last5retregs = 0;
-
-    // if no parameters, assume we don't need a stack frame
-    needframe = 0;
-    usedalloca = 0;
-    gotref = 0;
-    stackchanged = 0;
-    stackpush = 0;
@@ -2278 +2280 @@
-                regcon.immed.mval | regcon.params | mfuncreg);
-    }
-    return scratch;
-}
-
-
-/******************************
- * Evaluate an elem that is a common subexp that has been encountered
- * before.
- * Look first to see if it is already in a register.
- */
-
-STATIC code * comsub(elem *e,regm_t *pretregs)
-{   tym_t tym;
-    regm_t regm,emask,csemask;
-    unsigned reg,i,byte,sz;
-    code *c;
-    int forcc;                  // !=0 if we evaluate for condition codes
-    int forregs;                // !=0 if we evaluate into registers
-
-x%x)\n",e,*pretregs
+%s)\n",e,regm_str(*pretregs)
-    elem_debug(e);
-#ifdef DEBUG
-    if (e->Ecomsub > e->Ecount)
-        elem_print(e);
-#endif
-    assert(e->Ecomsub <= e->Ecount);
-
-  c = CNIL;
-  if (*pretregs == 0) goto done;        /* no possible side effects anyway */
-
-    if (tyfloating(e->Ety) && config.inline8087)
-        return comsub87(e,pretregs);
-
-  /* First construct a mask, emask, of all the registers that   */
-  /* have the right contents.                                   */
-
-  emask = 0;
-  for (i = 0; i < arraysize(regcon.cse.value); i++)
-  {
-        //dbg_printf("regcon.cse.value[%d] = %p\n",i,regcon.cse.value[i]);
@@ -2566 +2568 @@
- *                      Note:   longs are in AX,BX or CX,DX or SI,DI
- *                              doubles are AX,BX,CX,DX only
- *      constflag       TRUE if user of result will not modify the
- *                      registers returned in *pretregs.
- * Output:
- *      *pretregs       mask of registers result is returned in
- * Returns:
- *      pointer to code sequence generated
- */
-
-#include "cdxxx.c"                      /* jump table                   */
-
-code *codelem(elem *e,regm_t *pretregs,bool constflag)
-{ code *c;
-  Symbol *s;
-  tym_t tym;
-  unsigned op;
-
-#ifdef DEBUG
-  if (debugw)
-x%x) ",e,*pretregs
+%s) ",e,regm_str(*pretregs)
-        WROP(e->Eoper);
-        printf("msavereg=x%x regcon.cse.mval=x%x regcon.cse.mops=x%x\n",
-                msavereg,regcon.cse.mval,regcon.cse.mops);
-        printf("Ecount = %d, Ecomsub = %d\n", e->Ecount, e->Ecomsub);
-  }
-#endif
-  assert(e);
-  elem_debug(e);
-  if ((regcon.cse.mops & regcon.cse.mval) != regcon.cse.mops)
-  {
-#ifdef DEBUG
-        printf("+codelem(e=%p,*pretregs=x%x) ",e,*pretregs);
-        elem_print(e);
-        printf("msavereg=x%x regcon.cse.mval=x%x regcon.cse.mops=x%x\n",
-                msavereg,regcon.cse.mval,regcon.cse.mops);
-        printf("Ecount = %d, Ecomsub = %d\n", e->Ecount, e->Ecomsub);
-#endif
-        assert(0);
-  }
-

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

@@ -596 +596 @@
-        }
-        for (unsigned i = 0; rm; i++)
-        {       if (mask[i] & rm)
-                {       if (regcon.cse.value[i] == e && // if register has elem
-                            /* watch out for a CWD destroying DX        */
-                            !(i == DX && op == 0xF7 && desmsk & mDX))
-                        {
-                                /* if ES, then it can only be a load    */
-                                if (i == ES)
-                                {       if (op != 0x8B)
-                                            goto L1;    /* not a load   */
-                                        cs->Iop = 0x8C; /* MOV reg,ES   */
-                                        cs->Irm = modregrm(3,0,reg & 7);
-                                        if (reg & 8)
-                                            code_orrex(cs, REX_B);
-                                }
-                                else    // XXX reg,i
-                                {
-                                    cs->Irm = modregrm(3,reg & 7,i & 7);
-                                    if (reg & 8)
-ode_orrex(cs, REX_R)
+s->Irex |= REX_R
-                                    if (i & 8)
-ode_orrex(cs, REX_B)
+s->Irex |= REX_B
-                                }
-                                c = CNIL;
-                                goto L2;
-                        }
-                        rm &= ~mask[i];
-                }
-        }
-  }
-
-L1:
-  c = getlvalue(cs,e,keepmsk);
-  if (offset == REGSIZE)
-        getlvalue_msw(cs);
-  else
-        cs->IEVoffset1 += offset;
-  code_newreg(cs, reg);                         // OR in reg field
-  if (!I16)
-  {
-      if (reg == 6 && op == 0xFF ||             /* don't PUSH a word    */
-          op == 0x0FB7 || op == 0x0FBF ||       /* MOVZX/MOVSX          */
@@ -1108 +1107 @@
-                break;
-            case TYsptr:                        /* if pointer to stack  */
-                if (config.wflags & WFssneds)   // if SS != DS
-                    pcs->Iflags |= CFss;        /* then need SS: override */
-                break;
-            case TYcptr:                        /* if pointer to code   */
-                pcs->Iflags |= CFcs;            /* then need CS: override */
-                break;
-        }
-#endif
-        pcs->IFL1 = FLoffset;
-        pcs->IEV1.Vuns = 0;
-
-        /* see if we can replace *(e+c) with
-         *      MOV     idxreg,e
-         *      [MOV    ES,segment]
-         *      EA =    [ES:]c[idxreg]
-         */
-
-        if (e1isadd && e12->Eoper == OPconst &&
-tysize(e12->Ety) == REGSIZE
+(tysize(e12->Ety) == REGSIZE || (I64 && tysize(e12->Ety) == 4))
-            (!e1->Ecount || !e1free)
-           )
-        {   int ss;
-
-            pcs->IEV1.Vuns = e12->EV.Vuns;
-            freenode(e12);
-            if (e1free) freenode(e1);
-I32
+!I16
-                tysize(e11->Ety) == REGSIZE)
-            {
-                e12 = e11->E2;
-                e11 = e11->E1;
-                e1 = e1->E1;
-                e1free = TRUE;
-                goto L4;
-            }
-            if (!I16 && (ss = isscaledindex(e11)) != 0)
-            {   // (v * scale) + const
-                c = cdisscaledindex(e11,&idxregs,keepmsk);
-                reg = findreg(idxregs);
-                pcs->Irm = modregrm(0,0,4);
-                pcs->Isib = modregrm(ss,reg & 7,5);
-                if (reg & 8)
-                    pcs->Irex |= REX_X;
-            }
-            else
-            {
-                c = scodelem(e11,&idxregs,keepmsk,TRUE); // load index reg
@@ -1409 +1408 @@
-}
-
-/*******************************
- * Same as codelem(), but do not destroy the registers in keepmsk.
- * Use scratch registers as much as possible, then use stack.
- * Input:
- *      constflag       TRUE if user of result will not modify the
- *                      registers returned in *pretregs.
- */
-
-code *scodelem(elem *e,regm_t *pretregs,regm_t keepmsk,bool constflag)
-{ code *c,*cs1,*cs2,*cs3;
-  unsigned i,j;
-  regm_t oldmfuncreg,oldregcon,oldregimmed,overlap,tosave,touse;
-  int adjesp;
-  unsigned stackpushsave;
-  char calledafuncsave;
-
-#ifdef DEBUG
-  if (debugw)
-x%x keepmsk=x%x
-*pretregs,keepmsk
+%s keepmsk=%s
+regm_str(*pretregs),regm_str(keepmsk)
-#endif
-  elem_debug(e);
-  if (constflag)
-  {     regm_t regm;
-        unsigned reg;
-
-        if (isregvar(e,&regm,&reg) &&           // if e is a register variable
-            (regm & *pretregs) == regm &&       // in one of the right regs
-            e->EV.sp.Voffset == 0
-           )
-
-
-
-
+
+
+
-                if (sz1 <= REGSIZE && sz2 > REGSIZE)
-                    regm &= mLSW;
-                c = fixresult(e,regm,pretregs);
-                cssave(e,regm,0);
-                freenode(e);
-#ifdef DEBUG
-                if (debugw)
-                    printf("-scodelem(e=%p *pretregs=x%x keepmsk=x%x constflag=%d\n",
-                            e,*pretregs,keepmsk,constflag);
-#endif
-                return c;
-        }
-  }
-  overlap = msavereg & keepmsk;
-  msavereg |= keepmsk;          /* add to mask of regs to save          */
-  oldregcon = regcon.cse.mval;
-  oldregimmed = regcon.immed.mval;
-  oldmfuncreg = mfuncreg;       /* remember old one                     */
-  mfuncreg = (mBP | mES | ALLREGS) & ~regcon.mvar;
-  stackpushsave = stackpush;

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

@@ -3645 +3645 @@
-        // If the instruction has a second operand that is not an 8 bit,
-        // and the operand size prefix is present, then fix the size computation
-        // because the operand size will be different.
-        // Walter, I had problems with this bit at the end.  There can still be
-        // an ADDRSIZE prefix for these and it does indeed change the operand size.
-
-        if (iflags & (CFopsize | CFaddrsize))
-        {
-            if ((ins & (T|E)) == T)
-            {
-                if ((op & 0xAC) == 0xA0)
-                {
-                    if (iflags & CFaddrsize && !I64)
-                    {   if (I32)
-                            size -= 2;
-                        else
-                            size += 2;
-                    }
-                }
-                else if (iflags & CFopsize)
-
+
+
+
-                        size -= 2;
-                    else
-                        size += 2;
-                }
-            }
-            if (iflags & CFaddrsize)
-            {   if (!I64)
-                    a32 ^= 1;
-                size++;
-            }
-            if (iflags & CFopsize)
-                size++;                         /* +1 for OPSIZE prefix         */
-        }
-    }
-
-    if ((op & ~0x0F) == 0x70)
-    {   if (iflags & CFjmp16)           // if long branch
-            size += I16 ? 3 : 4;        // + 3(4) bytes for JMP
-    }
-    else if (ins & M)                   // if modregrm byte
-    {
-        rm = c->Irm;
-        mod = rm & 0xC0;
@@ -5002 +5002 @@
-        ;
-        pc = &code_next(c);
-    }
-}
-#endif
-
-
-/***************************
- * Debug code to dump code stucture.
- */
-
-#if DEBUG
-
-void WRcodlst(code *c)
-{ for (; c; c = code_next(c))
-        c->print();
-}
-
-void code::print()
-{
-
-
-
-
-
-
+
+
+
+
+
-        return;
-
-
-
+  
+
+
-    if ((c->Iop & 0xFF00) == 0x0F00)
-        ins = inssize2[op & 0xFF];
-    else
-        ins = inssize[op & 0xFF];
-
-
+
+
+
+
+
-  if ((op & 0xFF) == ESCAPE)
-  {     if ((op & 0xFF00) == ESClinnum)
-        {   printf(" linnum = %d\n",c->IEV2.Vsrcpos.Slinnum);
-            return;
-        }
-        printf(" ESCAPE %d",c->Iop >> 8);
-  }
-  if (c->Iflags)
-        printf(" flg=%x",c->Iflags);
-  if (ins & M)
-
+unsigned 
-        printf(" rm=%02x=%d,%d,%d",rm,(rm>>6)&3,(rm>>3)&7,rm&7);
-        if (I32 && issib(rm))
-        {   unsigned char sib = c->Isib;
-            printf(" sib=%02x=%d,%d,%d",sib,(sib>>6)&3,(sib>>3)&7,sib&7);
-        }
-        if ((rm & 0xC7) == BPRM || (rm & 0xC0) == 0x80 || (rm & 0xC0) == 0x40)
-        {
-            switch (c->IFL1)
-            {
-                case FLconst:
-                case FLoffset:
-                    printf(" int = %4d",c->IEV1.Vuns);
-                    break;
-                case FLblock:
-                    printf(" block = %p",c->IEV1.Vblock);
-                    break;
-                case FLswitch:
-                case FLblockoff:
-                case FLlocalsize:
-                case FLframehandler:

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

@@ -809 +809 @@
-};
-PTRNTAB2  aptb2CMPS[] = /* CMPS */ {
-        { 0xa6, _modsidi,               _m8,    _m8 },
-        { 0xa7, _modsidi,       _m16,   _m16 },
-        { 0xa7, _modsidi,       _m32,   _m32 },
-        { ASM_END, 0, 0, 0 }
-};
-PTRNTAB2  aptb2CMPXCHG[] = /* CMPXCHG */ {
-        { 0xfb0, _I386 | _cb|_mod2,     _rm8,   _r8 },
-                                                // This is really a 486 only
-                                                // instruction
-        { 0xfb1, _I386 | _cw | _16_bit|_mod2,   _rm16,  _r16 },
-        { 0xfb1, _I386 | _cd | _32_bit|_mod2,   _rm32,  _r32 },
-        { 0xfb1, _I386 | _cq | _64_bit|_mod2,   _rm64,  _r64 },
-        { ASM_END, 0, 0, 0 }
-};
-PTRNTAB2  aptb2DIV[] = /* DIV */ {
-        { 0xf6, _6,                     _al,            _rm8 },
-        { 0xf7, _6 | _16_bit | _moddx,          _ax,            _rm16 },
-        { 0xf7, _6 | _32_bit | _moddx,          _eax,           _rm32 },
+        { 0xf7, _6 | _64_bit | _moddx,          _rax,           _rm64 },
-        { 0xf6, _6 | _modax,                    _rm8,           0 },
-
-
+
+
+
-        { ASM_END, 0, 0, 0 }
-};
-PTRNTAB2  aptb2ENTER[] = /* ENTER */ {
-        { 0xc8, _iw|_ib,        _imm16, _imm8 },
-        { ASM_END, 0, 0, 0 }
-};
-PTRNTAB2  aptb2IDIV[] = /* IDIV */ {
-        { 0xf6, _7,                     _al,            _rm8 },
-
-
-
+
+
+
+
-        { 0xf7, _7|_16_bit|_modaxdx,    _rm16,          0 },
-        { 0xf7, _7|_32_bit|_modaxdx,    _rm32,          0 },
+        { 0xf7, _7|_64_bit|_modaxdx,    _rm64,          0 },
-        { ASM_END, 0, 0, 0 }
-};
-PTRNTAB2  aptb2IN[] = /* IN */ {
-        { 0xe4, _ib,        _al,                _imm8 },
-        { 0xe5, _ib|_16_bit,_ax,                _imm8 },
-        { 0xe5, _ib|_32_bit,_eax,       _imm8 },
-        { 0xec, 0,          _al,                _dx },
-        { 0xed, _16_bit,    _ax,                _dx },
-        { 0xed, _32_bit,    _eax,       _dx },
-        { ASM_END, 0, 0, 0 }
-};
-PTRNTAB2  aptb2INS[] = /* INS */ {
-        { 0x6c, _modsi, _rm8, _dx },
-        { 0x6d, _modsi|_16_bit, _rm16, _dx },
-        { 0x6d, _32_bit|_modsi, _rm32, _dx },
-        { ASM_END, 0, 0, 0 }
-};
-
-PTRNTAB2  aptb2LAR[] = /* LAR */ {
-        { 0x0f02,       _r|_16_bit,                     _r16,   _rm16 },
@@ -958 +962 @@
-#else
-        { 0x0fbf,       _r,                     _r32,   _rm16 },
-#endif
-        { ASM_END, 0, 0, 0 }
-};
-PTRNTAB2  aptb2MOVZX[] = /* MOVZX */ {
-        { 0x0fb6,       _r|_16_bit,                     _r16,   _rm8 },
-        { 0x0fb6,       _r|_32_bit,                     _r32,   _rm8 },
-#if 1
-        { 0x0fb7,       _r|_16_bit,             _r16,   _rm16 },
-        { 0x0fb7,       _r|_32_bit,             _r32,   _rm16 },
-#else
-        { 0x0fb7,       _r,                     _r32,   _rm16 },
-#endif
-        { ASM_END, 0, 0, 0 }
-};
-PTRNTAB2  aptb2MUL[] = /* MUL */ {
-        { 0xf6, _4,                     _al,    _rm8 },
-        { 0xf7, _4|_16_bit|_moddx,      _ax,    _rm16 },
-        { 0xf7, _4|_32_bit|_moddx,      _eax,   _rm32 },
+        { 0xf7, _4|_64_bit|_moddx,      _rax,   _rm64 },
-        { 0xf6, _4|_modax,              _rm8,   0 },
-        { 0xf7, _4|_16_bit|_modaxdx,    _rm16,  0 },
-        { 0xf7, _4|_32_bit|_modaxdx,    _rm32,  0 },
+        { 0xf7, _4|_64_bit|_modaxdx,    _rm64,  0 },
-        { ASM_END, 0, 0, 0 }
-};
-PTRNTAB2  aptb2OR[] = /* OR */ {
-        { 0x0c, _ib,            _al,    _imm8 },
-        { 0x83, _1|_ib|_16_bit,         _rm16,  _imm8 },
-        { 0x0d, _iw|_16_bit,            _ax,    _imm16 },
-        { 0x83, _1|_ib|_32_bit,         _rm32,  _imm8 },
-        { 0x0d, _id|_32_bit,            _eax,   _imm32 },
-        { 0x80, _1|_ib,         _rm8,   _imm8 },
-        { 0x81, _1|_iw|_16_bit,         _rm16,  _imm16 },
-        { 0x81, _1|_id|_32_bit,         _rm32,  _imm32 },
-        { 0x08, _r,                     _rm8,   _r8 },
-        { 0x09, _r|_16_bit,                     _rm16,  _r16 },
-        { 0x09, _r|_32_bit,                     _rm32,  _r32 },
-        { 0x0a, _r,                     _r8,    _rm8 },
-        { 0x0b, _r|_16_bit,                     _r16,   _rm16 },
-        { 0x0b, _r|_32_bit,                     _r32,   _rm32 },
-        { ASM_END, 0, 0, 0 }
-};
-PTRNTAB2  aptb2OUT[] = {
@@ -1263 +1269 @@
-};
-PTRNTAB2  aptb2CMOVNL[] = {
-        { 0x0F4D, _r|_16_bit,   _r16,   _rm16 },
-        { 0x0F4D, _r|_32_bit,   _r32,   _rm32 },
-        { ASM_END, 0, 0, 0 }
-};
-PTRNTAB2  aptb2CMOVLE[] = {
-        { 0x0F4E, _r|_16_bit,   _r16,   _rm16 },
-        { 0x0F4E, _r|_32_bit,   _r32,   _rm32 },
-        { ASM_END, 0, 0, 0 }
-};
-PTRNTAB2  aptb2CMOVNLE[] = {
-        { 0x0F4F, _r|_16_bit,   _r16,   _rm16 },
-        { 0x0F4F, _r|_32_bit,   _r32,   _rm32 },
-        { ASM_END, 0, 0, 0 }
-};
-
-PTRNTAB3  aptb3IMUL[] = /* IMUL */ {
-        { 0x0faf,       _r|_16_bit,             _r16,   _rm16, 0 },
-        { 0x0faf,       _r|_32_bit,             _r32,   _rm32, 0 },
+        { 0x0faf,       _r|_64_bit,             _r64,   _rm64, 0 },
-        { 0xf6, _5|_modax,                      _rm8,   0, 0 },
-        { 0xf7, _5|_16_bit|_modaxdx,            _rm16,  0, 0 },
-        { 0xf7, _5|_32_bit|_modaxdx,            _rm32,  0, 0 },
+        { 0xf7, _5|_64_bit|_modaxdx,            _rm64,  0, 0 },
-        { 0x6b, _r|_ib|_16_bit,         _r16,   _imm8, 0 },
-        { 0x6b, _r|_ib|_32_bit,         _r32,   _imm8, 0 },
-        { 0x69, _r|_iw|_16_bit,         _r16,   _imm16, 0 },
-        { 0x69, _r|_id|_32_bit,         _r32,   _imm32, 0 },
+        { 0x69, _r|_id|_64_bit,         _r64,   _imm32, 0 },
-        { 0x6b, _r|_ib|_16_bit,         _r16,   _rm16,  _imm8 },
-        { 0x6b, _r|_ib|_32_bit,         _r32,   _rm32,  _imm8 },
+        { 0x6b, _r|_ib|_64_bit,         _r64,   _rm64,  _imm8 },
-        { 0x69, _r|_iw|_16_bit,         _r16,   _rm16,  _imm16 },
-        { 0x69, _r|_id|_32_bit,         _r32,   _rm32,  _imm32 },
+        { 0x69, _r|_id|_64_bit,         _r64,   _rm64,  _imm32 },
-        { ASM_END, 0, 0, 0 }
-};
-PTRNTAB3  aptb3SHLD[] = /* SHLD */ {
-        { 0x0fa4,       _cw|_16_bit, _rm16, _r16, _imm8 },
-        { 0x0fa4,       _cd|_32_bit, _rm32, _r32, _imm8 },
-        { 0x0fa5,       _cw|_16_bit, _rm16, _r16, _cl },
-        { 0x0fa5,       _cd|_32_bit, _rm32, _r32, _cl },
-        { ASM_END, 0, 0, 0 }
-};
-PTRNTAB3  aptb3SHRD[] = /* SHRD */ {
-        { 0x0fac,       _cw|_16_bit, _rm16, _r16, _imm8 },
-        { 0x0fac,       _cd|_32_bit, _rm32, _r32, _imm8 },
-        { 0x0fad,       _cw|_16_bit, _rm16, _r16, _cl },
-        { 0x0fad,       _cd|_32_bit, _rm32, _r32, _cl },
-        { ASM_END, 0, 0, 0 }
-};
-//
-// Floating point instructions which have entirely different flag
-// interpretations
-//

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

@@ -3105 +3105 @@
-        t = this;
-    else
-        t = new TypeDelegate(t);
-    return t;
-}
-
-Type *TypeDelegate::semantic(Loc loc, Scope *sc)
-{
-    if (deco)                   // if semantic() already run
-    {
-        //printf("already done\n");
-        return this;
-    }
-    next = next->semantic(loc,sc);
-    return merge();
-}
-
-d_uns64 TypeDelegate::size(Loc loc)
-{
-    return PTRSIZE * 2;
+}
+
+unsigned TypeDelegate::alignsize()
+{
+    // See Bugzilla 942 for discussion
+#if 0
+    return PTRSIZE;
+#else
+    return PTRSIZE * 2;
+#endif
-}
-
-void TypeDelegate::toCBuffer2(OutBuffer *buf, HdrGenState *hgs, int mod)
-{
-    if (mod != this->mod)
-    {   toCBuffer3(buf, hgs, mod);
-        return;
-    }
-    TypeFunction *tf = (TypeFunction *)next;
-
-    tf->next->toCBuffer2(buf, hgs, 0);
-    buf->writestring(" delegate");
-    Parameter::argsToCBuffer(buf, hgs, tf->parameters, tf->varargs);
-}
-
-Expression *TypeDelegate::defaultInit(Loc loc)
-{
-#if LOGDEFAULTINIT
-    printf("TypeDelegate::defaultInit() '%s'\n", toChars());
-#endif

branches/dmd-1.x/src/mtype.h

@@ -465 +465 @@
-    void toDecoBuffer(OutBuffer *buf);
-    void toCBuffer(OutBuffer *buf, Identifier *ident, HdrGenState *hgs);
-    void toCBuffer2(OutBuffer *buf, HdrGenState *hgs, int mod);
-    MATCH deduceType(Scope *sc, Type *tparam, TemplateParameters *parameters, Objects *dedtypes);
-    TypeInfoDeclaration *getTypeInfoDeclaration();
-    Type *reliesOnTident();
-
-    int callMatch(Expressions *toargs);
-    type *toCtype();
-    enum RET retStyle();
-
-    unsigned totym();
-};
-
-struct TypeDelegate : Type
-{
-    TypeDelegate(Type *t);
-    Type *syntaxCopy();
-    Type *semantic(Loc loc, Scope *sc);
-    d_uns64 size(Loc loc);
+    unsigned alignsize();
-    void toCBuffer2(OutBuffer *buf, HdrGenState *hgs, int mod);
-    Expression *defaultInit(Loc loc);
-    int isZeroInit(Loc loc);
-    int checkBoolean();
-    TypeInfoDeclaration *getTypeInfoDeclaration();
-    Expression *dotExp(Scope *sc, Expression *e, Identifier *ident);
-    int hasPointers();
-
-    type *toCtype();
-};
-
-struct TypeQualified : Type
-{
-    Loc loc;
-    Array idents;       // array of Identifier's representing ident.ident.ident etc.
-
-    TypeQualified(TY ty, Loc loc);
-    void syntaxCopyHelper(TypeQualified *t);
-    void addIdent(Identifier *ident);
-    void toCBuffer2Helper(OutBuffer *buf, HdrGenState *hgs);

trunk/src/backend/cgcod.c

@@ -124 +124 @@
-
-    //printf("codgen('%s')\n",funcsym_p->Sident);
-
-    cgreg_init();
-    csmax = 64;
-    csextab = (struct CSE *) util_calloc(sizeof(struct CSE),csmax);
-    functy = tybasic(funcsym_p->ty());
-#if TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_SOLARIS
-    if (0 && config.flags3 & CFG3pic)
-    {
-        ALLREGS = ALLREGS_INIT_PIC;
-        BYTEREGS = BYTEREGS_INIT_PIC;
-    }
-    else
-    {
-        regm_t value = BYTEREGS_INIT;
-        ALLREGS = ALLREGS_INIT;
-        BYTEREGS = value;
-    }
-    if (I64)
-
+
+
+
-#endif
-    allregs = ALLREGS;
-    if (0 && config.flags3 & CFG3pic)
-        allregs &= ~mBX;
-    pass = PASSinit;
-
-tryagain:
-    #ifdef DEBUG
-    if (debugr)
-        printf("------------------ PASS%s -----------------\n",
-            (pass == PASSinit) ? "init" : ((pass == PASSreg) ? "reg" : "final"));
-    #endif
-    lastretregs = last2retregs = last3retregs = last4retregs = last5retregs = 0;
-
-    // if no parameters, assume we don't need a stack frame
-    needframe = 0;
-    usedalloca = 0;
-    gotref = 0;
-    stackchanged = 0;
-    stackpush = 0;
@@ -2278 +2280 @@
-                regcon.immed.mval | regcon.params | mfuncreg);
-    }
-    return scratch;
-}
-
-
-/******************************
- * Evaluate an elem that is a common subexp that has been encountered
- * before.
- * Look first to see if it is already in a register.
- */
-
-STATIC code * comsub(elem *e,regm_t *pretregs)
-{   tym_t tym;
-    regm_t regm,emask,csemask;
-    unsigned reg,i,byte,sz;
-    code *c;
-    int forcc;                  // !=0 if we evaluate for condition codes
-    int forregs;                // !=0 if we evaluate into registers
-
-x%x)\n",e,*pretregs
+%s)\n",e,regm_str(*pretregs)
-    elem_debug(e);
-#ifdef DEBUG
-    if (e->Ecomsub > e->Ecount)
-        elem_print(e);
-#endif
-    assert(e->Ecomsub <= e->Ecount);
-
-  c = CNIL;
-  if (*pretregs == 0) goto done;        /* no possible side effects anyway */
-
-    if (tyfloating(e->Ety) && config.inline8087)
-        return comsub87(e,pretregs);
-
-  /* First construct a mask, emask, of all the registers that   */
-  /* have the right contents.                                   */
-
-  emask = 0;
-  for (i = 0; i < arraysize(regcon.cse.value); i++)
-  {
-        //dbg_printf("regcon.cse.value[%d] = %p\n",i,regcon.cse.value[i]);
@@ -2566 +2568 @@
- *                      Note:   longs are in AX,BX or CX,DX or SI,DI
- *                              doubles are AX,BX,CX,DX only
- *      constflag       TRUE if user of result will not modify the
- *                      registers returned in *pretregs.
- * Output:
- *      *pretregs       mask of registers result is returned in
- * Returns:
- *      pointer to code sequence generated
- */
-
-#include "cdxxx.c"                      /* jump table                   */
-
-code *codelem(elem *e,regm_t *pretregs,bool constflag)
-{ code *c;
-  Symbol *s;
-  tym_t tym;
-  unsigned op;
-
-#ifdef DEBUG
-  if (debugw)
-x%x) ",e,*pretregs
+%s) ",e,regm_str(*pretregs)
-        WROP(e->Eoper);
-        printf("msavereg=x%x regcon.cse.mval=x%x regcon.cse.mops=x%x\n",
-                msavereg,regcon.cse.mval,regcon.cse.mops);
-        printf("Ecount = %d, Ecomsub = %d\n", e->Ecount, e->Ecomsub);
-  }
-#endif
-  assert(e);
-  elem_debug(e);
-  if ((regcon.cse.mops & regcon.cse.mval) != regcon.cse.mops)
-  {
-#ifdef DEBUG
-        printf("+codelem(e=%p,*pretregs=x%x) ",e,*pretregs);
-        elem_print(e);
-        printf("msavereg=x%x regcon.cse.mval=x%x regcon.cse.mops=x%x\n",
-                msavereg,regcon.cse.mval,regcon.cse.mops);
-        printf("Ecount = %d, Ecomsub = %d\n", e->Ecount, e->Ecomsub);
-#endif
-        assert(0);
-  }
-

trunk/src/backend/cod1.c

@@ -596 +596 @@
-        }
-        for (unsigned i = 0; rm; i++)
-        {       if (mask[i] & rm)
-                {       if (regcon.cse.value[i] == e && // if register has elem
-                            /* watch out for a CWD destroying DX        */
-                            !(i == DX && op == 0xF7 && desmsk & mDX))
-                        {
-                                /* if ES, then it can only be a load    */
-                                if (i == ES)
-                                {       if (op != 0x8B)
-                                            goto L1;    /* not a load   */
-                                        cs->Iop = 0x8C; /* MOV reg,ES   */
-                                        cs->Irm = modregrm(3,0,reg & 7);
-                                        if (reg & 8)
-                                            code_orrex(cs, REX_B);
-                                }
-                                else    // XXX reg,i
-                                {
-                                    cs->Irm = modregrm(3,reg & 7,i & 7);
-                                    if (reg & 8)
-ode_orrex(cs, REX_R)
+s->Irex |= REX_R
-                                    if (i & 8)
-ode_orrex(cs, REX_B)
+s->Irex |= REX_B
-                                }
-                                c = CNIL;
-                                goto L2;
-                        }
-                        rm &= ~mask[i];
-                }
-        }
-  }
-
-L1:
-  c = getlvalue(cs,e,keepmsk);
-  if (offset == REGSIZE)
-        getlvalue_msw(cs);
-  else
-        cs->IEVoffset1 += offset;
-  code_newreg(cs, reg);                         // OR in reg field
-  if (!I16)
-  {
-      if (reg == 6 && op == 0xFF ||             /* don't PUSH a word    */
-          op == 0x0FB7 || op == 0x0FBF ||       /* MOVZX/MOVSX          */
@@ -1108 +1107 @@
-                break;
-            case TYsptr:                        /* if pointer to stack  */
-                if (config.wflags & WFssneds)   // if SS != DS
-                    pcs->Iflags |= CFss;        /* then need SS: override */
-                break;
-            case TYcptr:                        /* if pointer to code   */
-                pcs->Iflags |= CFcs;            /* then need CS: override */
-                break;
-        }
-#endif
-        pcs->IFL1 = FLoffset;
-        pcs->IEV1.Vuns = 0;
-
-        /* see if we can replace *(e+c) with
-         *      MOV     idxreg,e
-         *      [MOV    ES,segment]
-         *      EA =    [ES:]c[idxreg]
-         */
-
-        if (e1isadd && e12->Eoper == OPconst &&
-tysize(e12->Ety) == REGSIZE
+(tysize(e12->Ety) == REGSIZE || (I64 && tysize(e12->Ety) == 4))
-            (!e1->Ecount || !e1free)
-           )
-        {   int ss;
-
-            pcs->IEV1.Vuns = e12->EV.Vuns;
-            freenode(e12);
-            if (e1free) freenode(e1);
-I32
+!I16
-                tysize(e11->Ety) == REGSIZE)
-            {
-                e12 = e11->E2;
-                e11 = e11->E1;
-                e1 = e1->E1;
-                e1free = TRUE;
-                goto L4;
-            }
-            if (!I16 && (ss = isscaledindex(e11)) != 0)
-            {   // (v * scale) + const
-                c = cdisscaledindex(e11,&idxregs,keepmsk);
-                reg = findreg(idxregs);
-                pcs->Irm = modregrm(0,0,4);
-                pcs->Isib = modregrm(ss,reg & 7,5);
-                if (reg & 8)
-                    pcs->Irex |= REX_X;
-            }
-            else
-            {
-                c = scodelem(e11,&idxregs,keepmsk,TRUE); // load index reg
@@ -1409 +1408 @@
-}
-
-/*******************************
- * Same as codelem(), but do not destroy the registers in keepmsk.
- * Use scratch registers as much as possible, then use stack.
- * Input:
- *      constflag       TRUE if user of result will not modify the
- *                      registers returned in *pretregs.
- */
-
-code *scodelem(elem *e,regm_t *pretregs,regm_t keepmsk,bool constflag)
-{ code *c,*cs1,*cs2,*cs3;
-  unsigned i,j;
-  regm_t oldmfuncreg,oldregcon,oldregimmed,overlap,tosave,touse;
-  int adjesp;
-  unsigned stackpushsave;
-  char calledafuncsave;
-
-#ifdef DEBUG
-  if (debugw)
-x%x keepmsk=x%x
-*pretregs,keepmsk
+%s keepmsk=%s
+regm_str(*pretregs),regm_str(keepmsk)
-#endif
-  elem_debug(e);
-  if (constflag)
-  {     regm_t regm;
-        unsigned reg;
-
-        if (isregvar(e,&regm,&reg) &&           // if e is a register variable
-            (regm & *pretregs) == regm &&       // in one of the right regs
-            e->EV.sp.Voffset == 0
-           )
-
-
-
-
+
+
+
-                if (sz1 <= REGSIZE && sz2 > REGSIZE)
-                    regm &= mLSW;
-                c = fixresult(e,regm,pretregs);
-                cssave(e,regm,0);
-                freenode(e);
-#ifdef DEBUG
-                if (debugw)
-                    printf("-scodelem(e=%p *pretregs=x%x keepmsk=x%x constflag=%d\n",
-                            e,*pretregs,keepmsk,constflag);
-#endif
-                return c;
-        }
-  }
-  overlap = msavereg & keepmsk;
-  msavereg |= keepmsk;          /* add to mask of regs to save          */
-  oldregcon = regcon.cse.mval;
-  oldregimmed = regcon.immed.mval;
-  oldmfuncreg = mfuncreg;       /* remember old one                     */
-  mfuncreg = (mBP | mES | ALLREGS) & ~regcon.mvar;
-  stackpushsave = stackpush;

trunk/src/backend/cod3.c

@@ -3645 +3645 @@
-        // If the instruction has a second operand that is not an 8 bit,
-        // and the operand size prefix is present, then fix the size computation
-        // because the operand size will be different.
-        // Walter, I had problems with this bit at the end.  There can still be
-        // an ADDRSIZE prefix for these and it does indeed change the operand size.
-
-        if (iflags & (CFopsize | CFaddrsize))
-        {
-            if ((ins & (T|E)) == T)
-            {
-                if ((op & 0xAC) == 0xA0)
-                {
-                    if (iflags & CFaddrsize && !I64)
-                    {   if (I32)
-                            size -= 2;
-                        else
-                            size += 2;
-                    }
-                }
-                else if (iflags & CFopsize)
-
+
+
+
-                        size -= 2;
-                    else
-                        size += 2;
-                }
-            }
-            if (iflags & CFaddrsize)
-            {   if (!I64)
-                    a32 ^= 1;
-                size++;
-            }
-            if (iflags & CFopsize)
-                size++;                         /* +1 for OPSIZE prefix         */
-        }
-    }
-
-    if ((op & ~0x0F) == 0x70)
-    {   if (iflags & CFjmp16)           // if long branch
-            size += I16 ? 3 : 4;        // + 3(4) bytes for JMP
-    }
-    else if (ins & M)                   // if modregrm byte
-    {
-        rm = c->Irm;
-        mod = rm & 0xC0;
@@ -5002 +5002 @@
-        ;
-        pc = &code_next(c);
-    }
-}
-#endif
-
-
-/***************************
- * Debug code to dump code stucture.
- */
-
-#if DEBUG
-
-void WRcodlst(code *c)
-{ for (; c; c = code_next(c))
-        c->print();
-}
-
-void code::print()
-{
-
-
-
-
-
-
+
+
+
+
+
-        return;
-
-
-
+  
+
+
-    if ((c->Iop & 0xFF00) == 0x0F00)
-        ins = inssize2[op & 0xFF];
-    else
-        ins = inssize[op & 0xFF];
-
-
+
+
+
+
+
-  if ((op & 0xFF) == ESCAPE)
-  {     if ((op & 0xFF00) == ESClinnum)
-        {   printf(" linnum = %d\n",c->IEV2.Vsrcpos.Slinnum);
-            return;
-        }
-        printf(" ESCAPE %d",c->Iop >> 8);
-  }
-  if (c->Iflags)
-        printf(" flg=%x",c->Iflags);
-  if (ins & M)
-
+unsigned 
-        printf(" rm=%02x=%d,%d,%d",rm,(rm>>6)&3,(rm>>3)&7,rm&7);
-        if (I32 && issib(rm))
-        {   unsigned char sib = c->Isib;
-            printf(" sib=%02x=%d,%d,%d",sib,(sib>>6)&3,(sib>>3)&7,sib&7);
-        }
-        if ((rm & 0xC7) == BPRM || (rm & 0xC0) == 0x80 || (rm & 0xC0) == 0x40)
-        {
-            switch (c->IFL1)
-            {
-                case FLconst:
-                case FLoffset:
-                    printf(" int = %4d",c->IEV1.Vuns);
-                    break;
-                case FLblock:
-                    printf(" block = %p",c->IEV1.Vblock);
-                    break;
-                case FLswitch:
-                case FLblockoff:
-                case FLlocalsize:
-                case FLframehandler:

trunk/src/backend/ptrntab.c

@@ -809 +809 @@
-};
-PTRNTAB2  aptb2CMPS[] = /* CMPS */ {
-        { 0xa6, _modsidi,               _m8,    _m8 },
-        { 0xa7, _modsidi,       _m16,   _m16 },
-        { 0xa7, _modsidi,       _m32,   _m32 },
-        { ASM_END, 0, 0, 0 }
-};
-PTRNTAB2  aptb2CMPXCHG[] = /* CMPXCHG */ {
-        { 0xfb0, _I386 | _cb|_mod2,     _rm8,   _r8 },
-                                                // This is really a 486 only
-                                                // instruction
-        { 0xfb1, _I386 | _cw | _16_bit|_mod2,   _rm16,  _r16 },
-        { 0xfb1, _I386 | _cd | _32_bit|_mod2,   _rm32,  _r32 },
-        { 0xfb1, _I386 | _cq | _64_bit|_mod2,   _rm64,  _r64 },
-        { ASM_END, 0, 0, 0 }
-};
-PTRNTAB2  aptb2DIV[] = /* DIV */ {
-        { 0xf6, _6,                     _al,            _rm8 },
-        { 0xf7, _6 | _16_bit | _moddx,          _ax,            _rm16 },
-        { 0xf7, _6 | _32_bit | _moddx,          _eax,           _rm32 },
+        { 0xf7, _6 | _64_bit | _moddx,          _rax,           _rm64 },
-        { 0xf6, _6 | _modax,                    _rm8,           0 },
-
-
+
+
+
-        { ASM_END, 0, 0, 0 }
-};
-PTRNTAB2  aptb2ENTER[] = /* ENTER */ {
-        { 0xc8, _iw|_ib,        _imm16, _imm8 },
-        { ASM_END, 0, 0, 0 }
-};
-PTRNTAB2  aptb2IDIV[] = /* IDIV */ {
-        { 0xf6, _7,                     _al,            _rm8 },
-
-
-
+
+
+
+
-        { 0xf7, _7|_16_bit|_modaxdx,    _rm16,          0 },
-        { 0xf7, _7|_32_bit|_modaxdx,    _rm32,          0 },
+        { 0xf7, _7|_64_bit|_modaxdx,    _rm64,          0 },
-        { ASM_END, 0, 0, 0 }
-};
-PTRNTAB2  aptb2IN[] = /* IN */ {
-        { 0xe4, _ib,        _al,                _imm8 },
-        { 0xe5, _ib|_16_bit,_ax,                _imm8 },
-        { 0xe5, _ib|_32_bit,_eax,       _imm8 },
-        { 0xec, 0,          _al,                _dx },
-        { 0xed, _16_bit,    _ax,                _dx },
-        { 0xed, _32_bit,    _eax,       _dx },
-        { ASM_END, 0, 0, 0 }
-};
-PTRNTAB2  aptb2INS[] = /* INS */ {
-        { 0x6c, _modsi, _rm8, _dx },
-        { 0x6d, _modsi|_16_bit, _rm16, _dx },
-        { 0x6d, _32_bit|_modsi, _rm32, _dx },
-        { ASM_END, 0, 0, 0 }
-};
-
-PTRNTAB2  aptb2LAR[] = /* LAR */ {
-        { 0x0f02,       _r|_16_bit,                     _r16,   _rm16 },
@@ -958 +962 @@
-#else
-        { 0x0fbf,       _r,                     _r32,   _rm16 },
-#endif
-        { ASM_END, 0, 0, 0 }
-};
-PTRNTAB2  aptb2MOVZX[] = /* MOVZX */ {
-        { 0x0fb6,       _r|_16_bit,                     _r16,   _rm8 },
-        { 0x0fb6,       _r|_32_bit,                     _r32,   _rm8 },
-#if 1
-        { 0x0fb7,       _r|_16_bit,             _r16,   _rm16 },
-        { 0x0fb7,       _r|_32_bit,             _r32,   _rm16 },
-#else
-        { 0x0fb7,       _r,                     _r32,   _rm16 },
-#endif
-        { ASM_END, 0, 0, 0 }
-};
-PTRNTAB2  aptb2MUL[] = /* MUL */ {
-        { 0xf6, _4,                     _al,    _rm8 },
-        { 0xf7, _4|_16_bit|_moddx,      _ax,    _rm16 },
-        { 0xf7, _4|_32_bit|_moddx,      _eax,   _rm32 },
+        { 0xf7, _4|_64_bit|_moddx,      _rax,   _rm64 },
-        { 0xf6, _4|_modax,              _rm8,   0 },
-        { 0xf7, _4|_16_bit|_modaxdx,    _rm16,  0 },
-        { 0xf7, _4|_32_bit|_modaxdx,    _rm32,  0 },
+        { 0xf7, _4|_64_bit|_modaxdx,    _rm64,  0 },
-        { ASM_END, 0, 0, 0 }
-};
-PTRNTAB2  aptb2OR[] = /* OR */ {
-        { 0x0c, _ib,            _al,    _imm8 },
-        { 0x83, _1|_ib|_16_bit,         _rm16,  _imm8 },
-        { 0x0d, _iw|_16_bit,            _ax,    _imm16 },
-        { 0x83, _1|_ib|_32_bit,         _rm32,  _imm8 },
-        { 0x0d, _id|_32_bit,            _eax,   _imm32 },
-        { 0x80, _1|_ib,         _rm8,   _imm8 },
-        { 0x81, _1|_iw|_16_bit,         _rm16,  _imm16 },
-        { 0x81, _1|_id|_32_bit,         _rm32,  _imm32 },
-        { 0x08, _r,                     _rm8,   _r8 },
-        { 0x09, _r|_16_bit,                     _rm16,  _r16 },
-        { 0x09, _r|_32_bit,                     _rm32,  _r32 },
-        { 0x0a, _r,                     _r8,    _rm8 },
-        { 0x0b, _r|_16_bit,                     _r16,   _rm16 },
-        { 0x0b, _r|_32_bit,                     _r32,   _rm32 },
-        { ASM_END, 0, 0, 0 }
-};
-PTRNTAB2  aptb2OUT[] = {
@@ -1263 +1269 @@
-};
-PTRNTAB2  aptb2CMOVNL[] = {
-        { 0x0F4D, _r|_16_bit,   _r16,   _rm16 },
-        { 0x0F4D, _r|_32_bit,   _r32,   _rm32 },
-        { ASM_END, 0, 0, 0 }
-};
-PTRNTAB2  aptb2CMOVLE[] = {
-        { 0x0F4E, _r|_16_bit,   _r16,   _rm16 },
-        { 0x0F4E, _r|_32_bit,   _r32,   _rm32 },
-        { ASM_END, 0, 0, 0 }
-};
-PTRNTAB2  aptb2CMOVNLE[] = {
-        { 0x0F4F, _r|_16_bit,   _r16,   _rm16 },
-        { 0x0F4F, _r|_32_bit,   _r32,   _rm32 },
-        { ASM_END, 0, 0, 0 }
-};
-
-PTRNTAB3  aptb3IMUL[] = /* IMUL */ {
-        { 0x0faf,       _r|_16_bit,             _r16,   _rm16, 0 },
-        { 0x0faf,       _r|_32_bit,             _r32,   _rm32, 0 },
+        { 0x0faf,       _r|_64_bit,             _r64,   _rm64, 0 },
-        { 0xf6, _5|_modax,                      _rm8,   0, 0 },
-        { 0xf7, _5|_16_bit|_modaxdx,            _rm16,  0, 0 },
-        { 0xf7, _5|_32_bit|_modaxdx,            _rm32,  0, 0 },
+        { 0xf7, _5|_64_bit|_modaxdx,            _rm64,  0, 0 },
-        { 0x6b, _r|_ib|_16_bit,         _r16,   _imm8, 0 },
-        { 0x6b, _r|_ib|_32_bit,         _r32,   _imm8, 0 },
-        { 0x69, _r|_iw|_16_bit,         _r16,   _imm16, 0 },
-        { 0x69, _r|_id|_32_bit,         _r32,   _imm32, 0 },
+        { 0x69, _r|_id|_64_bit,         _r64,   _imm32, 0 },
-        { 0x6b, _r|_ib|_16_bit,         _r16,   _rm16,  _imm8 },
-        { 0x6b, _r|_ib|_32_bit,         _r32,   _rm32,  _imm8 },
+        { 0x6b, _r|_ib|_64_bit,         _r64,   _rm64,  _imm8 },
-        { 0x69, _r|_iw|_16_bit,         _r16,   _rm16,  _imm16 },
-        { 0x69, _r|_id|_32_bit,         _r32,   _rm32,  _imm32 },
+        { 0x69, _r|_id|_64_bit,         _r64,   _rm64,  _imm32 },
-        { ASM_END, 0, 0, 0 }
-};
-PTRNTAB3  aptb3SHLD[] = /* SHLD */ {
-        { 0x0fa4,       _cw|_16_bit, _rm16, _r16, _imm8 },
-        { 0x0fa4,       _cd|_32_bit, _rm32, _r32, _imm8 },
-        { 0x0fa5,       _cw|_16_bit, _rm16, _r16, _cl },
-        { 0x0fa5,       _cd|_32_bit, _rm32, _r32, _cl },
-        { ASM_END, 0, 0, 0 }
-};
-PTRNTAB3  aptb3SHRD[] = /* SHRD */ {
-        { 0x0fac,       _cw|_16_bit, _rm16, _r16, _imm8 },
-        { 0x0fac,       _cd|_32_bit, _rm32, _r32, _imm8 },
-        { 0x0fad,       _cw|_16_bit, _rm16, _r16, _cl },
-        { 0x0fad,       _cd|_32_bit, _rm32, _r32, _cl },
-        { ASM_END, 0, 0, 0 }
-};
-//
-// Floating point instructions which have entirely different flag
-// interpretations
-//

trunk/src/mtype.c

@@ -5241 +5241 @@
-    }
-    return t;
-}
-
-Type *TypeDelegate::semantic(Loc loc, Scope *sc)
-{
-    if (deco)                   // if semantic() already run
-    {
-        //printf("already done\n");
-        return this;
-    }
-    next = next->semantic(loc,sc);
-    return merge();
-}
-
-d_uns64 TypeDelegate::size(Loc loc)
-{
-    return PTRSIZE * 2;
-}
-
+unsigned TypeDelegate::alignsize()
+{
+    // See Bugzilla 942 for discussion
+#if 0
+    return PTRSIZE;
+#else
+    return PTRSIZE * 2;
+#endif
+}
+
-MATCH TypeDelegate::implicitConvTo(Type *to)
-{
-    //printf("TypeDelegate::implicitConvTo(this=%p, to=%p)\n", this, to);
-    //printf("from: %s\n", toChars());
-    //printf("to  : %s\n", to->toChars());
-    if (this == to)
-        return MATCHexact;
-#if 0 // not allowing covariant conversions because it interferes with overriding
-    if (to->ty == Tdelegate && this->nextOf()->covariant(to->nextOf()) == 1)
-        return MATCHconvert;
-#endif
-    return MATCHnomatch;
-}
-
-void TypeDelegate::toCBuffer2(OutBuffer *buf, HdrGenState *hgs, int mod)
-{
-    if (mod != this->mod)
-    {   toCBuffer3(buf, hgs, mod);
-        return;
-    }

trunk/src/mtype.h

@@ -575 +575 @@
-#if CPP_MANGLE
-    void toCppMangle(OutBuffer *buf, CppMangleState *cms);
-#endif
-    bool parameterEscapes(Parameter *p);
-
-    int callMatch(Expression *ethis, Expressions *toargs, int flag = 0);
-    type *toCtype();
-    enum RET retStyle();
-
-    unsigned totym();
-};
-
-struct TypeDelegate : TypeNext
-{
-    // .next is a TypeFunction
-
-    TypeDelegate(Type *t);
-    Type *syntaxCopy();
-    Type *semantic(Loc loc, Scope *sc);
-    d_uns64 size(Loc loc);
+    unsigned alignsize();
-    MATCH implicitConvTo(Type *to);
-    void toCBuffer2(OutBuffer *buf, HdrGenState *hgs, int mod);
-    Expression *defaultInit(Loc loc);
-    int isZeroInit(Loc loc);
-    int checkBoolean();
-    TypeInfoDeclaration *getTypeInfoDeclaration();
-    Expression *dotExp(Scope *sc, Expression *e, Identifier *ident);
-    int hasPointers();
-#if CPP_MANGLE
-    void toCppMangle(OutBuffer *buf, CppMangleState *cms);
-#endif
-
-    type *toCtype();
-};
-
-struct TypeQualified : Type
-{
-    Loc loc;
-    Array idents;       // array of Identifier's representing ident.ident.ident etc.
-