From 12b77c0582c21366e3479a05c844cae7aaf6f32c Mon Sep 17 00:00:00 2001 From: jbj Date: Fri, 11 Apr 2003 22:21:40 +0000 Subject: [PATCH] Beecrypt python bindings for arithmetic and radix conversion formatting. CVS patchset: 6738 CVS date: 2003/04/11 22:21:40 --- python/bc.py | 75 +++---- python/rpmbc-py.c | 622 +++++++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 538 insertions(+), 159 deletions(-) diff --git a/python/bc.py b/python/bc.py index b58e230..dd221d7 100644 --- a/python/bc.py +++ b/python/bc.py @@ -1,51 +1,54 @@ import rpm i = 1 -a = rpm.bc("987654321") -b = rpm.bc("10") -c = rpm.bc("fedcba000000000") +a = rpm.bc("0000000987654321") +b = rpm.bc("0000000000000010") +c = rpm.bc("0fedcba000000000") -rpm.bc.__add__(a, b) -rpm.bc.__sub__(a, b) -rpm.bc.__mul__(a, b) -rpm.bc.__div__(a, b) -rpm.bc.__mod__(a, b) +#rpm.bc.__add__(a, b) +#rpm.bc.__sub__(a, b) +#rpm.bc.__mul__(a, b) +#rpm.bc.__div__(a, b) +#rpm.bc.__mod__(a, b) #rpm.bc.__divmod__(a, b) #rpm.bc.__pow__(a, b) -rpm.bc.__lshift__(a, b) -rpm.bc.__rshift__(a, b) +#rpm.bc.__lshift__(a, b) +#rpm.bc.__rshift__(a, b) -rpm.bc.__and__(a, c) -rpm.bc.__xor__(a, a) -rpm.bc.__or__(a, c) +#rpm.bc.__and__(a, c) +#rpm.bc.__xor__(a, a) +#rpm.bc.__or__(a, c) -rpm.bc.__neg__(a) -rpm.bc.__pos__(a) -rpm.bc.__abs__(a) -rpm.bc.__invert__(a) +#rpm.bc.__neg__(a) +#rpm.bc.__pos__(a) +#rpm.bc.__abs__(a) +#rpm.bc.__invert__(a) -rpm.bc.__int__(b) -rpm.bc.__long__(b) -#rpm.bc.__float__(b) +#rpm.bc.__int__(b) +#rpm.bc.__long__(b) +#rpm.bc.__float__(a*a*a*a*b*b*b*b*b*b) #rpm.bc.__complex__(b) -#rpm.bc.__oct__(b) -#rpm.bc.__hex__(b) -rpm.bc.__coerce__(b, i) - -d = rpm.bc("987654321"); rpm.bc.__iadd__(d, b) -d = rpm.bc("987654321"); rpm.bc.__isub__(d, b) -d = rpm.bc("987654321"); rpm.bc.__imul__(d, b) -d = rpm.bc("987654321"); rpm.bc.__idiv__(d, b) -d = rpm.bc("987654321"); rpm.bc.__imod__(d, b) - -d = rpm.bc("987654321"); rpm.bc.__ilshift__(d, b) -d = rpm.bc("987654321"); rpm.bc.__irshift__(d, b) - -d = rpm.bc("987654321"); rpm.bc.__iand__(d, c) -d = rpm.bc("987654321"); rpm.bc.__ixor__(d, a) -d = rpm.bc("987654321"); rpm.bc.__ior__(d, c) +#rpm.bc.__oct__(a*b) +#rpm.bc.__hex__(a*b) +#rpm.bc.__coerce__(b, i) + +#d = rpm.bc("987654321"); rpm.bc.__iadd__(d, b) +#d = rpm.bc("987654321"); rpm.bc.__isub__(d, b) +#d = rpm.bc("987654321"); rpm.bc.__imul__(d, b) +#d = rpm.bc("987654321"); rpm.bc.__idiv__(d, b) +#d = rpm.bc("987654321"); rpm.bc.__imod__(d, b) + +#d = rpm.bc("987654321"); rpm.bc.__ilshift__(d, b) +#d = rpm.bc("987654321"); rpm.bc.__irshift__(d, b) + +#d = rpm.bc("987654321"); rpm.bc.__iand__(d, c) +#d = rpm.bc("987654321"); rpm.bc.__ixor__(d, a) +#d = rpm.bc("987654321"); rpm.bc.__ior__(d, c) + +if a > i: + print "a > i" #b = rpm.bc("123456789") #print "b: ", a diff --git a/python/rpmbc-py.c b/python/rpmbc-py.c index d40e626..e122884 100644 --- a/python/rpmbc-py.c +++ b/python/rpmbc-py.c @@ -21,112 +21,414 @@ static int _bc_debug = 1; #define is_rpmbc(o) ((o)->ob_type == &rpmbc_Type) -#ifdef NOTYET static const char initialiser_name[] = "rpmbc"; -static PyObject * -rpmbc_format(rpmbcObject * s, int base, unsigned char withname) +const struct { + /* Number of digits in the conversion base that always fits in an mp_limb_t. + For example, for base 10 on a machine where a mp_limb_t has 32 bits this + is 9, since 10**9 is the largest number that fits into a mp_limb_t. */ + int chars_per_limb; + + /* log(2)/log(conversion_base) */ + double chars_per_bit_exactly; + + /* base**chars_per_limb, i.e. the biggest number that fits a word, built by + factors of base. Exception: For 2, 4, 8, etc, big_base is log2(base), + i.e. the number of bits used to represent each digit in the base. */ + unsigned int big_base; + + /* A BITS_PER_MP_LIMB bit approximation to 1/big_base, represented as a + fixed-point number. Instead of dividing by big_base an application can + choose to multiply by big_base_inverted. */ + unsigned int big_base_inverted; +} mp_bases[257] = { + /* 0 */ {0, 0.0, 0, 0}, + /* 1 */ {0, 1e37, 0, 0}, + /* 2 */ {32, 1.0000000000000000, 0x1, 0x0}, + /* 3 */ {20, 0.6309297535714574, 0xcfd41b91, 0x3b563c24}, + /* 4 */ {16, 0.5000000000000000, 0x2, 0x0}, + /* 5 */ {13, 0.4306765580733931, 0x48c27395, 0xc25c2684}, + /* 6 */ {12, 0.3868528072345416, 0x81bf1000, 0xf91bd1b6}, + /* 7 */ {11, 0.3562071871080222, 0x75db9c97, 0x1607a2cb}, + /* 8 */ {10, 0.3333333333333333, 0x3, 0x0}, + /* 9 */ {10, 0.3154648767857287, 0xcfd41b91, 0x3b563c24}, + /* 10 */ {9, 0.3010299956639812, 0x3b9aca00, 0x12e0be82}, + /* 11 */ {9, 0.2890648263178878, 0x8c8b6d2b, 0xd24cde04}, + /* 12 */ {8, 0.2789429456511298, 0x19a10000, 0x3fa39ab5}, + /* 13 */ {8, 0.2702381544273197, 0x309f1021, 0x50f8ac5f}, + /* 14 */ {8, 0.2626495350371935, 0x57f6c100, 0x74843b1e}, + /* 15 */ {8, 0.2559580248098155, 0x98c29b81, 0xad0326c2}, + /* 16 */ {8, 0.2500000000000000, 0x4, 0x0}, + /* 17 */ {7, 0.2446505421182260, 0x18754571, 0x4ef0b6bd}, + /* 18 */ {7, 0.2398124665681314, 0x247dbc80, 0xc0fc48a1}, + /* 19 */ {7, 0.2354089133666382, 0x3547667b, 0x33838942}, + /* 20 */ {7, 0.2313782131597592, 0x4c4b4000, 0xad7f29ab}, + /* 21 */ {7, 0.2276702486969530, 0x6b5a6e1d, 0x313c3d15}, + /* 22 */ {7, 0.2242438242175754, 0x94ace180, 0xb8cca9e0}, + /* 23 */ {7, 0.2210647294575037, 0xcaf18367, 0x42ed6de9}, + /* 24 */ {6, 0.2181042919855316, 0xb640000, 0x67980e0b}, + /* 25 */ {6, 0.2153382790366965, 0xe8d4a51, 0x19799812}, + /* 26 */ {6, 0.2127460535533632, 0x1269ae40, 0xbce85396}, + /* 27 */ {6, 0.2103099178571525, 0x17179149, 0x62c103a9}, + /* 28 */ {6, 0.2080145976765095, 0x1cb91000, 0x1d353d43}, + /* 29 */ {6, 0.2058468324604344, 0x23744899, 0xce1decea}, + /* 30 */ {6, 0.2037950470905062, 0x2b73a840, 0x790fc511}, + /* 31 */ {6, 0.2018490865820999, 0x34e63b41, 0x35b865a0}, + /* 32 */ {6, 0.2000000000000000, 0x5, 0x0}, + /* 33 */ {6, 0.1982398631705605, 0x4cfa3cc1, 0xa9aed1b3}, + /* 34 */ {6, 0.1965616322328226, 0x5c13d840, 0x63dfc229}, + /* 35 */ {6, 0.1949590218937863, 0x6d91b519, 0x2b0fee30}, + /* 36 */ {6, 0.1934264036172708, 0x81bf1000, 0xf91bd1b6}, + /* 37 */ {6, 0.1919587200065601, 0x98ede0c9, 0xac89c3a9}, + /* 38 */ {6, 0.1905514124267734, 0xb3773e40, 0x6d2c32fe}, + /* 39 */ {6, 0.1892003595168700, 0xd1bbc4d1, 0x387907c9}, + /* 40 */ {6, 0.1879018247091076, 0xf4240000, 0xc6f7a0b}, + /* 41 */ {5, 0.1866524112389434, 0x6e7d349, 0x28928154}, + /* 42 */ {5, 0.1854490234153689, 0x7ca30a0, 0x6e8629d}, + /* 43 */ {5, 0.1842888331487062, 0x8c32bbb, 0xd373dca0}, + /* 44 */ {5, 0.1831692509136336, 0x9d46c00, 0xa0b17895}, + /* 45 */ {5, 0.1820879004699383, 0xaffacfd, 0x746811a5}, + /* 46 */ {5, 0.1810425967800402, 0xc46bee0, 0x4da6500f}, + /* 47 */ {5, 0.1800313266566926, 0xdab86ef, 0x2ba23582}, + /* 48 */ {5, 0.1790522317510414, 0xf300000, 0xdb20a88}, + /* 49 */ {5, 0.1781035935540111, 0x10d63af1, 0xe68d5ce4}, + /* 50 */ {5, 0.1771838201355579, 0x12a05f20, 0xb7cdfd9d}, + /* 51 */ {5, 0.1762914343888821, 0x1490aae3, 0x8e583933}, + /* 52 */ {5, 0.1754250635819545, 0x16a97400, 0x697cc3ea}, + /* 53 */ {5, 0.1745834300480449, 0x18ed2825, 0x48a5ca6c}, + /* 54 */ {5, 0.1737653428714400, 0x1b5e4d60, 0x2b52db16}, + /* 55 */ {5, 0.1729696904450771, 0x1dff8297, 0x111586a6}, + /* 56 */ {5, 0.1721954337940981, 0x20d38000, 0xf31d2b36}, + /* 57 */ {5, 0.1714416005739134, 0x23dd1799, 0xc8d76d19}, + /* 58 */ {5, 0.1707072796637201, 0x271f35a0, 0xa2cb1eb4}, + /* 59 */ {5, 0.1699916162869140, 0x2a9ce10b, 0x807c3ec3}, + /* 60 */ {5, 0.1692938075987814, 0x2e593c00, 0x617ec8bf}, + /* 61 */ {5, 0.1686130986895011, 0x3257844d, 0x45746cbe}, + /* 62 */ {5, 0.1679487789570419, 0x369b13e0, 0x2c0aa273}, + /* 63 */ {5, 0.1673001788101741, 0x3b27613f, 0x14f90805}, + /* 64 */ {5, 0.1666666666666667, 0x6, 0x0}, + /* 65 */ {5, 0.1660476462159378, 0x4528a141, 0xd9cf0829}, + /* 66 */ {5, 0.1654425539190583, 0x4aa51420, 0xb6fc4841}, + /* 67 */ {5, 0.1648508567221603, 0x50794633, 0x973054cb}, + /* 68 */ {5, 0.1642720499620502, 0x56a94400, 0x7a1dbe4b}, + /* 69 */ {5, 0.1637056554452156, 0x5d393975, 0x5f7fcd7f}, + /* 70 */ {5, 0.1631512196835108, 0x642d7260, 0x47196c84}, + /* 71 */ {5, 0.1626083122716342, 0x6b8a5ae7, 0x30b43635}, + /* 72 */ {5, 0.1620765243931223, 0x73548000, 0x1c1fa5f6}, + /* 73 */ {5, 0.1615554674429964, 0x7b908fe9, 0x930634a}, + /* 74 */ {5, 0.1610447717564444, 0x84435aa0, 0xef7f4a3c}, + /* 75 */ {5, 0.1605440854340214, 0x8d71d25b, 0xcf5552d2}, + /* 76 */ {5, 0.1600530732548213, 0x97210c00, 0xb1a47c8e}, + /* 77 */ {5, 0.1595714156699382, 0xa1563f9d, 0x9634b43e}, + /* 78 */ {5, 0.1590988078692941, 0xac16c8e0, 0x7cd3817d}, + /* 79 */ {5, 0.1586349589155960, 0xb768278f, 0x65536761}, + /* 80 */ {5, 0.1581795909397823, 0xc3500000, 0x4f8b588e}, + /* 81 */ {5, 0.1577324383928644, 0xcfd41b91, 0x3b563c24}, + /* 82 */ {5, 0.1572932473495469, 0xdcfa6920, 0x28928154}, + /* 83 */ {5, 0.1568617748594410, 0xeac8fd83, 0x1721bfb0}, + /* 84 */ {5, 0.1564377883420715, 0xf9461400, 0x6e8629d}, + /* 85 */ {4, 0.1560210650222250, 0x31c84b1, 0x491cc17c}, + /* 86 */ {4, 0.1556113914024939, 0x342ab10, 0x3a11d83b}, + /* 87 */ {4, 0.1552085627701551, 0x36a2c21, 0x2be074cd}, + /* 88 */ {4, 0.1548123827357682, 0x3931000, 0x1e7a02e7}, + /* 89 */ {4, 0.1544226628011101, 0x3bd5ee1, 0x11d10edd}, + /* 90 */ {4, 0.1540392219542636, 0x3e92110, 0x5d92c68}, + /* 91 */ {4, 0.1536618862898642, 0x4165ef1, 0xf50dbfb2}, + /* 92 */ {4, 0.1532904886526781, 0x4452100, 0xdf9f1316}, + /* 93 */ {4, 0.1529248683028321, 0x4756fd1, 0xcb52a684}, + /* 94 */ {4, 0.1525648706011593, 0x4a75410, 0xb8163e97}, + /* 95 */ {4, 0.1522103467132434, 0x4dad681, 0xa5d8f269}, + /* 96 */ {4, 0.1518611533308632, 0x5100000, 0x948b0fcd}, + /* 97 */ {4, 0.1515171524096389, 0x546d981, 0x841e0215}, + /* 98 */ {4, 0.1511782109217764, 0x57f6c10, 0x74843b1e}, + /* 99 */ {4, 0.1508442006228941, 0x5b9c0d1, 0x65b11e6e}, + /* 100 */ {4, 0.1505149978319906, 0x5f5e100, 0x5798ee23}, + /* 101 */ {4, 0.1501904832236880, 0x633d5f1, 0x4a30b99b}, + /* 102 */ {4, 0.1498705416319474, 0x673a910, 0x3d6e4d94}, + /* 103 */ {4, 0.1495550618645152, 0x6b563e1, 0x314825b0}, + /* 104 */ {4, 0.1492439365274121, 0x6f91000, 0x25b55f2e}, + /* 105 */ {4, 0.1489370618588283, 0x73eb721, 0x1aadaccb}, + /* 106 */ {4, 0.1486343375718350, 0x7866310, 0x10294ba2}, + /* 107 */ {4, 0.1483356667053617, 0x7d01db1, 0x620f8f6}, + /* 108 */ {4, 0.1480409554829326, 0x81bf100, 0xf91bd1b6}, + /* 109 */ {4, 0.1477501131786861, 0x869e711, 0xe6d37b2a}, + /* 110 */ {4, 0.1474630519902391, 0x8ba0a10, 0xd55cff6e}, + /* 111 */ {4, 0.1471796869179852, 0x90c6441, 0xc4ad2db2}, + /* 112 */ {4, 0.1468999356504447, 0x9610000, 0xb4b985cf}, + /* 113 */ {4, 0.1466237184553111, 0x9b7e7c1, 0xa5782bef}, + /* 114 */ {4, 0.1463509580758620, 0xa112610, 0x96dfdd2a}, + /* 115 */ {4, 0.1460815796324244, 0xa6cc591, 0x88e7e509}, + /* 116 */ {4, 0.1458155105286054, 0xacad100, 0x7b8813d3}, + /* 117 */ {4, 0.1455526803620167, 0xb2b5331, 0x6eb8b595}, + /* 118 */ {4, 0.1452930208392429, 0xb8e5710, 0x627289db}, + /* 119 */ {4, 0.1450364656948130, 0xbf3e7a1, 0x56aebc07}, + /* 120 */ {4, 0.1447829506139581, 0xc5c1000, 0x4b66dc33}, + /* 121 */ {4, 0.1445324131589439, 0xcc6db61, 0x4094d8a3}, + /* 122 */ {4, 0.1442847926987864, 0xd345510, 0x3632f7a5}, + /* 123 */ {4, 0.1440400303421672, 0xda48871, 0x2c3bd1f0}, + /* 124 */ {4, 0.1437980688733776, 0xe178100, 0x22aa4d5f}, + /* 125 */ {4, 0.1435588526911310, 0xe8d4a51, 0x19799812}, + /* 126 */ {4, 0.1433223277500932, 0xf05f010, 0x10a523e5}, + /* 127 */ {4, 0.1430884415049874, 0xf817e01, 0x828a237}, + /* 128 */ {4, 0.1428571428571428, 0x7, 0x0}, + /* 129 */ {4, 0.1426283821033600, 0x10818201, 0xf04ec452}, + /* 130 */ {4, 0.1424021108869747, 0x11061010, 0xe136444a}, + /* 131 */ {4, 0.1421782821510107, 0x118db651, 0xd2af9589}, + /* 132 */ {4, 0.1419568500933153, 0x12188100, 0xc4b42a83}, + /* 133 */ {4, 0.1417377701235801, 0x12a67c71, 0xb73dccf5}, + /* 134 */ {4, 0.1415209988221527, 0x1337b510, 0xaa4698c5}, + /* 135 */ {4, 0.1413064939005528, 0x13cc3761, 0x9dc8f729}, + /* 136 */ {4, 0.1410942141636095, 0x14641000, 0x91bf9a30}, + /* 137 */ {4, 0.1408841194731412, 0x14ff4ba1, 0x86257887}, + /* 138 */ {4, 0.1406761707131039, 0x159df710, 0x7af5c98c}, + /* 139 */ {4, 0.1404703297561400, 0x16401f31, 0x702c01a0}, + /* 140 */ {4, 0.1402665594314587, 0x16e5d100, 0x65c3ceb1}, + /* 141 */ {4, 0.1400648234939879, 0x178f1991, 0x5bb91502}, + /* 142 */ {4, 0.1398650865947379, 0x183c0610, 0x5207ec23}, + /* 143 */ {4, 0.1396673142523192, 0x18eca3c1, 0x48ac9c19}, + /* 144 */ {4, 0.1394714728255649, 0x19a10000, 0x3fa39ab5}, + /* 145 */ {4, 0.1392775294872041, 0x1a592841, 0x36e98912}, + /* 146 */ {4, 0.1390854521985406, 0x1b152a10, 0x2e7b3140}, + /* 147 */ {4, 0.1388952096850913, 0x1bd51311, 0x2655840b}, + /* 148 */ {4, 0.1387067714131417, 0x1c98f100, 0x1e7596ea}, + /* 149 */ {4, 0.1385201075671774, 0x1d60d1b1, 0x16d8a20d}, + /* 150 */ {4, 0.1383351890281539, 0x1e2cc310, 0xf7bfe87}, + /* 151 */ {4, 0.1381519873525671, 0x1efcd321, 0x85d2492}, + /* 152 */ {4, 0.1379704747522905, 0x1fd11000, 0x179a9f4}, + /* 153 */ {4, 0.1377906240751463, 0x20a987e1, 0xf59e80eb}, + /* 154 */ {4, 0.1376124087861776, 0x21864910, 0xe8b768db}, + /* 155 */ {4, 0.1374358029495937, 0x226761f1, 0xdc39d6d5}, + /* 156 */ {4, 0.1372607812113589, 0x234ce100, 0xd021c5d1}, + /* 157 */ {4, 0.1370873187823978, 0x2436d4d1, 0xc46b5e37}, + /* 158 */ {4, 0.1369153914223921, 0x25254c10, 0xb912f39c}, + /* 159 */ {4, 0.1367449754241439, 0x26185581, 0xae150294}, + /* 160 */ {4, 0.1365760475984821, 0x27100000, 0xa36e2eb1}, + /* 161 */ {4, 0.1364085852596902, 0x280c5a81, 0x991b4094}, + /* 162 */ {4, 0.1362425662114337, 0x290d7410, 0x8f19241e}, + /* 163 */ {4, 0.1360779687331669, 0x2a135bd1, 0x8564e6b7}, + /* 164 */ {4, 0.1359147715670014, 0x2b1e2100, 0x7bfbb5b4}, + /* 165 */ {4, 0.1357529539050150, 0x2c2dd2f1, 0x72dadcc8}, + /* 166 */ {4, 0.1355924953769864, 0x2d428110, 0x69ffc498}, + /* 167 */ {4, 0.1354333760385373, 0x2e5c3ae1, 0x6167f154}, + /* 168 */ {4, 0.1352755763596663, 0x2f7b1000, 0x5911016e}, + /* 169 */ {4, 0.1351190772136599, 0x309f1021, 0x50f8ac5f}, + /* 170 */ {4, 0.1349638598663645, 0x31c84b10, 0x491cc17c}, + /* 171 */ {4, 0.1348099059658080, 0x32f6d0b1, 0x417b26d8}, + /* 172 */ {4, 0.1346571975321549, 0x342ab100, 0x3a11d83b}, + /* 173 */ {4, 0.1345057169479844, 0x3563fc11, 0x32dee622}, + /* 174 */ {4, 0.1343554469488779, 0x36a2c210, 0x2be074cd}, + /* 175 */ {4, 0.1342063706143054, 0x37e71341, 0x2514bb58}, + /* 176 */ {4, 0.1340584713587979, 0x39310000, 0x1e7a02e7}, + /* 177 */ {4, 0.1339117329233981, 0x3a8098c1, 0x180ea5d0}, + /* 178 */ {4, 0.1337661393673756, 0x3bd5ee10, 0x11d10edd}, + /* 179 */ {4, 0.1336216750601996, 0x3d311091, 0xbbfb88e}, + /* 180 */ {4, 0.1334783246737591, 0x3e921100, 0x5d92c68}, + /* 181 */ {4, 0.1333360731748201, 0x3ff90031, 0x1c024c}, + /* 182 */ {4, 0.1331949058177136, 0x4165ef10, 0xf50dbfb2}, + /* 183 */ {4, 0.1330548081372441, 0x42d8eea1, 0xea30efa3}, + /* 184 */ {4, 0.1329157659418126, 0x44521000, 0xdf9f1316}, + /* 185 */ {4, 0.1327777653067443, 0x45d16461, 0xd555c0c9}, + /* 186 */ {4, 0.1326407925678156, 0x4756fd10, 0xcb52a684}, + /* 187 */ {4, 0.1325048343149731, 0x48e2eb71, 0xc193881f}, + /* 188 */ {4, 0.1323698773862368, 0x4a754100, 0xb8163e97}, + /* 189 */ {4, 0.1322359088617821, 0x4c0e0f51, 0xaed8b724}, + /* 190 */ {4, 0.1321029160581950, 0x4dad6810, 0xa5d8f269}, + /* 191 */ {4, 0.1319708865228925, 0x4f535d01, 0x9d15039d}, + /* 192 */ {4, 0.1318398080287045, 0x51000000, 0x948b0fcd}, + /* 193 */ {4, 0.1317096685686114, 0x52b36301, 0x8c394d1d}, + /* 194 */ {4, 0.1315804563506306, 0x546d9810, 0x841e0215}, + /* 195 */ {4, 0.1314521597928493, 0x562eb151, 0x7c3784f8}, + /* 196 */ {4, 0.1313247675185968, 0x57f6c100, 0x74843b1e}, + /* 197 */ {4, 0.1311982683517524, 0x59c5d971, 0x6d02985d}, + /* 198 */ {4, 0.1310726513121843, 0x5b9c0d10, 0x65b11e6e}, + /* 199 */ {4, 0.1309479056113158, 0x5d796e61, 0x5e8e5c64}, + /* 200 */ {4, 0.1308240206478128, 0x5f5e1000, 0x5798ee23}, + /* 201 */ {4, 0.1307009860033912, 0x614a04a1, 0x50cf7bde}, + /* 202 */ {4, 0.1305787914387386, 0x633d5f10, 0x4a30b99b}, + /* 203 */ {4, 0.1304574268895465, 0x65383231, 0x43bb66bd}, + /* 204 */ {4, 0.1303368824626505, 0x673a9100, 0x3d6e4d94}, + /* 205 */ {4, 0.1302171484322746, 0x69448e91, 0x374842ee}, + /* 206 */ {4, 0.1300982152363760, 0x6b563e10, 0x314825b0}, + /* 207 */ {4, 0.1299800734730872, 0x6d6fb2c1, 0x2b6cde75}, + /* 208 */ {4, 0.1298627138972530, 0x6f910000, 0x25b55f2e}, + /* 209 */ {4, 0.1297461274170591, 0x71ba3941, 0x2020a2c5}, + /* 210 */ {4, 0.1296303050907487, 0x73eb7210, 0x1aadaccb}, + /* 211 */ {4, 0.1295152381234257, 0x7624be11, 0x155b891f}, + /* 212 */ {4, 0.1294009178639407, 0x78663100, 0x10294ba2}, + /* 213 */ {4, 0.1292873358018581, 0x7aafdeb1, 0xb160fe9}, + /* 214 */ {4, 0.1291744835645007, 0x7d01db10, 0x620f8f6}, + /* 215 */ {4, 0.1290623529140715, 0x7f5c3a21, 0x14930ef}, + /* 216 */ {4, 0.1289509357448472, 0x81bf1000, 0xf91bd1b6}, + /* 217 */ {4, 0.1288402240804449, 0x842a70e1, 0xefdcb0c7}, + /* 218 */ {4, 0.1287302100711566, 0x869e7110, 0xe6d37b2a}, + /* 219 */ {4, 0.1286208859913518, 0x891b24f1, 0xddfeb94a}, + /* 220 */ {4, 0.1285122442369443, 0x8ba0a100, 0xd55cff6e}, + /* 221 */ {4, 0.1284042773229231, 0x8e2ef9d1, 0xcceced50}, + /* 222 */ {4, 0.1282969778809442, 0x90c64410, 0xc4ad2db2}, + /* 223 */ {4, 0.1281903386569819, 0x93669481, 0xbc9c75f9}, + /* 224 */ {4, 0.1280843525090381, 0x96100000, 0xb4b985cf}, + /* 225 */ {4, 0.1279790124049077, 0x98c29b81, 0xad0326c2}, + /* 226 */ {4, 0.1278743114199984, 0x9b7e7c10, 0xa5782bef}, + /* 227 */ {4, 0.1277702427352035, 0x9e43b6d1, 0x9e1771a9}, + /* 228 */ {4, 0.1276667996348261, 0xa1126100, 0x96dfdd2a}, + /* 229 */ {4, 0.1275639755045533, 0xa3ea8ff1, 0x8fd05c41}, + /* 230 */ {4, 0.1274617638294791, 0xa6cc5910, 0x88e7e509}, + /* 231 */ {4, 0.1273601581921740, 0xa9b7d1e1, 0x8225759d}, + /* 232 */ {4, 0.1272591522708010, 0xacad1000, 0x7b8813d3}, + /* 233 */ {4, 0.1271587398372755, 0xafac2921, 0x750eccf9}, + /* 234 */ {4, 0.1270589147554692, 0xb2b53310, 0x6eb8b595}, + /* 235 */ {4, 0.1269596709794558, 0xb5c843b1, 0x6884e923}, + /* 236 */ {4, 0.1268610025517973, 0xb8e57100, 0x627289db}, + /* 237 */ {4, 0.1267629036018709, 0xbc0cd111, 0x5c80c07b}, + /* 238 */ {4, 0.1266653683442337, 0xbf3e7a10, 0x56aebc07}, + /* 239 */ {4, 0.1265683910770258, 0xc27a8241, 0x50fbb19b}, + /* 240 */ {4, 0.1264719661804097, 0xc5c10000, 0x4b66dc33}, + /* 241 */ {4, 0.1263760881150453, 0xc91209c1, 0x45ef7c7c}, + /* 242 */ {4, 0.1262807514205999, 0xcc6db610, 0x4094d8a3}, + /* 243 */ {4, 0.1261859507142915, 0xcfd41b91, 0x3b563c24}, + /* 244 */ {4, 0.1260916806894653, 0xd3455100, 0x3632f7a5}, + /* 245 */ {4, 0.1259979361142023, 0xd6c16d31, 0x312a60c3}, + /* 246 */ {4, 0.1259047118299582, 0xda488710, 0x2c3bd1f0}, + /* 247 */ {4, 0.1258120027502338, 0xdddab5a1, 0x2766aa45}, + /* 248 */ {4, 0.1257198038592741, 0xe1781000, 0x22aa4d5f}, + /* 249 */ {4, 0.1256281102107963, 0xe520ad61, 0x1e06233c}, + /* 250 */ {4, 0.1255369169267456, 0xe8d4a510, 0x19799812}, + /* 251 */ {4, 0.1254462191960791, 0xec940e71, 0x15041c33}, + /* 252 */ {4, 0.1253560122735751, 0xf05f0100, 0x10a523e5}, + /* 253 */ {4, 0.1252662914786691, 0xf4359451, 0xc5c2749}, + /* 254 */ {4, 0.1251770521943144, 0xf817e010, 0x828a237}, + /* 255 */ {4, 0.1250882898658681, 0xfc05fc01, 0x40a1423}, + /* 256 */ {4, 0.1250000000000000, 0x8, 0x0}, +}; + +static size_t +mp32sizeinbase(uint32 xsize, uint32 * xdata, int base) { - PyStringObject * so; - size_t i; - int cmpres; - int taglong; - char *cp; - char prefix[5]; + size_t res = 1; - char * tcp = &prefix[0]; + if (xsize > 0) { + uint32 nbits = (xsize * 32) - mp32mszcnt(xsize, xdata); + uint32 lbits; - if (s == NULL || !is_rpmbc(s)) { + if ((base & (base-1)) == 0) { /* exact power of 2 */ + lbits = mp_bases[base].big_base; + res = (nbits + (lbits - 1)) / lbits; + } else { + res = (nbits * mp_bases[base].chars_per_bit_exactly) + 1; + } + } + return res; +} + +static char * +mp32str(char * t, uint32 nt, uint32 zsize, uint32 * zdata, uint32 zbase) +{ + uint32 asize = zsize + 1; + uint32 * wksp = alloca((2*asize+2) * sizeof(*wksp)); + uint32 * adata = wksp + 2; + uint32 * bdata = adata + asize; + static char bchars[] = "0123456789abcdefghijklmnopqrstuvwxyz"; + uint32 result; + + bdata[0] = 0; + mp32copy(asize-1, bdata+1, zdata); + + t[nt] = '\0'; + while (nt--) { + mp32copy(asize, adata, bdata); + mp32nmod(bdata, asize, adata, 1, &zbase, wksp); + result = bdata[asize-1]; + t[nt] = bchars[result]; + mp32ndivmod(bdata, asize, adata, 1, &zbase, wksp); + } + return t; +} + +static PyObject * +rpmbc_format(rpmbcObject * z, uint32 zbase, int withname) +{ + PyStringObject * so; + uint32 i; + uint32 nt; + uint32 zsize; + uint32 * zdata; + char * te; + char prefix[5]; + char * tcp = prefix; + + if (z == NULL || !is_rpmbc(z)) { PyErr_BadInternalCall(); return NULL; } - assert(base >= 2 && base <= 36); + assert(zbase >= 2 && zbase <= 36); if (withname) i = strlen(initialiser_name) + 2; /* e.g. 'rpmbc(' + ')' */ else i = 0; - if (mp32z(s->n.size, s->n.data)) - base = 10; /* '0' in every base, right */ - else if (mp32msbset(s->n.size, s->n.data)) { + nt = mp32mszcnt(z->n.size, z->n.data)/32; + zsize = z->n.size - nt; + zdata = z->n.data + nt; + + if (mp32z(zsize, zdata)) + zbase = 10; /* '0' in every base, right */ + else if (mp32msbset(zsize, zdata)) { *tcp++ = '-'; i += 1; /* space to hold '-' */ } - i += (int)mpz_sizeinbase(&s->mpz, base); + nt = mp32sizeinbase(zsize, zdata, zbase); + i += nt; - if (base == 16) { + if (zbase == 16) { *tcp++ = '0'; *tcp++ = 'x'; i += 2; /* space to hold '0x' */ - } else if (base == 8) { + } else if (zbase == 8) { *tcp++ = '0'; i += 1; /* space to hold the extra '0' */ - } else if (base > 10) { - *tcp++ = '0' + base / 10; - *tcp++ = '0' + base % 10; + } else if (zbase > 10) { + *tcp++ = '0' + zbase / 10; + *tcp++ = '0' + zbase % 10; *tcp++ = '#'; i += 3; /* space to hold e.g. '12#' */ - } else if (base < 10) { - *tcp++ = '0' + base; + } else if (zbase < 10) { + *tcp++ = '0' + zbase; *tcp++ = '#'; i += 2; /* space to hold e.g. '6#' */ } - /* - ** the following code looks if we need a 'L' attached to the number - ** it will also attach an 'L' to the value -0x80000000 - */ - taglong = 0; - if (mpz_size(&s->mpz) > 1 - || (long)mpz_get_ui(&s->mpz) < 0L) { - taglong = 1; - i += 1; /* space to hold 'L' */ - } - so = (PyStringObject *)PyString_FromStringAndSize((char *)0, i); if (so == NULL) return NULL; /* get the beginning of the string memory and start copying things */ - cp = PyString_AS_STRING(so); + te = PyString_AS_STRING(so); if (withname) { - strcpy(cp, initialiser_name); - cp += strlen(initialiser_name); - *cp++ = '('; /*')'*/ + te = stpcpy(te, initialiser_name); + *te++ = '('; /*')'*/ } /* copy the already prepared prefix; e.g. sign and base indicator */ *tcp = '\0'; - strcpy(cp, prefix); - cp += tcp - prefix; - - /* since' we have the sign already, let the lib think it's a positive - number */ - if (cmpres < 0) - mpz_neg(&s->mpz,&s->mpz); /* hack Hack HAck HACk HACK */ - (void)mpz_get_str(cp, base, &s->mpz); - if (cmpres < 0) - mpz_neg(&s->mpz,&s->mpz); /* hack Hack HAck HACk HACK */ - cp += strlen(cp); - - if (taglong) - *cp++ = 'L'; - if (withname) - *cp++ = /*'('*/ ')'; + te = stpcpy(te, prefix); - *cp = '\0'; + (void) mp32str(te, nt, zsize, zdata, zbase); + te += strlen(te); - assert(cp - PyString_AS_STRING(so) <= i); + if (withname) + *te++ = /*'('*/ ')'; + *te = '\0'; - if (cp - PyString_AS_STRING(so) != i) - so->ob_size -= i - (cp - PyString_AS_STRING(so)); + assert(te - PyString_AS_STRING(so) <= i); + + if (te - PyString_AS_STRING(so) != i) + so->ob_size -= i - (te - PyString_AS_STRING(so)); return (PyObject *)so; } -#endif /* ---------- */ @@ -156,18 +458,28 @@ static int rpmbc_compare(rpmbcObject * a, rpmbcObject * b) /*@*/ { + int ret; + + if (mp32eqx(a->n.size, a->n.data, b->n.size, b->n.data)) + ret = 0; + else if (mp32gtx(a->n.size, a->n.data, b->n.size, b->n.data)) + ret = 1; + else + ret = -1; + if (_bc_debug) -fprintf(stderr, "*** rpmbc_compare(%p,%p)\n", a, b); - return 0; +fprintf(stderr, "*** rpmbc_compare(%p[%s],%p[%s]) ret %d\n", a, lbl(a), b, lbl(b), ret); + return ret; } static PyObject * rpmbc_repr(rpmbcObject * a) /*@*/ { -if (_bc_debug) -fprintf(stderr, "*** rpmbc_repr(%p)\n", a); - return NULL; + PyObject * so = rpmbc_format(a, 10, 1); +if (_bc_debug && so != NULL) +fprintf(stderr, "*** rpmbc_repr(%p): \"%s\"\n", a, PyString_AS_STRING(so)); + return so; } /** \ingroup python @@ -331,13 +643,13 @@ fprintf(stderr, "*** rpmbc_Gcd(%p)\n", s); if ((a = rpmbc_i2bc(op1)) != NULL && (b = rpmbc_i2bc(op2)) != NULL - && (wksp = malloc(a->n.size)) != NULL - && (z = rpmbc_New()) != NULL) { + && (z = rpmbc_New()) != NULL) + { + wksp = alloca((a->n.size) * sizeof(*wksp)); mp32nsize(&z->n, a->n.size); mp32gcd_w(a->n.size, a->n.data, b->n.data, z->n.data, wksp); } - if (wksp != NULL) free(wksp); Py_DECREF(a); Py_DECREF(b); @@ -450,27 +762,25 @@ static PyObject * rpmbc_divide(rpmbcObject * a, rpmbcObject * b) /*@*/ { - rpmbcObject * z = NULL; - uint32 * wksp; + rpmbcObject * z; if (mp32z(b->n.size, b->n.data)) { PyErr_SetString(PyExc_ZeroDivisionError, "rpmbc_divide by zero"); return NULL; } - if ((z = rpmbc_New()) == NULL - || (wksp = malloc(b->n.size+1)) == NULL) { - Py_XDECREF(z); - return NULL; - } - - mp32nsize(&z->n, a->n.size); - mp32ndivmod(z->n.data, a->n.size, a->n.data, b->n.size, b->n.data, wksp); - - free(wksp); + if ((z = rpmbc_New()) != NULL) { + uint32 bnorm = mp32mszcnt(b->n.size, b->n.data)/32; + uint32 bsize = b->n.size - bnorm; + uint32 * bdata = b->n.data + bnorm; + uint32 * wksp = alloca((bsize+1) * sizeof(*wksp)); + + mp32nsize(&z->n, a->n.size); + mp32ndivmod(z->n.data, a->n.size, a->n.data, bsize, bdata, wksp); if (_bc_debug) fprintf(stderr, "*** rpmbc_divide(%p,%p):\t", a, b), mp32println(stderr, z->n.size, z->n.data); + } return (PyObject *)z; } @@ -482,10 +792,13 @@ rpmbc_remainder(rpmbcObject * a, rpmbcObject * b) rpmbcObject * z; if ((z = rpmbc_New()) != NULL) { - uint32 * wksp = malloc(a->n.size+1); + uint32 bnorm = mp32mszcnt(b->n.size, b->n.data)/32; + uint32 bsize = b->n.size - bnorm; + uint32 * bdata = b->n.data + bnorm; + uint32 * wksp = alloca((bsize+1) * sizeof(*wksp)); + mp32nsize(&z->n, a->n.size); - mp32nmod(z->n.data, a->n.size, a->n.data, b->n.size, b->n.data, wksp); - free(wksp); + mp32nmod(z->n.data, a->n.size, a->n.data, bsize, bdata, wksp); } if (_bc_debug) @@ -501,15 +814,20 @@ rpmbc_divmod(rpmbcObject * a, rpmbcObject * b) PyObject * z = NULL; rpmbcObject * q = NULL; rpmbcObject * r = NULL; - -if (_bc_debug) -fprintf(stderr, "*** rpmbc_divmod(%p,%p)\n", a, b); + uint32 bnorm; + uint32 bsize; + uint32 * bdata; + uint32 * wksp; if (mp32z(b->n.size, b->n.data)) { PyErr_SetString(PyExc_ZeroDivisionError, "rpmbc_divmod by zero"); return NULL; } + bnorm = mp32mszcnt(b->n.size, b->n.data)/32; + bsize = b->n.size - bnorm; + bdata = b->n.data + bnorm; + if ((z = PyTuple_New(2)) == NULL || (q = rpmbc_New()) == NULL || (r = rpmbc_New()) == NULL) { @@ -519,10 +837,18 @@ fprintf(stderr, "*** rpmbc_divmod(%p,%p)\n", a, b); return NULL; } - mp32nsize(&q->n, a->n.size+1); - mp32nsize(&r->n, b->n.size+1); + mp32nsize(&q->n, a->n.size); + mp32nsize(&r->n, a->n.size); - mp32ndivmod(q->n.data, a->n.size, a->n.data, b->n.size, b->n.data, r->n.data); + wksp = alloca((bsize+1) * sizeof(*wksp)); + mp32ndivmod(q->n.data, a->n.size, a->n.data, bsize, bdata, wksp); + mp32nmod(r->n.data, a->n.size, a->n.data, bsize, bdata, wksp); + +if (_bc_debug) { +fprintf(stderr, "*** rpmbc_divmod(%p,%p)\n", a, b); +fprintf(stderr, " q(%p):\t", q), mp32println(stderr, q->n.size, q->n.data); +fprintf(stderr, " r(%p):\t", r), mp32println(stderr, r->n.size, r->n.data); +} (void) PyTuple_SetItem(z, 0, (PyObject *)q); (void) PyTuple_SetItem(z, 1, (PyObject *)r); @@ -533,9 +859,17 @@ static PyObject * rpmbc_power(rpmbcObject * a, rpmbcObject * b, rpmbcObject * c) /*@*/ { + rpmbcObject * z; + + if ((z = rpmbc_New()) != NULL) { + mp32ninit(&z->n, a->n.size, a->n.data); + if (_bc_debug) -fprintf(stderr, "*** rpmbc_power(%p,%p,%p)\n", a, b, c); - return NULL; +fprintf(stderr, "*** rpmbc_power(%p,%p,%p):\t", a, b, c), mp32println(stderr, z->n.size, z->n.data); + + } + + return (PyObject *)z; } static PyObject * @@ -620,19 +954,24 @@ rpmbc_lshift(rpmbcObject * a, rpmbcObject * b) /*@*/ { rpmbcObject * z; - uint32 count = 0; /* XXX check shift count in range. */ if ((z = rpmbc_New()) != NULL) { - if (b->n.size == 1) - count = b->n.data[0]; + uint32 bnorm = mp32mszcnt(b->n.size, b->n.data)/32; + uint32 bsize = b->n.size - bnorm; + uint32 * bdata = b->n.data + bnorm; + uint32 count = 0; + + if (bsize == 1) + count = bdata[0]; mp32ninit(&z->n, a->n.size, a->n.data); mp32lshift(z->n.size, z->n.data, count); - } if (_bc_debug) fprintf(stderr, "*** rpmbc_lshift(%p[%s],%p[%s]):\t", a, lbl(a), b, lbl(b)), mp32println(stderr, z->n.size, z->n.data); + } + return (PyObject *)z; } @@ -641,19 +980,24 @@ rpmbc_rshift(rpmbcObject * a, rpmbcObject * b) /*@*/ { rpmbcObject * z; - uint32 count = 0; /* XXX check shift count in range. */ if ((z = rpmbc_New()) != NULL) { - if (b->n.size == 1) - count = b->n.data[0]; + uint32 bnorm = mp32mszcnt(b->n.size, b->n.data)/32; + uint32 bsize = b->n.size - bnorm; + uint32 * bdata = b->n.data + bnorm; + uint32 count = 0; + + if (bsize == 1) + count = bdata[0]; mp32ninit(&z->n, a->n.size, a->n.data); mp32rshift(z->n.size, z->n.data, count); - } if (_bc_debug) fprintf(stderr, "*** rpmbc_rshift(%p[%s],%p[%s]):\t", a, lbl(a), b, lbl(b)), mp32println(stderr, z->n.size, z->n.data); + } + return (PyObject *)z; } @@ -788,57 +1132,79 @@ static PyObject * rpmbc_int(rpmbcObject * a) /*@*/ { - if (mp32size(a->n.size, a->n.data) > 1) { + uint32 anorm = mp32mszcnt(a->n.size, a->n.data)/32; + uint32 asize = a->n.size - anorm; + uint32 * adata = a->n.data + anorm; + + if (asize > 1) { PyErr_SetString(PyExc_ValueError, "rpmbc_int: arg too long to convert"); return NULL; } if (_bc_debug) -fprintf(stderr, "*** rpmbc_int(%p):\t%08x\n", a, (int)(a->n.data ? a->n.data[0] : 0)); +fprintf(stderr, "*** rpmbc_int(%p):\t%08x\n", a, (int)(asize ? adata[0] : 0)); - return Py_BuildValue("i", (a->n.data ? a->n.data[0] : 0)); + return Py_BuildValue("i", (asize ? adata[0] : 0)); } static PyObject * rpmbc_long(rpmbcObject * a) /*@*/ { - if (mp32size(a->n.size, a->n.data) > 1) { + uint32 anorm = mp32mszcnt(a->n.size, a->n.data)/32; + uint32 asize = a->n.size - anorm; + uint32 * adata = a->n.data + anorm; + + if (asize > 1) { PyErr_SetString(PyExc_ValueError, "rpmbc_long() arg too long to convert"); return NULL; } if (_bc_debug) -fprintf(stderr, "*** rpmbc_long(%p):\t%08lx\n", a, (long)(a->n.data ? a->n.data[0] : 0)); +fprintf(stderr, "*** rpmbc_long(%p):\t%08lx\n", a, (long)(asize ? adata[0] : 0)); - return Py_BuildValue("l", (a->n.data ? a->n.data[0] : 0)); + return Py_BuildValue("l", (asize ? adata[0] : 0)); } static PyObject * rpmbc_float(rpmbcObject * a) /*@*/ { + PyObject * so = rpmbc_format(a, 10, 0); + char * s, * se; + double d; + + if (so == NULL) + return NULL; + s = PyString_AS_STRING(so); + se = NULL; + d = strtod(s, &se); + if (_bc_debug) -fprintf(stderr, "*** rpmbc_float(%p)\n", a); - return NULL; +fprintf(stderr, "*** rpmbc_float(%p): s %p \"%s\" se %p d %g\n", a, s, s, se, d); + Py_DECREF(so); + + return Py_BuildValue("d", d); } static PyObject * rpmbc_oct(rpmbcObject * a) /*@*/ { -if (_bc_debug) -fprintf(stderr, "*** rpmbc_oct(%p)\n", a); - return NULL; + PyObject * so = rpmbc_format(a, 8, 1); +if (_bc_debug && so != NULL) +fprintf(stderr, "*** rpmbc_oct(%p): \"%s\"\n", a, PyString_AS_STRING(so)); + return so; } static PyObject * rpmbc_hex(rpmbcObject * a) /*@*/ { -if (_bc_debug) -fprintf(stderr, "*** rpmbc_hex(%p)\n", a); - return NULL; + PyObject * so = rpmbc_format(a, 16, 1); +if (_bc_debug && so != NULL) +fprintf(stderr, "*** rpmbc_hex(%p): \"%s\"\n", a, PyString_AS_STRING(so)); + return so; } static PyObject * @@ -895,11 +1261,13 @@ rpmbc_inplace_divide(rpmbcObject * a, rpmbcObject * b) /*@*/ { uint32 * result = xmalloc(a->n.size * sizeof(*result)); - uint32 * wksp = xmalloc(b->n.size+1); + uint32 bnorm = mp32mszcnt(b->n.size, b->n.data)/32; + uint32 bsize = b->n.size - bnorm; + uint32 * bdata = b->n.data + bnorm; + uint32 * wksp = alloca((bsize+1) * sizeof(*wksp)); - mp32ndivmod(result, a->n.size, a->n.data, b->n.size, b->n.data, wksp); + mp32ndivmod(result, a->n.size, a->n.data, bsize, bdata, wksp); - free(wksp); free(a->n.data); a->n.data = result; @@ -915,11 +1283,13 @@ rpmbc_inplace_remainder(rpmbcObject * a, rpmbcObject * b) /*@*/ { uint32 * result = xmalloc(a->n.size * sizeof(*result)); - uint32 * wksp = xmalloc(a->n.size+1); + uint32 bnorm = mp32mszcnt(b->n.size, b->n.data)/32; + uint32 bsize = b->n.size - bnorm; + uint32 * bdata = b->n.data + bnorm; + uint32 * wksp = alloca((bsize+1) * sizeof(*wksp)); - mp32nmod(result, a->n.size, a->n.data, b->n.size, b->n.data, wksp); + mp32nmod(result, a->n.size, a->n.data, bsize, bdata, wksp); - free(wksp); free(a->n.data); a->n.data = result; @@ -945,12 +1315,15 @@ static PyObject * rpmbc_inplace_lshift(rpmbcObject * a, rpmbcObject * b) /*@modifies a @*/ { + uint32 bnorm = mp32mszcnt(b->n.size, b->n.data)/32; + uint32 bsize = b->n.size - bnorm; + uint32 * bdata = b->n.data + bnorm; uint32 count = 0; /* XXX check shift count in range. */ - if (b->n.size == 1) - count = b->n.data[0]; - mp32lshift(a->n.size, a->n.data, count); + if (bsize == 1) + count = bdata[0]; + mp32lshift(a->n.size, a->n.data, bdata[0]); if (_bc_debug) fprintf(stderr, "*** rpmbc_inplace_lshift(%p,%p):\t", a, b), mp32println(stderr, a->n.size, a->n.data); @@ -963,11 +1336,14 @@ static PyObject * rpmbc_inplace_rshift(rpmbcObject * a, rpmbcObject * b) /*@modifies a @*/ { + uint32 bnorm = mp32mszcnt(b->n.size, b->n.data)/32; + uint32 bsize = b->n.size - bnorm; + uint32 * bdata = b->n.data + bnorm; uint32 count = 0; /* XXX check shift count in range. */ - if (b->n.size == 1) - count = b->n.data[0]; + if (bsize == 1) + count = bdata[0]; mp32rshift(a->n.size, a->n.data, count); if (_bc_debug) -- 2.7.4