Browse Source

* fix for the regressions caused by r27417

git-svn-id: trunk@27433 -
florian 11 years ago
parent
commit
0a7b795744
1 changed files with 1 additions and 4 deletions
  1. 1 4
      compiler/ncgcnv.pas

+ 1 - 4
compiler/ncgcnv.pas

@@ -758,10 +758,7 @@ interface
             (resultdef.typ=floatdef) and
             (resultdef.typ=floatdef) and
             (location.loc=LOC_CONSTANT)
             (location.loc=LOC_CONSTANT)
            ) or
            ) or
-           (
-            ((left.resultdef.typ=floatdef) and
-             (resultdef.typ<>floatdef) and (left.location.loc in [LOC_CFPUREGISTER,LOC_FPUREGISTER,LOC_CMMREGISTER,LOC_MMREGISTER]))
-           ) then
+           ((resultdef.typ=floatdef) xor (location.loc in [LOC_CFPUREGISTER,LOC_FPUREGISTER,LOC_CMMREGISTER,LOC_MMREGISTER])) then
           hlcg.location_force_mem(current_asmdata.CurrAsmList,location,left.resultdef);
           hlcg.location_force_mem(current_asmdata.CurrAsmList,location,left.resultdef);
 
 
         { but use the new size, but we don't know the size of all arrays }
         { but use the new size, but we don't know the size of all arrays }