@@ -25,11 +25,11 @@ mp_limb_t flint_mpn_mulhigh_9(mp_ptr, mp_srcptr, mp_srcptr);
2525
2626static mp_limb_t flint_mpn_mulhigh_10 (nn_ptr r , nn_srcptr x , nn_srcptr y )
2727{
28- mp_limb_t w0 , w1 , lo , w2 , cy ;
28+ mp_limb_t w0 , w1 , w2 , cy ;
2929
3030 w0 = flint_mpn_mulhigh_9 (r , x + 1 , y );
3131 r [9 ] = mpn_addmul_1 (r , x + 1 , 9 , y [9 ]);
32- umul_ppmm (w1 , lo , x [0 ], y [8 ]);
32+ umulhigh_pmm (w1 , x [0 ], y [8 ]);
3333 umul_ppmm (cy , w2 , x [0 ], y [9 ]);
3434 add_ssaaaa (cy , w0 , cy , w0 , 0 , w1 );
3535 add_ssaaaa (cy , w0 , cy , w0 , 0 , w2 );
@@ -40,22 +40,22 @@ static mp_limb_t flint_mpn_mulhigh_10(nn_ptr r, nn_srcptr x, nn_srcptr y)
4040
4141static mp_limb_t flint_mpn_mulhigh_11 (nn_ptr r , nn_srcptr x , nn_srcptr y )
4242{
43- mp_limb_t w0 , w1 , lo , w2 , cy ;
43+ mp_limb_t w0 , w1 , w2 , cy ;
4444
4545#if 0
4646 w0 = flint_mpn_mulhigh_10 (r , x + 1 , y );
4747#else
4848 w0 = flint_mpn_mulhigh_9 (r , x + 2 , y );
4949 r [9 ] = mpn_addmul_1 (r , x + 2 , 9 , y [9 ]);
50- umul_ppmm (w1 , lo , x [1 ], y [8 ]);
50+ umulhigh_pmm (w1 , x [1 ], y [8 ]);
5151 umul_ppmm (cy , w2 , x [1 ], y [9 ]);
5252 add_ssaaaa (cy , w0 , cy , w0 , 0 , w1 );
5353 add_ssaaaa (cy , w0 , cy , w0 , 0 , w2 );
5454 MPN_INCR_U (r , 10 , cy );
5555#endif
5656
5757 r [10 ] = mpn_addmul_1 (r , x + 1 , 10 , y [10 ]);
58- umul_ppmm (w1 , lo , x [0 ], y [9 ]);
58+ umulhigh_pmm (w1 , x [0 ], y [9 ]);
5959 umul_ppmm (cy , w2 , x [0 ], y [10 ]);
6060 add_ssaaaa (cy , w0 , cy , w0 , 0 , w1 );
6161 add_ssaaaa (cy , w0 , cy , w0 , 0 , w2 );
@@ -68,29 +68,29 @@ static mp_limb_t flint_mpn_mulhigh_11(nn_ptr r, nn_srcptr x, nn_srcptr y)
6868
6969static mp_limb_t flint_mpn_mulhigh_12 (nn_ptr r , nn_srcptr x , nn_srcptr y )
7070{
71- mp_limb_t w0 , w1 , lo , w2 , cy ;
71+ mp_limb_t w0 , w1 , w2 , cy ;
7272
7373#if 0
7474 w0 = flint_mpn_mulhigh_11 (r , x + 1 , y );
7575#else
7676 w0 = flint_mpn_mulhigh_9 (r , x + 3 , y );
7777 r [9 ] = mpn_addmul_1 (r , x + 3 , 9 , y [9 ]);
78- umul_ppmm (w1 , lo , x [2 ], y [8 ]);
78+ umulhigh_pmm (w1 , x [2 ], y [8 ]);
7979 umul_ppmm (cy , w2 , x [2 ], y [9 ]);
8080 add_ssaaaa (cy , w0 , cy , w0 , 0 , w1 );
8181 add_ssaaaa (cy , w0 , cy , w0 , 0 , w2 );
8282 MPN_INCR_U (r , 10 , cy );
8383
8484 r [10 ] = mpn_addmul_1 (r , x + 2 , 10 , y [10 ]);
85- umul_ppmm (w1 , lo , x [1 ], y [9 ]);
85+ umulhigh_pmm (w1 , x [1 ], y [9 ]);
8686 umul_ppmm (cy , w2 , x [1 ], y [10 ]);
8787 add_ssaaaa (cy , w0 , cy , w0 , 0 , w1 );
8888 add_ssaaaa (cy , w0 , cy , w0 , 0 , w2 );
8989 MPN_INCR_U (r , 11 , cy );
9090#endif
9191
9292 r [11 ] = mpn_addmul_1 (r , x + 1 , 11 , y [11 ]);
93- umul_ppmm (w1 , lo , x [0 ], y [10 ]);
93+ umulhigh_pmm (w1 , x [0 ], y [10 ]);
9494 umul_ppmm (cy , w2 , x [0 ], y [11 ]);
9595 add_ssaaaa (cy , w0 , cy , w0 , 0 , w1 );
9696 add_ssaaaa (cy , w0 , cy , w0 , 0 , w2 );
@@ -101,11 +101,11 @@ static mp_limb_t flint_mpn_mulhigh_12(nn_ptr r, nn_srcptr x, nn_srcptr y)
101101
102102static mp_limb_t flint_mpn_mulhigh_13 (nn_ptr r , nn_srcptr x , nn_srcptr y )
103103{
104- mp_limb_t w0 , w1 , lo , w2 , cy ;
104+ mp_limb_t w0 , w1 , w2 , cy ;
105105
106106 w0 = flint_mpn_mulhigh_12 (r , x + 1 , y );
107107 r [12 ] = mpn_addmul_1 (r , x + 1 , 12 , y [12 ]);
108- umul_ppmm (w1 , lo , x [0 ], y [11 ]);
108+ umulhigh_pmm (w1 , x [0 ], y [11 ]);
109109 umul_ppmm (cy , w2 , x [0 ], y [12 ]);
110110 add_ssaaaa (cy , w0 , cy , w0 , 0 , w1 );
111111 add_ssaaaa (cy , w0 , cy , w0 , 0 , w2 );
0 commit comments