powerpc: Rework PPC_RAW_xxx() macros for prefixed instructions

[linux-block.git] / arch / powerpc / lib / test_emulate_step.c

diff --git a/arch/powerpc/lib/test_emulate_step.c b/arch/powerpc/lib/test_emulate_step.c
index a0a52fe5e979647bce849b43395b6e3c26e17b15..6aef00293d437977b9462747d7026a981a48a95a 100644 (file)
--- a/arch/powerpc/lib/test_emulate_step.c
+++ b/arch/powerpc/lib/test_emulate_step.c
@@ -826,8 +826,7 @@ static void __init test_plxvp_pstxvp(void)
         * XTp = 32xTX + 2xTp
         * let RA=3 R=0 D=d0||d1=0 R=0 Tp=1 TX=1
         */
-       instr = ppc_inst_prefix(PPC_RAW_PLXVP(34, 0, 3, 0) >> 32,
-                       PPC_RAW_PLXVP(34, 0, 3, 0) & 0xffffffff);
+       instr = ppc_inst_prefix(PPC_RAW_PLXVP_P(34, 0, 3, 0), PPC_RAW_PLXVP_S(34, 0, 3, 0));
 
        stepped = emulate_step(&regs, instr);
        if (stepped == 1 && cpu_has_feature(CPU_FTR_VSX)) {
@@ -855,8 +854,7 @@ static void __init test_plxvp_pstxvp(void)
         * XSp = 32xSX + 2xSp
         * let RA=3 D=d0||d1=0 R=0 Sp=1 SX=1
         */
-       instr = ppc_inst_prefix(PPC_RAW_PSTXVP(34, 0, 3, 0) >> 32,
-                       PPC_RAW_PSTXVP(34, 0, 3, 0) & 0xffffffff);
+       instr = ppc_inst_prefix(PPC_RAW_PSTXVP_P(34, 0, 3, 0), PPC_RAW_PSTXVP_S(34, 0, 3, 0));
 
        stepped = emulate_step(&regs, instr);