Changeset 582

Timestamp:

07/23/10 22:58:11 (14 years ago)

Author:

walter

Message:

bring up to date

Files:

• branches/dmd-1.x/src/backend/cod3.c (modified) (1 diff)
• branches/dmd-1.x/src/backend/elfobj.c (modified) (2 diffs)
• branches/dmd-1.x/src/backend/global.h (modified) (1 diff)
• trunk/src/backend/cod3.c (modified) (1 diff)
• trunk/src/backend/elfobj.c (modified) (2 diffs)
• trunk/src/backend/global.h (modified) (1 diff)

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

@@ -2931 +2931 @@
-#endif
-
-  if (b)
-  {     bn = b->Bnext;
-        usespace = (config.flags4 & CFG4space && b->BC != BCasm);
-        useopsize = (I16 || (config.flags4 & CFG4space && b->BC != BCasm));
-  }
-  else
-  {     bn = NULL;
-        usespace = (config.flags4 & CFG4space);
-        useopsize = (I16 || config.flags4 & CFG4space);
-  }
-  for (; c; c = code_next(c))
-  {
-    L1:
-        op = c->Iop;
-        if (op == 0x0F)
-            ins = inssize2[c->Iop2];
-        else
-            ins = inssize[c->Iop];
-
+I32 && 
-        {   int shortop = (c->Iflags & CFopsize) ? !I16 : I16;
-            int local_BPRM = BPRM;
-
-            if (c->Iflags & CFaddrsize)
-                local_BPRM ^= 5 ^ 6;    // toggle between 5 and 6
-
-            unsigned rm = c->Irm;
-            unsigned reg = rm & modregrm(0,7,0);          // isolate reg field
-            unsigned ereg = rm & 7;
-            //printf("c = %p, op = %02x rm = %02x\n", c, op, rm);
-
-            /* If immediate second operand      */
-            if ((ins & T || op == 0xF6 || op == 0xF7) &&
-                c->IFL2 == FLconst)
-            {
-                int flags = c->Iflags & CFpsw;      /* if want result in flags */
-                targ_long u = c->IEV2.Vuns;
-                if (ins & E)
-                    u = (signed char) u;
-                else if (shortop)

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

@@ -2230 +2230 @@
-            relsec->sh_link = SHI_SYMTAB;
-            relsec->sh_info = secidx;
-            relsec->sh_entsize = sizeof(Elf64_Rela);
-            relsec->sh_addralign = 8;
-        }
-        else
-        {
-            Elf32_Shdr *relsec = &SecHdrTab[relidx];
-            relsec->sh_link = SHI_SYMTAB;
-            relsec->sh_info = secidx;
-            relsec->sh_entsize = sizeof(Elf32_Rel);
-            relsec->sh_addralign = 4;
-        }
-    }
-
-    if (I64)
-    {
-        Elf64_Rela rel;
-        rel.r_offset = offset;          // build relocation information
-        rel.r_info = ELF64_R_INFO(symidx,type);
-0
+val
-        buf = segdata->SDrel;
-        buf->write(&rel,sizeof(rel));
-        segdata->SDrelcnt++;
-
-        if (offset >= segdata->SDrelmaxoff)
-            segdata->SDrelmaxoff = offset;
-        else
-        {   // insert numerically
-            Elf64_Rela *relbuf = (Elf64_Rela *)buf->buf;
-            int i = relbuf[segdata->SDrelindex].r_offset > offset ? 0 : segdata->SDrelindex;
-            while (i < segdata->SDrelcnt)
-            {
-                if (relbuf[i].r_offset > offset)
-                    break;
-                i++;
-            }
-            assert(i != segdata->SDrelcnt);     // slide greater offsets down
-            memmove(relbuf+i+1,relbuf+i,sizeof(Elf64_Rela) * (segdata->SDrelcnt - i - 1));
-            *(relbuf+i) = rel;          // copy to correct location
-            segdata->SDrelindex = i;    // next entry usually greater
@@ -2504 +2504 @@
-                return retsize;
-            }
-            else
-            {
-                int save;
-                buf = SegData[seg]->SDbuf;
-                save = buf->size();
-                buf->setsize(offset);
-                if (flags & CFselfrel)
-                {               // only for function references within code segments
-                    if (!external &&            // local definition found
-                         s->Sseg == seg &&      // within same code segment
-                          (!(config.flags3 & CFG3pic) ||        // not position indp code
-                           s->Sclass == SCstatic)) // or is pic, but declared static
-                    {                   // Can use PC relative
-                        //dbg_printf("\tdoing PC relative\n");
-                        val = (s->Soffset+val) - (offset+4);
-                    }
-                    else
-                    {
-                        val = (targ_size_t)-4;
-                        //dbg_printf("\tadding relocation\n");
-                        if (I64)
-
+
+
+
+
-                        else
- 
-elf_addrel(seg,offset,
-    relinfo,
-        s->Sxtrnnum,0);
+{
+    elf_addrel(seg,offset, relinfo, s->Sxtrnnum, 0);
+val = (targ_size_t)-4;
+}
-                    }
-                    if (I64)
-                        val += 4;
-                }
-                else
-                {       // code to code code to data, data to code, data to data refs
-                    refseg = s->Sxtrnnum;       // default to name symbol table entry
-                    if (s->Sclass == SCstatic)
-                    {                           // offset into .data or .bss seg
-                        refseg = MAP_SEG2SYMIDX(s->Sseg);
-                                                // use segment symbol table entry
-                        val += s->Soffset;
-                        if (!(config.flags3 & CFG3pic) ||       // all static refs from normal code
-                             segtyp == DATA)    // or refs from data from posi indp
-                        {
-                           relinfo = I64 ? R_X86_64_32 : RI_TYPE_SYM32;
-                        }
-                        else
-                        {
-                            relinfo = I64 ? R_X86_64_PC32 : RI_TYPE_GOTOFF;
-                        }
-                    }
-                    else if (config.flags3 & CFG3pic && s == GOTsym)

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

@@ -534 +534 @@
-#if MACHOBJ
-int mach_getsegment(const char *sectname, const char *segname,
-        int align, int flags, int flags2 = 0);
-void mach_addrel(int seg, targ_size_t offset, symbol *targsym,
-        unsigned targseg, int rtype);
-#endif
-void elf_func_start(Symbol *sfunc);
-int elf_data_start(Symbol *sdata, targ_size_t datasize, int seg);
-void elf_func_term(Symbol *sfunc);
-unsigned elf_addstr(Outbuffer *strtab, const char *);
-
-void dwarf_CFA_set_loc(size_t location);
-void dwarf_CFA_set_reg_offset(int reg, int offset);
-void dwarf_CFA_offset(int reg, int offset);
-void dwarf_CFA_args_size(size_t sz);
-#endif
-
-#if TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_SOLARIS
-void elfobj_gotref(symbol *s);
-symbol *elfobj_getGOTsym();
+void elfobj_refGOTsym();
-elem * exp_isconst();
-elem *lnx_builtin_next_arg(elem *efunc,list_t arglist);
-char *lnx_redirect_funcname(const char *);
-void  lnx_funcdecl(symbol *,enum SC,enum_SC,int);
-int  lnx_attributes(int hinttype,const void *hint, type **ptyp, tym_t *ptym,int *pattrtype);
-#endif
-
-
-#if TARGET_MAC
-#include "TGglobal.h"
-#endif
-
-#endif /* GLOBAL_H */

trunk/src/backend/cod3.c

@@ -2931 +2931 @@
-#endif
-
-  if (b)
-  {     bn = b->Bnext;
-        usespace = (config.flags4 & CFG4space && b->BC != BCasm);
-        useopsize = (I16 || (config.flags4 & CFG4space && b->BC != BCasm));
-  }
-  else
-  {     bn = NULL;
-        usespace = (config.flags4 & CFG4space);
-        useopsize = (I16 || config.flags4 & CFG4space);
-  }
-  for (; c; c = code_next(c))
-  {
-    L1:
-        op = c->Iop;
-        if (op == 0x0F)
-            ins = inssize2[c->Iop2];
-        else
-            ins = inssize[c->Iop];
-
+I32 && 
-        {   int shortop = (c->Iflags & CFopsize) ? !I16 : I16;
-            int local_BPRM = BPRM;
-
-            if (c->Iflags & CFaddrsize)
-                local_BPRM ^= 5 ^ 6;    // toggle between 5 and 6
-
-            unsigned rm = c->Irm;
-            unsigned reg = rm & modregrm(0,7,0);          // isolate reg field
-            unsigned ereg = rm & 7;
-            //printf("c = %p, op = %02x rm = %02x\n", c, op, rm);
-
-            /* If immediate second operand      */
-            if ((ins & T || op == 0xF6 || op == 0xF7) &&
-                c->IFL2 == FLconst)
-            {
-                int flags = c->Iflags & CFpsw;      /* if want result in flags */
-                targ_long u = c->IEV2.Vuns;
-                if (ins & E)
-                    u = (signed char) u;
-                else if (shortop)

trunk/src/backend/elfobj.c

@@ -2230 +2230 @@
-            relsec->sh_link = SHI_SYMTAB;
-            relsec->sh_info = secidx;
-            relsec->sh_entsize = sizeof(Elf64_Rela);
-            relsec->sh_addralign = 8;
-        }
-        else
-        {
-            Elf32_Shdr *relsec = &SecHdrTab[relidx];
-            relsec->sh_link = SHI_SYMTAB;
-            relsec->sh_info = secidx;
-            relsec->sh_entsize = sizeof(Elf32_Rel);
-            relsec->sh_addralign = 4;
-        }
-    }
-
-    if (I64)
-    {
-        Elf64_Rela rel;
-        rel.r_offset = offset;          // build relocation information
-        rel.r_info = ELF64_R_INFO(symidx,type);
-0
+val
-        buf = segdata->SDrel;
-        buf->write(&rel,sizeof(rel));
-        segdata->SDrelcnt++;
-
-        if (offset >= segdata->SDrelmaxoff)
-            segdata->SDrelmaxoff = offset;
-        else
-        {   // insert numerically
-            Elf64_Rela *relbuf = (Elf64_Rela *)buf->buf;
-            int i = relbuf[segdata->SDrelindex].r_offset > offset ? 0 : segdata->SDrelindex;
-            while (i < segdata->SDrelcnt)
-            {
-                if (relbuf[i].r_offset > offset)
-                    break;
-                i++;
-            }
-            assert(i != segdata->SDrelcnt);     // slide greater offsets down
-            memmove(relbuf+i+1,relbuf+i,sizeof(Elf64_Rela) * (segdata->SDrelcnt - i - 1));
-            *(relbuf+i) = rel;          // copy to correct location
-            segdata->SDrelindex = i;    // next entry usually greater
@@ -2504 +2504 @@
-                return retsize;
-            }
-            else
-            {
-                int save;
-                buf = SegData[seg]->SDbuf;
-                save = buf->size();
-                buf->setsize(offset);
-                if (flags & CFselfrel)
-                {               // only for function references within code segments
-                    if (!external &&            // local definition found
-                         s->Sseg == seg &&      // within same code segment
-                          (!(config.flags3 & CFG3pic) ||        // not position indp code
-                           s->Sclass == SCstatic)) // or is pic, but declared static
-                    {                   // Can use PC relative
-                        //dbg_printf("\tdoing PC relative\n");
-                        val = (s->Soffset+val) - (offset+4);
-                    }
-                    else
-                    {
-                        val = (targ_size_t)-4;
-                        //dbg_printf("\tadding relocation\n");
-                        if (I64)
-
+
+
+
+
-                        else
- 
-elf_addrel(seg,offset,
-    relinfo,
-        s->Sxtrnnum,0);
+{
+    elf_addrel(seg,offset, relinfo, s->Sxtrnnum, 0);
+val = (targ_size_t)-4;
+}
-                    }
-                    if (I64)
-                        val += 4;
-                }
-                else
-                {       // code to code code to data, data to code, data to data refs
-                    refseg = s->Sxtrnnum;       // default to name symbol table entry
-                    if (s->Sclass == SCstatic)
-                    {                           // offset into .data or .bss seg
-                        refseg = MAP_SEG2SYMIDX(s->Sseg);
-                                                // use segment symbol table entry
-                        val += s->Soffset;
-                        if (!(config.flags3 & CFG3pic) ||       // all static refs from normal code
-                             segtyp == DATA)    // or refs from data from posi indp
-                        {
-                           relinfo = I64 ? R_X86_64_32 : RI_TYPE_SYM32;
-                        }
-                        else
-                        {
-                            relinfo = I64 ? R_X86_64_PC32 : RI_TYPE_GOTOFF;
-                        }
-                    }
-                    else if (config.flags3 & CFG3pic && s == GOTsym)

trunk/src/backend/global.h

@@ -534 +534 @@
-#if MACHOBJ
-int mach_getsegment(const char *sectname, const char *segname,
-        int align, int flags, int flags2 = 0);
-void mach_addrel(int seg, targ_size_t offset, symbol *targsym,
-        unsigned targseg, int rtype);
-#endif
-void elf_func_start(Symbol *sfunc);
-int elf_data_start(Symbol *sdata, targ_size_t datasize, int seg);
-void elf_func_term(Symbol *sfunc);
-unsigned elf_addstr(Outbuffer *strtab, const char *);
-
-void dwarf_CFA_set_loc(size_t location);
-void dwarf_CFA_set_reg_offset(int reg, int offset);
-void dwarf_CFA_offset(int reg, int offset);
-void dwarf_CFA_args_size(size_t sz);
-#endif
-
-#if TARGET_LINUX || TARGET_OSX || TARGET_FREEBSD || TARGET_SOLARIS
-void elfobj_gotref(symbol *s);
-symbol *elfobj_getGOTsym();
+void elfobj_refGOTsym();
-elem * exp_isconst();
-elem *lnx_builtin_next_arg(elem *efunc,list_t arglist);
-char *lnx_redirect_funcname(const char *);
-void  lnx_funcdecl(symbol *,enum SC,enum_SC,int);
-int  lnx_attributes(int hinttype,const void *hint, type **ptyp, tym_t *ptym,int *pattrtype);
-#endif
-
-
-#if TARGET_MAC
-#include "TGglobal.h"
-#endif
-
-#endif /* GLOBAL_H */