Changeset 572

Timestamp:

07/04/10 00:32:30 (2 years ago)

Author:

walter

Message:

start on 64 bit assembler

Files:

• branches/dmd-1.x/src/backend/code.h (modified) (1 diff)
• branches/dmd-1.x/src/backend/el.h (modified) (2 diffs)
• branches/dmd-1.x/src/backend/elfobj.c (modified) (8 diffs)
• branches/dmd-1.x/src/backend/iasm.h (modified) (3 diffs)
• branches/dmd-1.x/src/backend/machobj.c (modified) (1 diff)
• branches/dmd-1.x/src/backend/melf.h (modified) (1 diff)
• branches/dmd-1.x/src/backend/out.c (modified) (1 diff)
• branches/dmd-1.x/src/backend/ptrntab.c (modified) (1 diff)
• branches/dmd-1.x/src/iasm.c (modified) (18 diffs)
• trunk/src/backend/code.h (modified) (1 diff)
• trunk/src/backend/el.h (modified) (2 diffs)
• trunk/src/backend/elfobj.c (modified) (8 diffs)
• trunk/src/backend/iasm.h (modified) (3 diffs)
• trunk/src/backend/machobj.c (modified) (1 diff)
• trunk/src/backend/melf.h (modified) (1 diff)
• trunk/src/backend/out.c (modified) (1 diff)
• trunk/src/backend/ptrntab.c (modified) (1 diff)
• trunk/src/iasm.c (modified) (19 diffs)

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

@@ -369 +369 @@
-#define CFjmp16           2     // need 16 bit jump offset (long branch)
-#define CFtarg            4     // this code is the target of a jump
-#define CFseg             8     // get segment of immediate value
-#define CFoff          0x10     // get offset of immediate value
-#define CFss           0x20     // generate an SS: segment override (not with
-                                // CFes at the same time, though!)
-#define CFpsw          0x40     // we need the flags result after this instruction
-#define CFopsize       0x80     // prefix with operand size
-#define CFaddrsize    0x100     // prefix with address size
-#define CFds          0x200     // need DS override (not with es, ss, or cs )
-#define CFcs          0x400     // need CS override
-#define CFfs          0x800     // need FS override
-#define CFgs    (CFcs | CFfs)   // need GS override
-#define CFwait       0x1000     // If I32 it indicates when to output a WAIT
-#define CFselfrel    0x2000     // if self-relative
-#define CFunambig    0x4000     // indicates cannot be accessed by other addressing
-                                // modes
-#define CFtarg2      0x8000     // like CFtarg, but we can't optimize this away
-#define CFvolatile  0x10000     // volatile reference, do not schedule
-#define CFclassinit 0x20000     // class init code
+#define CFoffset64  0x40000     // offset is 64 bits
-
-#define CFPREFIX (CFSEG | CFopsize | CFaddrsize)
-#define CFSEG   (CFes | CFss | CFds | CFcs | CFfs | CFgs)
-
-    unsigned char Irex;         // REX prefix
-
-    unsigned char Iop;
-    unsigned char Irm;          // reg/mode
-
-    unsigned char Iop2;         // second opcode byte
-    unsigned char Isib;         // SIB byte
-
-    unsigned char Iop3;         // third opcode byte
-
-    unsigned char IFL1,IFL2;    // FLavors of 1st, 2nd operands
-    union evc IEV1;             // 1st operand, if any
-      #define IEVpointer1 IEV1._EP.Vpointer
-      #define IEVseg1     IEV1._EP.Vseg
-      #define IEVsym1     IEV1.sp.Vsym
-      #define IEVdsym1    IEV1.dsp.Vsym

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

@@ -1 +1 @@
-// Copyright (C) 1985-1995 by Symantec
-09
+10
-// All Rights Reserved
-// http://www.digitalmars.com
-// Written by Walter Bright
-/*
- * This source file is made available for personal use
- * only. The license is in /dmd/src/dmd/backendlicense.txt
- * or /dm/src/dmd/backendlicense.txt
- * For any other uses, please contact Digital Mars.
- */
-
-/* Routines to handle elems.                            */
-
-#if __SC__
-#pragma once
-#endif
-
-#ifndef EL_H
-#define EL_H    1
-
-#if TARGET_MAC
@@ -108 +108 @@
-        {
-            // Ety2: Must be in same position as Ety!
-            tym_t Ety2_;                        // data type (TYxxxx)
-            #define Ety2 _EU._EC.Ety2_
-            unsigned char Ecomsub_;     // number of remaining references to
-                                        // this common subexp (used to determine
-                                        // first, intermediate, and last references
-                                        // to a CSE)
-            #define Ecomsub _EU._EC.Ecomsub_
-
-#if TARGET_POWERPC
-            unsigned char Gflags;
-            #define     GFLassrval      1               // element is rvalue of an assign
-            #define     GFLsignok       2               // element does not need sign extend
-            #define     GFLstrthis_fixed        4       // strthis child elem has been fixed
-                                                        // on first pass, do not do it again
-#endif
-        }_EC;
-    }_EU;
-
-targ_size_t Enumbytes;
+unsigned Enumbytes;   
-    TARGET_structELEM           // target specific additions
-    Srcpos Esrcpos;             // source file position
-};
-
-#define typemask(e)     ((!MARS && PARSER) ? (e)->ET->Tty : (e)->Ety )
-#define typetym(e)      ((e)->ET->Tty)
-#define el_fl(e)        ((enum FL)((e)->EV.sp.Vsym->Sfl))
-#define Eoffset         EV.sp.Voffset
-#define Esymnum         EV.sp.Vsymnum
-
-#define list_elem(list) ((elem *) list_ptr(list))
-#define list_setelem(list,ptr) list_ptr(list) = (elem *)(ptr)
-#define cnst(e) ((e)->Eoper == OPconst) /* Determine if elem is a constant */
-#define E1        EV.eop.Eleft          /* left child                   */
-#define E2        EV.eop.Eright         /* right child                  */
-#define Erd       EV.sp.spu.Erd         // reaching definition
-
-#define el_int(a,b)     el_long(a,b)
-
-typedef elem *elem_p;   /* try to reduce the symbol table size  */

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

@@ -41 +41 @@
-//#define DEBSYM 0x7E
-
-static Outbuffer *fobjbuf;
-
-regm_t BYTEREGS = BYTEREGS_INIT;
-regm_t ALLREGS = ALLREGS_INIT;
-
-static char __file__[] = __FILE__;      // for tassert.h
-#include        "tassert.h"
-
-#define MATCH_SECTION 1
-
-#define DEST_LEN (IDMAX + IDOHD + 1)
-char *obj_mangle2(Symbol *s,char *dest);
-
-#if MARS
-// C++ name mangling is handled by front end
-#define cpp_mangle(s) ((s)->Sident)
-#endif
-
+/***************************************************
+ * Correspondence of relocation types
+ *      386             32 bit in 64      64 in 64
+ *      RI_TYPE_SYM32   R_X86_64_32       R_X86_64_64
+ *      RI_TYPE_GOTOFF  R_X86_64_PC32     R_X86_64_
+ *      RI_TYPE_GOTPC   R_X86_64_         R_X86_64_
+ *      RI_TYPE_GOT32   R_X86_64_         R_X86_64_
+ *      RI_TYPE_TLS_GD  R_X86_64_TLSGD    R_X86_64_
+ *      RI_TYPE_TLS_IE  R_X86_64_GOTTPOFF R_X86_64_
+ *      RI_TYPE_TLS_LE  R_X86_64_TPOFF32  R_X86_64_
+ *      RI_TYPE_PLT32   R_X86_64_PLT32    R_X86_64_
+ *      RI_TYPE_PC32    R_X86_64_PC32     R_X86_64_
+ */
-
-/******************************************
- */
-
-symbol *GOTsym; // global offset table reference
-
-symbol *elfobj_getGOTsym()
-{
-    if (!GOTsym)
-    {
-        GOTsym = symbol_name("_GLOBAL_OFFSET_TABLE_",SCglobal,tspvoid);
-    }
-    return GOTsym;
-}
-
-static void objfile_write(FILE *fd, void *buffer, unsigned len);
-
-STATIC char * objmodtoseg (const char *modname);
-STATIC void obj_browse_flush();
-STATIC void objfixupp (struct FIXUP *);
-STATIC void ledata_new (int seg,targ_size_t offset);
-static int obj_align(Symbol *s);
-void obj_tlssections();
-
-static IDXSYM elf_addsym(IDXSTR sym, targ_size_t val, unsigned sz,
-                        unsigned typ,unsigned bind,IDXSEC sec);
-static long elf_align(FILE *fd, targ_size_t size, long offset);
-
-// The object file is built is several separate pieces
-
-// Non-repeatable section types have single output buffers
-//      Pre-allocated buffers are defined for:
-//              Section Names string table
-//              Section Headers table
-//              Symbol table
-//              String table
-//              Notes section
-//              Comment data
-
-// Section Names  - String table for section names only
-static Outbuffer *section_names;
-#define SEC_NAMES_INIT  800
@@ -1236 +1248 @@
-{
-    //dbg_printf("obj_exestr(char *%s)\n",p);
-}
-
-/**************************
- * Embed string in obj.
- */
-
-void obj_user(const char *p)
-{
-    //dbg_printf("obj_user(char *%s)\n",p);
-}
-
-/*******************************
- * Output a weak extern record.
- */
-
-void obj_wkext(Symbol *s1,Symbol *s2)
-{
-    //dbg_printf("obj_wkext(Symbol *%s,Symbol *s2)\n",s1->Sident,s2->Sident);
-#if 0
-    char buffer[2+2+2];
-    int i;
-
-    buffer[0] = 0x80;
-    buffer[1] = 0xA8;
-    i = 2;
-    i += insidx(&buffer[2],s1->Sxtrnnum);
-    i += insidx(&buffer[i],s2->Sxtrnnum);
-    objrecord(COMENT,buffer,i);
-#endif
-}
-
-/*******************************
- * Output file name record.
- *
- * Currently assumes that obj_filename will not be called
- *      twice for the same file.
- */
-
-void obj_filename(const char *modname)
-
-
-
+
-    //dbg_printf("obj_filename(char *%s)\n",modname);
-
+unsigned 
-    elf_addsym(strtab_idx,0,0,STT_FILE,STB_LOCAL,SHT_ABS);
-}
-
-/*******************************
- * Embed compiler version in .obj file.
- */
-
-void obj_compiler()
-{
-    //dbg_printf("obj_compiler\n");
-    comment_data = new Outbuffer();
-    comment_data->write(compiler,sizeof(compiler));
-    //dbg_printf("Comment data size %d\n",comment_data->size());
-}
-
-#if 0
-/********************************
- * Convert module name to code segment name.
- * Output:
- *      mem_malloc'd code seg name
- */
-
-STATIC char * objmodtoseg(const char *modname)
-{   char *csegname = NULL;
-
-    if (LARGECODE)              // if need to add in module name
-    {   int i;
-        char *m;
-        static const char suffix[] = "_TEXT";
-
-        // Prepend the module name to the beginning of the _TEXT
-        m = filespecgetroot(filespecname(modname));
-        strupr(m);
-        i = strlen(m);
-        csegname = mem_malloc(i + sizeof(suffix));
-        strcpy(csegname,m);
-        strcat(csegname,suffix);
-        mem_free(m);
-    }
-    return csegname;
-}
-#endif
-
-//#if NEWSTATICDTOR
-
-/**************************************
- * Symbol is the function that calls the static constructors.
- * Put a pointer to it into a special segment that the startup code
- * looks at.
- * Input:
- *      s       static constructor function
- *      dtor    !=0 if leave space for static destructor
- *      seg     1:      user
- *              2:      lib
- *              3:      compiler
- */
-
-void obj_staticctor(Symbol *s,int dtor,int none)
-{
-// Static constructors and destructors
-    IDXSEC seg;
-    Outbuffer *buf;
-
-    //dbg_printf("obj_staticctor(%s) offset %x\n",s->Sident,s->Soffset);
-    //symbol_print(s);
-    s->Sseg = seg =
-        elf_getsegment(".ctors", NULL, SHT_PROGDEF, SHF_ALLOC|SHF_WRITE, 4);
-    buf = SegData[seg]->SDbuf;
-    if (I64)
-        buf->write64(s->Soffset);
-    else
-        buf->write32(s->Soffset);
-
+I64 ? R_X86_64_64 : 
-    SegData[seg]->SDoffset = buf->size();
-}
-
-/**************************************
- * Symbol is the function that calls the static destructors.
- * Put a pointer to it into a special segment that the exit code
- * looks at.
- * Input:
- *      s       static destructor function
- */
-
-void obj_staticdtor(Symbol *s)
-{
-    IDXSEC seg;
-    Outbuffer *buf;
-
-    //dbg_printf("obj_staticdtor(%s) offset %x\n",s->Sident,s->Soffset);
-    //symbol_print(s);
-    seg = elf_getsegment(".dtors", NULL, SHT_PROGDEF, SHF_ALLOC|SHF_WRITE, 4);
-    buf = SegData[seg]->SDbuf;
-    if (I64)
-        buf->write64(s->Soffset);
-    else
-        buf->write32(s->Soffset);
-
-
+
-    SegData[seg]->SDoffset = buf->size();
-}
-
-//#else
-
-/***************************************
- * Stuff pointer to function in its own segment.
- * Used for static ctor and dtor lists.
- */
-
-void obj_funcptr(Symbol *s)
-{
-    //dbg_printf("obj_funcptr(%s) \n",s->Sident);
-}
-
-//#endif
-
-/***************************************
- * Stuff the following data in a separate segment:
- *      pointer to function
- *      pointer to ehsym
- *      length of function
- */
-
-void obj_ehtables(Symbol *sfunc,targ_size_t size,Symbol *ehsym)
-{
-    //dbg_printf("obj_ehtables(%s) \n",sfunc->Sident);
-
-
-
-
-
+
-    symbol_keep(ehtab_entry);
-    elf_getsegment(".deh_beg", NULL, SHT_PROGDEF, SHF_ALLOC, 4);
-    ehtab_entry->Sseg = elf_getsegment(".deh_eh", NULL, SHT_PROGDEF, SHF_ALLOC, 4);
-    elf_getsegment(".deh_end", NULL, SHT_PROGDEF, SHF_ALLOC, 4);
-    ehtab_entry->Stype->Tmangle = mTYman_c;
-    ehsym->Stype->Tmangle = mTYman_c;
-
+dt_t **
-    pdte = dtxoff(pdte,sfunc,0,TYnptr);
-    pdte = dtxoff(pdte,ehsym,0,TYnptr);
-    pdte = dtnbytes(pdte,4,(char *)&sfunc->Ssize);
-    outdata(ehtab_entry);
-}
-
-/*********************************************
- * Put out symbols that define the beginning/end of the .deh_eh section.
- */
-
-void obj_ehsections()
-
-
-
-
-
+
+
-    //obj_bytes(sec, 0, 4, NULL);
-
-
+IDXSTR 
-    elf_addsym(namidx, 0, 0, STT_OBJECT, STB_GLOBAL, MAP_SEG2SECIDX(sec));
-    //elf_addsym(namidx, 0, 4, STT_OBJECT, STB_GLOBAL, MAP_SEG2SECIDX(sec));
-
-    elf_getsegment(".deh_eh", NULL, SHT_PROGDEF, SHF_ALLOC, 4);
-
-    sec = elf_getsegment(".deh_end", NULL, SHT_PROGDEF, SHF_ALLOC, 4);
-    namidx = elf_addstr(symtab_strings,"_deh_end");
-    elf_addsym(namidx, 0, 0, STT_OBJECT, STB_GLOBAL, MAP_SEG2SECIDX(sec));
-
-    obj_tlssections();
-}
-
-/*********************************************
- * Put out symbols that define the beginning/end of the thread local storage sections.
- */
-
-void obj_tlssections()
-{
-    IDXSTR namidx;
-
@@ -1676 +1641 @@
- * won't be storing D gc roots in their tls.
- * Output:
- *      seg_tlsseg      set to segment number for TLS segment.
- * Returns:
- *      segment for TLS segment
- */
-
-seg_data *obj_tlsseg()
-{
-    /* Ensure that ".tdata" precedes any other .tdata. section, as the ld
-     * linker script fails to work right.
-     */
-    elf_getsegment(".tdata", NULL, SHT_PROGDEF, SHF_ALLOC|SHF_WRITE|SHF_TLS, 4);
-
-    static const char tlssegname[] = ".tdata.";
-    //dbg_printf("obj_tlsseg(\n");
-
-    if (seg_tlsseg == UNKNOWN)
-    {
-        seg_tlsseg = elf_getsegment(tlssegname, NULL, SHT_PROGDEF,
-
+I64 ? 16 : 
-    }
-    return SegData[seg_tlsseg];
-}
-
-
-/*********************************
- * Define segments for Thread Local Storage.
- * Output:
- *      seg_tlsseg_bss  set to segment number for TLS segment.
- * Returns:
- *      segment for TLS segment
- */
-
-seg_data *obj_tlsseg_bss()
-{
-    static const char tlssegname[] = ".tbss";
-    //dbg_printf("obj_tlsseg_bss(\n");
-
-    if (seg_tlsseg_bss == UNKNOWN)
-    {
-        seg_tlsseg_bss = elf_getsegment(tlssegname, NULL, SHT_NOBITS,
-
+I64 ? 16 : 
-    }
-    return SegData[seg_tlsseg_bss];
-}
-
-
-/*******************************
- * Output an alias definition record.
- */
-
-void obj_alias(const char *n1,const char *n2)
-
-
-
+
-    dbg_printf("obj_alias(%s,%s)\n",n1,n2);
-    assert(0);
-#if NOT_DONE
-
-
+char *
+unsigned 
-    len += obj_namestring(buffer + len,n2);
-    objrecord(ALIAS,buffer,len);
-#endif
-}
-
- 
-
- 
-
- 
+
+
+
+
+
-    return buffer;
-}
-
-/*******************************
- * Mangle a name.
- * Returns:
- *      mangled name
- */
-
-char *obj_mangle2(Symbol *s,char *dest)
-{
-    size_t len;
-    char *name;
-
-    //dbg_printf("obj_mangle('%s'), mangle = x%x\n",s->Sident,type_mangle(s->Stype));
-    symbol_debug(s);
-    assert(dest);
-#if SCPP
-    name = CPP ? cpp_mangle(s) : s->Sident;
-#elif MARS
-    name = cpp_mangle(s);
-#else
-    name = s->Sident;
-#endif
-
+size_t 
-    //dbg_printf("len %d\n",len);
-    switch (type_mangle(s->Stype))
-    {
-        case mTYman_pas:                // if upper case
-        case mTYman_for:
-            if (len >= DEST_LEN)
-                dest = (char *)mem_malloc(len + 1);
-            memcpy(dest,name,len + 1);  // copy in name and ending 0
-            for (int i = 0; 1; i++)
-            {   char c = dest[i];
-                if (!c)
-                    break;
-                if (c >= 'a' && c <= 'z')
-                    dest[i] = c + 'A' - 'a';
-            }
-            break;
-        case mTYman_std:
-#if TARGET_LINUX || TARGET_FREEBSD || TARGET_SOLARIS
-            if (tyfunc(s->ty()) && !variadic(s->Stype))
-#else
@@ -1815 +1777 @@
-            memcpy(dest,name,len+1);// copy in name and trailing 0
-            break;
-
-        default:
-#ifdef DEBUG
-            printf("mangling %x\n",type_mangle(s->Stype));
-            symbol_print(s);
-#endif
-            printf("%d\n", type_mangle(s->Stype));
-            assert(0);
-    }
-    //dbg_printf("\t %s\n",dest);
-    return dest;
-}
-
-/*******************************
- * Export a function name.
- */
-
-void obj_export(Symbol *s,unsigned argsize)
-
-
-
+
-    //dbg_printf("obj_export(%s,%d)\n",s->Sident,argsize);
-
-}
-
-/*******************************
- * Update data information about symbol
- *      align for output and assign segment
- *      if not already specified.
- *
- * Input:
- *      sdata           data symbol
- *      datasize        output size
- *      seg             default seg if not known
- * Returns:
- *      actual seg
- */
-
-int elf_data_start(Symbol *sdata, targ_size_t datasize, int seg)
-{
-    targ_size_t alignbytes;
@@ -1985 +1944 @@
-    return symidx;
-}
-
-int objextdef(const char *name)
-{
-    return objextern(name);
-}
-
-/*******************************
- * Output an external for existing symbol.
- * Input:
- *      s       Symbol to do EXTDEF on
- *              (Name is to be mangled)
- * Returns:
- *      Symbol table index of the definition
- *      NOTE: Numbers will not be linear.
- */
-
-int objextern(Symbol *s)
-{
-    IDXSTR namidx;
-    int symtype,sectype;
-targ_size_t
+unsigned
-
-    //dbg_printf("objextern('%s') %x\n",s->Sident,s->Svalue);
-    symbol_debug(s);
-
+IDXSTR 
-
-#if SCPP
-    if (s->Sscope && !tyfunc(s->ty()))
-    {
-        symtype = STT_OBJECT;
-        sectype = SHT_COMMON;
-        size = type_size(s->Stype);
-    }
-    else
-#endif
-    {
-        symtype = STT_NOTYPE;
-        sectype = SHT_UNDEF;
-        size = 0;
-    }
-    if (s->ty() & mTYthread)
-    {
-        //printf("objextern('%s') %x TLS\n",s->Sident,s->Svalue);
-        symtype = STT_TLS;
-    }
@@ -2034 +1992 @@
-        /*(s->ty() & mTYweak) ? STB_WEAK : */STB_GLOBAL, sectype);
-    return s->Sxtrnnum;
-
-}
-
-/*******************************
- * Output a common block definition.
- * Input:
- *      p ->    external identifier
- *      size    size in bytes of each elem
- *      count   number of elems
- * Returns:
- *      Symbol table index for symbol
- */
-
-int obj_comdef(Symbol *s,targ_size_t size,targ_size_t count)
-{
-    //printf("obj_comdef('%s',%d,%d)\n",s->Sident,size,count);
-    symbol_debug(s);
-
+    int align = I64 ? 16 : 4;
-    if (s->ty() & mTYthread)
-    {
-        s->Sseg = elf_getsegment(".tbss.", cpp_mangle(s),
-4
+align
-        s->Sfl = FLtlsdata;
-        SegData[s->Sseg]->SDsym = s;
-        SegData[s->Sseg]->SDoffset += size * count;
-        objpubdef(s->Sseg, s, 0);
-        searchfixlist(s);
-        return s->Sseg;
-    }
-    else
-    {
-        s->Sseg = elf_getsegment(".bss.", cpp_mangle(s),
-4
+align
-        s->Sfl = FLudata;
-        SegData[s->Sseg]->SDsym = s;
-        SegData[s->Sseg]->SDoffset += size * count;
-        objpubdef(s->Sseg, s, 0);
-        searchfixlist(s);
-        return s->Sseg;
-    }
-#if 0
-    IDXSTR namidx = elf_addmangled(s);
-    alignOffset(UDATA,size);
-    IDXSYM symidx = elf_addsym(namidx, SegData[UDATA]->SDoffset, size*count,
-                    (s->ty() & mTYthread) ? STT_TLS : STT_OBJECT,
-                    STB_WEAK, SHI_BSS);
-    //dbg_printf("\tobj_comdef returning symidx %d\n",symidx);
-    s->Sseg = UDATA;
-    s->Sfl = FLudata;
-    SegData[UDATA]->SDoffset += size * count;
-    return symidx;
-#endif
-}
@@ -2345 +2304 @@
- *              reftodatseg(DATA,offset,3 * sizeof(int *),UDATA);
- */
-
-void reftodatseg(int seg,targ_size_t offset,targ_size_t val,
-        unsigned targetdatum,int flags)
-{
-    Outbuffer *buf;
-    int save;
-
-    buf = SegData[seg]->SDbuf;
-    save = buf->size();
-    buf->setsize(offset);
-    //dbg_printf("reftodatseg(seg=%d, offset=x%lx, val=x%lx,data %x, flags %x )\n",
-    //  seg,offset,val,targetdatum,flags);
-    /*if (OPT_IS_SET(OPTfwritable_strings))
-    {
-        elf_addrel(seg,offset,RI_TYPE_SYM32,STI_DATA,0);
-    }
-    else*/
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        buf->setsize(save);
-}
-
-/*******************************
- * Refer to address that is in the code segment.
- * Only offsets are output, regardless of the memory model.
- * Used to put values in switch address tables.
- * Input:
- *      seg =           where the address is going (CODE or DATA)
- *      offset =        offset within seg
- *      val =           displacement from start of this module
- */
-
-void reftocodseg(int seg,targ_size_t offset,targ_size_t val)
-{
-    Outbuffer *buf;
-    int save;
-    int segtyp = MAP_SEG2TYP(seg);
-
-    //dbg_printf("reftocodseg(seg=%d, offset=x%lx, val=x%lx )\n",seg,offset,val);
-    assert(seg > 0);            // COMDATs not done yet
-    buf = SegData[seg]->SDbuf;
-    save = buf->size();
-    buf->setsize(offset);
-#if 0
-    if (segtyp == CODE)
-    {
-        val = val - funcsym_p->Soffset;
-        elf_addrel(seg,offset,RI_TYPE_PC32,funcsym_p->Sxtrnnum,0);
-    }
-    else
-#endif
-    {
-        val = val - funcsym_p->Soffset;
-elf_addrel(seg,offset,
-        (config.flags3 & CFG3pic) ? RI_TYPE_GOTOFF : RI_TYPE_SYM32,
-    funcsym_p->Sxtrnnum,0)
-}
-if (I64)
-buf->write64(val
-else
-    
-NPTRSIZE
+int relinfo;
+if (I64)
+relinfo = (config.flags3 & CFG3pic) ? R_X86_64_PC32 : R_X86_64_32
+    else
+        relinfo = (config.flags3 & CFG3pic) ? RI_TYPE_GOTOFF : RI_TYPE_SYM32;
+elf_addrel(seg,offset, relinfo, funcsym_p->Sxtrnnum, 0
+}
+
+4
-        buf->setsize(save);
-}
-
-/*******************************
- * Refer to an identifier.
- * Input:
- *      segtyp =        where the address is going (CODE or DATA)
- *      offset =        offset within seg
- *      s ->            Symbol table entry for identifier
- *      val =           displacement from identifier
- *      flags =         CFselfrel: self-relative
- *                      CFseg: get segment
- *                      CFoff: get offset
+ *                      CFoffset64: 64 bit fixup
- * Returns:
-2 or 
+
- */
-
-int reftoident(int seg, targ_size_t offset, Symbol *s, targ_size_t val,
-        int flags)
-{
-    tym_t ty;
-    bool external = TRUE;
-    Outbuffer *buf;
-    elf_u32_f32 relinfo,refseg;
-    int segtyp = MAP_SEG2TYP(seg);
-    //assert(val == 0);
+    int retsize = (flags & CFoffset64) ? 8 : 4;
-
-#if 0
-    dbg_printf("\nreftoident('%s' seg %d, offset x%lx, val x%lx, flags x%x)\n",
-        s->Sident,seg,offset,val,flags);
-    dbg_printf("Sseg = %d, Sxtrnnum = %d\n",s->Sseg,s->Sxtrnnum);
-    symbol_print(s);
-#endif
-
-    ty = s->ty();
-    if (s->Sxtrnnum)
-    {                           // identifier is defined somewhere else
-        if (I64)
-        {
-            if (SymbolTable64[s->Sxtrnnum].st_shndx != SHT_UNDEF)
-                external = FALSE;
-        }
-        else
-        {
-            if (SymbolTable[s->Sxtrnnum].st_shndx != SHT_UNDEF)
-                external = FALSE;
-        }
-    }
-
-    switch (s->Sclass)
-    {
-        case SClocstat:
-            buf = SegData[seg]->SDbuf;
-            refseg = /*(OPT_IS_SET(OPTfwritable_strings)) ?
-                STI_DATA : */STI_RODAT;
-            relinfo = config.flags3 & CFG3pic ?
-                  RI_TYPE_GOTOFF:RI_TYPE_SYM32,STI_RODAT;
-            if (s->Sfl == FLtlsdata)
-                relinfo = config.flags3 & CFG3pic ? RI_TYPE_TLS_GD : RI_TYPE_TLS_LE;
-            elf_addrel(seg,offset,relinfo,refseg,0);
-            if (I64)
+            {
+                if (s->Sfl == FLtlsdata)
+                    relinfo = config.flags3 & CFG3pic ? R_X86_64_TLSGD : R_X86_64_TPOFF32;
+                else
+                    relinfo = config.flags3 & CFG3pic ? R_X86_64_PC32 : R_X86_64_32;
+            }
+            else
+            {
+                if (s->Sfl == FLtlsdata)
+                    relinfo = config.flags3 & CFG3pic ? RI_TYPE_TLS_GD : RI_TYPE_TLS_LE;
+                else
+                    relinfo = config.flags3 & CFG3pic ? RI_TYPE_GOTOFF : RI_TYPE_SYM32;
+            }
+            if (flags & CFoffset64 && relinfo == R_X86_64_32)
+            {
+                relinfo = R_X86_64_64;
+            }
+            elf_addrel(seg,offset,relinfo,STI_RODAT,0);
+            if (retsize == 8)
-                buf->write64(val + s->Soffset);
-            else
-                buf->write32(val + s->Soffset);
-            break;
-
-        case SCcomdat:
-        case_SCcomdat:
-        case SCstatic:
-#if 0
-            if ((s->Sflags & SFLthunk) && s->Soffset)
-            {                   // A thunk symbol that has be defined
-                assert(s->Sseg == seg);
-                val = (s->Soffset+val) - (offset+4);
-                goto outaddrval;
-            }
-            // FALL_THROUGH
-#endif
-
-        case SCextern:
-        case SCcomdef:
-        case_extern:
-        case SCglobal:
-            if (!s->Sxtrnnum)
-            {   // not in symbol table yet - class might change
-                //dbg_printf("\tadding %s to fixlist\n",s->Sident);
-                addtofixlist(s,offset,seg,val,flags);
-NPTRSIZE
+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");
-NPTRSIZE
+4
-                    }
-                    else
-                    {
-NPTRSIZE
+4
-                        //dbg_printf("\tadding relocation\n");
+                        if (I64)
+                            relinfo = config.flags3 & CFG3pic ?  R_X86_64_PLT32 : R_X86_64_PC32;
+                        else
+                            relinfo = config.flags3 & CFG3pic ?  RI_TYPE_PLT32 : RI_TYPE_PC32;
-                        elf_addrel(seg,offset,
-config.flags3 & CFG3pic ?  RI_TYPE_PLT32 : RI_TYPE_PC32
+relinfo
-                                s->Sxtrnnum,0);
-                    }
-                }
-                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
-                        {
-
+I64 ? R_X86_64_32 : 
-                        }
-                        else
-                        {
-
+I64 ? R_X86_64_PC32 : 
-                        }
-                    }
-                    else if (config.flags3 & CFG3pic && s == GOTsym)
-                    {                   // relocation for Gbl Offset Tab
-
+I64 ? R_X86_64_NONE : 
-                    }
-                    else if (segtyp == DATA)
- 
-
+
+I64 ? R_X86_64_32 : 
-                    }
-                    else
-
-
-
+
+
+
+
+
-                    }
-                    if ((s->ty() & mTYLINK) & mTYthread)
-                    {
-config.flags3 & CFG3pic
+I64
-                        {
-
-
+
+
+
+
+
+
+
-                            else
-
+
+
+
+
+
+
-                        }
-                        else
-                        {
-
-
+
+
+
+
+
+
+
-                            else
-
+
+
+
+
+
+
-                        }
+                    }
+                    if (flags & CFoffset64 && relinfo == R_X86_64_32)
+                    {
+                        relinfo = R_X86_64_64;
-                    }
-                    //printf("\t\t************* adding relocation\n");
-                    elf_addrel(seg,offset,relinfo,refseg,0);
-                }
-outaddrval:
-I64
+retsize == 8
-                    buf->write64(val);
-                else
-                    buf->write32(val);
-NPTRSIZE
+retsize
-                    buf->setsize(save);
-            }
-            break;
-
-        case SCsinline:
-        case SCeinline:
-            printf ("Undefined inline value <<fixme>>\n");
-            //warerr(WM_undefined_inline,s->Sident);
-        case SCinline:
-            if (tyfunc(ty))
-            {
-                s->Sclass = SCextern;
-                goto case_extern;
-            }
-            else if (config.flags2 & CFG2comdat)
-                goto case_SCcomdat;     // treat as initialized common block
-
-        default:
-#ifdef DEBUG
-            //symbol_print(s);
-#endif
-            assert(0);
-    }
-NPTRSIZE
+retsize
-}
-
-/*****************************************
- * Generate far16 thunk.
- * Input:
- *      s       Symbol to generate a thunk for
- */
-
-void obj_far16thunk(Symbol *s)
-{
-    //dbg_printf("obj_far16thunk('%s')\n", s->Sident);
-    assert(0);
-}
-
-/**************************************
- * Mark object file as using floating point.
- */
-
-void obj_fltused()
-{
-    //dbg_printf("obj_fltused()\n");
-}
-
-static int obj_align(Symbol *s)
-{
-    if (type_size(s->Stype) == CHARSIZE)
-        return 1;
-    else if (type_size(s->Stype) == SHORTSIZE)
-        return 2;
-    else if (type_size(s->Stype) == LONGSIZE)
-        return 4;
-    else
-        return I64 ? 8 : 4;
-}
-
-/************************************
- * Close and delete .OBJ file.
- */
-
-void objfile_delete()
-{
-    //remove(fobjname); // delete corrupt output file
-}
-
-/**********************************
- * Terminate.
- */
-
-void objfile_term()
-{
-#if TERMCODE
-    mem_free(fobjname);
-    fobjname = NULL;
@@ -2699 +2701 @@
-            offset = (foffset + 31) & ~31;
-            break;
-        default:
-            dbg_printf("size was %d\n",(int)size);
-            assert(0);
-            break;
-    }
-    if (offset > foffset)
-        fobjbuf->writezeros(offset - foffset);
-    return offset;
-}
-
-/***************************************
- * Stuff pointer to ModuleInfo in its own segment.
- */
-
-#if MARS
-
-void obj_moduleinfo(Symbol *scc)
-{
-
-
-
-
-
-
-
-
-
-
+
-
-    /* Put in the ModuleReference. */
-    {
-        /* struct ModuleReference
-         * {
-         *      void*   next;
-         *      ModuleReference* module;
-         * }
-         */
-
+
+
-        SegData[seg]->SDoffset = SegData[seg]->SDbuf->size();
-        refOffset = SegData[seg]->SDoffset;
-        SegData[seg]->SDbuf->writezeros(NPTRSIZE);
-        SegData[seg]->SDoffset += NPTRSIZE;
-        SegData[seg]->SDoffset += reftoident(seg, SegData[seg]->SDoffset, scc, 0, CFoff);
-
-
-
+
+
+
+
+
+
-    {
-        /*      ret
+         * codeOffset:
-         *      pushad
-         *      mov     EAX,&ModuleReference
-         *      mov     ECX,_DmoduleRef
-         *      mov     EDX,[ECX]
-         *      mov     [EAX],EDX
-         *      mov     [ECX],EAX
-         *      popad
-         *      ret
-         */
-
-
-
+
+
+
+
+
-        SegData[seg]->SDoffset = buf->size();
-        codeOffset = SegData[seg]->SDoffset + 1;
-//      codeOffset = SegData[seg]->SDoffset;
-        buf->writeByte(0xC3); /* ret */
-
-        buf->writeByte(0x60); /* pushad */
-
-        /* movl ModuleReference*, %eax */
-        buf->writeByte(0xB8);
-        buf->write32(refOffset);
-RI_TYPE_SYM32
+reltype
-
-        /* movl _Dmodule_ref, %ecx */
-        buf->writeByte(0xB9);
-//offset);
-RI_TYPE_SYM32
+
+reltype
-
-        buf->writeByte(0x8B); buf->writeByte(0x11); /* movl (%ecx), %edx */
-        buf->writeByte(0x89); buf->writeByte(0x10); /* movl %edx, (%eax) */
-        buf->writeByte(0x89); buf->writeByte(0x01); /* movl %eax, (%ecx) */
-
-        buf->writeByte(0x61); /* popad */
-        buf->writeByte(0xC3); /* ret */
-        SegData[seg]->SDoffset = buf->size();
-    }
-
-
-
-
-
+
+
+
+
+
-    buf->write32(codeOffset);
-
+I64 ? R_X86_64_64 : 
-    SegData[seg]->SDoffset += NPTRSIZE;
-}
-
-#endif
-
-/************************************
- * Output long word of data.
- * Input:
- *      seg     CODE, DATA, CDATA, UDATA
- *      offset  offset of start of data
- *      data    long word of data
- *   Present only if size == 2:
- *      lcfd    LCxxxx | FDxxxx
- *      if (FD_F2 | FD_T6)
- *              idx1 = external Symbol #
- *      else
- *              idx1 = frame datum
- *              idx2 = target datum
- */
-
-void obj_long(int seg,targ_size_t offset,unsigned long data,
-        unsigned lcfd,unsigned idx1,unsigned idx2)
-{
-    printf ("obj_long\n");
-    exit (1);
-    /*
-    unsigned i;
-
-    if (
-        (seg != obj.ledata->lseg ||             // or segments don't match
-         obj.ledata->i + tysize[TYfptr] > LEDATAMAX || // or it'll overflow
-         offset < obj.ledata->offset || // underflow
-         offset > obj.ledata->offset + obj.ledata->i
-        )
-     )
-        ledata_new(seg,offset);
-  i = offset - obj.ledata->offset;
-  if (obj.ledata->i < i + tysize[TYfptr])
-        obj.ledata->i = i + tysize[TYfptr];
-  TOLONG(obj.ledata->data + i,data);
-  if (I32)                              // if 6 byte far pointers
-        TOWORD(obj.ledata->data + i + LONGSIZE,0);              // fill out seg
-  addfixup(offset - obj.ledata->offset,lcfd,idx1,idx2);
-  */
-}
-
-/*************************************
- */
-
-void elfobj_gotref(symbol *s)
-{
-    //printf("elfobj_gotref(%x '%s', %d)\n",s,s->Sident, s->Sclass);
-    switch(s->Sclass)
-    {
-        case SCstatic:
-        case SClocstat:
-            s->Sfl = FLgotoff;
-            break;
-
-        case SCextern:
-        case SCglobal:
-        case SCcomdat:
-        case SCcomdef:
-            s->Sfl = FLgot;
-            break;

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

@@ -1 +1 @@
-
-/*
- * Copyright (c) 1992-1999 by Symantec
-08
+10
- * All Rights Reserved
- * http://www.digitalmars.com
- * Written by Mike Cote, John Micco and Walter Bright
- *
- * This source file is made available for personal use
- * only. The license is in /dmd/src/dmd/backendlicense.txt
- * or /dm/src/dmd/backendlicense.txt
- * For any other uses, please contact Digital Mars.
- */
-
-#include <setjmp.h>
-
-/////////////////////////////////////////////////
-// Instruction flags (usFlags)
-//
-//
-
-// This is for when the reg field of modregrm specifies which instruction it is
-#define NUM_MASK        0x7
-#define _0      (0x0 | _modrm)          // insure that some _modrm bit is set
@@ -28 +28 @@
-#define _4      0x4
-#define _5      0x5
-#define _6      0x6
-#define _7      0x7
-
-#define _modrm  0x10
-
-#define _r      _modrm
-#define _cb     _modrm
-#define _cw     _modrm
-#define _cd     _modrm
-#define _cp     _modrm
-#define _ib     0
-#define _iw     0
-#define _id     0
-#define _rb     0
-#define _rw     0
-#define _rd     0
-#define _16_bit 0x20
-#define _32_bit 0x40
+#define _64_bit 0x10000
-#define _I386   0x80            // opcode is only for 386 and later
-#define _16_bit_addr    0x100
-#define _32_bit_addr    0x200
-#define _fwait 0x400    // Add an FWAIT prior to the instruction opcode
-#define _nfwait 0x800   // Do not add an FWAIT prior to the instruction
-
-#define MOD_MASK        0xF000  // Mod mask
-#define _modsi          0x1000  // Instruction modifies SI
-#define _moddx          0x2000  // Instruction modifies DX
-#define _mod2           0x3000  // Instruction modifies second operand
-#define _modax          0x4000  // Instruction modifies AX
-#define _modnot1        0x5000  // Instruction does not modify first operand
-#define _modaxdx        0x6000  // instruction modifies AX and DX
-#define _moddi          0x7000  // Instruction modifies DI
-#define _modsidi        0x8000  // Instruction modifies SI and DI
-#define _modcx          0x9000  // Instruction modifies CX
-#define _modes          0xa000  // Instruction modifies ES
-#define _modall         0xb000  // Instruction modifies all register values
-#define _modsiax        0xc000  // Instruction modifies AX and SI
-#define _modsinot1      0xd000  // Instruction modifies SI and not first param
-
-/////////////////////////////////////////////////
-// Operand flags - usOp1, usOp2, usOp3
-//
-
-short 
+
-
-// Operand flags for normal opcodes
-
-#define _r8     CONSTRUCT_FLAGS( _8, _reg, _normal, 0 )
-#define _r16    CONSTRUCT_FLAGS(_16, _reg, _normal, 0 )
-#define _r32    CONSTRUCT_FLAGS(_32, _reg, _normal, 0 )
+#define _r64    CONSTRUCT_FLAGS(_64, _reg, _normal, 0 )
-#define _m8     CONSTRUCT_FLAGS(_8, _m, _normal, 0 )
-#define _m16    CONSTRUCT_FLAGS(_16, _m, _normal, 0 )
-#define _m32    CONSTRUCT_FLAGS(_32, _m, _normal, 0 )
-#define _m48    CONSTRUCT_FLAGS( _48, _m, _normal, 0 )
-anysize
+64
-#define _m128   CONSTRUCT_FLAGS( _anysize, _m, _normal, 0 )
-#define _rm8    CONSTRUCT_FLAGS(_8, _rm, _normal, 0 )
-#define _rm16   CONSTRUCT_FLAGS(_16, _rm, _normal, 0 )
-#define _rm32   CONSTRUCT_FLAGS(_32, _rm, _normal, 0)
-#define _r32m16 CONSTRUCT_FLAGS(_32|_16, _rm, _normal, 0)
-#define _imm8   CONSTRUCT_FLAGS(_8, _imm, _normal, 0 )
-#define _imm16  CONSTRUCT_FLAGS(_16, _imm, _normal, 0)
-#define _imm32  CONSTRUCT_FLAGS(_32, _imm, _normal, 0)
-#define _rel8   CONSTRUCT_FLAGS(_8, _rel, _normal, 0)
-#define _rel16  CONSTRUCT_FLAGS(_16, _rel, _normal, 0)
-#define _rel32  CONSTRUCT_FLAGS(_32, _rel, _normal, 0)
-#define _p1616  CONSTRUCT_FLAGS(_32, _p, _normal, 0)
-#define _m1616  CONSTRUCT_FLAGS(_32, _mnoi, _normal, 0)
-#define _p1632  CONSTRUCT_FLAGS(_48, _p, _normal, 0 )
-#define _m1632  CONSTRUCT_FLAGS(_48, _mnoi, _normal, 0)
-#define _special  CONSTRUCT_FLAGS( 0, 0, _rspecial, 0 )
-#define _seg    CONSTRUCT_FLAGS( 0, 0, _rseg, 0 )
-#define _a16    CONSTRUCT_FLAGS( 0, 0, _addr16, 0 )
-#define _a32    CONSTRUCT_FLAGS( 0, 0, _addr32, 0 )
-#define _f16    CONSTRUCT_FLAGS( 0, 0, _fn16, 0)
-                                                // Near function pointer
-#define _f32    CONSTRUCT_FLAGS( 0, 0, _fn32, 0)
-                                                // Far function pointer
-#define _lbl    CONSTRUCT_FLAGS( 0, 0, _flbl, 0 )
-                                                // Label (in current function)
-
-#define _mmm32  CONSTRUCT_FLAGS( 0, _m, 0, _32)
-0, _m, 0, _
-
+_64, _m, 0, _f
+f
-
-#define _xmm_m32 CONSTRUCT_FLAGS( _32, _m, _rspecial, 0)
-#define _xmm_m64 CONSTRUCT_FLAGS( _anysize, _m, _rspecial, 0)
-#define _xmm_m128 CONSTRUCT_FLAGS( _anysize, _m, _rspecial, 0)
-
-#define _moffs8 (_rel8)
-#define _moffs16 (_rel16 )
-#define _moffs32 (_rel32 )
-
-
-////////////////////////////////////////////////////////////////////
-// Operand flags for floating point opcodes are all just aliases for
-// normal opcode variants and only asm_determine_operator_flags should
-// need to care.
-//
-
-
-
-64 | _80 | _112 | _224
+f
+f
+f
+f64 | _f80 | _f112 
-
-#define _float_m CONSTRUCT_FLAGS( _anysize, _float, 0, _fanysize)
-
-#define _st     CONSTRUCT_FLAGS( 0, _float, 0, _rst )   // stack register 0
-
-CONSTRUCT_FLAGS( 0, _m, 0, _224 )
+f
+_m112
-#define _m512   _m224
-#define _sti    CONSTRUCT_FLAGS( 0, _float, 0, _rsti )
-
-////////////////// FLAGS /////////////////////////////////////
-
+#if 1
+// bit size                      5      3     3         7
+#define CONSTRUCT_FLAGS( uSizemask, aopty, amod, uRegmask ) \
+    ( (uSizemask) | (aopty) << 5 | (amod) << 8 | (uRegmask) << 11)
+
+#define ASM_GET_uSizemask(us)   ((us) & 0x1F)
+#define ASM_GET_aopty(us)       ((ASM_OPERAND_TYPE)(((us) >> 5) & 7))
+#define ASM_GET_amod(us)        ((ASM_MODIFIERS)(((us) >> 8) & 7))
+#define ASM_GET_uRegmask(us)    (((us) >> 11) & 0x7F)
+#else
-#define CONSTRUCT_FLAGS( uSizemask, aopty, amod, uRegmask ) \
-    ( (uSizemask) | (aopty) << 4 | (amod) << 7 | (uRegmask) << 10)
-
-#define ASM_GET_uSizemask(us)   ((us) & 0x0F)
-#define ASM_GET_aopty(us)       ((ASM_OPERAND_TYPE)(((us) & 0x70) >> 4))
-#define ASM_GET_amod(us)        ((ASM_MODIFIERS)(((us) & 0x380) >> 7))
-#define ASM_GET_uRegmask(us)    (((us) & 0xFC00) >> 10)
-
-
-4
+
+
+5
-#define _8  0x1
-#define _16 0x2
-#define _32 0x4
-#define _48 0x8
-
+
+
-
-// For aopty (3 bits)
-enum ASM_OPERAND_TYPE {
-    _reg,           // _r8, _r16, _r32
-    _m,             // _m8, _m16, _m32, _m48
-    _imm,           // _imm8, _imm16, _imm32
-    _rel,           // _rel8, _rel16, _rel32
-    _mnoi,          // _m1616, _m1632
-    _p,             // _p1616, _p1632
-    _rm,            // _rm8, _rm16, _rm32
-    _float          // Floating point operand, look at cRegmask for the
-                    // actual size
-};
-
-// For amod (3 bits)
-enum ASM_MODIFIERS {
-    _normal,        // Normal register value
-    _rseg,          // Segment registers
-    _rspecial,      // Special registers
-    _addr16,        // 16 bit address
-    _addr32,        // 32 bit address
-    _fn16,          // 16 bit function call
-    _fn32,          // 32 bit function call
-    _flbl           // Label
-};
-
-6
+7
-
-// uRegmask flags when aopty == _float
-#define _rst    0x1
-#define _rsti   0x2
-
-
-
-
-
+
+
+
+
-
-// _seg register values (amod == _rseg)
-//
-#define _ds     CONSTRUCT_FLAGS( 0, 0, _rseg, 0x01 )
-#define _es     CONSTRUCT_FLAGS( 0, 0, _rseg, 0x02 )
-#define _ss     CONSTRUCT_FLAGS( 0, 0, _rseg, 0x04 )
-#define _fs     CONSTRUCT_FLAGS( 0, 0, _rseg, 0x08 )
-#define _gs     CONSTRUCT_FLAGS( 0, 0, _rseg, 0x10 )
-#define _cs     CONSTRUCT_FLAGS( 0, 0, _rseg, 0x20 )
-
-//
-// _special register values
-//
-#define _crn    CONSTRUCT_FLAGS( 0, 0, _rspecial, 0x01 ) // CRn register (0,2,3)
-#define _drn    CONSTRUCT_FLAGS( 0, 0, _rspecial, 0x02 ) // DRn register (0-3,6-7)
-#define _trn    CONSTRUCT_FLAGS( 0, 0, _rspecial, 0x04 ) // TRn register (3-7)
-#define _mm     CONSTRUCT_FLAGS( 0, 0, _rspecial, 0x08 ) // MMn register (0-7)
-#define _xmm    CONSTRUCT_FLAGS( 0, 0, _rspecial, 0x10 ) // XMMn register (0-7)
-
-//
-// Default register values
-//
-
-#define _al     CONSTRUCT_FLAGS( 0, 0, _normal, 0x01 )  // AL register
-#define _ax     CONSTRUCT_FLAGS( 0, 0, _normal, 0x02 )  // AX register
-#define _eax    CONSTRUCT_FLAGS( 0, 0, _normal, 0x04 )  // EAX register
-#define _dx     CONSTRUCT_FLAGS( 0, 0, _normal, 0x08 )  // DX register
-#define _cl     CONSTRUCT_FLAGS( 0, 0, _normal, 0x10 )  // CL register
+#define _rax    CONSTRUCT_FLAGS( 0, 0, _normal, 0x40 )  // RAX register
+
-
-#define _rplus_r        0x20
-#define _plus_r CONSTRUCT_FLAGS( 0, 0, 0, _rplus_r )
-                // Add the register to the opcode (no mod r/m)
-
-
-
-//////////////////////////////////////////////////////////////////
-
-#define ITprefix        0x10    // special prefix
-#define ITjump          0x20    // jump instructions CALL, Jxx and LOOPxx
-#define ITimmed         0x30    // value of an immediate operand controls
-                                // code generation
-#define ITopt           0x40    // not all operands are required
-#define ITshift         0x50    // rotate and shift instructions
-#define ITfloat         0x60    // floating point coprocessor instructions
-#define ITdata          0x70    // DB, DW, DD, DQ, DT pseudo-ops
-#define ITaddr          0x80    // DA (define addresss) pseudo-op
-#define ITMASK          0xF0
-#define ITSIZE          0x0F    // mask for size
@@ -266 +280 @@
-    // Float types
-    OPdf,
-    OPdd,
-    OPde,
-
-    // Deprecated
-    OPdw = OPds,
-    OPdq = OPdl,
-    OPdt = OPde,
-#endif
-};
-
-
-/* from iasm.c */
-int asm_state(int iFlags);
-
-void asm_process_fixup( block **ppblockLabels );
-
-typedef struct _PTRNTAB3 {
-        unsigned usOpcode;
-short 
+
-        opflag_t usOp1;
-        opflag_t usOp2;
-        opflag_t usOp3;
-} PTRNTAB3, * PPTRNTAB3, ** PPPTRNTAB3;
-
-typedef struct _PTRNTAB2 {
-        unsigned usOpcode;
-short 
+
-        opflag_t usOp1;
-        opflag_t usOp2;
-} PTRNTAB2, * PPTRNTAB2, ** PPPTRNTAB2;
-
-typedef struct _PTRNTAB1 {
-        unsigned usOpcode;
-short 
+
-        opflag_t usOp1;
-} PTRNTAB1, * PPTRNTAB1, ** PPPTRNTAB1;
-
-typedef struct _PTRNTAB0 {
-        unsigned usOpcode;
-        #define ASM_END 0xffff          // special opcode meaning end of table
-short 
+
-} PTRNTAB0, * PPTRNTAB0, ** PPPTRNTAB0;
-
-typedef union _PTRNTAB {
-        PTRNTAB0        *pptb0;
-        PTRNTAB1        *pptb1;
-        PTRNTAB2        *pptb2;
-        PTRNTAB3        *pptb3;
-} PTRNTAB, * PPTRNTAB, ** PPPTRNTAB;
-
-typedef struct
-{
-        unsigned char usNumops;
-        PTRNTAB ptb;
-} OP;
-

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

@@ -2309 +2309 @@
-    int seg = mach_getsegment("__minfodata", "__DATA", align, S_REGULAR);
-    //printf("obj_moduleinfo(%s) seg = %d:x%x\n", scc->Sident, seg, Offset(seg));
-
-#if 0
-    type *t = type_fake(TYint);
-    t->Tmangle = mTYman_c;
-    char *p = (char *)malloc(5 + strlen(scc->Sident) + 1);
-    strcpy(p, "SUPER");
-    strcpy(p + 5, scc->Sident);
-    symbol *s_minfo_beg = symbol_name(p, SCglobal, t);
-    objpubdef(seg, s_minfo_beg, 0);
-#endif
-
-    SegData[seg]->SDoffset += reftoident(seg, Offset(seg), scc, 0, CFoff);
-
-    mach_getsegment("__minfo_end", "__DATA", align, S_COALESCED, 4);
-}
-
-#endif
-
-/************************************
- * Output long word of data.
- * Input:
- *      seg     CODE, DATA, CDATA, UDATA
- *      offset  offset of start of data
- *      data    long word of data
- *   Present only if size == 2:
- *      lcfd    LCxxxx | FDxxxx
- *      if (FD_F2 | FD_T6)
- *              idx1 = external Symbol #
- *      else
- *              idx1 = frame datum
- *              idx2 = target datum
- */
-
-void obj_long(int seg,targ_size_t offset,unsigned long data,
-        unsigned lcfd,unsigned idx1,unsigned idx2)
-{
-    printf("obj_long\n");
-    exit(1);
-}
-
-/*************************************
- */
-
-void elfobj_gotref(symbol *s)
-{
-    //printf("elfobj_gotref(%x '%s', %d)\n",s,s->Sident, s->Sclass);
-    switch(s->Sclass)
-    {
-        case SCstatic:
-        case SClocstat:
-            s->Sfl = FLgotoff;
-            break;
-
-        case SCextern:
-        case SCglobal:
-        case SCcomdat:
-        case SCcomdef:
-            s->Sfl = FLgot;
-            break;
-

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

@@ -324 +324 @@
-} Elf64_Phdr;
-
-typedef struct {
-    Elf64_Word  st_name;
-    unsigned char st_info;
-    unsigned char st_other;
-    Elf64_Half  st_shndx;
-    Elf64_Addr  st_value;
-    Elf64_Xword st_size;
-} Elf64_Sym;
-
-typedef struct {
-    Elf64_Addr  r_offset;
-    Elf64_Xword r_info;
-        #define ELF64_R_SYM(i) ((Elf64_Word)((i)>>32))
-        #define ELF64_R_TYPE(i) ((Elf64_Word)(i & 0xFFFFFFFF))
-        #define ELF64_R_INFO(s,t) ((((Elf64_Xword)(s))<<32)|(Elf64_Word)(t))
-
-        // X86-64 Relocation types
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-} Elf64_Rel;
-
-typedef struct {
-    Elf64_Addr   r_offset;
-    Elf64_Xword  r_info;
-    Elf64_Sxword r_addend;
-} Elf64_Rela;
-
-

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

@@ -416 +416 @@
-                    reftodatseg(seg,offset,dt->DTabytes,DATA,flags);
-                else
-                    reftofarseg(seg,offset,dt->DTabytes,dt->DTseg,flags);
-#endif
-                offset += size(dt->Dty);
-                break;
-            case DT_ibytes:
-                obj_bytes(seg,offset,dt->DTn,dt->DTdata);
-                offset += dt->DTn;
-                break;
-            case DT_nbytes:
-                obj_bytes(seg,offset,dt->DTnbytes,dt->DTpbytes);
-                offset += dt->DTnbytes;
-                break;
-            case DT_azeros:
-                //printf("obj_lidata(seg = %d, offset = %d, azeros = %d)\n", seg, offset, dt->DTazeros);
-                obj_lidata(seg,offset,dt->DTazeros);
-                offset += dt->DTazeros;
-                break;
-            case DT_xoff:
-
-
-
+
+
-                a = dt->DToffset; // offset from it
-                if (tyreg(dt->Dty))
-                    flags = CFoff;
-                else
-                    flags = CFoff | CFseg;
+                if (I64)
+                    flags |= CFoffset64;
-                offset += reftoident(seg,offset,sb,a,flags);
-                break;
-            }
-            case DT_coff:
-                reftocodseg(seg,offset,dt->DToffset);
-                offset += intsize;
-                break;
-            case DT_1byte:
-                obj_byte(seg,offset++,dt->DTonebyte);
-                break;
-            default:
-#ifdef DEBUG
-                dbg_printf("dt = %p, dt = %d\n",dt,dt->dt);
-#endif
-                assert(0);
-        }
-    }
-#if ELFOBJ || MACHOBJ
-    Offset(seg) = offset;
-#else

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

@@ -826 +826 @@
-PTRNTAB2  aptb2IDIV[] = /* IDIV */ {
-        { 0xf6, _7,                     _al,            _rm8 },
-        { 0xf7, _7|_16_bit|_moddx,              _ax,            _rm16 },
-        { 0xf7, _7|_32_bit|_moddx,              _eax,           _rm32 },
-        { 0xf6, _7 | _modax,                    _rm8,           0 },
-        { 0xf7, _7|_16_bit|_modaxdx,    _rm16,          0 },
-        { 0xf7, _7|_32_bit|_modaxdx,    _rm32,          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 },
- | _16_bit
- | _32_bit
+
+
-        { ASM_END, 0, 0, 0 }
-};
-
-PTRNTAB2  aptb2LAR[] = /* LAR */ {
-        { 0x0f02,       _r|_16_bit,                     _r16,   _rm16 },
-        { 0x0f02,       _r|_32_bit,                     _r32,   _rm32 },
-        { ASM_END, 0, 0, 0 }
-};
-PTRNTAB2  aptb2LDS[] = /* LDS */ {
-        { 0xc5, _r|_16_bit,                     _r16,   _m32 },
-        { 0xc5, _r|_32_bit,                     _r32,   _m48 },
-        { ASM_END, 0, 0, 0 }
-};
-
-PTRNTAB2  aptb2LEA[] = /* LEA */ {
-        { 0x8d, _r|_16_bit,             _r16,   _m8 | _m16 | _m32 | _m48 },
-        { 0x8d, _r|_32_bit,             _r32,   _m8 | _m16 | _m32 | _m48 },
-        { 0x8d, _r|_16_bit,             _r16,   _rel16 },
-        { 0x8d, _r|_32_bit,             _r32,   _rel32 },
-        { ASM_END, 0, 0, 0 }

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

@@ -1 +1 @@
-
-/*
- * Copyright (c) 1992-1999 by Symantec
-09
+10
- * All Rights Reserved
- * http://www.digitalmars.com
- * Written by Mike Cote, John Micco and Walter Bright
- * D version by Walter Bright
- *
- * This source file is made available for personal use
- * only. The license is in /dmd/src/dmd/backendlicense.txt
- * For any other uses, please contact Digital Mars.
- */
-
-// Inline assembler for the D programming language compiler
-
-#include        <ctype.h>
-#include        <stdlib.h>
-#include        <stdio.h>
-#include        <string.h>
-#include        <time.h>
-#include        <assert.h>
-#include        <setjmp.h>
-#if __DMC__
-#undef setjmp
-#include        <limits.h>
-#endif
-
-
-// D compiler
-#include        "mars.h"
-#include        "lexer.h"
-#include        "mtype.h"
-#include        "statement.h"
-#include        "id.h"
-#include        "declaration.h"
-#include        "scope.h"
-#include        "init.h"
-#include        "enum.h"
+#include        "module.h"
-
-// C/C++ compiler
-#define SCOPE_H 1               // avoid conflicts with D's Scope
-#include        "cc.h"
-#include        "token.h"
-#include        "parser.h"
-#include        "global.h"
-#include        "el.h"
-#include        "type.h"
-#include        "oper.h"
-#include        "code.h"
-#include        "iasm.h"
-#include        "cpp.h"
-
-#undef _DH
-
-// I32 isn't set correctly yet because this is the front end, and I32
-// is a backend flag
+#undef I16
-#undef I32
+#undef I64
+#define I16 0
-#define I32 (global.params.isX86_64 == 0)
+#define I64 (global.params.isX86_64 == 1)
-
-//#define EXTRA_DEBUG 1
-
-#undef ADDFWAIT
-#define ADDFWAIT()      0
-
-// Error numbers
-enum ASMERRMSGS
-{
-    EM_bad_float_op,
-    EM_bad_addr_mode,
-    EM_align,
-    EM_opcode_exp,
-    EM_prefix,
-    EM_eol,
-    EM_bad_operand,
-    EM_bad_integral_operand,
-    EM_ident_exp,
-    EM_not_struct,
-    EM_nops_expected,
@@ -289 +294 @@
-"TR6",  6,      _special | _trn,
-"TR7",  7,      _special | _trn,
-"MM0",  0,      _mm,
-"MM1",  1,      _mm,
-"MM2",  2,      _mm,
-"MM3",  3,      _mm,
-"MM4",  4,      _mm,
-"MM5",  5,      _mm,
-"MM6",  6,      _mm,
-"MM7",  7,      _mm,
-"XMM0", 0,      _xmm,
-"XMM1", 1,      _xmm,
-"XMM2", 2,      _xmm,
-"XMM3", 3,      _xmm,
-"XMM4", 4,      _xmm,
-"XMM5", 5,      _xmm,
-"XMM6", 6,      _xmm,
-"XMM7", 7,      _xmm,
-};
-
+// 64 bit only registers
+#define _RAX    0
+#define _RBX    3
+#define _RCX    1
+#define _RDX    2
+#define _RSI    6
+#define _RDI    7
+#define _RBP    5
+#define _RSP    4
+#define _R8     8
+#define _R9     9
+#define _R10    10
+#define _R11    11
+#define _R12    12
+#define _R13    13
+#define _R14    14
+#define _R15    15
+
+#define _R8D    8
+#define _R9D    9
+#define _R10D   10
+#define _R11D   11
+#define _R12D   12
+#define _R13D   13
+#define _R14D   14
+#define _R15D   15
+
+#define _R8W    8
+#define _R9W    9
+#define _R10W   10
+#define _R11W   11
+#define _R12W   12
+#define _R13W   13
+#define _R14W   13
+#define _R15W   15
+
+#define _SIL    6
+#define _DIL    7
+#define _BPL    5
+#define _SPL    4
+#define _R8B    8
+#define _R9B    9
+#define _R10B   10
+#define _R11B   11
+#define _R12B   12
+#define _R13B   13
+#define _R14B   14
+#define _R15B   15
+
+static REG regtab64[] =
+{
+"RAX",  _RAX,   _r64 | _rax,
+"RBX",  _RBX,   _r64,
+"RCX",  _RCX,   _r64,
+"RDX",  _RDX,   _r64,
+"RSI",  _RSI,   _r64,
+"RDI",  _RDI,   _r64,
+"RBP",  _RBP,   _r64,
+"RSP",  _RSP,   _r64,
+"R8",   _R8,    _r64,
+"R9",   _R9,    _r64,
+"R10",  _R10,   _r64,
+"R11",  _R11,   _r64,
+"R12",  _R12,   _r64,
+"R13",  _R13,   _r64,
+"R14",  _R14,   _r64,
+"R15",  _R15,   _r64,
+
+"R8D",  _R8D,   _r32,
+"R9D",  _R9D,   _r32,
+"R10D", _R10D,  _r32,
+"R11D", _R11D,  _r32,
+"R12D", _R12D,  _r32,
+"R13D", _R13D,  _r32,
+"R14D", _R14D,  _r32,
+"R15D", _R15D,  _r32,
+
+"R8W",  _R8W,   _r16,
+"R9W",  _R9W,   _r16,
+"R10W", _R10W,  _r16,
+"R11W", _R11W,  _r16,
+"R12W", _R12W,  _r16,
+"R13W", _R13W,  _r16,
+"R14W", _R14W,  _r16,
+"R15W", _R15W,  _r16,
+
+"SIL",  _SIL,   _r8,
+"DIL",  _DIL,   _r8,
+"BPL",  _BPL,   _r8,
+"SPL",  _SPL,   _r8,
+"R8B",  _R8B,   _r8,
+"R9B",  _R9B,   _r8,
+"R10B", _R10B,  _r8,
+"R11B", _R11B,  _r8,
+"R12B", _R12B,  _r8,
+"R13B", _R13B,  _r8,
+"R14B", _R14B,  _r8,
+"R15B", _R15B,  _r8,
+
+"XMM8",   8,    _xmm,
+"XMM9",   9,    _xmm,
+"XMM10", 10,    _xmm,
+"XMM11", 11,    _xmm,
+"XMM12", 12,    _xmm,
+"XMM13", 13,    _xmm,
+"XMM14", 14,    _xmm,
+"XMM15", 15,    _xmm,
+};
+
-typedef enum {
-    ASM_JUMPTYPE_UNSPECIFIED,
-    ASM_JUMPTYPE_SHORT,
-    ASM_JUMPTYPE_NEAR,
-    ASM_JUMPTYPE_FAR
-} ASM_JUMPTYPE;             // ajt
-
-typedef struct opnd
-{
-        REG *base;              // if plain register
-        REG *pregDisp1;         // if [register1]
-        REG *pregDisp2;
-        REG *segreg;            // if segment override
-        char indirect;          // if had a '*' or '->'
-        char bOffset;           // if 'offset' keyword
-        char bSeg;              // if 'segment' keyword
-        char bPtr;              // if 'ptr' keyword
-        unsigned uchMultiplier; // register multiplier; valid values are 0,1,2,4,8
-        opflag_t usFlags;
-        Dsymbol *s;
@@ -351 +465 @@
-int asm_getnum();
-
-STATIC void asmerr(char *, ...);
-STATIC void asmerr(int, ...);
-#pragma SC noreturn(asmerr)
-
-STATIC OPND *asm_equal_exp();
-STATIC OPND *asm_inc_or_exp();
-STATIC OPND *asm_log_and_exp();
-STATIC OPND *asm_log_or_exp();
-STATIC char asm_length_type_size(OPND *popnd);
-STATIC void asm_token();
-STATIC void asm_token_trans(Token *tok);
-STATIC unsigned char asm_match_flags(opflag_t usOp , opflag_t usTable );
-STATIC unsigned char asm_match_float_flags(opflag_t usOp, opflag_t usTable);
-STATIC void asm_make_modrm_byte(
-#ifdef DEBUG
-        unsigned char *puchOpcode, unsigned *pusIdx,
-#endif
-        code *pc,
-short 
+
-        OPND *popnd, OPND *popnd2);
-STATIC regm_t asm_modify_regs(PTRNTAB ptb, OPND *popnd1, OPND *popnd2);
-STATIC void asm_output_flags(opflag_t usFlags);
-STATIC void asm_output_popnd(OPND *popnd);
-STATIC unsigned asm_type_size(Type * ptype);
-STATIC opflag_t asm_float_type_size(Type * ptype, opflag_t *pusFloat);
-STATIC OPND *asm_mul_exp();
-STATIC OPND *asm_br_exp();
-STATIC OPND *asm_primary_exp();
-STATIC OPND *asm_prim_post(OPND *);
-STATIC OPND *asm_rel_exp();
-STATIC OPND *asm_shift_exp();
-STATIC OPND *asm_una_exp();
-STATIC OPND *asm_xor_exp();
-STATIC void *link_alloc(size_t, void *);
-STATIC void asm_chktok(enum TOK toknum, unsigned errnum);
-STATIC code *asm_db_parse(OP *pop);
-STATIC code *asm_da_parse(OP *pop);
-
-short 
+
-
-
-/*******************************
- */
-
-STATIC OPND *opnd_calloc()
-{   OPND *o;
-
-    o = new OPND();
-    memset(o, 0, sizeof(*o));
-    return o;
-}
-
-/*******************************
- */
-
-STATIC void opnd_free(OPND *o)
-{
-    if (o)
-    {
@@ -461 +575 @@
-            {
-                popnd2->usFlags = usFlags2 = asm_determine_operand_flags(popnd2);
-                if (!popnd3)
-                    usNumops = 2;
-                else
-                {
-                    popnd3->usFlags = usFlags3 = asm_determine_operand_flags(popnd3);
-                    usNumops = 3;
-                }
-            }
-        }
-
-        // Now check to insure that the number of operands is correct
-        usActual = (pop->usNumops & ITSIZE);
-        if (usActual != usNumops && asmstate.ucItype != ITopt &&
-            asmstate.ucItype != ITfloat)
-        {
-PARAM_ERROR:
-                asmerr(EM_nops_expected, usActual, asm_opstr(pop), usNumops);
-        }
-
+
+
+
+
+
-//
-//      The number of arguments matches, now check to find the opcode
-//      in the associated opcode table
-//
-RETRY:
-        //printf("usActual = %d\n", usActual);
-        switch (usActual)
-        {
-            case 0:
-                ptbRet = pop->ptb ;
-                goto RETURN_IT;
-
-            case 1:
-                //printf("usFlags1 = "); asm_output_flags(usFlags1); printf("\n");
-                for (pptb1 = pop->ptb.pptb1; pptb1->usOpcode != ASM_END;
-                        pptb1++)
-                {
-                        //printf("table    = "); asm_output_flags(pptb1->usOp1); printf("\n");
-                        bMatch1 = asm_match_flags(usFlags1, pptb1->usOp1);
+                        //printf("bMatch1 = x%x\n", bMatch1);
-                        if (bMatch1)
-                        {   if (pptb1->usOpcode == 0x68 &&
-I32
+!I16
-                                pptb1->usOp1 == _imm16
-                              )
-                                // Don't match PUSH imm16 in 32 bit code
-                                continue;
-                            break;
-                        }
-                        if ((asmstate.ucItype == ITimmed) &&
-                            asm_match_flags(usFlags1,
-                                CONSTRUCT_FLAGS(_8 | _16 | _32, _imm, _normal,
-                                                 0)) &&
-                                popnd1->disp == pptb1->usFlags)
-                            break;
-                        if ((asmstate.ucItype == ITopt ||
-                             asmstate.ucItype == ITfloat) &&
-                            !usNumops &&
-                            !pptb1->usOp1)
-                        {
-                            if (usNumops > 1)
-                                goto PARAM_ERROR;
-                            break;
@@ -785 +904 @@
-    }
-    if (popnd->pregDisp1 && !popnd->base)
-    {
-        us = asm_float_type_size(popnd->ptype, &usFloat);
-        //printf("us = x%x, usFloat = x%x\n", us, usFloat);
-        if (popnd->pregDisp1->ty & _r32)
-            return(CONSTRUCT_FLAGS(us, _m, _addr32, usFloat));
-        else
-        if (popnd->pregDisp1->ty & _r16)
-            return(CONSTRUCT_FLAGS(us, _m, _addr16, usFloat));
-    }
-    else if (popnd->s != 0)
-    {
-        us = asm_float_type_size(popnd->ptype, &usFloat);
-        return CONSTRUCT_FLAGS(us, _m, _normal, usFloat);
-    }
-
-    if (popnd->segreg)
-    {
-        us = asm_float_type_size(popnd->ptype, &usFloat);
-
+
+
+
-            return(CONSTRUCT_FLAGS(us, _m, _addr32, usFloat));
-        else
-            return(CONSTRUCT_FLAGS(us, _m, _addr16, usFloat));
-    }
-
-#if 0
-    if (popnd->real)
-    {
-        switch (popnd->ptype->ty)
-        {
-            case Tfloat32:
-                popnd->s = fconst(popnd->real);
-                return(CONSTRUCT_FLAGS(_32, _m, _normal, 0));
-
-            case Tfloat64:
-                popnd->s = dconst(popnd->real);
-
+f
-
-            case Tfloat80:
-                popnd->s = ldconst(popnd->real);
-
+f
-        }
-    }
-#endif
-
-    asmerr(EM_bad_float_op);    // unknown operand for floating point instruction
-    return 0;
-}
-
-/*******************************
- */
-
-STATIC opflag_t asm_determine_operand_flags(OPND *popnd)
-{
-        Dsymbol *ps;
-        int ty;
-        opflag_t us;
-        opflag_t sz;
-        ASM_OPERAND_TYPE opty;
-        ASM_MODIFIERS amod;
-
@@ -850 +969 @@
-
-        if (asmstate.ucItype == ITfloat)
-            return asm_determine_float_flags(popnd);
-
-        // If just a register
-        if (popnd->base && !popnd->s && !popnd->disp && !popnd->real)
-                return popnd->base->ty;
-#if DEBUG
-        if (debuga)
-            printf("popnd->base = %s\n, popnd->pregDisp1 = %p\n", popnd->base ? popnd->base->regstr : "NONE", popnd->pregDisp1);
-#endif
-        ps = popnd->s;
-        Declaration *ds = ps ? ps->isDeclaration() : NULL;
-        if (ds && ds->storage_class & STClazy)
-            sz = _anysize;
-        else
-            sz = asm_type_size((ds && ds->storage_class & (STCout | STCref)) ? popnd->ptype->pointerTo() : popnd->ptype);
-        if (popnd->pregDisp1 && !popnd->base)
-        {
-            if (ps && ps->isLabel() && sz == _anysize)
-32 ? _32 : _16
+16 ? _16 : _32
-            return (popnd->pregDisp1->ty & _r32)
-                ? CONSTRUCT_FLAGS(sz, _m, _addr32, 0)
-                : CONSTRUCT_FLAGS(sz, _m, _addr16, 0);
-        }
-        else if (ps)
-        {
-                if (popnd->bOffset || popnd->bSeg || ps == asmstate.psLocalsize)
-32
-32
-16
+16
+16
+32
-
-                if (ps->isLabel())
-                {
-                    switch (popnd->ajt)
-                    {
-                        case ASM_JUMPTYPE_UNSPECIFIED:
-                            if (ps == asmstate.psDollar)
-                            {
-                                if (popnd->disp >= CHAR_MIN &&
-                                    popnd->disp <= CHAR_MAX)
-                                    us = CONSTRUCT_FLAGS(_8, _rel, _flbl,0);
-                                else
-                                if (popnd->disp >= SHRT_MIN &&
-                                    popnd->disp <= SHRT_MAX)
-                                    us = CONSTRUCT_FLAGS(_16, _rel, _flbl,0);
-                                else
-                                    us = CONSTRUCT_FLAGS(_32, _rel, _flbl,0);
-                            }
-                            else if (asmstate.ucItype != ITjump)
-                            {   if (sz == _8)
-                                {   us = CONSTRUCT_FLAGS(_8,_rel,_flbl,0);
-                                    break;
-                                }
-                                goto case_near;
-                            }
-                            else
-32
-32
-16
+16
+16
+32
-                            break;
-
-                        case ASM_JUMPTYPE_NEAR:
-                        case_near:
-32
-32
-16
+16
+16
+32
-                            break;
-                        case ASM_JUMPTYPE_SHORT:
-                            us = CONSTRUCT_FLAGS(_8, _rel, _flbl, 0);
-                            break;
-                        case ASM_JUMPTYPE_FAR:
-32
-48
-32
+16
+32
+48
-                            break;
-                        default:
-                            assert(0);
-                    }
-                    return us;
-                }
-                if (!popnd->ptype)
-                    return CONSTRUCT_FLAGS(sz, _m, _normal, 0);
-                ty = popnd->ptype->ty;
-                if (ty == Tpointer && popnd->ptype->nextOf()->ty == Tfunction &&
-                    !ps->isVarDeclaration())
-                {
-#if 1
-                    return CONSTRUCT_FLAGS(_32, _m, _fn16, 0);
-#else
-                    ty = popnd->ptype->Tnext->Tty;
-                    if (tyfarfunc(tybasic(ty))) {
-                        return I32
-                            ? CONSTRUCT_FLAGS(_48, _mnoi, _fn32, 0)
-                            : CONSTRUCT_FLAGS(_32, _mnoi, _fn32, 0);
@@ -957 +1076 @@
-#else
-                    if (tyfarfunc(tybasic(ty)))
-                        return I32
-                            ? CONSTRUCT_FLAGS(_48, _p, _fn32, 0)
-                            : CONSTRUCT_FLAGS(_32, _p, _fn32, 0);
-                    else
-                        return I32
-                            ? CONSTRUCT_FLAGS(_32, _rel, _fn16, 0)
-                            : CONSTRUCT_FLAGS(_16, _rel, _fn16, 0);
-#endif
-                }
-                else if (asmstate.ucItype == ITjump)
-                {   amod = _normal;
-                    goto L1;
-                }
-                else
-                    return CONSTRUCT_FLAGS(sz, _m, _normal, 0);
-        }
-        if (popnd->segreg /*|| popnd->bPtr*/)
-        {
-32 ? _addr32 : _addr16
+16 ? _addr16 : _addr32
-            if (asmstate.ucItype == ITjump)
-            {
-            L1:
-                opty = _m;
-
+
+
+
+
+
-                {   if (sz == _48)
-                        opty = _mnoi;
-                }
-                else
-                {
-                    if (sz == _32)
-                        opty = _mnoi;
-                }
-                us = CONSTRUCT_FLAGS(sz,opty,amod,0);
-            }
-            else
-                us = CONSTRUCT_FLAGS(sz,
-//                                   _rel, amod, 0);
-                                     _m, amod, 0);
-        }
-
-        else if (popnd->ptype)
-            us = CONSTRUCT_FLAGS(sz, _imm, _normal, 0);
-
-        else if (popnd->disp >= CHAR_MIN && popnd->disp <= UCHAR_MAX)
-            us = CONSTRUCT_FLAGS(_8 | _16 | _32, _imm, _normal, 0);
-        else if (popnd->disp >= SHRT_MIN && popnd->disp <= USHRT_MAX)
-            us = CONSTRUCT_FLAGS(_16 | _32, _imm, _normal, 0);
-        else
-            us = CONSTRUCT_FLAGS(_32, _imm, _normal, 0);
-        return us;
-}
-
-/******************************
- * Convert assembly instruction into a code, and append
- * it to the code generated for this block.
- */
-
-STATIC code *asm_emit(Loc loc,
-        unsigned usNumops, PTRNTAB ptb,
-        OP *pop,
-        OPND *popnd1, OPND *popnd2, OPND *popnd3)
-{
-#ifdef DEBUG
-        unsigned char auchOpcode[16];
-        unsigned usIdx = 0;
-        #define emit(op)        (auchOpcode[usIdx++] = op)
-#else
-        #define emit(op)        ((void)(op))
-#endif
-        Identifier *id;
-short 
+
-        unsigned char *puc;
-        unsigned usDefaultseg;
-        code *pc = NULL;
-        OPND *popndTmp;
-        ASM_OPERAND_TYPE    aoptyTmp;
-short 
+
-        REG     *pregSegment;
-        code    *pcPrefix = NULL;
-        unsigned            uSizemask1 =0, uSizemask2 =0, uSizemask3 =0;
-        //ASM_OPERAND_TYPE    aopty1 = _reg , aopty2 = 0, aopty3 = 0;
-        ASM_MODIFIERS       amod1 = _normal, amod2 = _normal, amod3 = _normal;
-        unsigned            uRegmask1 = 0, uRegmask2 =0, uRegmask3 =0;
-        unsigned            uSizemaskTable1 =0, uSizemaskTable2 =0,
-                            uSizemaskTable3 =0;
-        ASM_OPERAND_TYPE    aoptyTable1 = _reg, aoptyTable2 = _reg, aoptyTable3 = _reg;
-        ASM_MODIFIERS       amodTable1 = _normal,
-                            amodTable2 = _normal,
-                            amodTable3 = _normal;
-        unsigned            uRegmaskTable1 = 0, uRegmaskTable2 =0,
-                            uRegmaskTable3 =0;
-
-        pc = code_calloc();
-        pc->Iflags |= CFpsw;            // assume we want to keep the flags
-        if (popnd1)
-        {
-            uSizemask1 = ASM_GET_uSizemask(popnd1->usFlags);
@@ -1080 +1198 @@
-            uSizemaskTable2 = ASM_GET_uSizemask(ptb.pptb2->usOp2);
-            aoptyTable2 = ASM_GET_aopty(ptb.pptb2->usOp2);
-            amodTable2 = ASM_GET_amod(ptb.pptb2->usOp2);
-            uRegmaskTable2 = ASM_GET_uRegmask(ptb.pptb2->usOp2);
-        }
-        if (popnd3)
-        {
-            uSizemask3 = ASM_GET_uSizemask(popnd3->usFlags);
-            //aopty3 = ASM_GET_aopty(popnd3->usFlags);
-            amod3 = ASM_GET_amod(popnd3->usFlags);
-            uRegmask3 = ASM_GET_uRegmask(popnd3->usFlags);
-
-            uSizemaskTable3 = ASM_GET_uSizemask(ptb.pptb3->usOp3);
-            aoptyTable3 = ASM_GET_aopty(ptb.pptb3->usOp3);
-            amodTable3 = ASM_GET_amod(ptb.pptb3->usOp3);
-            uRegmaskTable3 = ASM_GET_uRegmask(ptb.pptb3->usOp3);
-        }
-
-        asmstate.statement->regs |= asm_modify_regs(ptb, popnd1, popnd2);
-
-!I32
+I16
-        {
-            switch (usNumops)
-            {
-                case 0:
-                    break;
-                case 1:
-                    if (popnd1 && popnd1->s)
-                    {
-L386_WARNING:
-                        id = popnd1->s->ident;
-L386_WARNING2:
-                        if (config.target_cpu < TARGET_80386)
-                        {   // Reference to %s caused a 386 instruction to be generated
-                            //warerr(WM_386_op, id->toChars());
-                        }
-                    }
-                    break;
-                case 2:
-                case 3:     // The third operand is always an _imm
-                    if (popnd1 && popnd1->s)
-                        goto L386_WARNING;
-                    if (popnd2 && popnd2->s)
-                    {
-                        id = popnd2->s->ident;
-                        goto L386_WARNING2;
-                    }
-                    break;
-            }
-        }
-
-        switch (usNumops)
-        {
-            case 0:
-                if ((I32 && (ptb.pptb0->usFlags & _16_bit)) ||
-!I32
+I16
-                {
-                        emit(0x66);
-                        pc->Iflags |= CFopsize;
-                }
-                break;
-
-            // 3 and 2 are the same because the third operand is always
-            // an immediate and does not affect operation size
-            case 3:
-            case 2:
-                if ((I32 &&
-                      (amod2 == _addr16 ||
-                       (uSizemaskTable2 & _16 && aoptyTable2 == _rel) ||
-                       (uSizemaskTable2 & _32 && aoptyTable2 == _mnoi) ||
-                       (ptb.pptb2->usFlags & _16_bit_addr)
-                     )
-                    ) ||
-!I32
+I16
-                       (amod2 == _addr32 ||
-                        (uSizemaskTable2 & _32 && aoptyTable2 == _rel) ||
-                        (uSizemaskTable2 & _48 && aoptyTable2 == _mnoi) ||
-                        (ptb.pptb2->usFlags & _32_bit_addr)))
-                  )
-                {
-                        emit(0x67);
-                        pc->Iflags |= CFaddrsize;
-                        if (I32)
-                            amod2 = _addr16;
-                        else
-                            amod2 = _addr32;
-                        popnd2->usFlags &= ~CONSTRUCT_FLAGS(0,0,7,0);
-                        popnd2->usFlags |= CONSTRUCT_FLAGS(0,0,amod2,0);
-                }
-
-
-            /* Fall through, operand 1 controls the opsize, but the
-                address size can be in either operand 1 or operand 2,
-                hence the extra checking the flags tested for SHOULD
-                be mutex on operand 1 and operand 2 because there is
-                only one MOD R/M byte
-             */
-
-            case 1:
-                if ((I32 &&
-                      (amod1 == _addr16 ||
-                       (uSizemaskTable1 & _16 && aoptyTable1 == _rel) ||
-                        (uSizemaskTable1 & _32 && aoptyTable1 == _mnoi) ||
-                        (ptb.pptb1->usFlags & _16_bit_addr))) ||
-!I32
+I16
-                      (amod1 == _addr32 ||
-                        (uSizemaskTable1 & _32 && aoptyTable1 == _rel) ||
-                        (uSizemaskTable1 & _48 && aoptyTable1 == _mnoi) ||
-                         (ptb.pptb1->usFlags & _32_bit_addr))))
-                {
-                        emit(0x67);     // address size prefix
-                        pc->Iflags |= CFaddrsize;
-                        if (I32)
-                            amod1 = _addr16;
-                        else
-                            amod1 = _addr32;
-                        popnd1->usFlags &= ~CONSTRUCT_FLAGS(0,0,7,0);
-                        popnd1->usFlags |= CONSTRUCT_FLAGS(0,0,amod1,0);
-                }
-
-                // If the size of the operand is unknown, assume that it is
-                // the default size
-                if ((I32 && (ptb.pptb0->usFlags & _16_bit)) ||
-!I32
+I16
-                {
-                    //if (asmstate.ucItype != ITjump)
-                    {   emit(0x66);
-                        pc->Iflags |= CFopsize;
-                    }
-                }
-                if (((pregSegment = (popndTmp = popnd1)->segreg) != NULL) ||
-                        ((popndTmp = popnd2) != NULL &&
-                        (pregSegment = popndTmp->segreg) != NULL)
-                  )
-                {
-                    if ((popndTmp->pregDisp1 &&
-                            popndTmp->pregDisp1->val == _BP) ||
-                            popndTmp->pregDisp2 &&
-                            popndTmp->pregDisp2->val == _BP)
-                            usDefaultseg = _SS;
-                    else
-                            usDefaultseg = _DS;
-                    if (pregSegment->val != usDefaultseg)
-                        switch (pregSegment->val) {
@@ -1733 +1851 @@
-    va_end(ap);
-
-    printf("\n");
-    fflush(stdout);
-
-    longjmp(asmstate.env,1);
-}
-
-/*******************************
- */
-
-STATIC opflag_t asm_float_type_size(Type *ptype, opflag_t *pusFloat)
-{
-    *pusFloat = 0;
-
-    //printf("asm_float_type_size('%s')\n", ptype->toChars());
-    if (ptype && ptype->isscalar())
-    {
-        int sz = (int)ptype->size();
-        if (sz == REALSIZE)
-
+f
-            return 0;
-        }
-        switch (sz)
-        {
-            case 2:
-                return _16;
-            case 4:
-                return _32;
-            case 8:
-
+
+
+
+
-                return 0;
-            default:
-                break;
-        }
-    }
-    *pusFloat = _fanysize;
-    return _anysize;
-}
-
-/*******************************
- */
-
-STATIC int asm_isint(OPND *o)
-{
-    if (!o || o->base || o->s)
-        return 0;
-    //return o->disp != 0;
-    return 1;
-}
-
@@ -1993 +2114 @@
-    {
-        if (v->isParameter())
-            asmstate.statement->refparam = TRUE;
-
-        v->checkNestedReference(asmstate.sc, asmstate.loc);
-#if 0
-        if (!v->isDataseg() && v->parent != asmstate.sc->parent && v->parent)
-        {
-            asmerr(EM_uplevel, v->toChars());
-        }
-#endif
-        if (v->storage_class & STCfield)
-        {
-            o1->disp += v->offset;
-            goto L2;
-        }
-        if ((v->isConst()
-#if DMDV2
-                || v->isImmutable() || v->storage_class & STCmanifest
-#endif
-
+ && v->init
-        {   ExpInitializer *ei = v->init->isExpInitializer();
-
-            if (ei)
-            {
-                o1->disp = ei->exp->toInteger();
-                return;
-            }
-        }
-    }
-    em = s->isEnumMember();
-    if (em)
-    {
-        o1->disp = em->value->toInteger();
-        return;
-    }
-    o1->s = s;  // a C identifier
-L2:
-    Declaration *d = s->isDeclaration();
-    if (!d)
-    {
-        asmerr("%s %s is not a declaration", s->kind(), s->toChars());
-    }
-    else if (d->getType())
-        asmerr(EM_type_as_operand, d->getType()->toChars());
-    else if (d->isTupleDeclaration())
-        ;
-    else
-        o1->ptype = d->type->toBasetype();
-}
-
-/****************************
- * Fill in the modregrm and sib bytes of code.
- */
-
-STATIC void asm_make_modrm_byte(
-#ifdef DEBUG
-        unsigned char *puchOpcode, unsigned *pusIdx,
-#endif
-        code *pc,
-short 
+
-        OPND *popnd, OPND *popnd2)
-{
-    #undef modregrm
-
-    typedef union {
-        unsigned char   uchOpcode;
-        struct {
-            unsigned rm  : 3;
-            unsigned reg : 3;
-            unsigned mod : 2;
-        } modregrm;
-    } MODRM_BYTE;                       // mrmb
-
-    typedef union {
-        unsigned char   uchOpcode;
-        struct {
-            unsigned base  : 3;
-            unsigned index : 3;
-            unsigned ss    : 2;
-        } sib;
-    } SIB_BYTE;
-
-
-    MODRM_BYTE  mrmb = { 0 };
-    SIB_BYTE    sib = { 0 };
-    char                bSib = FALSE;
-    char                bDisp = FALSE;
-    char                b32bit = FALSE;
-    unsigned char       *puc;
-    char                bModset = FALSE;
-    Dsymbol             *s;
-
-    unsigned        uSizemask =0;
-    ASM_OPERAND_TYPE    aopty;
-    ASM_MODIFIERS           amod;
-short 
+
-    unsigned char           bOffsetsym = FALSE;
-
-#if 0
-    printf("asm_make_modrm_byte(usFlags = x%x)\n", usFlags);
-    printf("op1: ");
-    asm_output_flags(popnd->usFlags);
-    if (popnd2)
-    {   printf(" op2: ");
-        asm_output_flags(popnd2->usFlags);
-    }
-    printf("\n");
-#endif
-
-    uSizemask = ASM_GET_uSizemask(popnd->usFlags);
-    aopty = ASM_GET_aopty(popnd->usFlags);
-    amod = ASM_GET_amod(popnd->usFlags);
-    uRegmask = ASM_GET_uRegmask(popnd->usFlags);
-    s = popnd->s;
-    if (s)
-    {
@@ -2190 +2311 @@
-    }
-    mrmb.modregrm.reg = usFlags & NUM_MASK;
-
-    if (s && (aopty == _m || aopty == _mnoi) && !s->isLabel())
-    {
-        if (s == asmstate.psLocalsize)
-        {
-    DATA_REF:
-            mrmb.modregrm.rm = BPRM;
-            if (amod == _addr16 || amod == _addr32)
-                mrmb.modregrm.mod = 0x2;
-            else
-                mrmb.modregrm.mod = 0x0;
-        }
-        else
-        {
-            Declaration *d = s->isDeclaration();
-            assert(d);
-            if (d->isDataseg() || d->isCodeseg())
-            {
- 
-!I32
+
+I16
-                    asmerr(EM_bad_addr_mode);   // illegal addressing mode
-                goto DATA_REF;
-            }
-            mrmb.modregrm.rm = BPRM;
-            mrmb.modregrm.mod = 0x2;
-        }
-    }
-
-    if (aopty == _reg || amod == _rspecial) {
-            mrmb.modregrm.mod = 0x3;
-            mrmb.modregrm.rm |= popnd->base->val;
-    }
-!I32
+I16
-    {   unsigned rm;
-
-#ifdef DEBUG
-        if (debuga)
-            printf("This is an ADDR16\n");
-#endif
-        if (!popnd->pregDisp1)
-        {   rm = 0x6;
-            if (!s)
-                bDisp = TRUE;
-        }
-        else
-        {   unsigned r1r2;
-            #define X(r1,r2)    (((r1) * 16) + (r2))
-            #define Y(r1)               X(r1,9)
-
-
-            if (popnd->pregDisp2)
-                r1r2 = X(popnd->pregDisp1->val,popnd->pregDisp2->val);
-            else
@@ -2615 +2736 @@
-}
-
-/*******************************
- * Match flags in operand against flags in opcode table.
- * Returns:
- *      !=0 if match
- */
-
-STATIC unsigned char asm_match_flags(opflag_t usOp, opflag_t usTable)
-{
-    ASM_OPERAND_TYPE    aoptyTable;
-    ASM_OPERAND_TYPE    aoptyOp;
-    ASM_MODIFIERS       amodTable;
-    ASM_MODIFIERS       amodOp;
-    unsigned            uRegmaskTable;
-    unsigned            uRegmaskOp;
-    unsigned char       bRegmatch;
-    unsigned char       bRetval = FALSE;
-    unsigned            uSizemaskOp;
-    unsigned            uSizemaskTable;
-char
+    
-
-    //printf("asm_match_flags(usOp = x%x, usTable = x%x)\n", usOp, usTable);
-    if (asmstate.ucItype == ITfloat)
-    {
-        bRetval = asm_match_float_flags(usOp, usTable);
-        goto EXIT;
-    }
-
-    uSizemaskOp = ASM_GET_uSizemask(usOp);
-    uSizemaskTable = ASM_GET_uSizemask(usTable);
-
-    // Check #1, if the sizes do not match, NO match
-    bSizematch =  (uSizemaskOp & uSizemaskTable);
-
-    amodOp = ASM_GET_amod(usOp);
-
-    aoptyTable = ASM_GET_aopty(usTable);
-    aoptyOp = ASM_GET_aopty(usOp);
-
-    // _mmm64 matches with a 64 bit mem or an MMX register
@@ -2741 +2862 @@
-    printf(": %s\n", bRetval ? "MATCH" : "NOMATCH");
-#endif
-    return bRetval;
-
-Lmatch:
-    //printf("match\n");
-    return 1;
-}
-
-/*******************************
- */
-
-STATIC unsigned char asm_match_float_flags(opflag_t usOp, opflag_t usTable)
-{
-    ASM_OPERAND_TYPE    aoptyTable;
-    ASM_OPERAND_TYPE    aoptyOp;
-    ASM_MODIFIERS       amodTable;
-    ASM_MODIFIERS       amodOp;
-    unsigned            uRegmaskTable;
-    unsigned            uRegmaskOp;
-char
+    
-
-
-//
-// Check #1, if the sizes do not match, NO match
-//
-    uRegmaskOp = ASM_GET_uRegmask(usOp);
-    uRegmaskTable = ASM_GET_uRegmask(usTable);
-    bRegmatch = (uRegmaskTable & uRegmaskOp);
-
-    if (!(ASM_GET_uSizemask(usTable) & ASM_GET_uSizemask(usOp) ||
-          bRegmatch))
-        return(FALSE);
-
-    aoptyTable = ASM_GET_aopty(usTable);
-    aoptyOp = ASM_GET_aopty(usOp);
-//
-// The operand types must match, otherwise return FALSE.
-// There is one exception for the _rm which is a table entry which matches
-// _reg or _m
-//
@@ -2824 +2945 @@
-{
-        ASM_OPERAND_TYPE    aopty = ASM_GET_aopty(usFlags);
-        ASM_MODIFIERS       amod = ASM_GET_amod(usFlags);
-        unsigned            uRegmask = ASM_GET_uRegmask(usFlags);
-        unsigned            uSizemask = ASM_GET_uSizemask(usFlags);
-
-        if (uSizemask == _anysize)
-            printf("_anysize ");
-        else if (uSizemask == 0)
-            printf("0        ");
-        else
-        {
-            if (uSizemask & _8)
-                printf("_8  ");
-            if (uSizemask & _16)
-                printf("_16 ");
-            if (uSizemask & _32)
-                printf("_32 ");
-            if (uSizemask & _48)
-                printf("_48 ");
+            if (uSizemask & _64)
+                printf("_64 ");
-        }
-
-        printf("_");
-        switch (aopty) {
-            case _reg:
-                printf("reg   ");
-                break;
-            case _m:
-                printf("m     ");
-                break;
-            case _imm:
-                printf("imm   ");
-                break;
-            case _rel:
-                printf("rel   ");
-                break;
-            case _mnoi:
-                printf("mnoi  ");
-                break;
-            case _p:
@@ -2865 +2988 @@
-                break;
-            case _rm:
-                printf("rm    ");
-                break;
-            case _float:
-                printf("float ");
-                break;
-            default:
-                printf(" UNKNOWN ");
-        }
-
-        printf("_");
-        switch (amod) {
-            case _normal:
-                printf("normal   ");
-                if (uRegmask & 1) printf("_al ");
-                if (uRegmask & 2) printf("_ax ");
-                if (uRegmask & 4) printf("_eax ");
-                if (uRegmask & 8) printf("_dx ");
-                if (uRegmask & 0x10) printf("_cl ");
+                if (uRegmask & 0x40) printf("_rax ");
+                if (uRegmask & 0x20) printf("_rplus_r ");
-                return;
-            case _rseg:
-                printf("rseg     ");
-                break;
-            case _rspecial:
-                printf("rspecial ");
-                break;
-            case _addr16:
-                printf("addr16   ");
-                break;
-            case _addr32:
-                printf("addr32   ");
-                break;
-            case _fn16:
-                printf("fn16     ");
-                break;
-            case _fn32:
-                printf("fn32     ");
-                break;
-            case _flbl:
@@ -2960 +3085 @@
-}
-
-#endif
-
-/*******************************
- */
-
-STATIC REG *asm_reg_lookup(char *s)
-{
-    int i;
-
-    //dbg_printf("asm_reg_lookup('%s')\n",s);
-
-    for (i = 0; i < sizeof(regtab) / sizeof(regtab[0]); i++)
-    {
-        if (strcmp(s,regtab[i].regstr) == 0)
-        {
-            return &regtab[i];
-        }
-    }
+    if (I64)
+    {
+        for (i = 0; i < sizeof(regtab64) / sizeof(regtab64[0]); i++)
+        {
+            if (strcmp(s,regtab64[i].regstr) == 0)
+            {
+                return &regtab64[i];
+            }
+        }
+    }
-    return NULL;
-}
-
-
-/*******************************
- */
-
-STATIC void asm_token()
-{
-    if (asmtok)
-        asmtok = asmtok->next;
-    asm_token_trans(asmtok);
-}
-
-/*******************************
- */
-
-STATIC void asm_token_trans(Token *tok)
-{
-    tok_value = TOKeof;
@@ -3016 +3151 @@
-    }
-}
-
-/*******************************
- */
-
-STATIC unsigned asm_type_size(Type * ptype)
-{   unsigned u;
-
-    //if (ptype) printf("asm_type_size('%s') = %d\n", ptype->toChars(), (int)ptype->size());
-    u = _anysize;
-    if (ptype && ptype->ty != Tfunction /*&& ptype->isscalar()*/)
-    {
-        switch ((int)ptype->size())
-        {
-            case 0:     asmerr(EM_bad_op, "0 size");    break;
-            case 1:     u = _8;         break;
-            case 2:     u = _16;        break;
-            case 4:     u = _32;        break;
-            case 6:     u = _48;        break;
+            case 8:     if (I64) u = _64;        break;
-        }
-    }
-    return u;
-}
-
-/*******************************
- *      start of inline assemblers expression parser
- *      NOTE: functions in call order instead of alphabetical
- */
-
-/*******************************************
- * Parse DA expression
- *
- * Very limited define address to place a code
- * address in the assembly
- * Problems:
- *      o       Should use dw offset and dd offset instead,
- *              for near/far support.
- *      o       Should be able to add an offset to the label address.
- *      o       Blocks addressed by DA should get their Bpred set correctly
@@ -4215 +4351 @@
- * Return mask of registers used by block bp.
- */
-
-regm_t iasm_regs(block *bp)
-{
-#ifdef DEBUG
-    if (debuga)
-        printf("Block iasm regs = 0x%X\n", bp->usIasmregs);
-#endif
-
-    refparam |= bp->bIasmrefparam;
-    return bp->usIasmregs;
-}
-
-
-/************************ AsmStatement ***************************************/
-
-Statement *AsmStatement::semantic(Scope *sc)
-{
-    //printf("AsmStatement::semantic()\n");
+
+#if DMDV2
+    if (sc->func && sc->func->isSafe())
+        error("inline assembler not allowed in @safe function %s", sc->func->toChars());
+#endif
+
-    OP *o;
-    OPND *o1 = NULL,*o2 = NULL, *o3 = NULL;
-    PTRNTAB ptb;
-    unsigned usNumops;
-    unsigned char uchPrefix = 0;
-    unsigned char bAsmseen;
-    char *pszLabel = NULL;
-    code *c;
-    FuncDeclaration *fd = sc->parent->isFuncDeclaration();
-
-    assert(fd);
-    fd->inlineAsm = 1;
-
-    if (!tokens)
-        return NULL;
-
-    memset(&asmstate, 0, sizeof(asmstate));
-
-    asmstate.statement = this;
-    asmstate.sc = sc;

trunk/src/backend/code.h

@@ -369 +369 @@
-#define CFjmp16           2     // need 16 bit jump offset (long branch)
-#define CFtarg            4     // this code is the target of a jump
-#define CFseg             8     // get segment of immediate value
-#define CFoff          0x10     // get offset of immediate value
-#define CFss           0x20     // generate an SS: segment override (not with
-                                // CFes at the same time, though!)
-#define CFpsw          0x40     // we need the flags result after this instruction
-#define CFopsize       0x80     // prefix with operand size
-#define CFaddrsize    0x100     // prefix with address size
-#define CFds          0x200     // need DS override (not with es, ss, or cs )
-#define CFcs          0x400     // need CS override
-#define CFfs          0x800     // need FS override
-#define CFgs    (CFcs | CFfs)   // need GS override
-#define CFwait       0x1000     // If I32 it indicates when to output a WAIT
-#define CFselfrel    0x2000     // if self-relative
-#define CFunambig    0x4000     // indicates cannot be accessed by other addressing
-                                // modes
-#define CFtarg2      0x8000     // like CFtarg, but we can't optimize this away
-#define CFvolatile  0x10000     // volatile reference, do not schedule
-#define CFclassinit 0x20000     // class init code
+#define CFoffset64  0x40000     // offset is 64 bits
-
-#define CFPREFIX (CFSEG | CFopsize | CFaddrsize)
-#define CFSEG   (CFes | CFss | CFds | CFcs | CFfs | CFgs)
-
-    unsigned char Irex;         // REX prefix
-
-    unsigned char Iop;
-    unsigned char Irm;          // reg/mode
-
-    unsigned char Iop2;         // second opcode byte
-    unsigned char Isib;         // SIB byte
-
-    unsigned char Iop3;         // third opcode byte
-
-    unsigned char IFL1,IFL2;    // FLavors of 1st, 2nd operands
-    union evc IEV1;             // 1st operand, if any
-      #define IEVpointer1 IEV1._EP.Vpointer
-      #define IEVseg1     IEV1._EP.Vseg
-      #define IEVsym1     IEV1.sp.Vsym
-      #define IEVdsym1    IEV1.dsp.Vsym

trunk/src/backend/el.h

@@ -1 +1 @@
-// Copyright (C) 1985-1995 by Symantec
-09
+10
-// All Rights Reserved
-// http://www.digitalmars.com
-// Written by Walter Bright
-/*
- * This source file is made available for personal use
- * only. The license is in /dmd/src/dmd/backendlicense.txt
- * or /dm/src/dmd/backendlicense.txt
- * For any other uses, please contact Digital Mars.
- */
-
-/* Routines to handle elems.                            */
-
-#if __SC__
-#pragma once
-#endif
-
-#ifndef EL_H
-#define EL_H    1
-
-#if TARGET_MAC
@@ -108 +108 @@
-        {
-            // Ety2: Must be in same position as Ety!
-            tym_t Ety2_;                        // data type (TYxxxx)
-            #define Ety2 _EU._EC.Ety2_
-            unsigned char Ecomsub_;     // number of remaining references to
-                                        // this common subexp (used to determine
-                                        // first, intermediate, and last references
-                                        // to a CSE)
-            #define Ecomsub _EU._EC.Ecomsub_
-
-#if TARGET_POWERPC
-            unsigned char Gflags;
-            #define     GFLassrval      1               // element is rvalue of an assign
-            #define     GFLsignok       2               // element does not need sign extend
-            #define     GFLstrthis_fixed        4       // strthis child elem has been fixed
-                                                        // on first pass, do not do it again
-#endif
-        }_EC;
-    }_EU;
-
-targ_size_t Enumbytes;
+unsigned Enumbytes;   
-    TARGET_structELEM           // target specific additions
-    Srcpos Esrcpos;             // source file position
-};
-
-#define typemask(e)     ((!MARS && PARSER) ? (e)->ET->Tty : (e)->Ety )
-#define typetym(e)      ((e)->ET->Tty)
-#define el_fl(e)        ((enum FL)((e)->EV.sp.Vsym->Sfl))
-#define Eoffset         EV.sp.Voffset
-#define Esymnum         EV.sp.Vsymnum
-
-#define list_elem(list) ((elem *) list_ptr(list))
-#define list_setelem(list,ptr) list_ptr(list) = (elem *)(ptr)
-#define cnst(e) ((e)->Eoper == OPconst) /* Determine if elem is a constant */
-#define E1        EV.eop.Eleft          /* left child                   */
-#define E2        EV.eop.Eright         /* right child                  */
-#define Erd       EV.sp.spu.Erd         // reaching definition
-
-#define el_int(a,b)     el_long(a,b)
-
-typedef elem *elem_p;   /* try to reduce the symbol table size  */

trunk/src/backend/elfobj.c

@@ -41 +41 @@
-//#define DEBSYM 0x7E
-
-static Outbuffer *fobjbuf;
-
-regm_t BYTEREGS = BYTEREGS_INIT;
-regm_t ALLREGS = ALLREGS_INIT;
-
-static char __file__[] = __FILE__;      // for tassert.h
-#include        "tassert.h"
-
-#define MATCH_SECTION 1
-
-#define DEST_LEN (IDMAX + IDOHD + 1)
-char *obj_mangle2(Symbol *s,char *dest);
-
-#if MARS
-// C++ name mangling is handled by front end
-#define cpp_mangle(s) ((s)->Sident)
-#endif
-
+/***************************************************
+ * Correspondence of relocation types
+ *      386             32 bit in 64      64 in 64
+ *      RI_TYPE_SYM32   R_X86_64_32       R_X86_64_64
+ *      RI_TYPE_GOTOFF  R_X86_64_PC32     R_X86_64_
+ *      RI_TYPE_GOTPC   R_X86_64_         R_X86_64_
+ *      RI_TYPE_GOT32   R_X86_64_         R_X86_64_
+ *      RI_TYPE_TLS_GD  R_X86_64_TLSGD    R_X86_64_
+ *      RI_TYPE_TLS_IE  R_X86_64_GOTTPOFF R_X86_64_
+ *      RI_TYPE_TLS_LE  R_X86_64_TPOFF32  R_X86_64_
+ *      RI_TYPE_PLT32   R_X86_64_PLT32    R_X86_64_
+ *      RI_TYPE_PC32    R_X86_64_PC32     R_X86_64_
+ */
-
-/******************************************
- */
-
-symbol *GOTsym; // global offset table reference
-
-symbol *elfobj_getGOTsym()
-{
-    if (!GOTsym)
-    {
-        GOTsym = symbol_name("_GLOBAL_OFFSET_TABLE_",SCglobal,tspvoid);
-    }
-    return GOTsym;
-}
-
-static void objfile_write(FILE *fd, void *buffer, unsigned len);
-
-STATIC char * objmodtoseg (const char *modname);
-STATIC void obj_browse_flush();
-STATIC void objfixupp (struct FIXUP *);
-STATIC void ledata_new (int seg,targ_size_t offset);
-static int obj_align(Symbol *s);
-void obj_tlssections();
-
-static IDXSYM elf_addsym(IDXSTR sym, targ_size_t val, unsigned sz,
-                        unsigned typ,unsigned bind,IDXSEC sec);
-static long elf_align(FILE *fd, targ_size_t size, long offset);
-
-// The object file is built is several separate pieces
-
-// Non-repeatable section types have single output buffers
-//      Pre-allocated buffers are defined for:
-//              Section Names string table
-//              Section Headers table
-//              Symbol table
-//              String table
-//              Notes section
-//              Comment data
-
-// Section Names  - String table for section names only
-static Outbuffer *section_names;
-#define SEC_NAMES_INIT  800
@@ -1236 +1248 @@
-{
-    //dbg_printf("obj_exestr(char *%s)\n",p);
-}
-
-/**************************
- * Embed string in obj.
- */
-
-void obj_user(const char *p)
-{
-    //dbg_printf("obj_user(char *%s)\n",p);
-}
-
-/*******************************
- * Output a weak extern record.
- */
-
-void obj_wkext(Symbol *s1,Symbol *s2)
-{
-    //dbg_printf("obj_wkext(Symbol *%s,Symbol *s2)\n",s1->Sident,s2->Sident);
-#if 0
-    char buffer[2+2+2];
-    int i;
-
-    buffer[0] = 0x80;
-    buffer[1] = 0xA8;
-    i = 2;
-    i += insidx(&buffer[2],s1->Sxtrnnum);
-    i += insidx(&buffer[i],s2->Sxtrnnum);
-    objrecord(COMENT,buffer,i);
-#endif
-}
-
-/*******************************
- * Output file name record.
- *
- * Currently assumes that obj_filename will not be called
- *      twice for the same file.
- */
-
-void obj_filename(const char *modname)
-
-
-
+
-    //dbg_printf("obj_filename(char *%s)\n",modname);
-
+unsigned 
-    elf_addsym(strtab_idx,0,0,STT_FILE,STB_LOCAL,SHT_ABS);
-}
-
-/*******************************
- * Embed compiler version in .obj file.
- */
-
-void obj_compiler()
-{
-    //dbg_printf("obj_compiler\n");
-    comment_data = new Outbuffer();
-    comment_data->write(compiler,sizeof(compiler));
-    //dbg_printf("Comment data size %d\n",comment_data->size());
-}
-
-#if 0
-/********************************
- * Convert module name to code segment name.
- * Output:
- *      mem_malloc'd code seg name
- */
-
-STATIC char * objmodtoseg(const char *modname)
-{   char *csegname = NULL;
-
-    if (LARGECODE)              // if need to add in module name
-    {   int i;
-        char *m;
-        static const char suffix[] = "_TEXT";
-
-        // Prepend the module name to the beginning of the _TEXT
-        m = filespecgetroot(filespecname(modname));
-        strupr(m);
-        i = strlen(m);
-        csegname = mem_malloc(i + sizeof(suffix));
-        strcpy(csegname,m);
-        strcat(csegname,suffix);
-        mem_free(m);
-    }
-    return csegname;
-}
-#endif
-
-//#if NEWSTATICDTOR
-
-/**************************************
- * Symbol is the function that calls the static constructors.
- * Put a pointer to it into a special segment that the startup code
- * looks at.
- * Input:
- *      s       static constructor function
- *      dtor    !=0 if leave space for static destructor
- *      seg     1:      user
- *              2:      lib
- *              3:      compiler
- */
-
-void obj_staticctor(Symbol *s,int dtor,int none)
-{
-// Static constructors and destructors
-    IDXSEC seg;
-    Outbuffer *buf;
-
-    //dbg_printf("obj_staticctor(%s) offset %x\n",s->Sident,s->Soffset);
-    //symbol_print(s);
-    s->Sseg = seg =
-        elf_getsegment(".ctors", NULL, SHT_PROGDEF, SHF_ALLOC|SHF_WRITE, 4);
-    buf = SegData[seg]->SDbuf;
-    if (I64)
-        buf->write64(s->Soffset);
-    else
-        buf->write32(s->Soffset);
-
+I64 ? R_X86_64_64 : 
-    SegData[seg]->SDoffset = buf->size();
-}
-
-/**************************************
- * Symbol is the function that calls the static destructors.
- * Put a pointer to it into a special segment that the exit code
- * looks at.
- * Input:
- *      s       static destructor function
- */
-
-void obj_staticdtor(Symbol *s)
-{
-    IDXSEC seg;
-    Outbuffer *buf;
-
-    //dbg_printf("obj_staticdtor(%s) offset %x\n",s->Sident,s->Soffset);
-    //symbol_print(s);
-    seg = elf_getsegment(".dtors", NULL, SHT_PROGDEF, SHF_ALLOC|SHF_WRITE, 4);
-    buf = SegData[seg]->SDbuf;
-    if (I64)
-        buf->write64(s->Soffset);
-    else
-        buf->write32(s->Soffset);
-
-
+
-    SegData[seg]->SDoffset = buf->size();
-}
-
-//#else
-
-/***************************************
- * Stuff pointer to function in its own segment.
- * Used for static ctor and dtor lists.
- */
-
-void obj_funcptr(Symbol *s)
-{
-    //dbg_printf("obj_funcptr(%s) \n",s->Sident);
-}
-
-//#endif
-
-/***************************************
- * Stuff the following data in a separate segment:
- *      pointer to function
- *      pointer to ehsym
- *      length of function
- */
-
-void obj_ehtables(Symbol *sfunc,targ_size_t size,Symbol *ehsym)
-{
-    //dbg_printf("obj_ehtables(%s) \n",sfunc->Sident);
-
-
-
-
-
+
-    symbol_keep(ehtab_entry);
-    elf_getsegment(".deh_beg", NULL, SHT_PROGDEF, SHF_ALLOC, 4);
-    ehtab_entry->Sseg = elf_getsegment(".deh_eh", NULL, SHT_PROGDEF, SHF_ALLOC, 4);
-    elf_getsegment(".deh_end", NULL, SHT_PROGDEF, SHF_ALLOC, 4);
-    ehtab_entry->Stype->Tmangle = mTYman_c;
-    ehsym->Stype->Tmangle = mTYman_c;
-
+dt_t **
-    pdte = dtxoff(pdte,sfunc,0,TYnptr);
-    pdte = dtxoff(pdte,ehsym,0,TYnptr);
-    pdte = dtnbytes(pdte,4,(char *)&sfunc->Ssize);
-    outdata(ehtab_entry);
-}
-
-/*********************************************
- * Put out symbols that define the beginning/end of the .deh_eh section.
- */
-
-void obj_ehsections()
-
-
-
-
-
+
+
-    //obj_bytes(sec, 0, 4, NULL);
-
-
+IDXSTR 
-    elf_addsym(namidx, 0, 0, STT_OBJECT, STB_GLOBAL, MAP_SEG2SECIDX(sec));
-    //elf_addsym(namidx, 0, 4, STT_OBJECT, STB_GLOBAL, MAP_SEG2SECIDX(sec));
-
-    elf_getsegment(".deh_eh", NULL, SHT_PROGDEF, SHF_ALLOC, 4);
-
-    sec = elf_getsegment(".deh_end", NULL, SHT_PROGDEF, SHF_ALLOC, 4);
-    namidx = elf_addstr(symtab_strings,"_deh_end");
-    elf_addsym(namidx, 0, 0, STT_OBJECT, STB_GLOBAL, MAP_SEG2SECIDX(sec));
-
-    obj_tlssections();
-}
-
-/*********************************************
- * Put out symbols that define the beginning/end of the thread local storage sections.
- */
-
-void obj_tlssections()
-{
-    IDXSTR namidx;
-
@@ -1676 +1641 @@
- * won't be storing D gc roots in their tls.
- * Output:
- *      seg_tlsseg      set to segment number for TLS segment.
- * Returns:
- *      segment for TLS segment
- */
-
-seg_data *obj_tlsseg()
-{
-    /* Ensure that ".tdata" precedes any other .tdata. section, as the ld
-     * linker script fails to work right.
-     */
-    elf_getsegment(".tdata", NULL, SHT_PROGDEF, SHF_ALLOC|SHF_WRITE|SHF_TLS, 4);
-
-    static const char tlssegname[] = ".tdata.";
-    //dbg_printf("obj_tlsseg(\n");
-
-    if (seg_tlsseg == UNKNOWN)
-    {
-        seg_tlsseg = elf_getsegment(tlssegname, NULL, SHT_PROGDEF,
-
+I64 ? 16 : 
-    }
-    return SegData[seg_tlsseg];
-}
-
-
-/*********************************
- * Define segments for Thread Local Storage.
- * Output:
- *      seg_tlsseg_bss  set to segment number for TLS segment.
- * Returns:
- *      segment for TLS segment
- */
-
-seg_data *obj_tlsseg_bss()
-{
-    static const char tlssegname[] = ".tbss";
-    //dbg_printf("obj_tlsseg_bss(\n");
-
-    if (seg_tlsseg_bss == UNKNOWN)
-    {
-        seg_tlsseg_bss = elf_getsegment(tlssegname, NULL, SHT_NOBITS,
-
+I64 ? 16 : 
-    }
-    return SegData[seg_tlsseg_bss];
-}
-
-
-/*******************************
- * Output an alias definition record.
- */
-
-void obj_alias(const char *n1,const char *n2)
-
-
-
+
-    dbg_printf("obj_alias(%s,%s)\n",n1,n2);
-    assert(0);
-#if NOT_DONE
-
-
+char *
+unsigned 
-    len += obj_namestring(buffer + len,n2);
-    objrecord(ALIAS,buffer,len);
-#endif
-}
-
- 
-
- 
-
- 
+
+
+
+
+
-    return buffer;
-}
-
-/*******************************
- * Mangle a name.
- * Returns:
- *      mangled name
- */
-
-char *obj_mangle2(Symbol *s,char *dest)
-{
-    size_t len;
-    char *name;
-
-    //dbg_printf("obj_mangle('%s'), mangle = x%x\n",s->Sident,type_mangle(s->Stype));
-    symbol_debug(s);
-    assert(dest);
-#if SCPP
-    name = CPP ? cpp_mangle(s) : s->Sident;
-#elif MARS
-    name = cpp_mangle(s);
-#else
-    name = s->Sident;
-#endif
-
+size_t 
-    //dbg_printf("len %d\n",len);
-    switch (type_mangle(s->Stype))
-    {
-        case mTYman_pas:                // if upper case
-        case mTYman_for:
-            if (len >= DEST_LEN)
-                dest = (char *)mem_malloc(len + 1);
-            memcpy(dest,name,len + 1);  // copy in name and ending 0
-            for (int i = 0; 1; i++)
-            {   char c = dest[i];
-                if (!c)
-                    break;
-                if (c >= 'a' && c <= 'z')
-                    dest[i] = c + 'A' - 'a';
-            }
-            break;
-        case mTYman_std:
-#if TARGET_LINUX || TARGET_FREEBSD || TARGET_SOLARIS
-            if (tyfunc(s->ty()) && !variadic(s->Stype))
-#else
@@ -1815 +1777 @@
-            memcpy(dest,name,len+1);// copy in name and trailing 0
-            break;
-
-        default:
-#ifdef DEBUG
-            printf("mangling %x\n",type_mangle(s->Stype));
-            symbol_print(s);
-#endif
-            printf("%d\n", type_mangle(s->Stype));
-            assert(0);
-    }
-    //dbg_printf("\t %s\n",dest);
-    return dest;
-}
-
-/*******************************
- * Export a function name.
- */
-
-void obj_export(Symbol *s,unsigned argsize)
-
-
-
+
-    //dbg_printf("obj_export(%s,%d)\n",s->Sident,argsize);
-
-}
-
-/*******************************
- * Update data information about symbol
- *      align for output and assign segment
- *      if not already specified.
- *
- * Input:
- *      sdata           data symbol
- *      datasize        output size
- *      seg             default seg if not known
- * Returns:
- *      actual seg
- */
-
-int elf_data_start(Symbol *sdata, targ_size_t datasize, int seg)
-{
-    targ_size_t alignbytes;
@@ -1985 +1944 @@
-    return symidx;
-}
-
-int objextdef(const char *name)
-{
-    return objextern(name);
-}
-
-/*******************************
- * Output an external for existing symbol.
- * Input:
- *      s       Symbol to do EXTDEF on
- *              (Name is to be mangled)
- * Returns:
- *      Symbol table index of the definition
- *      NOTE: Numbers will not be linear.
- */
-
-int objextern(Symbol *s)
-{
-    IDXSTR namidx;
-    int symtype,sectype;
-targ_size_t
+unsigned
-
-    //dbg_printf("objextern('%s') %x\n",s->Sident,s->Svalue);
-    symbol_debug(s);
-
+IDXSTR 
-
-#if SCPP
-    if (s->Sscope && !tyfunc(s->ty()))
-    {
-        symtype = STT_OBJECT;
-        sectype = SHT_COMMON;
-        size = type_size(s->Stype);
-    }
-    else
-#endif
-    {
-        symtype = STT_NOTYPE;
-        sectype = SHT_UNDEF;
-        size = 0;
-    }
-    if (s->ty() & mTYthread)
-    {
-        //printf("objextern('%s') %x TLS\n",s->Sident,s->Svalue);
-        symtype = STT_TLS;
-    }
@@ -2034 +1992 @@
-        /*(s->ty() & mTYweak) ? STB_WEAK : */STB_GLOBAL, sectype);
-    return s->Sxtrnnum;
-
-}
-
-/*******************************
- * Output a common block definition.
- * Input:
- *      p ->    external identifier
- *      size    size in bytes of each elem
- *      count   number of elems
- * Returns:
- *      Symbol table index for symbol
- */
-
-int obj_comdef(Symbol *s,targ_size_t size,targ_size_t count)
-{
-    //printf("obj_comdef('%s',%d,%d)\n",s->Sident,size,count);
-    symbol_debug(s);
-
+    int align = I64 ? 16 : 4;
-    if (s->ty() & mTYthread)
-    {
-        s->Sseg = elf_getsegment(".tbss.", cpp_mangle(s),
-4
+align
-        s->Sfl = FLtlsdata;
-        SegData[s->Sseg]->SDsym = s;
-        SegData[s->Sseg]->SDoffset += size * count;
-        objpubdef(s->Sseg, s, 0);
-        searchfixlist(s);
-        return s->Sseg;
-    }
-    else
-    {
-        s->Sseg = elf_getsegment(".bss.", cpp_mangle(s),
-4
+align
-        s->Sfl = FLudata;
-        SegData[s->Sseg]->SDsym = s;
-        SegData[s->Sseg]->SDoffset += size * count;
-        objpubdef(s->Sseg, s, 0);
-        searchfixlist(s);
-        return s->Sseg;
-    }
-#if 0
-    IDXSTR namidx = elf_addmangled(s);
-    alignOffset(UDATA,size);
-    IDXSYM symidx = elf_addsym(namidx, SegData[UDATA]->SDoffset, size*count,
-                    (s->ty() & mTYthread) ? STT_TLS : STT_OBJECT,
-                    STB_WEAK, SHI_BSS);
-    //dbg_printf("\tobj_comdef returning symidx %d\n",symidx);
-    s->Sseg = UDATA;
-    s->Sfl = FLudata;
-    SegData[UDATA]->SDoffset += size * count;
-    return symidx;
-#endif
-}
@@ -2345 +2304 @@
- *              reftodatseg(DATA,offset,3 * sizeof(int *),UDATA);
- */
-
-void reftodatseg(int seg,targ_size_t offset,targ_size_t val,
-        unsigned targetdatum,int flags)
-{
-    Outbuffer *buf;
-    int save;
-
-    buf = SegData[seg]->SDbuf;
-    save = buf->size();
-    buf->setsize(offset);
-    //dbg_printf("reftodatseg(seg=%d, offset=x%lx, val=x%lx,data %x, flags %x )\n",
-    //  seg,offset,val,targetdatum,flags);
-    /*if (OPT_IS_SET(OPTfwritable_strings))
-    {
-        elf_addrel(seg,offset,RI_TYPE_SYM32,STI_DATA,0);
-    }
-    else*/
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        buf->setsize(save);
-}
-
-/*******************************
- * Refer to address that is in the code segment.
- * Only offsets are output, regardless of the memory model.
- * Used to put values in switch address tables.
- * Input:
- *      seg =           where the address is going (CODE or DATA)
- *      offset =        offset within seg
- *      val =           displacement from start of this module
- */
-
-void reftocodseg(int seg,targ_size_t offset,targ_size_t val)
-{
-    Outbuffer *buf;
-    int save;
-    int segtyp = MAP_SEG2TYP(seg);
-
-    //dbg_printf("reftocodseg(seg=%d, offset=x%lx, val=x%lx )\n",seg,offset,val);
-    assert(seg > 0);            // COMDATs not done yet
-