--- Merging r33131 into '.':

U    rtl/i386/math.inc
--- Recording mergeinfo for merge of r33131 into '.':
 U   .
--- Merging r33205 into '.':
U    rtl/x86_64/math.inc
--- Recording mergeinfo for merge of r33205 into '.':
 G   .

# revisions: 33131,33205

git-svn-id: branches/fixes_3_0@33411 -

rtl/i386/math.inc

@@ -158,22 +158,25 @@ const
       + PIC support
       * return +Inf/0 for +Inf/-Inf input, instead of NaN }
     function fpc_exp_real(d : ValReal) : ValReal;assembler;compilerproc;
+      const
+        ln2hi: double=6.9314718036912382E-001;
+        ln2lo: double=1.9082149292705877E-010;
+        large: single=24576.0;
+        two:   single=2.0;
+        half:  single=0.5;
       asm
+        call     .LPIC
+.LPIC:
+        pop         %ecx
         fldt        d
         fldl2e
         fmul        %st(1),%st        { z = d * log2(e) }
         frndint
-      { Calculate frac(z) using modular arithmetic to avoid precision loss.
+      { Calculate frac(z) using modular arithmetic to avoid precision loss. }
-        Avoid PIC hacks by using immediate operands (it's not the fastest,
+        fldl        ln2hi-.LPIC(%ecx)
-        but likely the cleanest solution). }
-        pushl       $0x3fe62e42       { ln(2).hi=6.9314718036912382E-001 }
-        pushl       $0xfee00000
-        fldl        (%esp)
         fmul        %st(1),%st
         fsubrp      %st,%st(2)
-        pushl       $0x3dea39ef       { ln(2).lo=1.9082149292705877E-010 }
+        fldl        ln2lo-.LPIC(%ecx)
-        pushl       $0x35793c76
-        fldl        (%esp)
         fmul        %st(1),%st
         fsubrp      %st,%st(2)
         fxch        %st(1)            { (d-int(z)*ln2_hi)-int(z)*ln2_lo }
@@ -193,8 +196,7 @@ const
         jae         .L1               { frac(z) <= 1 }
         fld         %st(1)
         fabs
-        pushl       $0x46c00000       { single(24576.0) }
+        fcomps      large-.LPIC(%ecx)
-        fcomps      (%esp)
         fstsw       %ax
         sahf
         jb          .L0               { int(z) < 24576 }
@@ -204,12 +206,10 @@ const
         jmp         .L1
 .L0:
         { Calculate 2**frac(z)-1 as N*(N+2), where N=2**(frac(z)/2)-1 }
-        pushl       $0x3f000000       { single(0.5) }
+        fmuls       half-.LPIC(%ecx)
-        fmuls       (%esp)
         f2xm1
         fld         %st
-        pushl       $0x40000000       { single(2.0) }
+        fadds       two-.LPIC(%ecx)
-        fadds       (%esp)
         fmulp       %st,%st(1)
         jmp         .L2
 .L1:

rtl/x86_64/math.inc

@@ -203,22 +203,17 @@ const
             fld         %st
             fabs
             fld1
-            fcompp
+            fcomip
-            fstsw       %ax
+            fstp        %st
-            sahf
             jp          .L3               { NaN }
             jae         .L1               { |frac(z)| <= 1, good }
 
             fld         %st(1)
             fabs
-            fcomps      large(%rip)
+            flds        large(%rip)
-            fstsw       %ax
+            fcomip
-            sahf
+            fstp        %st
-            jb          .L0               { int(z) < 24576 }
+            jb          .L3               { int(z) >= 24576 }
-   .L3:
-            fstp        %st               { pop frac(z) and load 0 }
-            fldz
-            jmp         .L1
    .L0:
             { Calculate 2**frac(z)-1 as N*(N+2), where N=2**(frac(z)/2)-1 }
             fmuls       half(%rip)
@@ -227,6 +222,9 @@ const
             fadds       two(%rip)
             fmulp       %st,%st(1)
             jmp         .L2
+   .L3:
+            fstp        %st               { pop frac(z) and load 0 }
+            fldz
    .L1:
             f2xm1
    .L2: