* initial addr_pic support for x86_64 binary writer

git-svn-id: trunk@4848 -

compiler/ogbase.pas

@@ -55,6 +55,9 @@ interface
          RELOC_RELATIVE_3,
          RELOC_RELATIVE_4,
          RELOC_RELATIVE_5,
+         { PIC }
+         RELOC_GOTPCREL,
+         RELOC_PLT32,
 {$endif x86_64}
 {$ifdef arm}
          RELOC_RELATIVE_24,

compiler/ogelf.pas

@@ -57,7 +57,7 @@ interface
          destructor  destroy;override;
          function  sectionname(atype:TAsmSectiontype;const aname:string):string;override;
          procedure CreateDebugSections;override;
-         procedure writereloc(data,len:aint;p:TObjSymbol;relative:TObjRelocationType);override;
+         procedure writereloc(data,len:aint;p:TObjSymbol;reltype:TObjRelocationType);override;
          procedure writestab(offset:aint;ps:TObjSymbol;nidx,nother:byte;ndesc:word;p:pchar);override;
        end;
 
@@ -155,11 +155,11 @@ implementation
       R_X86_64_32S = 11;
       { Direct 16 bit zero extended  }
       R_X86_64_16 = 12;
-      { 16 bit sign extended pc relative  }
+      { 16 bit sign extended PC relative  }
       R_X86_64_PC16 = 13;
       { Direct 8 bit sign extended   }
       R_X86_64_8 = 14;
-      { 8 bit sign extended pc relative  }
+      { 8 bit sign extended PC relative  }
       R_X86_64_PC8 = 15;
       { ID of module containing symbol  }
       R_X86_64_DTPMOD64 = 16;
@@ -611,7 +611,7 @@ implementation
       end;
 
 
-    procedure TElfObjData.writereloc(data,len:aint;p:TObjSymbol;relative:TObjRelocationType);
+    procedure TElfObjData.writereloc(data,len:aint;p:TObjSymbol;reltype:TObjRelocationType);
       var
         symaddr : longint;
       begin
@@ -626,24 +626,25 @@ implementation
            { real address of the symbol }
            symaddr:=p.address;
            { Local ObjSymbols can be resolved already or need a section reloc }
-           if (p.bind=AB_LOCAL) then
+           if (p.bind=AB_LOCAL) and
+              (reltype in [RELOC_RELATIVE,RELOC_ABSOLUTE{$ifdef x86_64},RELOC_ABSOLUTE32{$endif x86_64}]) then
              begin
-               { For a relative relocation in the same section the
+               { For a reltype relocation in the same section the
                  value can be calculated }
                if (p.objsection=CurrObjSec) and
-                  (relative=RELOC_RELATIVE) then
+                  (reltype=RELOC_RELATIVE) then
                  inc(data,symaddr-len-CurrObjSec.Size)
                else
                  begin
-                   CurrObjSec.addsectionreloc(CurrObjSec.Size,p.objsection,relative);
+                   CurrObjSec.addsectionreloc(CurrObjSec.Size,p.objsection,reltype);
                    inc(data,symaddr);
                  end;
              end
            else
              begin
-               CurrObjSec.addsymreloc(CurrObjSec.Size,p,relative);
+               CurrObjSec.addsymreloc(CurrObjSec.Size,p,reltype);
 {$ifndef x86_64}
-               if relative=RELOC_RELATIVE then
+               if reltype=RELOC_RELATIVE then
                  dec(data,len);
 {$endif x86_64}
             end;
@@ -723,24 +724,6 @@ implementation
                objreloc:=TObjRelocation(s.Objrelocations[i]);
                fillchar(rel,sizeof(rel),0);
                rel.address:=objreloc.dataoffset;
-               if assigned(objreloc.symbol) then
-                 begin
-                   if (objreloc.symbol.bind=AB_LOCAL) then
-                     relsym:=objreloc.symbol.objsection.secsymidx
-                   else
-                     begin
-                       if objreloc.symbol.symidx=-1 then
-                         internalerror(200603012);
-                       relsym:=objreloc.symbol.symidx;
-                     end;
-                 end
-               else
-                 begin
-                   if objreloc.objsection<>nil then
-                     relsym:=objreloc.objsection.secsymidx
-                   else
-                     relsym:=SHN_UNDEF;
-                 end;
 
                { when things settle down, we can create processor specific
                  derived classes }
@@ -766,10 +749,37 @@ implementation
                    reltyp:=R_X86_64_64;
                  RELOC_ABSOLUTE32 :
                    reltyp:=R_X86_64_32S;
+                 RELOC_GOTPCREL :
+                   begin
+                     reltyp:=R_X86_64_GOTPCREL;
+                     { length of the relocated location is handled here }
+                     rel.addend:=qword(-4);
+                   end;
+                 RELOC_PLT32 :
+                   begin
+                     reltyp:=R_X86_64_PLT32;
+                     { length of the relocated location is handled here }
+                     rel.addend:=qword(-4);
+                   end;
 {$endif x86_64}
                  else
                    internalerror(200602261);
                end;
+
+               { Symbol }
+               if assigned(objreloc.symbol) then
+                 begin
+                   if objreloc.symbol.symidx=-1 then
+                     internalerror(200603012);
+                   relsym:=objreloc.symbol.symidx;
+                 end
+               else
+                 begin
+                   if objreloc.objsection<>nil then
+                     relsym:=objreloc.objsection.secsymidx
+                   else
+                     relsym:=SHN_UNDEF;
+                 end;
 {$ifdef cpu64bit}
                rel.info:=(qword(relsym) shl 32) or reltyp;
 {$else cpu64bit}

compiler/x86/aasmcpu.pas

@@ -1017,7 +1017,14 @@ implementation
                 end;
               top_ref :
                 begin
-                  if ref^.refaddr=addr_no then
+                  if (ref^.refaddr=addr_no)
+{$ifdef x86_64}
+                     or (
+                         (ref^.refaddr=addr_pic) and
+                         (ref^.base<>NR_NO)
+                        )
+{$endif x86_64}
+                     then
                     begin
                       { create ot field }
                       if (ot and OT_SIZE_MASK)=0 then
@@ -1463,7 +1470,7 @@ implementation
         o:=input.ref^.offset;
         sym:=input.ref^.symbol;
         if ((ir<>NR_NO) and (getregtype(ir)<>R_INTREGISTER)) or
-           ((br<>NR_NO) and (getregtype(br)<>R_INTREGISTER)) then
+           ((br<>NR_NO) and (br<>NR_RIP) and (getregtype(br)<>R_INTREGISTER)) then
           internalerror(200301081);
         { it's direct address }
         if (br=NR_NO) and (ir=NR_NO) then
@@ -1976,6 +1983,9 @@ implementation
       var
         currval : aint;
         currsym : tobjsymbol;
+        currrelreloc,
+        currabsreloc,
+        currabsreloc32 : TObjRelocationType;
 {$ifdef x86_64}
         rexwritten : boolean;
 {$endif x86_64}
@@ -1987,11 +1997,27 @@ implementation
                 begin
                   currval:=oper[opidx]^.ref^.offset;
                   currsym:=ObjData.symbolref(oper[opidx]^.ref^.symbol);
+{$ifdef x86_64}
+                  if oper[opidx]^.ref^.refaddr=addr_pic then
+                    begin
+                      currrelreloc:=RELOC_PLT32;
+                      currabsreloc:=RELOC_GOTPCREL;
+                      currabsreloc32:=RELOC_GOTPCREL;
+                    end
+                  else
+{$endif x86_64}
+                    begin
+                      currrelreloc:=RELOC_RELATIVE;
+                      currabsreloc:=RELOC_ABSOLUTE;
+                      currabsreloc32:=RELOC_ABSOLUTE32;
+                    end;
                 end;
               top_const :
                 begin
                   currval:=aint(oper[opidx]^.val);
                   currsym:=nil;
+                  currabsreloc:=RELOC_ABSOLUTE;
+                  currabsreloc32:=RELOC_ABSOLUTE32;
                 end;
               else
                 Message(asmw_e_immediate_or_reference_expected);
@@ -2105,7 +2131,7 @@ implementation
                 if (currval<-128) or (currval>127) then
                  Message2(asmw_e_value_exceeds_bounds,'signed byte',tostr(currval));
                 if assigned(currsym) then
-                  objdata.writereloc(currval,1,currsym,RELOC_ABSOLUTE)
+                  objdata.writereloc(currval,1,currsym,currabsreloc)
                 else
                   objdata.writebytes(currval,1);
               end;
@@ -2115,7 +2141,7 @@ implementation
                 if (currval<-256) or (currval>255) then
                  Message2(asmw_e_value_exceeds_bounds,'byte',tostr(currval));
                 if assigned(currsym) then
-                 objdata.writereloc(currval,1,currsym,RELOC_ABSOLUTE)
+                 objdata.writereloc(currval,1,currsym,currabsreloc)
                 else
                  objdata.writebytes(currval,1);
               end;
@@ -2125,7 +2151,7 @@ implementation
                 if (currval<0) or (currval>255) then
                  Message2(asmw_e_value_exceeds_bounds,'unsigned byte',tostr(currval));
                 if assigned(currsym) then
-                 objdata.writereloc(currval,1,currsym,RELOC_ABSOLUTE)
+                 objdata.writereloc(currval,1,currsym,currabsreloc)
                 else
                  objdata.writebytes(currval,1);
               end;
@@ -2135,7 +2161,7 @@ implementation
                 if (currval<-65536) or (currval>65535) then
                  Message2(asmw_e_value_exceeds_bounds,'word',tostr(currval));
                 if assigned(currsym) then
-                 objdata.writereloc(currval,2,currsym,RELOC_ABSOLUTE)
+                 objdata.writereloc(currval,2,currsym,currabsreloc)
                 else
                  objdata.writebytes(currval,2);
               end;
@@ -2145,14 +2171,14 @@ implementation
                 if opsize=S_Q then
                   begin
                     if assigned(currsym) then
-                     objdata.writereloc(currval,8,currsym,RELOC_ABSOLUTE)
+                     objdata.writereloc(currval,8,currsym,currabsreloc)
                     else
                      objdata.writebytes(currval,8);
                   end
                 else
                   begin
                     if assigned(currsym) then
-                      objdata.writereloc(currval,4,currsym,RELOC_ABSOLUTE32)
+                      objdata.writereloc(currval,4,currsym,currabsreloc32)
                     else
                       objdata.writebytes(currval,4);
                   end
@@ -2161,7 +2187,7 @@ implementation
               begin
                 getvalsym(c-32);
                 if assigned(currsym) then
-                 objdata.writereloc(currval,4,currsym,RELOC_ABSOLUTE32)
+                 objdata.writereloc(currval,4,currsym,currabsreloc32)
                 else
                  objdata.writebytes(currval,4);
               end;
@@ -2179,17 +2205,17 @@ implementation
               begin
                 getvalsym(c-52);
                 if assigned(currsym) then
-                 objdata.writereloc(currval,4,currsym,RELOC_RELATIVE)
+                 objdata.writereloc(currval,4,currsym,currrelreloc)
                 else
-                 objdata.writereloc(currval-insend,4,nil,RELOC_ABSOLUTE32)
+                 objdata.writereloc(currval-insend,4,nil,currabsreloc32)
               end;
             56,57,58 :
               begin
                 getvalsym(c-56);
                 if assigned(currsym) then
-                 objdata.writereloc(currval,4,currsym,RELOC_RELATIVE)
+                 objdata.writereloc(currval,4,currsym,currrelreloc)
                 else
-                 objdata.writereloc(currval-insend,4,nil,RELOC_ABSOLUTE32)
+                 objdata.writereloc(currval-insend,4,nil,currabsreloc32)
               end;
             192,193,194 :
               begin
@@ -2317,7 +2343,13 @@ implementation
                          if (oper[opidx]^.ot and OT_MEMORY)=OT_MEMORY then
                            begin
                              currsym:=objdata.symbolref(oper[opidx]^.ref^.symbol);
-                             objdata.writereloc(oper[opidx]^.ref^.offset,1,currsym,RELOC_ABSOLUTE);
+{$ifdef x86_64}
+                             if oper[opidx]^.ref^.refaddr=addr_pic then
+                               currabsreloc:=RELOC_PLT32
+                             else
+{$endif x86_64}
+                               currabsreloc:=RELOC_ABSOLUTE;
+                             objdata.writereloc(oper[opidx]^.ref^.offset,1,currsym,currabsreloc);
                            end
                          else
                           begin
@@ -2328,8 +2360,14 @@ implementation
                        end;
                      2,4 :
                        begin
-                         objdata.writereloc(oper[opidx]^.ref^.offset,ea_data.bytes,
-                           objdata.symbolref(oper[opidx]^.ref^.symbol),RELOC_ABSOLUTE32);
+                         currsym:=objdata.symbolref(oper[opidx]^.ref^.symbol);
+{$ifdef x86_64}
+                         if oper[opidx]^.ref^.refaddr=addr_pic then
+                           currabsreloc:=RELOC_PLT32
+                         else
+{$endif x86_64}
+                           currabsreloc:=RELOC_ABSOLUTE;
+                         objdata.writereloc(oper[opidx]^.ref^.offset,ea_data.bytes,currsym,currabsreloc);
                          inc(s,ea_data.bytes);
                        end;
                    end;