Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC

Commits:

1 changed file:

Changes:

  • compiler/GHC/CmmToAsm/PPC/CodeGen.hs
    ... ... @@ -539,7 +539,7 @@ getRegister' config platform (CmmMachOp mop [x]) -- unary MachOps
    539 539
                                      CLRLI arch_fmt dst src1 (arch_bits - size)
    
    540 540
                      return (Any (intFormat to) code)
    
    541 541
     
    
    542
    -getRegister' _ _ (CmmMachOp mop [x, y]) -- dyadic PrimOps
    
    542
    +getRegister' _ platform (CmmMachOp mop [x, y]) -- dyadic PrimOps
    
    543 543
       = case mop of
    
    544 544
           MO_F_Eq _ -> condFltReg EQQ x y
    
    545 545
           MO_F_Ne _ -> condFltReg NE  x y
    
    ... ... @@ -622,8 +622,9 @@ getRegister' _ _ (CmmMachOp mop [x, y]) -- dyadic PrimOps
    622 622
                     (src, srcCode) <- getSomeReg x
    
    623 623
                     let clear_mask = if imm == -4 then 2 else 3
    
    624 624
                         fmt = intFormat rep
    
    625
    +                    arch_fmt = intFormat (wordWidth platform)
    
    625 626
                         code dst = srcCode
    
    626
    -                               `appOL` unitOL (CLRRI fmt dst src clear_mask)
    
    627
    +                      `appOL` unitOL (CLRRI arch_fmt dst src clear_mask)
    
    627 628
                     return (Any fmt code)
    
    628 629
             _ -> trivialCode rep False AND x y
    
    629 630
           MO_Or rep    -> trivialCode rep False OR x y