.. | .. |
---|
25 | 25 | mpi_limb_t limb = v; |
---|
26 | 26 | |
---|
27 | 27 | mpi_normalize(u); |
---|
28 | | - if (!u->nlimbs && !limb) |
---|
29 | | - return 0; |
---|
| 28 | + if (u->nlimbs == 0) { |
---|
| 29 | + if (v == 0) |
---|
| 30 | + return 0; |
---|
| 31 | + else |
---|
| 32 | + return -1; |
---|
| 33 | + } |
---|
30 | 34 | if (u->sign) |
---|
31 | 35 | return -1; |
---|
32 | 36 | if (u->nlimbs > 1) |
---|
.. | .. |
---|
41 | 45 | } |
---|
42 | 46 | EXPORT_SYMBOL_GPL(mpi_cmp_ui); |
---|
43 | 47 | |
---|
44 | | -int mpi_cmp(MPI u, MPI v) |
---|
| 48 | +static int do_mpi_cmp(MPI u, MPI v, int absmode) |
---|
45 | 49 | { |
---|
46 | | - mpi_size_t usize, vsize; |
---|
| 50 | + mpi_size_t usize; |
---|
| 51 | + mpi_size_t vsize; |
---|
| 52 | + int usign; |
---|
| 53 | + int vsign; |
---|
47 | 54 | int cmp; |
---|
48 | 55 | |
---|
49 | 56 | mpi_normalize(u); |
---|
50 | 57 | mpi_normalize(v); |
---|
| 58 | + |
---|
51 | 59 | usize = u->nlimbs; |
---|
52 | 60 | vsize = v->nlimbs; |
---|
53 | | - if (!u->sign && v->sign) |
---|
| 61 | + usign = absmode ? 0 : u->sign; |
---|
| 62 | + vsign = absmode ? 0 : v->sign; |
---|
| 63 | + |
---|
| 64 | + /* Compare sign bits. */ |
---|
| 65 | + |
---|
| 66 | + if (!usign && vsign) |
---|
54 | 67 | return 1; |
---|
55 | | - if (u->sign && !v->sign) |
---|
| 68 | + if (usign && !vsign) |
---|
56 | 69 | return -1; |
---|
57 | | - if (usize != vsize && !u->sign && !v->sign) |
---|
| 70 | + |
---|
| 71 | + /* U and V are either both positive or both negative. */ |
---|
| 72 | + |
---|
| 73 | + if (usize != vsize && !usign && !vsign) |
---|
58 | 74 | return usize - vsize; |
---|
59 | | - if (usize != vsize && u->sign && v->sign) |
---|
60 | | - return vsize - usize; |
---|
| 75 | + if (usize != vsize && usign && vsign) |
---|
| 76 | + return vsize + usize; |
---|
61 | 77 | if (!usize) |
---|
62 | 78 | return 0; |
---|
63 | 79 | cmp = mpihelp_cmp(u->d, v->d, usize); |
---|
64 | | - if (u->sign) |
---|
65 | | - return -cmp; |
---|
66 | | - return cmp; |
---|
| 80 | + if (!cmp) |
---|
| 81 | + return 0; |
---|
| 82 | + if ((cmp < 0?1:0) == (usign?1:0)) |
---|
| 83 | + return 1; |
---|
| 84 | + |
---|
| 85 | + return -1; |
---|
| 86 | +} |
---|
| 87 | + |
---|
| 88 | +int mpi_cmp(MPI u, MPI v) |
---|
| 89 | +{ |
---|
| 90 | + return do_mpi_cmp(u, v, 0); |
---|
67 | 91 | } |
---|
68 | 92 | EXPORT_SYMBOL_GPL(mpi_cmp); |
---|
| 93 | + |
---|
| 94 | +int mpi_cmpabs(MPI u, MPI v) |
---|
| 95 | +{ |
---|
| 96 | + return do_mpi_cmp(u, v, 1); |
---|
| 97 | +} |
---|
| 98 | +EXPORT_SYMBOL_GPL(mpi_cmpabs); |
---|