summaryrefslogtreecommitdiff
path: root/debian/patches/fix-733618.patch
blob: 00af92a3013ca63ad493728866694af29b0185d4 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
Bug-Debian: http://bugs.debian.org/733618
Forwarded: not-needed

--- fpc-2.6.2.orig/fpcsrc/compiler/sparc/cgcpu.pas
+++ fpc-2.6.2/fpcsrc/compiler/sparc/cgcpu.pas
@@ -43,6 +43,7 @@ interface
         function  getfpuregister(list:TAsmList;size:Tcgsize):Tregister;override;
         { sparc special, needed by cg64 }
         procedure make_simple_ref(list:TAsmList;var ref: treference);
+        procedure make_simple_ref_sparc(list:TAsmList;var ref: treference;loadaddr : boolean;addrreg : tregister);
         procedure handle_load_store(list:TAsmList;isstore:boolean;op: tasmop;reg:tregister;ref: treference);
         procedure handle_reg_const_reg(list:TAsmList;op:Tasmop;src:tregister;a:tcgint;dst:tregister);
         { parameter }
@@ -84,6 +85,7 @@ interface
         procedure g_overflowCheck_loc(List:TAsmList;const Loc:TLocation;def:TDef;ovloc : tlocation);override;
         procedure g_proc_entry(list : TAsmList;localsize : longint;nostackframe:boolean);override;
         procedure g_proc_exit(list : TAsmList;parasize:longint;nostackframe:boolean);override;
+        procedure g_maybe_got_init(list: TAsmList); override;
         procedure g_restore_registers(list:TAsmList);override;
         procedure g_save_registers(list : TAsmList);override;
         procedure g_concatcopy(list : TAsmList;const source,dest : treference;len : tcgint);override;
@@ -92,6 +94,7 @@ interface
         procedure g_intf_wrapper(list: TAsmList; procdef: tprocdef; const labelname: string; ioffset: longint);override;
        private
         g1_used : boolean;
+        use_unlimited_pic_mode : boolean;
       end;
 
       TCg64Sparc=class(tcg64f32)
@@ -146,11 +149,22 @@ implementation
 
 
     procedure tcgsparc.make_simple_ref(list:TAsmList;var ref: treference);
+      begin
+        make_simple_ref_sparc(list,ref,false,NR_NO);
+      end;
+
+    procedure tcgsparc.make_simple_ref_sparc(list:TAsmList;var ref: treference;loadaddr : boolean;addrreg : tregister);
       var
-        tmpreg : tregister;
+        tmpreg,tmpreg2 : tregister;
         tmpref : treference;
+        need_add_got,need_got_load : boolean;
       begin
-        tmpreg:=NR_NO;
+        if loadaddr then
+          tmpreg:=addrreg
+        else
+          tmpreg:=NR_NO;
+        need_add_got:=false;
+        need_got_load:=false;
         { Be sure to have a base register }
         if (ref.base=NR_NO) then
           begin
@@ -158,14 +172,37 @@ implementation
             ref.index:=NR_NO;
           end;
         if (cs_create_pic in current_settings.moduleswitches) and
-          assigned(ref.symbol) then
+           (tf_pic_uses_got in target_info.flags) and
+           use_unlimited_pic_mode and
+           assigned(ref.symbol) then
+          begin
+            if not(pi_needs_got in current_procinfo.flags) then
+              begin
+                //internalerror(200501161);
+                include(current_procinfo.flags,pi_needs_got);
+              end;
+            if current_procinfo.got=NR_NO then
+              current_procinfo.got:=NR_L7;
+            need_got_load:=true;
+            need_add_got:=true;
+          end;
+        if (cs_create_pic in current_settings.moduleswitches) and
+           (tf_pic_uses_got in target_info.flags) and
+           not use_unlimited_pic_mode and
+           assigned(ref.symbol) then
           begin
-            tmpreg:=GetIntRegister(list,OS_INT);
+            if tmpreg=NR_NO then
+              tmpreg:=GetIntRegister(list,OS_INT);
             reference_reset(tmpref,ref.alignment);
             tmpref.symbol:=ref.symbol;
             tmpref.refaddr:=addr_pic;
             if not(pi_needs_got in current_procinfo.flags) then
-              internalerror(200501161);
+              begin
+                //internalerror(200501161);
+                include(current_procinfo.flags,pi_needs_got);
+              end;
+            if current_procinfo.got=NR_NO then
+              current_procinfo.got:=NR_L7;
             tmpref.index:=current_procinfo.got;
             list.concat(taicpu.op_ref_reg(A_LD,tmpref,tmpreg));
             ref.symbol:=nil;
@@ -187,14 +224,16 @@ implementation
            (ref.offset<simm13lo) or
            (ref.offset>simm13hi) then
           begin
-            tmpreg:=GetIntRegister(list,OS_INT);
+            if tmpreg=NR_NO then
+              tmpreg:=GetIntRegister(list,OS_INT);
             reference_reset(tmpref,ref.alignment);
             tmpref.symbol:=ref.symbol;
-            tmpref.offset:=ref.offset;
+            if not need_got_load then
+              tmpref.offset:=ref.offset;
             tmpref.refaddr:=addr_high;
             list.concat(taicpu.op_ref_reg(A_SETHI,tmpref,tmpreg));
             if (ref.offset=0) and (ref.index=NR_NO) and
-              (ref.base=NR_NO) then
+              (ref.base=NR_NO) and not need_add_got then
               begin
                 ref.refaddr:=addr_low;
               end
@@ -203,10 +242,36 @@ implementation
                 { Load the low part is left }
                 tmpref.refaddr:=addr_low;
                 list.concat(taicpu.op_reg_ref_reg(A_OR,tmpreg,tmpref,tmpreg));
-                ref.offset:=0;
+                if not need_got_load then
+                  ref.offset:=0;
                 { symbol is loaded }
                 ref.symbol:=nil;
               end;
+            if need_add_got then
+              begin
+                list.concat(taicpu.op_reg_reg_reg(A_ADD,tmpreg,current_procinfo.got,tmpreg));
+                need_add_got:=false;
+              end;
+            if need_got_load then
+              begin
+                tmpref.refaddr:=addr_no;
+                tmpref.base:=tmpreg;
+                tmpref.symbol:=nil;
+                list.concat(taicpu.op_ref_reg(A_LD,tmpref,tmpreg));
+                need_got_load:=false;
+                if (ref.offset<simm13lo) or
+                   (ref.offset>simm13hi) then
+                  begin
+                    tmpref.symbol:=nil;
+                    tmpref.offset:=ref.offset;
+                    tmpref.base:=tmpreg;
+                    tmpref.refaddr := addr_high;
+                    tmpreg2:=GetIntRegister(list,OS_INT);
+                    a_load_const_reg(list,OS_INT,ref.offset,tmpreg2);
+                    list.concat(taicpu.op_reg_reg_reg(A_ADD,tmpreg,tmpreg2,tmpreg));
+                    ref.offset:=0;
+                  end;
+              end;
             if (ref.index<>NR_NO) then
               begin
                 list.concat(taicpu.op_reg_reg_reg(A_ADD,tmpreg,ref.index,tmpreg));
@@ -220,9 +285,34 @@ implementation
                   ref.base:=tmpreg;
               end;
           end;
-        if (ref.base<>NR_NO) then
+        if need_add_got then
           begin
-            if (ref.index<>NR_NO) and
+            if tmpreg=NR_NO then
+              tmpreg:=GetIntRegister(list,OS_INT);
+            list.concat(taicpu.op_reg_reg_reg(A_ADD,ref.base,current_procinfo.got,tmpreg));
+            ref.base:=tmpreg;
+            ref.index:=NR_NO;
+          end;
+        if need_got_load then
+          begin
+            if tmpreg=NR_NO then
+              tmpreg:=GetIntRegister(list,OS_INT);
+            list.concat(taicpu.op_ref_reg(A_LD,ref,tmpreg));
+            ref.base:=tmpreg;
+            ref.index:=NR_NO;
+          end;
+        if (ref.base<>NR_NO) or loadaddr then
+          begin
+            if loadaddr then
+              begin
+                if ref.index<>NR_NO then
+                  list.concat(taicpu.op_reg_reg_reg(A_ADD,ref.base,ref.index,tmpreg));
+                ref.base:=tmpreg;
+                ref.index:=NR_NO;
+                if ref.offset<>0 then
+                  list.concat(taicpu.op_reg_const_reg(A_ADD,ref.base,ref.offset,tmpreg));
+              end
+            else if (ref.index<>NR_NO) and
                ((ref.offset<>0) or assigned(ref.symbol)) then
               begin
                 if tmpreg=NR_NO then
@@ -278,7 +368,8 @@ implementation
         inherited init_register_allocators;
 
         if (cs_create_pic in current_settings.moduleswitches) and
-          (pi_needs_got in current_procinfo.flags) then
+           assigned(current_procinfo) and
+           (pi_needs_got in current_procinfo.flags) then
           begin
             current_procinfo.got:=NR_L7;
             rg[R_INTREGISTER]:=Trgcpu.create(R_INTREGISTER,R_SUBD,
@@ -637,21 +728,47 @@ implementation
     procedure TCgSparc.a_loadaddr_ref_reg(list : TAsmList;const ref : TReference;r : tregister);
       var
          tmpref,href : treference;
-         hreg,tmpreg : tregister;
+         hreg,tmpreg,hreg2 : tregister;
+         need_got,need_got_load : boolean;
       begin
         href:=ref;
+        (* make_simple_ref_sparc(list,href,true,r); *)
+        need_got:=false;
+        need_got_load:=false;
         if (href.base=NR_NO) and (href.index<>NR_NO) then
           internalerror(200306171);
+        if (cs_create_pic in current_settings.moduleswitches) and
+           (tf_pic_uses_got in target_info.flags) and
+           use_unlimited_pic_mode and
+           assigned(ref.symbol) then
+          begin
+            if not(pi_needs_got in current_procinfo.flags) then
+              begin
+                //internalerror(200501161);
+                include(current_procinfo.flags,pi_needs_got);
+              end;
+            if current_procinfo.got=NR_NO then
+              current_procinfo.got:=NR_L7;
+            need_got_load:=true;
+            need_got:=true;
+          end;
 
         if (cs_create_pic in current_settings.moduleswitches) and
-          assigned(href.symbol) then
+           (tf_pic_uses_got in target_info.flags) and
+           not use_unlimited_pic_mode and
+           assigned(href.symbol) then
           begin
             tmpreg:=GetIntRegister(list,OS_ADDR);
             reference_reset(tmpref,href.alignment);
             tmpref.symbol:=href.symbol;
             tmpref.refaddr:=addr_pic;
             if not(pi_needs_got in current_procinfo.flags) then
-              internalerror(200501161);
+              begin
+                //internalerror(200501161);
+                include(current_procinfo.flags,pi_needs_got);
+              end;
+            if current_procinfo.got=NR_NO then
+              current_procinfo.got:=NR_L7;
             tmpref.base:=current_procinfo.got;
             list.concat(taicpu.op_ref_reg(A_LD,tmpref,tmpreg));
             href.symbol:=nil;
@@ -677,12 +794,41 @@ implementation
             hreg:=GetAddressRegister(list);
             reference_reset(tmpref,href.alignment);
             tmpref.symbol := href.symbol;
-            tmpref.offset := href.offset;
+            if not need_got_load then
+              tmpref.offset := href.offset;
             tmpref.refaddr := addr_high;
             list.concat(taicpu.op_ref_reg(A_SETHI,tmpref,hreg));
             { Only the low part is left }
             tmpref.refaddr:=addr_low;
             list.concat(taicpu.op_reg_ref_reg(A_OR,hreg,tmpref,hreg));
+            if need_got then
+              begin
+                list.concat(taicpu.op_reg_reg_reg(A_ADD,hreg,current_procinfo.got,hreg));
+                need_got:=false;
+              end;
+            if need_got_load then
+              begin
+                 tmpref.symbol:=nil;
+                 tmpref.base:=hreg;
+                 tmpref.refaddr:=addr_no;
+                 list.concat(taicpu.op_ref_reg(A_LD,tmpref,hreg));
+                 need_got_load:=false;
+                if (href.offset<simm13lo) or
+                   (href.offset>simm13hi) then
+                  begin
+                    tmpref.symbol:=nil;
+                    tmpref.offset:=href.offset;
+                    tmpref.refaddr := addr_high;
+                    hreg2:=GetIntRegister(list,OS_INT);
+                    a_load_const_reg(list,OS_INT,href.offset,hreg2);
+                    { Only the low part is left }
+                    list.concat(taicpu.op_reg_reg_reg(A_ADD,hreg,hreg2,hreg));
+                  end
+                else if (href.offset<>0) then
+                  begin
+                    list.concat(taicpu.op_reg_const_reg(A_ADD,hreg,href.offset,hreg));
+                  end;
+              end;
             if href.base<>NR_NO then
               begin
                 if href.index<>NR_NO then
@@ -728,6 +874,10 @@ implementation
         else
           { only offset, can be generated by absolute }
           a_load_const_reg(list,OS_ADDR,href.offset,r);
+        if need_got then
+          list.concat(taicpu.op_reg_reg_reg(A_ADD,r,current_procinfo.got,r));
+        if need_got_load then
+          list.concat(taicpu.op_reg_reg(A_LD,r,r));
       end;
 
 
@@ -1102,10 +1252,28 @@ implementation
           end
         else
           list.concat(Taicpu.Op_reg_const_reg(A_SAVE,NR_STACK_POINTER_REG,-LocalSize,NR_STACK_POINTER_REG));
+      end;
+
+    procedure TCgSparc.g_maybe_got_init(list : TAsmList);
+      var
+        ref : treference;
+      begin
         if (cs_create_pic in current_settings.moduleswitches) and
-          (pi_needs_got in current_procinfo.flags) then
+           (pi_needs_got in current_procinfo.flags) then
           begin
             current_procinfo.got:=NR_L7;
+            { Set register $l7 to _GLOBAL_OFFSET_TABLE_ at function entry }
+            { The offsets -8 for %hi and -4 for %lo correspnod to the
+              code distance from the call to FPC_GETGOT inxtruction }
+            reference_reset_symbol(ref,current_asmdata.RefAsmSymbol('_GLOBAL_OFFSET_TABLE_'),-8,sizeof(pint));
+            ref.refaddr:=addr_high;
+            list.concat(taicpu.op_ref_reg(A_SETHI,ref,NR_L7));
+            ref.refaddr:=addr_low;
+            ref.offset:=-4;
+            list.concat(Taicpu.Op_reg_ref_reg(A_OR,NR_L7,ref,NR_L7));
+            list.concat(Taicpu.Op_sym(A_CALL,current_asmdata.RefAsmSymbol('FPC_GETGOT')));
+            { Delay slot }
+            list.concat(Taicpu.Op_none(A_NOP));
           end;
       end;
 
@@ -1388,6 +1556,13 @@ implementation
             { jmp *vmtoffs(%eax) ; method offs }
             reference_reset_base(href,NR_G1,tobjectdef(procdef.struct).vmtmethodoffset(procdef.extnumber),sizeof(pint));
             list.concat(taicpu.op_ref_reg(A_LD,href,NR_G1));
+            { FIXME: this assumes for now that %l7 already has the correct value }
+            if (cs_create_pic in current_settings.moduleswitches) then
+              begin
+                list.concat(taicpu.op_reg_reg_reg(A_ADD,NR_G1,NR_L7,NR_G1));
+                reference_reset_base(href,NR_G1,0,sizeof(pint));
+                list.concat(taicpu.op_ref_reg(A_LD,href,NR_G1));
+              end;
             list.concat(taicpu.op_reg(A_JMP,NR_G1));
 	    g1_used:=false;
           end
@@ -1399,6 +1574,14 @@ implementation
 	    g1_used:=true;
             href.refaddr := addr_low;
             list.concat(taicpu.op_reg_ref_reg(A_OR,NR_G1,href,NR_G1));
+            { FIXME: this assumes for now that %l7 already has the correct value }
+            if (cs_create_pic in current_settings.moduleswitches) then
+              begin
+                list.concat(taicpu.op_reg_reg_reg(A_ADD,NR_G1,NR_L7,NR_G1));
+                reference_reset_base(href,NR_G1,0,sizeof(pint));
+                list.concat(taicpu.op_ref_reg(A_LD,href,NR_G1));
+              end;
+
             list.concat(taicpu.op_reg(A_JMP,NR_G1));
 	    g1_used:=false;
           end;
@@ -1579,6 +1762,10 @@ implementation
     procedure create_codegen;
       begin
         cg:=TCgSparc.Create;
+        if target_info.system=system_sparc_linux then
+          TCgSparc(cg).use_unlimited_pic_mode:=true
+        else
+          TCgSparc(cg).use_unlimited_pic_mode:=false;
         cg64:=TCg64Sparc.Create;
       end;