* replaced "in_make_direct_ref" field with a trefaddr flag

git-svn-id: trunk@34548 -

compiler/cgbase.pas

@@ -69,7 +69,8 @@ interface
          addr_no,
          addr_full,
          addr_pic,
-         addr_pic_no_got
+         addr_pic_no_got,
+         addr_load_indirect    // only load symbol address via indirect symbol, not actual symbol data
          {$IF defined(POWERPC) or defined(POWERPC64) or defined(SPARC) or defined(MIPS)}
          ,
          addr_low,         // bits 48-63

compiler/powerpc/agppcvasm.pas

@@ -66,13 +66,13 @@ unit agppcvasm;
 
 {$ifdef cpu64bitaddr}
     const
-      refaddr2str: array[trefaddr] of string[9] = ('', '', '', '', '@l', '@h', '@higher', '@highest', '@ha', '@highera', '@highesta');
+      refaddr2str: array[trefaddr] of string[9] = ('', '', '', '', '', '@l', '@h', '@higher', '@highest', '@ha', '@highera', '@highesta');
       verbose_refaddrs = [addr_low, addr_high, addr_higher, addr_highest, addr_higha, addr_highera, addr_highesta];
-      refaddr2str_darwin: array[trefaddr] of string[4] = ('','','','','lo16', 'hi16', '@err', '@err', 'ha16', '@err', '@err');
+      refaddr2str_darwin: array[trefaddr] of string[4] = ('','','','','','lo16', 'hi16', '@err', '@err', 'ha16', '@err', '@err');
 {$else cpu64bitaddr}
     const
-      refaddr2str: array[trefaddr] of string[3] = ('','','','','@l','@h','@ha');
-      refaddr2str_darwin: array[trefaddr] of string[4] = ('','','','','lo16','hi16','ha16');
+      refaddr2str: array[trefaddr] of string[3] = ('','','','','','@l','@h','@ha');
+      refaddr2str_darwin: array[trefaddr] of string[4] = ('','','','','','lo16','hi16','ha16');
       verbose_refaddrs = [addr_low,addr_high,addr_higha];
 {$endif cpu64bitaddr}
 

compiler/ppcgen/agppcgas.pas

@@ -78,13 +78,13 @@ unit agppcgas;
 
 {$ifdef cpu64bitaddr}
     const
-      refaddr2str: array[trefaddr] of string[9] = ('', '', '', '', '@l', '@h', '@higher', '@highest', '@ha', '@highera', '@highesta');
+      refaddr2str: array[trefaddr] of string[9] = ('', '', '', '', '', '@l', '@h', '@higher', '@highest', '@ha', '@highera', '@highesta');
       verbose_refaddrs = [addr_low, addr_high, addr_higher, addr_highest, addr_higha, addr_highera, addr_highesta];
-      refaddr2str_darwin: array[trefaddr] of string[4] = ('','','','','lo16', 'hi16', '@err', '@err', 'ha16', '@err', '@err');
+      refaddr2str_darwin: array[trefaddr] of string[4] = ('','','','','','lo16', 'hi16', '@err', '@err', 'ha16', '@err', '@err');
 {$else cpu64bitaddr}
     const
-      refaddr2str: array[trefaddr] of string[3] = ('','','','','@l','@h','@ha');
-      refaddr2str_darwin: array[trefaddr] of string[4] = ('','','','','lo16','hi16','ha16');
+      refaddr2str: array[trefaddr] of string[3] = ('','','','','','@l','@h','@ha');
+      refaddr2str_darwin: array[trefaddr] of string[4] = ('','','','','','lo16','hi16','ha16');
       verbose_refaddrs = [addr_low,addr_high,addr_higha];
 {$endif cpu64bitaddr}
 

compiler/x86/cgx86.pas

@@ -132,8 +132,6 @@ unit cgx86;
 
         procedure generate_leave(list : TAsmList);
       protected
-        in_make_direct_ref : boolean;
-
         procedure a_jmp_cond(list : TAsmList;cond : TOpCmp;l: tasmlabel);
         procedure check_register_size(size:tcgsize;reg:tregister);
 
@@ -428,7 +426,8 @@ unit cgx86;
           exit;
 
         { handle indirect symbols first }
-        make_direct_ref(list,ref);
+        if ref.refaddr<>addr_load_indirect then
+            make_direct_ref(list,ref);
 
 {$if defined(x86_64)}
         { Only 32bit is allowed }
@@ -649,13 +648,13 @@ unit cgx86;
         href : treference;
         hreg : tregister;
       begin
-        if in_make_direct_ref then
-          exit;
-        in_make_direct_ref:=true;
         if assigned(ref.symbol) and (ref.symbol.bind in asmsymbindindirect) then
           begin
             hreg:=getaddressregister(list);
             reference_reset_symbol(href,ref.symbol,0,sizeof(pint));
+            { tell make_simple_ref that we are loading the symbol address via an indirect
+              symbol and that hence it should not call make_direct_ref() again }
+            href.refaddr:=addr_load_indirect;
             a_op_ref_reg(list,OP_MOVE,OS_ADDR,href,hreg);
             if ref.base<>NR_NO then
               begin
@@ -666,7 +665,6 @@ unit cgx86;
             ref.symbol:=nil;
             ref.base:=hreg;
           end;
-        in_make_direct_ref:=false;
       end;
 
 
@@ -1040,7 +1038,8 @@ unit cgx86;
 
         { this could probably done in a more optimized way, but for now this
           is sufficent }
-        make_direct_ref(list,dirref);
+        if dirref.refaddr<>addr_load_indirect then
+          make_direct_ref(list,dirref);
 
         with dirref do
           begin