diff options
| author | jbj <devnull@localhost> | 2003-04-30 18:16:10 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2003-04-30 18:16:10 +0000 |
| commit | b1c4b8352440609c0c9c1a9a415d37a8e0c75439 (patch) | |
| tree | 4344f659f893bf0ae37d33f76250c070aed809cc | |
| parent | e4aa414fe7eb95b08e8784b4bfb59ff7a8151a83 (diff) | |
| download | librpm-tizen-b1c4b8352440609c0c9c1a9a415d37a8e0c75439.tar.gz librpm-tizen-b1c4b8352440609c0c9c1a9a415d37a8e0c75439.tar.bz2 librpm-tizen-b1c4b8352440609c0c9c1a9a415d37a8e0c75439.zip | |
Create rpm.mpw module from guts of rpm.bc.
CVS patchset: 6796
CVS date: 2003/04/30 18:16:10
| -rw-r--r-- | python/Makefile.am | 6 | ||||
| -rw-r--r-- | python/bc.py | 65 | ||||
| -rw-r--r-- | python/pow.py | 65 | ||||
| -rw-r--r-- | python/rpmbc-py.c | 1961 | ||||
| -rw-r--r-- | python/rpmbc-py.h | 1 | ||||
| -rw-r--r-- | python/rpmdebug-py.c | 2 | ||||
| -rw-r--r-- | python/rpmmodule.c | 5 | ||||
| -rw-r--r-- | python/rpmmpw-py.c | 618 | ||||
| -rw-r--r-- | python/rpmmpw-py.h | 10 |
9 files changed, 395 insertions, 2338 deletions
diff --git a/python/Makefile.am b/python/Makefile.am index 17075c6d4..b4091f2fb 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -25,7 +25,7 @@ INCLUDES = -I. \ noinst_HEADERS = header-py.h \ rpmal-py.h rpmbc-py.h rpmds-py.h rpmdb-py.h rpmfd-py.h rpmfts-py.h \ - rpmfi-py.h rpmmi-py.h rpmrc-py.h rpmte-py.h rpmts-py.h + rpmfi-py.h rpmmi-py.h rpmmpw-py.h rpmrc-py.h rpmte-py.h rpmts-py.h mylibs= \ $(top_builddir)/lib/.libs/librpm.so \ @@ -56,7 +56,7 @@ poptmodule_so_LDFLAGS = $(mylibs) $(LIBS) -shared -Wl,-soname,poptmodule.so noinst_LTLIBRARIES = librpmmodule.la librpmmodule_la_SOURCES = rpmmodule.c header-py.c \ rpmal-py.c rpmbc-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfts-py.c \ - rpmfi-py.c rpmmi-py.c rpmrc-py.c rpmte-py.c rpmts-py.c + rpmfi-py.c rpmmi-py.c rpmmpw-py.c rpmrc-py.c rpmte-py.c rpmts-py.c rpmmodule.so$(EXEEXT): $(librpmmodule_la_OBJECTS) $(CC) -o $@ $(librpmmodule_la_OBJECTS) $(rpmmodule_so_LDFLAGS) @@ -73,7 +73,7 @@ poptmodule.so$(EXEEXT): poptmodule.lo # rpmmodule.c header-py.c splint_srcs = \ rpmal-py.c rpmbc-py.c rpmds-py.c rpmdb-py.c rpmfd-py.c rpmfts-py.c \ - rpmfi-py.c rpmmi-py.c rpmrc-py.c rpmte-py.c rpmts-py.c + rpmfi-py.c rpmmi-py.c rpmmpw-py.c rpmrc-py.c rpmte-py.c rpmts-py.c .PHONY: lint lint: diff --git a/python/bc.py b/python/bc.py deleted file mode 100644 index 66b27f420..000000000 --- a/python/bc.py +++ /dev/null @@ -1,65 +0,0 @@ -import rpm - -i = 1 -#rpm.bc().Debug(-1); -#a = rpm.bc("0000000987654321") -#b = rpm.bc("0000000000000010") -#c = rpm.bc("0fedcba000000000") - -for i in range(100): - a = rpm.bc(i) - for j in range(100): - b = rpm.bc(j) - print i, '^', j, '=', rpm.bc.__pow__(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.__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.__int__(b) -#rpm.bc.__long__(b) -#rpm.bc.__float__(a) -#rpm.bc.__complex__(b) -#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 -# -#c = a + b -#print "c: ", c - diff --git a/python/pow.py b/python/pow.py new file mode 100644 index 000000000..3016f294b --- /dev/null +++ b/python/pow.py @@ -0,0 +1,65 @@ +import rpm + +i = 1 +#rpm.mpw().Debug(-1); +#a = rpm.mpw("0000000987654321") +#b = rpm.mpw("0000000000000010") +#c = rpm.mpw("0fedcba000000000") + +for i in range(100): + a = rpm.mpw(i) + for j in range(100): + b = rpm.mpw(j) + print i, '^', j, '=', rpm.mpw.__pow__(a, b) + +#rpm.mpw.__add__(a, b) +#rpm.mpw.__sub__(a, b) +#rpm.mpw.__mul__(a, b) +#rpm.mpw.__div__(a, b) +#rpm.mpw.__mod__(a, b) + +#rpm.mpw.__divmod__(a, b) +#rpm.mpw.__pow__(a, b) + +#rpm.mpw.__lshift__(a, b) +#rpm.mpw.__rshift__(a, b) + +#rpm.mpw.__and__(a, c) +#rpm.mpw.__xor__(a, a) +#rpm.mpw.__or__(a, c) + +#rpm.mpw.__neg__(a) +#rpm.mpw.__pos__(a) +#rpm.mpw.__abs__(a) +#rpm.mpw.__invert__(a) + +#rpm.mpw.__int__(b) +#rpm.mpw.__long__(b) +#rpm.mpw.__float__(a) +#rpm.mpw.__complex__(b) +#rpm.mpw.__oct__(a*b) +#rpm.mpw.__hex__(a*b) +#rpm.mpw.__coerce__(b, i) + +#d = rpm.mpw("987654321"); rpm.bc.__iadd__(d, b) +#d = rpm.mpw("987654321"); rpm.bc.__isub__(d, b) +#d = rpm.mpw("987654321"); rpm.bc.__imul__(d, b) +#d = rpm.mpw("987654321"); rpm.bc.__idiv__(d, b) +#d = rpm.mpw("987654321"); rpm.bc.__imod__(d, b) + +#d = rpm.mpw("987654321"); rpm.bc.__ilshift__(d, b) +#d = rpm.mpw("987654321"); rpm.bc.__irshift__(d, b) + +#d = rpm.mpw("987654321"); rpm.bc.__iand__(d, c) +#d = rpm.mpw("987654321"); rpm.bc.__ixor__(d, a) +#d = rpm.mpw("987654321"); rpm.bc.__ior__(d, c) + +#if a > i: +# print "a > i" + +#b = rpm.mpw("123456789") +#print "b: ", a +# +#c = a + b +#print "c: ", c + diff --git a/python/rpmbc-py.c b/python/rpmbc-py.c index 66861b1d9..1ace8fa82 100644 --- a/python/rpmbc-py.c +++ b/python/rpmbc-py.c @@ -22,761 +22,7 @@ static int _bc_debug = 0; #define is_rpmbc(o) ((o)->ob_type == &rpmbc_Type) /*@unchecked@*/ /*@observer@*/ -static const char initialiser_name[] = "rpmbc"; - -/*@unchecked@*/ /*@observer@*/ -static 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 -mpsizeinbase(size_t xsize, mpw* xdata, size_t base) -{ - size_t nbits; - size_t res; - - if (xsize == 0) - return 1; - - /* XXX assumes positive integer. */ - nbits = 32 * xsize - mpmszcnt(xsize, xdata); - if ((base & (base-1)) == 0) { /* exact power of 2 */ - size_t lbits = mp_bases[base].big_base; - res = (nbits + (lbits - 1)) / lbits; - } else { - res = (nbits * mp_bases[base].chars_per_bit_exactly) + 1; - } -if (_bc_debug < -1) -fprintf(stderr, "*** mpsizeinbase(%p[%d], %d) res %u\n", xdata, xsize, base, (unsigned)res); - return res; -} - -/*@-boundswrite@*/ -static void myndivmod(mpw* result, size_t xsize, const mpw* xdata, size_t ysize, const mpw* ydata, register mpw* workspace) -{ - /* result must be xsize+1 in length */ - /* workspace must be ysize+1 in length */ - /* expect ydata to be normalized */ - mpw q; - mpw msw = *ydata; - size_t qsize = xsize-ysize; - - mpcopy(xsize, result+1, xdata); - - if (mpge(ysize, result+1, ydata)) - { - (void) mpsub(ysize, result+1, ydata); - *(result++) = 1; - } - else - *(result++) = 0; - - while (qsize--) - { - q = mppndiv(result[0], result[1], msw); - - *workspace = mpsetmul(ysize, workspace+1, ydata, q); - - while (mplt(ysize+1, result, workspace)) - { - mpsubx(ysize+1, workspace, ysize, ydata); - q--; - } - - mpsub(ysize+1, result, workspace); - *(result++) = q; - } -} -/*@=boundswrite@*/ - -static char * -mpstr(char * t, size_t nt, size_t zsize, mpw* zdata, size_t zbase) -{ - size_t size = zsize + 1; - mpw* wksp = alloca((size+1) * sizeof(*wksp)); - mpw* adata = alloca(size * sizeof(*adata)); - mpw* bdata = alloca(size * sizeof(*bdata)); - static char bchars[] = "0123456789abcdefghijklmnopqrstuvwxyz"; - size_t result; - -if (_bc_debug < -1) -fprintf(stderr, "*** mpstr(%p[%d], %p[%d], %d):\t", t, nt, zdata, zsize, zbase), mpprintln(stderr, zsize, zdata); - - mpsetx(size, bdata, zsize, zdata); - - t[nt] = '\0'; - while (nt--) { - mpsetx(size, adata, size, bdata); -if (_bc_debug < -1) -fprintf(stderr, "*** a: %p[%d]\t", adata, size), mpprintln(stderr, size, adata); - mpnmod(bdata, size, adata, 1, &zbase, wksp); -if (_bc_debug < -1) -fprintf(stderr, "*** nmod: %p[%d]\t", bdata, size), mpprintln(stderr, size, bdata); - result = bdata[size-1]; - t[nt] = bchars[result]; - mpndivmod(bdata, size, adata, 1, &zbase, wksp); -if (_bc_debug < -1) -fprintf(stderr, "*** ndivmod: %p[%d]\t", bdata, size), mpprintln(stderr, size, bdata); - if (mpz(size, bdata)) - break; - } - /* XXX Fill leading zeroes (if any). */ - while (nt--) - t[nt] = '0'; - return t; -} - -static PyObject * -rpmbc_format(rpmbcObject * z, size_t zbase, int withname) -{ - PyStringObject * so; - size_t i; - size_t nt; - size_t zsize; - mpw* zdata; - char * t, * te; - char prefix[5]; - char * tcp = prefix; - int zsign; - - if (z == NULL || !is_rpmbc(z)) { - PyErr_BadInternalCall(); - return NULL; - } - -if (_bc_debug < -1) -fprintf(stderr, "*** rpmbc_format(%p,%d,%d):\t", z, zbase, withname), mpprintln(stderr, z->n.size, z->n.data); - - assert(zbase >= 2 && zbase <= 36); - - if (withname) - i = strlen(initialiser_name) + 2; /* e.g. 'rpmbc(' + ')' */ - else - i = 0; - - zsign = mpmsbset(z->n.size, z->n.data); - nt = mpbitcnt(z->n.size, z->n.data); - if (nt == 0) { - zbase = 10; /* '0' in every base, right */ - nt = 1; - zsize = 1; - zdata = &zsign; - } else if (zsign) { - *tcp++ = '-'; - i += 1; /* space to hold '-' */ - zsize = (nt + 31)/32; - zdata = alloca(zsize * sizeof(*zdata)); - mpsetx(zsize, zdata, zsize, z->n.data + (z->n.size - zsize)); - mpneg(zsize, zdata); - } else { - zsize = (nt + 31)/32; - zdata = z->n.data + (z->n.size - zsize); - } - - nt = mpsizeinbase(zsize, zdata, zbase); - i += nt; - - if (zbase == 16) { - *tcp++ = '0'; - *tcp++ = 'x'; - i += 2; /* space to hold '0x' */ - } else if (zbase == 8) { - *tcp++ = '0'; - i += 1; /* space to hold the extra '0' */ - } else if (zbase > 10) { - *tcp++ = '0' + zbase / 10; - *tcp++ = '0' + zbase % 10; - *tcp++ = '#'; - i += 3; /* space to hold e.g. '12#' */ - } else if (zbase < 10) { - *tcp++ = '0' + zbase; - *tcp++ = '#'; - i += 2; /* space to hold e.g. '6#' */ - } - - so = (PyStringObject *)PyString_FromStringAndSize((char *)0, i); - if (so == NULL) - return NULL; - - /* get the beginning of the string memory and start copying things */ - te = PyString_AS_STRING(so); - if (withname) { - te = stpcpy(te, initialiser_name); - *te++ = '('; /*')'*/ - } - - /* copy the already prepared prefix; e.g. sign and base indicator */ - *tcp = '\0'; - t = te = stpcpy(te, prefix); - - (void) mpstr(te, nt, zsize, zdata, zbase); - - /* Nuke leading zeroes. */ - nt = 0; - while (t[nt] == '0') - nt++; - if (t[nt] == '\0') /* all zeroes special case. */ - nt--; - if (nt > 0) - do { - *t = t[nt]; - } while (*t++ != '\0'); - - te += strlen(te); - - if (withname) - *te++ = /*'('*/ ')'; - *te = '\0'; - - 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; -} - -/** - * Precomputes the sliding window table for computing powers of x. - * - * Sliding Window Exponentiation, Algorithm 14.85 in "Handbook of Applied Cryptography". - * - * First of all, the table with the powers of g can be reduced by - * about half; the even powers don't need to be accessed or stored. - * - * Get up to K bits starting with a one, if we have that many still available. - * - * Do the number of squarings of A in the first column, then multiply by - * the value in column two, and finally do the number of squarings in - * column three. - * - * This table can be used for K=2,3,4 and can be extended. - * - * -\verbatim - 0 : - | - | - - 1 : 1 | g1 @ 0 | 0 - 10 : 1 | g1 @ 0 | 1 - 11 : 2 | g3 @ 1 | 0 - 100 : 1 | g1 @ 0 | 2 - 101 : 3 | g5 @ 2 | 0 - 110 : 2 | g3 @ 1 | 1 - 111 : 3 | g7 @ 3 | 0 - 1000 : 1 | g1 @ 0 | 3 - 1001 : 4 | g9 @ 4 | 0 - 1010 : 3 | g5 @ 2 | 1 - 1011 : 4 | g11 @ 5 | 0 - 1100 : 2 | g3 @ 1 | 2 - 1101 : 4 | g13 @ 6 | 0 - 1110 : 3 | g7 @ 3 | 1 - 1111 : 4 | g15 @ 7 | 0 -\endverbatim - * - */ -static void mpnslide(const mpnumber* n, size_t xsize, const mpw* xdata, - size_t size, /*@out@*/ mpw* slide) - /*@modifies slide @*/ -{ - size_t rsize = (xsize > size ? xsize : size); - mpw* result = alloca(2 * rsize * sizeof(*result)); - - mpsqr(result, xsize, xdata); /* x^2 temp */ - mpsetx(size, slide, xsize+xsize, result); -if (_bc_debug < 0) -fprintf(stderr, "\t x^2:\t"), mpprintln(stderr, size, slide); - mpmul(result, xsize, xdata, size, slide); /* x^3 */ - mpsetx(size, slide+size, xsize+size, result); -if (_bc_debug < 0) -fprintf(stderr, "\t x^3:\t"), mpprintln(stderr, size, slide+size); - mpmul(result, size, slide, size, slide+size); /* x^5 */ - mpsetx(size, slide+2*size, size+size, result); -if (_bc_debug < 0) -fprintf(stderr, "\t x^5:\t"), mpprintln(stderr, size, slide+2*size); - mpmul(result, size, slide, size, slide+2*size); /* x^7 */ - mpsetx(size, slide+3*size, size+size, result); -if (_bc_debug < 0) -fprintf(stderr, "\t x^7:\t"), mpprintln(stderr, size, slide+3*size); - mpmul(result, size, slide, size, slide+3*size); /* x^9 */ - mpsetx(size, slide+4*size, size+size, result); -if (_bc_debug < 0) -fprintf(stderr, "\t x^9:\t"), mpprintln(stderr, size, slide+4*size); - mpmul(result, size, slide, size, slide+4*size); /* x^11 */ - mpsetx(size, slide+5*size, size+size, result); -if (_bc_debug < 0) -fprintf(stderr, "\t x^11:\t"), mpprintln(stderr, size, slide+5*size); - mpmul(result, size, slide, size, slide+5*size); /* x^13 */ - mpsetx(size, slide+6*size, size+size, result); -if (_bc_debug < 0) -fprintf(stderr, "\t x^13:\t"), mpprintln(stderr, size, slide+6*size); - mpmul(result, size, slide, size, slide+6*size); /* x^15 */ - mpsetx(size, slide+7*size, size+size, result); -if (_bc_debug < 0) -fprintf(stderr, "\t x^15:\t"), mpprintln(stderr, size, slide+7*size); - mpsetx(size, slide, xsize, xdata); /* x^1 */ -if (_bc_debug < 0) -fprintf(stderr, "\t x^1:\t"), mpprintln(stderr, size, slide); -} - -/*@observer@*/ /*@unchecked@*/ -static byte mpnslide_presq[16] = -{ 0, 1, 1, 2, 1, 3, 2, 3, 1, 4, 3, 4, 2, 4, 3, 4 }; - -/*@observer@*/ /*@unchecked@*/ -static byte mpnslide_mulg[16] = -{ 0, 0, 0, 1, 0, 2, 1, 3, 0, 4, 2, 5, 1, 6, 3, 7 }; - -/*@observer@*/ /*@unchecked@*/ -static byte mpnslide_postsq[16] = -{ 0, 0, 1, 0, 2, 0, 1, 0, 3, 0, 1, 0, 2, 0, 1, 0 }; - -/** - * Exponentiation with precomputed sliding window table. - */ -/*@-boundsread@*/ -static void mpnpowsld_w(mpnumber* n, size_t size, const mpw* slide, - size_t psize, const mpw* pdata) -{ - size_t rsize = (n->size > size ? n->size : size); - mpw* rdata = alloca(2 * rsize * sizeof(*rdata)); - short lbits = 0; - short kbits = 0; - byte s; - mpw temp; - short count; - -if (_bc_debug < 0) -fprintf(stderr, "npowsld: p\t"), mpprintln(stderr, psize, pdata); - /* 2. A = 1, i = t. */ - mpzero(n->size, n->data); - n->data[n->size-1] = 1; - - /* Find first bit set in exponent. */ - temp = *pdata; - count = 8 * sizeof(temp); - while (count != 0) { - if (temp & MP_MSBMASK) - break; - temp <<= 1; - count--; - } - - while (psize) { - while (count != 0) { - - /* Shift next bit of exponent into sliding window. */ - kbits <<= 1; - if (temp & MP_MSBMASK) - kbits++; - - /* On 1st non-zero in window, try to collect K bits. */ - if (kbits != 0) { - if (lbits != 0) - lbits++; - else if (temp & MP_MSBMASK) - lbits = 1; - else - {}; - - /* If window is full, then compute and clear window. */ - if (lbits == 4) { -if (_bc_debug < 0) -fprintf(stderr, "*** #1 lbits %d kbits %d\n", lbits, kbits); - for (s = mpnslide_presq[kbits]; s > 0; s--) { - mpsqr(rdata, n->size, n->data); - mpsetx(n->size, n->data, 2*n->size, rdata); -if (_bc_debug < 0) -fprintf(stderr, "\t pre1:\t"), mpprintln(stderr, n->size, n->data); - } - - mpmul(rdata, n->size, n->data, - size, slide+mpnslide_mulg[kbits]*size); - mpsetx(n->size, n->data, n->size+size, rdata); -if (_bc_debug < 0) -fprintf(stderr, "\t mul1:\t"), mpprintln(stderr, n->size, n->data); - - for (s = mpnslide_postsq[kbits]; s > 0; s--) { - mpsqr(rdata, n->size, n->data); - mpsetx(n->size, n->data, 2*n->size, rdata); -if (_bc_debug < 0) -fprintf(stderr, "\tpost1:\t"), mpprintln(stderr, n->size, n->data); - } - - lbits = kbits = 0; - } - } else { - mpsqr(rdata, n->size, n->data); - mpsetx(n->size, n->data, 2*n->size, rdata); -if (_bc_debug < 0) -fprintf(stderr, "\t sqr:\t"), mpprintln(stderr, n->size, n->data); - } - - temp <<= 1; - count--; - } - if (--psize) { - count = 8 * sizeof(temp); - temp = *(pdata++); - } - } - - if (kbits != 0) { -if (_bc_debug < 0) -fprintf(stderr, "*** #1 lbits %d kbits %d\n", lbits, kbits); - for (s = mpnslide_presq[kbits]; s > 0; s--) { - mpsqr(rdata, n->size, n->data); - mpsetx(n->size, n->data, 2*n->size, rdata); -if (_bc_debug < 0) -fprintf(stderr, "\t pre2:\t"), mpprintln(stderr, n->size, n->data); - } - - mpmul(rdata, n->size, n->data, - size, slide+mpnslide_mulg[kbits]*size); - mpsetx(n->size, n->data, n->size+size, rdata); -if (_bc_debug < 0) -fprintf(stderr, "\t mul2:\t"), mpprintln(stderr, n->size, n->data); - - for (s = mpnslide_postsq[kbits]; s > 0; s--) { - mpsqr(rdata, n->size, n->data); - mpsetx(n->size, n->data, 2*n->size, rdata); -if (_bc_debug < 0) -fprintf(stderr, "\tpost2:\t"), mpprintln(stderr, n->size, n->data); - } - } -} -/*@=boundsread@*/ - -/** - * mpnpow_w - * - * Uses sliding window exponentiation; needs extra storage: - * if K=3, needs 4*size, if K=4, needs 8*size - */ -/*@-boundsread@*/ -static void mpnpow_w(mpnumber* n, size_t xsize, const mpw* xdata, - size_t psize, const mpw* pdata) -{ - size_t xbits = mpbitcnt(xsize, xdata); - size_t pbits = mpbitcnt(psize, pdata); - size_t nbits; - mpw *slide; - size_t nsize; - size_t size; - - /* Special case: 0**P and X**(-P) */ - if (xbits == 0 || mpmsbset(psize, pdata)) { - mpnsetw(n, 0); - return; - } - /* Special case: X**0 and 1**P */ - if (pbits == 0 || mpisone(xsize, xdata)) { - mpnsetw(n, 1); - return; - } - - /* Normalize (to mpw boundary) exponent. */ - pdata += psize - ((pbits+31)/32); - psize -= (pbits/32); - - /* Calculate size of result. */ - if (xbits == 0) xbits = 1; - nbits = (*pdata) * xbits; - nsize = (nbits + 31)/32; - - /* XXX Add 1 word to carry sign bit */ - if (!mpmsbset(xsize, xdata) && (nbits & (32 -1)) == 0) - nsize++; - - size = ((15 * xbits)+31)/32; - -if (_bc_debug < 0) -fprintf(stderr, "*** pbits %d xbits %d nsize %d size %d\n", pbits, xbits, nsize, size); - mpnsize(n, nsize); - - /* 1. Precompute odd powers of x (up to 2**K). */ - slide = (mpw*) alloca( (8*size) * sizeof(mpw)); - - mpnslide(n, xsize, xdata, size, slide); - - /*@-internalglobs -mods@*/ /* noisy */ - mpnpowsld_w(n, size, slide, psize, pdata); - /*@=internalglobs =mods@*/ - -} -/*@=boundsread@*/ +static const char initialiser_name[] = "rpm.bc"; /* ---------- */ @@ -787,11 +33,9 @@ rpmbc_dealloc(rpmbcObject * s) if (_bc_debug < -1) fprintf(stderr, "*** rpmbc_dealloc(%p)\n", s); - mpnfree(&s->n); PyObject_Del(s); } -#ifdef DYING static int rpmbc_print(rpmbcObject * s, FILE * fp, /*@unused@*/ int flags) /*@globals fileSystem @*/ @@ -799,52 +43,8 @@ rpmbc_print(rpmbcObject * s, FILE * fp, /*@unused@*/ int flags) { if (_bc_debug < -1) fprintf(stderr, "*** rpmbc_print(%p)\n", s); - mpprint(fp, s->n.size, s->n.data); return 0; } -#else -#define rpmbc_print 0 -#endif - -static int -rpmbc_compare(rpmbcObject * a, rpmbcObject * b) - /*@*/ -{ - int ret; - - if (mpeqx(a->n.size, a->n.data, b->n.size, b->n.data)) - ret = 0; - else if (mpgtx(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[%s],%p[%s]) ret %d\n", a, lbl(a), b, lbl(b), ret); - return ret; -} - -static PyObject * -rpmbc_repr(rpmbcObject * a) - /*@*/ -{ - 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 py_c - */ -static PyObject * -rpmbc_str(rpmbcObject * a) - /*@*/ -{ - PyObject * so = rpmbc_format(a, 10, 0); -if (_bc_debug && so != NULL) -fprintf(stderr, "*** rpmbc_str(%p): \"%s\"\n", a, PyString_AS_STRING(so)); - return so; -} /** \ingroup py_c */ @@ -852,56 +52,11 @@ static int rpmbc_init(rpmbcObject * z, PyObject *args, PyObject *kwds) /*@modifies z @*/ { PyObject * o = NULL; - size_t words = 0; - long l = 0; if (!PyArg_ParseTuple(args, "|O:Cvt", &o)) return -1; - if (o == NULL) { - if (z->n.data == NULL) - mpnsetw(&z->n, 0); - } else if (PyInt_Check(o)) { - l = PyInt_AsLong(o); - words = sizeof(l)/sizeof(words); - } else if (PyLong_Check(o)) { - l = PyLong_AsLong(o); - words = sizeof(l)/sizeof(words); - } else if (PyFloat_Check(o)) { - double d = PyFloat_AsDouble(o); - /* XXX TODO: check for overflow/underflow. */ - l = (long) (d + 0.5); - words = sizeof(l)/sizeof(words); - } else if (PyString_Check(o)) { - const unsigned char * hex = PyString_AsString(o); - /* XXX TODO: check for hex. */ - mpnsethex(&z->n, hex); - } else if (is_rpmbc(o)) { - rpmbcObject *a = (rpmbcObject *)o; - mpnsize(&z->n, a->n.size); - if (a->n.size > 0) - mpsetx(z->n.size, z->n.data, a->n.size, a->n.data); - } else { - PyErr_SetString(PyExc_TypeError, "non-numeric coercion failed (rpmbc_init)"); - return -1; - } - - if (words > 0) { - mpnsize(&z->n, words); - switch (words) { - case 2: -/*@-shiftimplementation @*/ - z->n.data[0] = (l >> 32) & 0xffffffff; -/*@=shiftimplementation @*/ - z->n.data[1] = (l ) & 0xffffffff; - break; - case 1: - z->n.data[0] = (l ) & 0xffffffff; - break; - } - } - if (_bc_debug) -fprintf(stderr, "*** rpmbc_init(%p[%s],%p[%s],%p[%s]):\t", z, lbl(z), args, lbl(args), kwds, lbl(kwds)), mpprintln(stderr, z->n.size, z->n.data); +fprintf(stderr, "*** rpmbc_init(%p[%s],%p[%s],%p[%s])\n", z, lbl(z), args, lbl(args), kwds, lbl(kwds)); return 0; } @@ -913,7 +68,6 @@ static void rpmbc_free(/*@only@*/ rpmbcObject * s) { if (_bc_debug) fprintf(stderr, "*** rpmbc_free(%p[%s])\n", s, lbl(s)); - mpnfree(&s->n); PyObject_Del(s); } @@ -935,9 +89,6 @@ rpmbc_new(PyTypeObject * subtype, PyObject *args, PyObject *kwds) { PyObject * ns = (PyObject *) PyObject_New(rpmbcObject, &rpmbc_Type); - if (ns != NULL) - mpnzero(&((rpmbcObject *)ns)->n); - if (_bc_debug < -1) fprintf(stderr, "*** rpmbc_new(%p[%s],%p[%s],%p[%s]) ret %p[%s]\n", subtype, lbl(subtype), args, lbl(args), kwds, lbl(kwds), ns, lbl(ns)); return ns; @@ -948,326 +99,9 @@ rpmbc_New(void) { rpmbcObject * ns = PyObject_New(rpmbcObject, &rpmbc_Type); - mpnzero(&ns->n); return ns; } -/** \ingroup py_c - * Convert integer to mp. - */ -static rpmbcObject * -rpmbc_i2bc(PyObject * o) -{ - if (is_rpmbc(o)) { - Py_INCREF(o); - return (rpmbcObject *)o; - } - if (PyInt_Check(o) || PyLong_Check(o)) { - rpmbcObject * ns = PyObject_New(rpmbcObject, &rpmbc_Type); - PyObject * args = PyTuple_New(1); - - mpnzero(&((rpmbcObject *)ns)->n); - (void) PyTuple_SetItem(args, 0, o); - rpmbc_init(ns, args, NULL); - Py_DECREF(args); - return ns; - } - - PyErr_SetString(PyExc_TypeError, "number coercion (to rpmbcObject) failed"); - return NULL; -} - -/** \ingroup py_c - * Compute 1 argument operations. - */ -static PyObject * -rpmbc_ops1(const char *fname, char op, rpmbcObject *x) - /*@*/ -{ - rpmbcObject * z = rpmbc_New(); - mpbarrett b; - - mpbzero(&b); - if (x == NULL || z == NULL) - goto exit; - -if (_bc_debug < 0) { -fprintf(stderr, " a %p[%d]:\t", x->n.data, x->n.size), mpprintln(stderr, x->n.size, x->n.data); -} - - switch (op) { - default: - Py_DECREF(z); - z = NULL; - goto exit; - /*@notreached@*/ break; - case '~': - mpninit(&z->n, x->n.size, x->n.data); - mpnot(z->n.size, z->n.data); - break; - case '-': - mpninit(&z->n, x->n.size, x->n.data); - mpneg(z->n.size, z->n.data); - break; - } - -if (_bc_debug < 0) -fprintf(stderr, "*** rpmbc_%s %p[%d]\t", fname, z->n.data, z->n.size), mpprintln(stderr, z->n.size, z->n.data); - -exit: - mpbfree(&b); - Py_XDECREF(x); - return (PyObject *)z; -} - -/** \ingroup py_c - * Compute 2 argument operations. - */ -static PyObject * -rpmbc_ops2(const char *fname, char op, rpmbcObject *x, rpmbcObject *m) - /*@*/ -{ - rpmbcObject * z = rpmbc_New(); - mpbarrett b; - mpw* wksp; - int carry; - - mpbzero(&b); - if (x == NULL || m == NULL || z == NULL) - goto exit; - -if (_bc_debug < 0) { -fprintf(stderr, " a %p[%d]:\t", x->n.data, x->n.size), mpprintln(stderr, x->n.size, x->n.data); -fprintf(stderr, " b %p[%d]:\t", m->n.data, m->n.size), mpprintln(stderr, m->n.size, m->n.data); -} - - switch (op) { - default: - Py_DECREF(z); - z = NULL; - goto exit; - /*@notreached@*/ break; - case '+': - mpninit(&z->n, x->n.size, x->n.data); - carry = mpaddx(z->n.size, z->n.data, m->n.size, m->n.data); - break; - case '-': - mpninit(&z->n, x->n.size, x->n.data); - carry = mpsubx(z->n.size, z->n.data, m->n.size, m->n.data); - break; - case '*': - { size_t zsize = x->n.size + m->n.size; - mpw* zdata = alloca(zsize * sizeof(*zdata)); - size_t znorm; - - mpmul(zdata, x->n.size, x->n.data, m->n.size, m->n.data); - znorm = zsize - (mpbitcnt(zsize, zdata) + 31)/32; - zsize -= znorm; - zdata += znorm; - mpnset(&z->n, zsize, zdata); - } break; - case '/': - { size_t asize = x->n.size; - mpw* adata = x->n.data; - size_t anorm = asize - (mpbitcnt(asize, adata) + 31)/32; - size_t bsize = m->n.size; - mpw* bdata = m->n.data; - size_t bnorm = bsize - (mpbitcnt(bsize, bdata) + 31)/32; - size_t zsize; - mpw* zdata; - size_t znorm; - mpw* wksp; - - if (anorm < asize) { - asize -= anorm; - adata += anorm; - } - zsize = asize + 1; - zdata = alloca(zsize * sizeof(*zdata)); - if (bnorm < bsize) { - bsize -= bnorm; - bdata += bnorm; - } - wksp = alloca((bsize+1) * sizeof(*wksp)); - - myndivmod(zdata, asize, adata, bsize, bdata, wksp); - - zsize -= bsize; - znorm = mpsize(zsize, zdata); - if (znorm < zsize) { - zsize -= znorm; - zdata += znorm; - } - - mpnset(&z->n, zsize, zdata); - } break; - case '%': - { size_t bsize = m->n.size; - mpw* bdata = m->n.data; - size_t bnorm = mpsize(bsize, bdata); - size_t zsize = x->n.size; - mpw* zdata = alloca(zsize * sizeof(*zdata)); - mpw* wksp; - - if (bnorm < bsize) { - bsize -= bnorm; - bdata += bnorm; - } - wksp = alloca((bsize+1) * sizeof(*wksp)); - - mpnmod(zdata, x->n.size, x->n.data, bsize, bdata, wksp); - mpnset(&z->n, zsize, zdata); - } break; - case '<': - { size_t bnorm = m->n.size - (mpbitcnt(m->n.size, m->n.data) + 31)/32; - size_t bsize = m->n.size - bnorm; - mpw* bdata = m->n.data + bnorm; - size_t count = 0; - - if (bsize == 1) - count = bdata[0]; - mpninit(&z->n, x->n.size, x->n.data); - mprshift(z->n.size, z->n.data, count); - } break; - case '>': - { size_t bnorm = m->n.size - (mpbitcnt(m->n.size, m->n.data) + 31)/32; - size_t bsize = m->n.size - bnorm; - mpw* bdata = m->n.data + bnorm; - size_t count = 0; - - if (bsize == 1) - count = bdata[0]; - mpninit(&z->n, x->n.size, x->n.data); - mprshift(z->n.size, z->n.data, count); - } break; - case '&': - if (x->n.size <= m->n.size) { - mpninit(&z->n, x->n.size, x->n.data); - mpand(z->n.size, z->n.data, m->n.data + (m->n.size - x->n.size)); - } else { - mpninit(&z->n, m->n.size, m->n.data); - mpand(z->n.size, z->n.data, x->n.data + (x->n.size - m->n.size)); - } - break; - case '|': - if (x->n.size <= m->n.size) { - mpninit(&z->n, x->n.size, x->n.data); - mpor(z->n.size, z->n.data, m->n.data + (m->n.size - x->n.size)); - } else { - mpninit(&z->n, m->n.size, m->n.data); - mpor(z->n.size, z->n.data, x->n.data + (x->n.size - m->n.size)); - } - break; - case '^': - if (x->n.size <= m->n.size) { - mpninit(&z->n, x->n.size, x->n.data); - mpxor(z->n.size, z->n.data, m->n.data + (m->n.size - x->n.size)); - } else { - mpninit(&z->n, m->n.size, m->n.data); - mpxor(z->n.size, z->n.data, x->n.data + (x->n.size - m->n.size)); - } - break; - case 'P': - mpnpow_w(&z->n, x->n.size, x->n.data, m->n.size, m->n.data); - break; - case 'G': - wksp = alloca((x->n.size) * sizeof(*wksp)); - mpnsize(&z->n, m->n.size); - mpgcd_w(x->n.size, x->n.data, m->n.data, z->n.data, wksp); - break; - case 'I': - wksp = alloca(6*(m->n.size+1)*sizeof(*wksp)); - mpbset(&b, m->n.size, m->n.data); - mpnsize(&z->n, m->n.size); - mpbinv_w(&b, x->n.size, x->n.data, z->n.data, wksp); - break; - case 'S': - wksp = alloca((4*m->n.size+2)*sizeof(*wksp)); - mpbset(&b, m->n.size, m->n.data); - mpnsize(&z->n, m->n.size); - mpbsqrmod_w(&b, x->n.size, x->n.data, z->n.data, wksp); - break; - } - -if (_bc_debug) -fprintf(stderr, "*** rpmbc_%s %p[%d]\t", fname, z->n.data, z->n.size), mpprintln(stderr, z->n.size, z->n.data); - -exit: - mpbfree(&b); - Py_XDECREF(x); - Py_XDECREF(m); - return (PyObject *)z; -} - -/** \ingroup py_c - * Compute 3 argument operations. - */ -static PyObject * -rpmbc_ops3(const char *fname, char op, - rpmbcObject *x, rpmbcObject *y, rpmbcObject *m) - /*@*/ -{ - rpmbcObject * z = rpmbc_New(); - mpbarrett b; - size_t zsize; - mpw* zdata; - mpw* wksp; - - mpbzero(&b); - if (x == NULL || y == NULL || m == NULL || z == NULL) - goto exit; - -if (_bc_debug < 0) { -fprintf(stderr, " a %p[%d]:\t", x->n.data, x->n.size), mpprintln(stderr, x->n.size, x->n.data); -fprintf(stderr, " b %p[%d]:\t", y->n.data, y->n.size), mpprintln(stderr, y->n.size, y->n.data); -fprintf(stderr, " c %p[%d]:\t", m->n.data, m->n.size), mpprintln(stderr, m->n.size, m->n.data); -} - - mpbset(&b, m->n.size, m->n.data); - - zsize = b.size; - zdata = alloca(zsize * sizeof(*zdata)); - wksp = alloca((4*zsize+2)*sizeof(*wksp)); - - switch (op) { - case '/': - case '%': - default: - Py_DECREF(z); - z = NULL; - goto exit; - /*@notreached@*/ break; - case '+': - fname = "Addm"; - mpbaddmod_w(&b, x->n.size, x->n.data, y->n.size, y->n.data, zdata, wksp); - break; - case '-': - fname = "Subm"; - mpbsubmod_w(&b, x->n.size, x->n.data, y->n.size, y->n.data, zdata, wksp); - break; - case '*': - fname = "Mulm"; - mpbmulmod_w(&b, x->n.size, x->n.data, y->n.size, y->n.data, zdata, wksp); - break; - case 'P': - fname = "Powm"; - mpbpowmod_w(&b, x->n.size, x->n.data, y->n.size, y->n.data, zdata, wksp); - break; - } - - mpnset(&z->n, zsize, zdata); - -if (_bc_debug < 0) -fprintf(stderr, "*** rpmbc_%s %p[%d]\t", fname, z->n.data, z->n.size), mpprintln(stderr, z->n.size, z->n.data); - -exit: - mpbfree(&b); - Py_XDECREF(x); - Py_XDECREF(y); - Py_XDECREF(m); - return (PyObject *)z; -} - /* ---------- */ /** \ingroup py_c @@ -1286,120 +120,11 @@ fprintf(stderr, "*** rpmbc_Debug(%p)\n", s); return Py_None; } -/** \ingroup py_c - * Compute gcd(x, y). - */ -static PyObject * -rpmbc_Gcd(rpmbcObject * s, PyObject * args) - /*@*/ -{ - PyObject * xo, * mo; - - if (!PyArg_ParseTuple(args, "OO:Gcd", &xo, &mo)) return NULL; - return rpmbc_ops2("Gcd", 'G', rpmbc_i2bc(xo), rpmbc_i2bc(mo)); -} - -/** \ingroup py_c - * Compute inverse (modulo m) of x. - */ -static PyObject * -rpmbc_Invm(/*@unused@*/ rpmbcObject * s, PyObject * args) - /*@*/ -{ - PyObject * xo, * mo; - - if (!PyArg_ParseTuple(args, "OO:Invm", &xo, &mo)) return NULL; - return rpmbc_ops2("Invm", 'I', rpmbc_i2bc(xo), rpmbc_i2bc(mo)); -} - -/** \ingroup py_c - * Compute x*x (modulo m). - */ -static PyObject * -rpmbc_Sqrm(rpmbcObject * s, PyObject * args) - /*@*/ -{ - PyObject * xo, * mo; - - if (!PyArg_ParseTuple(args, "OO:Sqrm", &xo, &mo)) return NULL; - return rpmbc_ops2("Sqrm", 'S', rpmbc_i2bc(xo), rpmbc_i2bc(mo)); -} - -/** \ingroup py_c - * Compute x+y (modulo m). - */ -static PyObject * -rpmbc_Addm(rpmbcObject * s, PyObject * args) - /*@*/ -{ - PyObject * xo, * yo, * mo; - - if (!PyArg_ParseTuple(args, "OOO:Addm", &xo, &yo, &mo)) return NULL; - return rpmbc_ops3("Addm", '+', - rpmbc_i2bc(xo), rpmbc_i2bc(yo), rpmbc_i2bc(mo)); -} - -/** \ingroup py_c - * Compute x-y (modulo m). - */ -static PyObject * -rpmbc_Subm(rpmbcObject * s, PyObject * args) - /*@*/ -{ - PyObject * xo, * yo, * mo; - - if (!PyArg_ParseTuple(args, "OOO:Subm", &xo, &yo, &mo)) return NULL; - return rpmbc_ops3("Subm", '-', - rpmbc_i2bc(xo), rpmbc_i2bc(yo), rpmbc_i2bc(mo)); -} - -/** \ingroup py_c - * Compute x*y (modulo m). - */ -static PyObject * -rpmbc_Mulm(rpmbcObject * s, PyObject * args) - /*@*/ -{ - PyObject * xo, * yo, * mo; - - if (!PyArg_ParseTuple(args, "OOO:Mulm", &xo, &yo, &mo)) return NULL; - return rpmbc_ops3("Mulm", '*', - rpmbc_i2bc(xo), rpmbc_i2bc(yo), rpmbc_i2bc(mo)); -} - -/** \ingroup py_c - * Compute x**y (modulo m). - */ -static PyObject * -rpmbc_Powm(rpmbcObject * s, PyObject * args) - /*@*/ -{ - PyObject * xo, * yo, * mo; - - if (!PyArg_ParseTuple(args, "OOO:Powm", &xo, &yo, &mo)) return NULL; - return rpmbc_ops3("Powm", 'P', - rpmbc_i2bc(xo), rpmbc_i2bc(yo), rpmbc_i2bc(mo)); -} - /*@-fullinitblock@*/ /*@unchecked@*/ /*@observer@*/ static struct PyMethodDef rpmbc_methods[] = { {"Debug", (PyCFunction)rpmbc_Debug, METH_VARARGS, NULL}, - {"gcd", (PyCFunction)rpmbc_Gcd, METH_VARARGS, - NULL}, - {"invm", (PyCFunction)rpmbc_Invm, METH_VARARGS, - NULL}, - {"sqrm", (PyCFunction)rpmbc_Sqrm, METH_VARARGS, - NULL}, - {"addm", (PyCFunction)rpmbc_Addm, METH_VARARGS, - NULL}, - {"subm", (PyCFunction)rpmbc_Subm, METH_VARARGS, - NULL}, - {"mulm", (PyCFunction)rpmbc_Mulm, METH_VARARGS, - NULL}, - {"powm", (PyCFunction)rpmbc_Powm, METH_VARARGS, - NULL}, {NULL, NULL} /* sentinel */ }; /*@=fullinitblock@*/ @@ -1413,680 +138,6 @@ rpmbc_getattr(PyObject * s, char * name) /* ---------- */ -static PyObject * -rpmbc_add(rpmbcObject * a, rpmbcObject * b) - /*@*/ -{ - Py_INCREF(a); Py_INCREF(b); - return rpmbc_ops2("add", '+', a, b); -} - -static PyObject * -rpmbc_subtract(rpmbcObject * a, rpmbcObject * b) - /*@*/ -{ - Py_INCREF(a); Py_INCREF(b); - return rpmbc_ops2("sub", '-', a, b); -} - -static PyObject * -rpmbc_multiply(rpmbcObject * a, rpmbcObject * b) - /*@*/ -{ - Py_INCREF(a); Py_INCREF(b); - return rpmbc_ops2("mul", '*', a, b); -} - -static PyObject * -rpmbc_divide(rpmbcObject * a, rpmbcObject * b) - /*@*/ -{ - if (mpz(b->n.size, b->n.data)) { - PyErr_SetString(PyExc_ZeroDivisionError, "rpmbc_divide by zero"); - return NULL; - } - Py_INCREF(a); Py_INCREF(b); - return rpmbc_ops2("div", '/', a, b); -} - -static PyObject * -rpmbc_remainder(rpmbcObject * a, rpmbcObject * b) - /*@*/ -{ - Py_INCREF(a); Py_INCREF(b); - return rpmbc_ops2("rem", '%', a, b); -} - -static PyObject * -rpmbc_divmod(rpmbcObject * a, rpmbcObject * b) - /*@*/ -{ - PyObject * z = NULL; - rpmbcObject * q = NULL; - rpmbcObject * r = NULL; - size_t asize = a->n.size; - mpw* adata = a->n.data; - size_t anorm = mpsize(asize, adata); - size_t bsize = b->n.size; - mpw* bdata = b->n.data; - size_t bnorm = mpsize(bsize, bdata); - size_t zsize; - mpw* zdata; - size_t znorm; - mpw* wksp; - - if (mpz(bsize, bdata)) { - PyErr_SetString(PyExc_ZeroDivisionError, "rpmbc_divmod by zero"); - return NULL; - } - - if ((z = PyTuple_New(2)) == NULL - || (q = rpmbc_New()) == NULL - || (r = rpmbc_New()) == NULL) { - Py_XDECREF(z); - Py_XDECREF(q); - Py_XDECREF(r); - return NULL; - } - - if (anorm < asize) { - asize -= anorm; - adata += anorm; - } - zsize = asize + 1; - zdata = alloca(zsize * sizeof(*zdata)); - if (bnorm < bsize) { - bsize -= bnorm; - bdata += bnorm; - } - wksp = alloca((bsize+1) * sizeof(*wksp)); - - mpndivmod(zdata, asize, adata, bsize, bdata, wksp); - -if (_bc_debug < 0) { -fprintf(stderr, " a %p[%d]:\t", adata, asize), mpprintln(stderr, asize, adata); -fprintf(stderr, " b %p[%d]:\t", bdata, bsize), mpprintln(stderr, bsize, bdata); -fprintf(stderr, " z %p[%d]:\t", zdata, zsize), mpprintln(stderr, zsize, zdata); -} - - zsize -= bsize; - mpnset(&r->n, bsize, zdata+zsize); - - znorm = mpsize(zsize, zdata); - if (znorm < zsize) { - zsize -= znorm; - zdata += znorm; - } - mpnset(&q->n, zsize, zdata); - -if (_bc_debug) { -fprintf(stderr, " q %p[%d]:\t", q->n.data, q->n.size), mpprintln(stderr, q->n.size, q->n.data); -fprintf(stderr, " r %p[%d]:\t", r->n.data, r->n.size), mpprintln(stderr, r->n.size, r->n.data); -fprintf(stderr, "*** rpmbc_divmod(%p,%p)\n", a, b); -} - - (void) PyTuple_SetItem(z, 0, (PyObject *)q); - (void) PyTuple_SetItem(z, 1, (PyObject *)r); - return (PyObject *)z; -} - -static PyObject * -rpmbc_power(rpmbcObject * a, rpmbcObject * b, rpmbcObject * c) - /*@*/ -{ - Py_INCREF(a); Py_INCREF(b); -#ifdef NOTYET - if (c != NULL) { - Py_INCREF(c); - return rpmbc_ops3("Powm", 'P', a, b, c); - } else -#endif - return rpmbc_ops2("pow", 'P', a, b); -} - -static PyObject * -rpmbc_negative(rpmbcObject * a) - /*@*/ -{ - Py_INCREF(a); - return rpmbc_ops1("neg", '-', a); -} - -static PyObject * -rpmbc_positive(rpmbcObject * a) - /*@*/ -{ - Py_INCREF(a); - -if (_bc_debug) -fprintf(stderr, "*** rpmbc_positive(%p):\t", a), mpprintln(stderr, a->n.size, a->n.data); - - return (PyObject *)a; -} - -static PyObject * -rpmbc_absolute(rpmbcObject * a) - /*@*/ -{ - rpmbcObject * z; - - if (mpmsbset(a->n.size, a->n.data) == 0) { - Py_INCREF(a); - return (PyObject *)a; - } - - if ((z = rpmbc_New()) != NULL) { - mpninit(&z->n, a->n.size, a->n.data); - mpneg(z->n.size, z->n.data); - } - -if (_bc_debug) -fprintf(stderr, "*** rpmbc_absolute(%p):\t", a), mpprintln(stderr, z->n.size, z->n.data); - - return (PyObject *)z; -} - -static int -rpmbc_nonzero(rpmbcObject * a) - /*@*/ -{ -if (_bc_debug) -fprintf(stderr, "*** rpmbc_nonzero(%p)\n", a); - return mpnz(a->n.size, a->n.data); -} - -static PyObject * -rpmbc_invert(rpmbcObject * a) - /*@*/ -{ - Py_INCREF(a); - return rpmbc_ops1("not", '~', a); -} - -static PyObject * -rpmbc_lshift(rpmbcObject * a, rpmbcObject * b) - /*@*/ -{ - Py_INCREF(a); Py_INCREF(b); - return rpmbc_ops2("lshift", '<', a, b); -} - -static PyObject * -rpmbc_rshift(rpmbcObject * a, rpmbcObject * b) - /*@*/ -{ - Py_INCREF(a); Py_INCREF(b); - return rpmbc_ops2("rshift", '>', a, b); -} - -static PyObject * -rpmbc_and(rpmbcObject * a, rpmbcObject * b) - /*@*/ -{ - Py_INCREF(a); Py_INCREF(b); - return rpmbc_ops2("and", '&', a, b); -} - -static PyObject * -rpmbc_xor(rpmbcObject * a, rpmbcObject * b) - /*@*/ -{ - Py_INCREF(a); Py_INCREF(b); - return rpmbc_ops2("xor", '^', a, b); -} - -static PyObject * -rpmbc_or(rpmbcObject * a, rpmbcObject * b) - /*@*/ -{ - Py_INCREF(a); Py_INCREF(b); - return rpmbc_ops2("or", '|', a, b); -} - -static int -rpmbc_coerce(PyObject ** pv, PyObject ** pw) - /*@modifies *pv, *pw @*/ -{ - size_t words = 0; - long l = 0; - -if (_bc_debug) -fprintf(stderr, "*** rpmbc_coerce(%p[%s],%p[%s])\n", pv, lbl(*pv), pw, lbl(*pw)); - - if (is_rpmbc(*pw)) { - Py_INCREF(*pw); - } else if (PyInt_Check(*pw)) { - l = PyInt_AsLong(*pw); - words = sizeof(l)/sizeof(words); - } else if (PyLong_Check(*pw)) { - l = PyLong_AsLong(*pw); - words = sizeof(l)/sizeof(words); - } else if (PyFloat_Check(*pw)) { - double d = PyFloat_AsDouble(*pw); - /* XXX TODO: check for overflow/underflow. */ - l = (long) (d + 0.5); - words = sizeof(l)/sizeof(words); - } else { - PyErr_SetString(PyExc_TypeError, "non-numeric coercion failed (rpmbc_coerce)"); - return 1; - } - - if (words > 0) { - rpmbcObject * z = rpmbc_New(); - mpnsize(&z->n, words); - switch (words) { - case 2: -/*@-shiftimplementation @*/ - z->n.data[0] = (l >> 32) & 0xffffffff; -/*@=shiftimplementation @*/ - z->n.data[1] = (l ) & 0xffffffff; - break; - case 1: - z->n.data[0] = (l ) & 0xffffffff; - break; - } - (*pw) = (PyObject *) z; - } - - Py_INCREF(*pv); - return 0; -} - -static PyObject * -rpmbc_int(rpmbcObject * a) - /*@*/ -{ - size_t anorm = a->n.size - (mpbitcnt(a->n.size, a->n.data) + 31)/32; - size_t asize = a->n.size - anorm; - mpw* 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)(asize ? adata[0] : 0)); - - return Py_BuildValue("i", (asize ? adata[0] : 0)); -} - -static PyObject * -rpmbc_long(rpmbcObject * a) - /*@*/ -{ - size_t anorm = a->n.size - (mpbitcnt(a->n.size, a->n.data) + 31)/32; - size_t asize = a->n.size - anorm; - mpw* 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)(asize ? adata[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): 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) - /*@*/ -{ - 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) - /*@*/ -{ - 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 * -rpmbc_inplace_add(rpmbcObject * a, rpmbcObject * b) - /*@modifies a @*/ -{ - int carry; - - carry = mpaddx(a->n.size, a->n.data, b->n.size, b->n.data); - -if (_bc_debug) -fprintf(stderr, "*** rpmbc_inplace_add(%p,%p):\t", a, b), mpprintln(stderr, a->n.size, a->n.data); - - Py_INCREF(a); - return (PyObject *)a; -} - -static PyObject * -rpmbc_inplace_subtract(rpmbcObject * a, rpmbcObject * b) - /*@modifies a @*/ -{ - int carry; - - carry = mpsubx(a->n.size, a->n.data, b->n.size, b->n.data); - -if (_bc_debug) -fprintf(stderr, "*** rpmbc_inplace_subtract(%p,%p):\t", a, b), mpprintln(stderr, a->n.size, a->n.data); - - Py_INCREF(a); - return (PyObject *)a; -} - -static PyObject * -rpmbc_inplace_multiply(rpmbcObject * a, rpmbcObject * b) - /*@*/ -{ - size_t zsize = a->n.size + b->n.size; - mpw* zdata = alloca(zsize * sizeof(*zdata)); - size_t znorm; - - mpmul(zdata, a->n.size, a->n.data, b->n.size, b->n.data); - znorm = zsize - (mpbitcnt(zsize, zdata) + 31)/32; - zsize -= znorm; - zdata += znorm; - - mpnset(&a->n, zsize, zdata); - -if (_bc_debug) -fprintf(stderr, "*** rpmbc_inplace_multiply(%p,%p):\t", a, b), mpprintln(stderr, a->n.size, a->n.data); - - Py_INCREF(a); - return (PyObject *)a; -} - -static PyObject * -rpmbc_inplace_divide(rpmbcObject * a, rpmbcObject * b) - /*@*/ -{ - size_t asize = a->n.size; - mpw* adata = a->n.data; - size_t anorm = mpsize(asize, adata); - size_t bsize = b->n.size; - mpw* bdata = b->n.data; - size_t bnorm = mpsize(bsize, bdata); - size_t zsize; - mpw* zdata; - size_t znorm; - mpw* wksp; - - if (anorm < asize) { - asize -= anorm; - adata += anorm; - } - zsize = asize + 1; - zdata = alloca(zsize * sizeof(*zdata)); - if (bnorm < bsize) { - bsize -= bnorm; - bdata += bnorm; - } - wksp = alloca((bsize+1) * sizeof(*wksp)); - - mpndivmod(zdata, asize, adata, bsize, bdata, wksp); -if (_bc_debug < 0) -fprintf(stderr, "*** a %p[%d] b %p[%d] z %p[%d]\t", adata, asize, bdata, bsize, zdata, zsize), mpprintln(stderr, zsize, zdata); - zsize -= bsize; - znorm = mpsize(zsize, zdata); - if (znorm < zsize) { - zsize -= znorm; - zdata += znorm; - } - mpnset(&a->n, zsize, zdata); - -if (_bc_debug) -fprintf(stderr, "*** rpmbc_inplace_divide(%p,%p):\t", a, b), mpprintln(stderr, a->n.size, a->n.data); - - Py_INCREF(a); - return (PyObject *)a; -} - -static PyObject * -rpmbc_inplace_remainder(rpmbcObject * a, rpmbcObject * b) - /*@*/ -{ - size_t bsize = b->n.size; - mpw* bdata = b->n.data; - size_t bnorm = bsize - (mpbitcnt(bsize, bdata) + 31)/32; - size_t zsize = a->n.size; - mpw* zdata = alloca(zsize * sizeof(*zdata)); - mpw* wksp; - - if (bnorm < bsize) { - bsize -= bnorm; - bdata += bnorm; - } - wksp = alloca((bsize+1) * sizeof(*wksp)); - - mpnmod(zdata, a->n.size, a->n.data, bsize, bdata, wksp); - mpnset(&a->n, zsize, zdata); - -if (_bc_debug) -fprintf(stderr, "*** rpmbc_inplace_remainder(%p,%p):\t", a, b), mpprintln(stderr, a->n.size, a->n.data); - - Py_INCREF(a); - return (PyObject *)a; -} - -static PyObject * -rpmbc_inplace_power(rpmbcObject * a, rpmbcObject * b, rpmbcObject * c) - /*@*/ -{ -if (_bc_debug) -fprintf(stderr, "*** rpmbc_inplace_power(%p,%p,%p):\t", a, b, c), mpprintln(stderr, a->n.size, a->n.data); - - Py_INCREF(a); - return (PyObject *)a; -} - -static PyObject * -rpmbc_inplace_lshift(rpmbcObject * a, rpmbcObject * b) - /*@modifies a @*/ -{ - size_t bnorm = b->n.size - (mpbitcnt(b->n.size, b->n.data) + 31)/32; - size_t bsize = b->n.size - bnorm; - mpw* bdata = b->n.data + bnorm; - size_t count = 0; - - /* XXX check shift count in range. */ - if (bsize == 1) - count = bdata[0]; - mplshift(a->n.size, a->n.data, count); - -if (_bc_debug) -fprintf(stderr, "*** rpmbc_inplace_lshift(%p,%p):\t", a, b), mpprintln(stderr, a->n.size, a->n.data); - - Py_INCREF(a); - return (PyObject *)a; -} - -static PyObject * -rpmbc_inplace_rshift(rpmbcObject * a, rpmbcObject * b) - /*@modifies a @*/ -{ - size_t bnorm = b->n.size - (mpbitcnt(b->n.size, b->n.data) + 31)/32; - size_t bsize = b->n.size - bnorm; - mpw* bdata = b->n.data + bnorm; - size_t count = 0; - - /* XXX check shift count in range. */ - if (bsize == 1) - count = bdata[0]; - mprshift(a->n.size, a->n.data, count); - -if (_bc_debug) -fprintf(stderr, "*** rpmbc_inplace_rshift(%p,%p):\t", a, b), mpprintln(stderr, a->n.size, a->n.data); - - Py_INCREF(a); - return (PyObject *)a; -} - -static PyObject * -rpmbc_inplace_and(rpmbcObject * a, rpmbcObject * b) - /*@*/ -{ - if (a->n.size <= b->n.size) - mpand(a->n.size, a->n.data, b->n.data + (b->n.size - a->n.size)); - else { - memset(a->n.data, 0, (a->n.size - b->n.size) * sizeof(*a->n.data)); - mpand(a->n.size, a->n.data + (a->n.size - b->n.size), b->n.data); - } - -if (_bc_debug) -fprintf(stderr, "*** rpmbc_inplace_and(%p,%p):\t", a, b), mpprintln(stderr, a->n.size, a->n.data); - - Py_INCREF(a); - return (PyObject *)a; -} - -static PyObject * -rpmbc_inplace_xor(rpmbcObject * a, rpmbcObject * b) -{ - if (a->n.size <= b->n.size) - mpxor(a->n.size, a->n.data, b->n.data + (b->n.size - a->n.size)); - else { - memset(a->n.data, 0, (a->n.size - b->n.size) * sizeof(*a->n.data)); - mpxor(a->n.size, a->n.data + (a->n.size - b->n.size), b->n.data); - } - -if (_bc_debug) -fprintf(stderr, "*** rpmbc_inplace_xor(%p,%p):\t", a, b), mpprintln(stderr, a->n.size, a->n.data); - - Py_INCREF(a); - return (PyObject *)a; -} - -static PyObject * -rpmbc_inplace_or(rpmbcObject * a, rpmbcObject * b) - /*@*/ -{ - if (a->n.size <= b->n.size) - mpor(a->n.size, a->n.data, b->n.data + (b->n.size - a->n.size)); - else { - memset(a->n.data, 0, (a->n.size - b->n.size) * sizeof(*a->n.data)); - mpor(a->n.size, a->n.data + (a->n.size - b->n.size), b->n.data); - } - -if (_bc_debug) -fprintf(stderr, "*** rpmbc_inplace_or(%p,%p):\t", a, b), mpprintln(stderr, a->n.size, a->n.data); - - Py_INCREF(a); - return (PyObject *)a; -} - -static PyObject * -rpmbc_floor_divide(rpmbcObject * a, rpmbcObject * b) - /*@*/ -{ -if (_bc_debug) -fprintf(stderr, "*** rpmbc_floor_divide(%p,%p)\n", a, b); - return NULL; -} - -static PyObject * -rpmbc_true_divide(rpmbcObject * a, rpmbcObject * b) - /*@*/ -{ -if (_bc_debug) -fprintf(stderr, "*** rpmbc_true_divide(%p,%p)\n", a, b); - return NULL; -} - -static PyObject * -rpmbc_inplace_floor_divide(rpmbcObject * a, rpmbcObject * b) - /*@*/ -{ -if (_bc_debug) -fprintf(stderr, "*** rpmbc_inplace_floor_divide(%p,%p)\n", a, b); - return NULL; -} - -static PyObject * -rpmbc_inplace_true_divide(rpmbcObject * a, rpmbcObject * b) - /*@*/ -{ -if (_bc_debug) -fprintf(stderr, "*** rpmbc_inplace_true_divide(%p,%p)\n", a, b); - return NULL; -} - -static PyNumberMethods rpmbc_as_number = { - (binaryfunc) rpmbc_add, /* nb_add */ - (binaryfunc) rpmbc_subtract, /* nb_subtract */ - (binaryfunc) rpmbc_multiply, /* nb_multiply */ - (binaryfunc) rpmbc_divide, /* nb_divide */ - (binaryfunc) rpmbc_remainder, /* nb_remainder */ - (binaryfunc) rpmbc_divmod, /* nb_divmod */ - (ternaryfunc) rpmbc_power, /* nb_power */ - (unaryfunc) rpmbc_negative, /* nb_negative */ - (unaryfunc) rpmbc_positive, /* nb_positive */ - (unaryfunc) rpmbc_absolute, /* nb_absolute */ - (inquiry) rpmbc_nonzero, /* nb_nonzero */ - (unaryfunc) rpmbc_invert, /* nb_invert */ - (binaryfunc) rpmbc_lshift, /* nb_lshift */ - (binaryfunc) rpmbc_rshift, /* nb_rshift */ - (binaryfunc) rpmbc_and, /* nb_and */ - (binaryfunc) rpmbc_xor, /* nb_xor */ - (binaryfunc) rpmbc_or, /* nb_or */ - (coercion) rpmbc_coerce, /* nb_coerce */ - - (unaryfunc) rpmbc_int, /* nb_int */ - (unaryfunc) rpmbc_long, /* nb_long */ - (unaryfunc) rpmbc_float, /* nb_float */ - (unaryfunc) rpmbc_oct, /* nb_oct */ - (unaryfunc) rpmbc_hex, /* nb_hex */ - - /* Added in release 2.0 */ - (binaryfunc) rpmbc_inplace_add, /* nb_inplace_add */ - (binaryfunc) rpmbc_inplace_subtract, /* nb_inplace_subtract */ - (binaryfunc) rpmbc_inplace_multiply, /* nb_inplace_multiply */ - (binaryfunc) rpmbc_inplace_divide, /* nb_inplace_divide */ - (binaryfunc) rpmbc_inplace_remainder, /* nb_inplace_remainder */ - (ternaryfunc) rpmbc_inplace_power, /* nb_inplace_power */ - (binaryfunc) rpmbc_inplace_lshift, /* nb_inplace_lshift */ - (binaryfunc) rpmbc_inplace_rshift, /* nb_inplace_rshift */ - (binaryfunc) rpmbc_inplace_and, /* nb_inplace_and */ - (binaryfunc) rpmbc_inplace_xor, /* nb_inplace_xor */ - (binaryfunc) rpmbc_inplace_or, /* nb_inplace_or */ - - /* Added in release 2.2 */ - /* The following require the Py_TPFLAGS_HAVE_CLASS flag */ - (binaryfunc) rpmbc_floor_divide, /* nb_floor_divide */ - (binaryfunc) rpmbc_true_divide, /* nb_true_divide */ - (binaryfunc) rpmbc_inplace_floor_divide,/* nb_inplace_floor_divide */ - (binaryfunc) rpmbc_inplace_true_divide /* nb_inplace_true_divide */ - -}; - -/* ---------- */ - /** */ /*@unchecked@*/ /*@observer@*/ @@ -2105,14 +156,14 @@ PyTypeObject rpmbc_Type = { (printfunc) rpmbc_print, /* tp_print */ (getattrfunc) rpmbc_getattr, /* tp_getattr */ (setattrfunc) 0, /* tp_setattr */ - (cmpfunc) rpmbc_compare, /* tp_compare */ - (reprfunc) rpmbc_repr, /* tp_repr */ - &rpmbc_as_number, /* tp_as_number */ + (cmpfunc) 0, /* tp_compare */ + (reprfunc) 0, /* tp_repr */ + 0, /* tp_as_number */ 0, /* tp_as_sequence */ 0, /* tp_as_mapping */ (hashfunc) 0, /* tp_hash */ (ternaryfunc) 0, /* tp_call */ - (reprfunc) rpmbc_str, /* tp_str */ + (reprfunc) 0, /* tp_str */ 0, /* tp_getattro */ 0, /* tp_setattro */ 0, /* tp_as_buffer */ diff --git a/python/rpmbc-py.h b/python/rpmbc-py.h index febf5fd07..550976602 100644 --- a/python/rpmbc-py.h +++ b/python/rpmbc-py.h @@ -12,7 +12,6 @@ typedef struct rpmbcObject_s { PyObject_HEAD PyObject *md_dict; /*!< to look like PyModuleObject */ - mpnumber n; } rpmbcObject; /** diff --git a/python/rpmdebug-py.c b/python/rpmdebug-py.c index bd5520cfc..75f413470 100644 --- a/python/rpmdebug-py.c +++ b/python/rpmdebug-py.c @@ -16,6 +16,7 @@ extern PyTypeObject PyFrame_Type; #include "rpmfi-py.h" /* XXX debug only */ #include "rpmfts-py.h" /* XXX debug only */ #include "rpmmi-py.h" /* XXX debug only */ +#include "rpmmpw-py.h" /* XXX debug only */ #include "rpmrc-py.h" /* XXX debug only */ #include "rpmte-py.h" /* XXX debug only */ #include "rpmts-py.h" /* XXX debug only */ @@ -59,6 +60,7 @@ static const char * lbl(void * s) if (o->ob_type == &PyUnicode_Type) return "Unicode"; if (o->ob_type == &hdr_Type) return "hdr"; + if (o->ob_type == &mpw_Type) return "mpw"; if (o->ob_type == &rpmal_Type) return "rpmal"; if (o->ob_type == &rpmbc_Type) return "rpmbc"; if (o->ob_type == &rpmds_Type) return "rpmds"; diff --git a/python/rpmmodule.c b/python/rpmmodule.c index 9897868b8..1038dc5b8 100644 --- a/python/rpmmodule.c +++ b/python/rpmmodule.c @@ -26,6 +26,7 @@ #include "rpmfts-py.h" #include "rpmfi-py.h" #include "rpmmi-py.h" +#include "rpmmpw-py.h" #include "rpmrc-py.h" #include "rpmte-py.h" #include "rpmts-py.h" @@ -179,6 +180,7 @@ void initrpm(void) if (PyType_Ready(&rpmfts_Type) < 0) return; if (PyType_Ready(&rpmfi_Type) < 0) return; if (PyType_Ready(&rpmmi_Type) < 0) return; + if (PyType_Ready(&mpw_Type) < 0) return; rpmrc_Type.tp_base = &PyDict_Type; if (PyType_Ready(&rpmrc_Type) < 0) return; @@ -209,6 +211,9 @@ void initrpm(void) Py_INCREF(&hdr_Type); PyModule_AddObject(m, "hdr", (PyObject *) &hdr_Type); + Py_INCREF(&mpw_Type); + PyModule_AddObject(m, "mpw", (PyObject *) &mpw_Type); + Py_INCREF(&rpmal_Type); PyModule_AddObject(m, "al", (PyObject *) &rpmal_Type); diff --git a/python/rpmmpw-py.c b/python/rpmmpw-py.c index 66861b1d9..a5d01cd2b 100644 --- a/python/rpmmpw-py.c +++ b/python/rpmmpw-py.c @@ -1,5 +1,5 @@ /** \ingroup py_c - * \file python/rpmbc-py.c + * \file python/mpw-py.c */ #include "system.h" @@ -10,19 +10,19 @@ #define PyObject_HEAD int _PyObjectHead; #endif -#include "rpmbc-py.h" +#include "rpmmpw-py.h" #include "rpmdebug-py.c" #include "debug.h" /*@unchecked@*/ -static int _bc_debug = 0; +static int _mpw_debug = 0; -#define is_rpmbc(o) ((o)->ob_type == &rpmbc_Type) +#define is_mpw(o) ((o)->ob_type == &mpw_Type) /*@unchecked@*/ /*@observer@*/ -static const char initialiser_name[] = "rpmbc"; +static const char initialiser_name[] = "rpm.mpw"; /*@unchecked@*/ /*@observer@*/ static const struct { @@ -320,7 +320,7 @@ mpsizeinbase(size_t xsize, mpw* xdata, size_t base) } else { res = (nbits * mp_bases[base].chars_per_bit_exactly) + 1; } -if (_bc_debug < -1) +if (_mpw_debug < -1) fprintf(stderr, "*** mpsizeinbase(%p[%d], %d) res %u\n", xdata, xsize, base, (unsigned)res); return res; } @@ -370,10 +370,10 @@ mpstr(char * t, size_t nt, size_t zsize, mpw* zdata, size_t zbase) mpw* wksp = alloca((size+1) * sizeof(*wksp)); mpw* adata = alloca(size * sizeof(*adata)); mpw* bdata = alloca(size * sizeof(*bdata)); - static char bchars[] = "0123456789abcdefghijklmnopqrstuvwxyz"; + static char mpwhars[] = "0123456789ampwdefghijklmnopqrstuvwxyz"; size_t result; -if (_bc_debug < -1) +if (_mpw_debug < -1) fprintf(stderr, "*** mpstr(%p[%d], %p[%d], %d):\t", t, nt, zdata, zsize, zbase), mpprintln(stderr, zsize, zdata); mpsetx(size, bdata, zsize, zdata); @@ -381,15 +381,15 @@ fprintf(stderr, "*** mpstr(%p[%d], %p[%d], %d):\t", t, nt, zdata, zsize, zbase), t[nt] = '\0'; while (nt--) { mpsetx(size, adata, size, bdata); -if (_bc_debug < -1) +if (_mpw_debug < -1) fprintf(stderr, "*** a: %p[%d]\t", adata, size), mpprintln(stderr, size, adata); mpnmod(bdata, size, adata, 1, &zbase, wksp); -if (_bc_debug < -1) +if (_mpw_debug < -1) fprintf(stderr, "*** nmod: %p[%d]\t", bdata, size), mpprintln(stderr, size, bdata); result = bdata[size-1]; - t[nt] = bchars[result]; + t[nt] = mpwhars[result]; mpndivmod(bdata, size, adata, 1, &zbase, wksp); -if (_bc_debug < -1) +if (_mpw_debug < -1) fprintf(stderr, "*** ndivmod: %p[%d]\t", bdata, size), mpprintln(stderr, size, bdata); if (mpz(size, bdata)) break; @@ -401,7 +401,7 @@ fprintf(stderr, "*** ndivmod: %p[%d]\t", bdata, size), mpprintln(stderr, size, b } static PyObject * -rpmbc_format(rpmbcObject * z, size_t zbase, int withname) +mpw_format(mpwObject * z, size_t zbase, int withname) { PyStringObject * so; size_t i; @@ -413,18 +413,18 @@ rpmbc_format(rpmbcObject * z, size_t zbase, int withname) char * tcp = prefix; int zsign; - if (z == NULL || !is_rpmbc(z)) { + if (z == NULL || !is_mpw(z)) { PyErr_BadInternalCall(); return NULL; } -if (_bc_debug < -1) -fprintf(stderr, "*** rpmbc_format(%p,%d,%d):\t", z, zbase, withname), mpprintln(stderr, z->n.size, z->n.data); +if (_mpw_debug < -1) +fprintf(stderr, "*** mpw_format(%p,%d,%d):\t", z, zbase, withname), mpprintln(stderr, z->n.size, z->n.data); assert(zbase >= 2 && zbase <= 36); if (withname) - i = strlen(initialiser_name) + 2; /* e.g. 'rpmbc(' + ')' */ + i = strlen(initialiser_name) + 2; /* e.g. 'mpw(' + ')' */ else i = 0; @@ -556,38 +556,38 @@ static void mpnslide(const mpnumber* n, size_t xsize, const mpw* xdata, mpsqr(result, xsize, xdata); /* x^2 temp */ mpsetx(size, slide, xsize+xsize, result); -if (_bc_debug < 0) +if (_mpw_debug < 0) fprintf(stderr, "\t x^2:\t"), mpprintln(stderr, size, slide); mpmul(result, xsize, xdata, size, slide); /* x^3 */ mpsetx(size, slide+size, xsize+size, result); -if (_bc_debug < 0) +if (_mpw_debug < 0) fprintf(stderr, "\t x^3:\t"), mpprintln(stderr, size, slide+size); mpmul(result, size, slide, size, slide+size); /* x^5 */ mpsetx(size, slide+2*size, size+size, result); -if (_bc_debug < 0) +if (_mpw_debug < 0) fprintf(stderr, "\t x^5:\t"), mpprintln(stderr, size, slide+2*size); mpmul(result, size, slide, size, slide+2*size); /* x^7 */ mpsetx(size, slide+3*size, size+size, result); -if (_bc_debug < 0) +if (_mpw_debug < 0) fprintf(stderr, "\t x^7:\t"), mpprintln(stderr, size, slide+3*size); mpmul(result, size, slide, size, slide+3*size); /* x^9 */ mpsetx(size, slide+4*size, size+size, result); -if (_bc_debug < 0) +if (_mpw_debug < 0) fprintf(stderr, "\t x^9:\t"), mpprintln(stderr, size, slide+4*size); mpmul(result, size, slide, size, slide+4*size); /* x^11 */ mpsetx(size, slide+5*size, size+size, result); -if (_bc_debug < 0) +if (_mpw_debug < 0) fprintf(stderr, "\t x^11:\t"), mpprintln(stderr, size, slide+5*size); mpmul(result, size, slide, size, slide+5*size); /* x^13 */ mpsetx(size, slide+6*size, size+size, result); -if (_bc_debug < 0) +if (_mpw_debug < 0) fprintf(stderr, "\t x^13:\t"), mpprintln(stderr, size, slide+6*size); mpmul(result, size, slide, size, slide+6*size); /* x^15 */ mpsetx(size, slide+7*size, size+size, result); -if (_bc_debug < 0) +if (_mpw_debug < 0) fprintf(stderr, "\t x^15:\t"), mpprintln(stderr, size, slide+7*size); mpsetx(size, slide, xsize, xdata); /* x^1 */ -if (_bc_debug < 0) +if (_mpw_debug < 0) fprintf(stderr, "\t x^1:\t"), mpprintln(stderr, size, slide); } @@ -618,7 +618,7 @@ static void mpnpowsld_w(mpnumber* n, size_t size, const mpw* slide, mpw temp; short count; -if (_bc_debug < 0) +if (_mpw_debug < 0) fprintf(stderr, "npowsld: p\t"), mpprintln(stderr, psize, pdata); /* 2. A = 1, i = t. */ mpzero(n->size, n->data); @@ -653,25 +653,25 @@ fprintf(stderr, "npowsld: p\t"), mpprintln(stderr, psize, pdata); /* If window is full, then compute and clear window. */ if (lbits == 4) { -if (_bc_debug < 0) +if (_mpw_debug < 0) fprintf(stderr, "*** #1 lbits %d kbits %d\n", lbits, kbits); for (s = mpnslide_presq[kbits]; s > 0; s--) { mpsqr(rdata, n->size, n->data); mpsetx(n->size, n->data, 2*n->size, rdata); -if (_bc_debug < 0) +if (_mpw_debug < 0) fprintf(stderr, "\t pre1:\t"), mpprintln(stderr, n->size, n->data); } mpmul(rdata, n->size, n->data, size, slide+mpnslide_mulg[kbits]*size); mpsetx(n->size, n->data, n->size+size, rdata); -if (_bc_debug < 0) +if (_mpw_debug < 0) fprintf(stderr, "\t mul1:\t"), mpprintln(stderr, n->size, n->data); for (s = mpnslide_postsq[kbits]; s > 0; s--) { mpsqr(rdata, n->size, n->data); mpsetx(n->size, n->data, 2*n->size, rdata); -if (_bc_debug < 0) +if (_mpw_debug < 0) fprintf(stderr, "\tpost1:\t"), mpprintln(stderr, n->size, n->data); } @@ -680,7 +680,7 @@ fprintf(stderr, "\tpost1:\t"), mpprintln(stderr, n->size, n->data); } else { mpsqr(rdata, n->size, n->data); mpsetx(n->size, n->data, 2*n->size, rdata); -if (_bc_debug < 0) +if (_mpw_debug < 0) fprintf(stderr, "\t sqr:\t"), mpprintln(stderr, n->size, n->data); } @@ -694,25 +694,25 @@ fprintf(stderr, "\t sqr:\t"), mpprintln(stderr, n->size, n->data); } if (kbits != 0) { -if (_bc_debug < 0) +if (_mpw_debug < 0) fprintf(stderr, "*** #1 lbits %d kbits %d\n", lbits, kbits); for (s = mpnslide_presq[kbits]; s > 0; s--) { mpsqr(rdata, n->size, n->data); mpsetx(n->size, n->data, 2*n->size, rdata); -if (_bc_debug < 0) +if (_mpw_debug < 0) fprintf(stderr, "\t pre2:\t"), mpprintln(stderr, n->size, n->data); } mpmul(rdata, n->size, n->data, size, slide+mpnslide_mulg[kbits]*size); mpsetx(n->size, n->data, n->size+size, rdata); -if (_bc_debug < 0) +if (_mpw_debug < 0) fprintf(stderr, "\t mul2:\t"), mpprintln(stderr, n->size, n->data); for (s = mpnslide_postsq[kbits]; s > 0; s--) { mpsqr(rdata, n->size, n->data); mpsetx(n->size, n->data, 2*n->size, rdata); -if (_bc_debug < 0) +if (_mpw_debug < 0) fprintf(stderr, "\tpost2:\t"), mpprintln(stderr, n->size, n->data); } } @@ -762,7 +762,7 @@ static void mpnpow_w(mpnumber* n, size_t xsize, const mpw* xdata, size = ((15 * xbits)+31)/32; -if (_bc_debug < 0) +if (_mpw_debug < 0) fprintf(stderr, "*** pbits %d xbits %d nsize %d size %d\n", pbits, xbits, nsize, size); mpnsize(n, nsize); @@ -781,11 +781,11 @@ fprintf(stderr, "*** pbits %d xbits %d nsize %d size %d\n", pbits, xbits, nsize, /* ---------- */ static void -rpmbc_dealloc(rpmbcObject * s) +mpw_dealloc(mpwObject * s) /*@modifies s @*/ { -if (_bc_debug < -1) -fprintf(stderr, "*** rpmbc_dealloc(%p)\n", s); +if (_mpw_debug < -1) +fprintf(stderr, "*** mpw_dealloc(%p)\n", s); mpnfree(&s->n); PyObject_Del(s); @@ -793,21 +793,21 @@ fprintf(stderr, "*** rpmbc_dealloc(%p)\n", s); #ifdef DYING static int -rpmbc_print(rpmbcObject * s, FILE * fp, /*@unused@*/ int flags) +mpw_print(mpwObject * s, FILE * fp, /*@unused@*/ int flags) /*@globals fileSystem @*/ /*@modifies fp, fileSystem @*/ { -if (_bc_debug < -1) -fprintf(stderr, "*** rpmbc_print(%p)\n", s); +if (_mpw_debug < -1) +fprintf(stderr, "*** mpw_print(%p)\n", s); mpprint(fp, s->n.size, s->n.data); return 0; } #else -#define rpmbc_print 0 +#define mpw_print 0 #endif static int -rpmbc_compare(rpmbcObject * a, rpmbcObject * b) +mpw_compare(mpwObject * a, mpwObject * b) /*@*/ { int ret; @@ -819,36 +819,36 @@ rpmbc_compare(rpmbcObject * a, rpmbcObject * b) else ret = -1; -if (_bc_debug) -fprintf(stderr, "*** rpmbc_compare(%p[%s],%p[%s]) ret %d\n", a, lbl(a), b, lbl(b), ret); +if (_mpw_debug) +fprintf(stderr, "*** mpw_compare(%p[%s],%p[%s]) ret %d\n", a, lbl(a), b, lbl(b), ret); return ret; } static PyObject * -rpmbc_repr(rpmbcObject * a) +mpw_repr(mpwObject * a) /*@*/ { - PyObject * so = rpmbc_format(a, 10, 1); -if (_bc_debug && so != NULL) -fprintf(stderr, "*** rpmbc_repr(%p): \"%s\"\n", a, PyString_AS_STRING(so)); + PyObject * so = mpw_format(a, 10, 1); +if (_mpw_debug && so != NULL) +fprintf(stderr, "*** mpw_repr(%p): \"%s\"\n", a, PyString_AS_STRING(so)); return so; } /** \ingroup py_c */ static PyObject * -rpmbc_str(rpmbcObject * a) +mpw_str(mpwObject * a) /*@*/ { - PyObject * so = rpmbc_format(a, 10, 0); -if (_bc_debug && so != NULL) -fprintf(stderr, "*** rpmbc_str(%p): \"%s\"\n", a, PyString_AS_STRING(so)); + PyObject * so = mpw_format(a, 10, 0); +if (_mpw_debug && so != NULL) +fprintf(stderr, "*** mpw_str(%p): \"%s\"\n", a, PyString_AS_STRING(so)); return so; } /** \ingroup py_c */ -static int rpmbc_init(rpmbcObject * z, PyObject *args, PyObject *kwds) +static int mpw_init(mpwObject * z, PyObject *args, PyObject *kwds) /*@modifies z @*/ { PyObject * o = NULL; @@ -875,13 +875,13 @@ static int rpmbc_init(rpmbcObject * z, PyObject *args, PyObject *kwds) const unsigned char * hex = PyString_AsString(o); /* XXX TODO: check for hex. */ mpnsethex(&z->n, hex); - } else if (is_rpmbc(o)) { - rpmbcObject *a = (rpmbcObject *)o; + } else if (is_mpw(o)) { + mpwObject *a = (mpwObject *)o; mpnsize(&z->n, a->n.size); if (a->n.size > 0) mpsetx(z->n.size, z->n.data, a->n.size, a->n.data); } else { - PyErr_SetString(PyExc_TypeError, "non-numeric coercion failed (rpmbc_init)"); + PyErr_SetString(PyExc_TypeError, "non-numeric coercion failed (mpw_init)"); return -1; } @@ -900,53 +900,53 @@ static int rpmbc_init(rpmbcObject * z, PyObject *args, PyObject *kwds) } } -if (_bc_debug) -fprintf(stderr, "*** rpmbc_init(%p[%s],%p[%s],%p[%s]):\t", z, lbl(z), args, lbl(args), kwds, lbl(kwds)), mpprintln(stderr, z->n.size, z->n.data); +if (_mpw_debug) +fprintf(stderr, "*** mpw_init(%p[%s],%p[%s],%p[%s]):\t", z, lbl(z), args, lbl(args), kwds, lbl(kwds)), mpprintln(stderr, z->n.size, z->n.data); return 0; } /** \ingroup py_c */ -static void rpmbc_free(/*@only@*/ rpmbcObject * s) +static void mpw_free(/*@only@*/ mpwObject * s) /*@modifies s @*/ { -if (_bc_debug) -fprintf(stderr, "*** rpmbc_free(%p[%s])\n", s, lbl(s)); +if (_mpw_debug) +fprintf(stderr, "*** mpw_free(%p[%s])\n", s, lbl(s)); mpnfree(&s->n); PyObject_Del(s); } /** \ingroup py_c */ -static PyObject * rpmbc_alloc(PyTypeObject * subtype, int nitems) +static PyObject * mpw_alloc(PyTypeObject * subtype, int nitems) /*@*/ { PyObject * ns = PyType_GenericAlloc(subtype, nitems); -if (_bc_debug) -fprintf(stderr, "*** rpmbc_alloc(%p[%s},%d) ret %p[%s]\n", subtype, lbl(subtype), nitems, ns, lbl(ns)); +if (_mpw_debug) +fprintf(stderr, "*** mpw_alloc(%p[%s},%d) ret %p[%s]\n", subtype, lbl(subtype), nitems, ns, lbl(ns)); return (PyObject *) ns; } static PyObject * -rpmbc_new(PyTypeObject * subtype, PyObject *args, PyObject *kwds) +mpw_new(PyTypeObject * subtype, PyObject *args, PyObject *kwds) /*@*/ { - PyObject * ns = (PyObject *) PyObject_New(rpmbcObject, &rpmbc_Type); + PyObject * ns = (PyObject *) PyObject_New(mpwObject, &mpw_Type); if (ns != NULL) - mpnzero(&((rpmbcObject *)ns)->n); + mpnzero(&((mpwObject *)ns)->n); -if (_bc_debug < -1) -fprintf(stderr, "*** rpmbc_new(%p[%s],%p[%s],%p[%s]) ret %p[%s]\n", subtype, lbl(subtype), args, lbl(args), kwds, lbl(kwds), ns, lbl(ns)); +if (_mpw_debug < -1) +fprintf(stderr, "*** mpw_new(%p[%s],%p[%s],%p[%s]) ret %p[%s]\n", subtype, lbl(subtype), args, lbl(args), kwds, lbl(kwds), ns, lbl(ns)); return ns; } -static rpmbcObject * -rpmbc_New(void) +static mpwObject * +mpw_New(void) { - rpmbcObject * ns = PyObject_New(rpmbcObject, &rpmbc_Type); + mpwObject * ns = PyObject_New(mpwObject, &mpw_Type); mpnzero(&ns->n); return ns; @@ -955,25 +955,25 @@ rpmbc_New(void) /** \ingroup py_c * Convert integer to mp. */ -static rpmbcObject * -rpmbc_i2bc(PyObject * o) +static mpwObject * +mpw_i2mpw(PyObject * o) { - if (is_rpmbc(o)) { + if (is_mpw(o)) { Py_INCREF(o); - return (rpmbcObject *)o; + return (mpwObject *)o; } if (PyInt_Check(o) || PyLong_Check(o)) { - rpmbcObject * ns = PyObject_New(rpmbcObject, &rpmbc_Type); + mpwObject * ns = PyObject_New(mpwObject, &mpw_Type); PyObject * args = PyTuple_New(1); - mpnzero(&((rpmbcObject *)ns)->n); + mpnzero(&((mpwObject *)ns)->n); (void) PyTuple_SetItem(args, 0, o); - rpmbc_init(ns, args, NULL); + mpw_init(ns, args, NULL); Py_DECREF(args); return ns; } - PyErr_SetString(PyExc_TypeError, "number coercion (to rpmbcObject) failed"); + PyErr_SetString(PyExc_TypeError, "number coercion (to mpwObject) failed"); return NULL; } @@ -981,17 +981,17 @@ rpmbc_i2bc(PyObject * o) * Compute 1 argument operations. */ static PyObject * -rpmbc_ops1(const char *fname, char op, rpmbcObject *x) +mpw_ops1(const char *fname, char op, mpwObject *x) /*@*/ { - rpmbcObject * z = rpmbc_New(); + mpwObject * z = mpw_New(); mpbarrett b; mpbzero(&b); if (x == NULL || z == NULL) goto exit; -if (_bc_debug < 0) { +if (_mpw_debug < 0) { fprintf(stderr, " a %p[%d]:\t", x->n.data, x->n.size), mpprintln(stderr, x->n.size, x->n.data); } @@ -1011,8 +1011,8 @@ fprintf(stderr, " a %p[%d]:\t", x->n.data, x->n.size), mpprintln(stderr, x->n break; } -if (_bc_debug < 0) -fprintf(stderr, "*** rpmbc_%s %p[%d]\t", fname, z->n.data, z->n.size), mpprintln(stderr, z->n.size, z->n.data); +if (_mpw_debug < 0) +fprintf(stderr, "*** mpw_%s %p[%d]\t", fname, z->n.data, z->n.size), mpprintln(stderr, z->n.size, z->n.data); exit: mpbfree(&b); @@ -1024,10 +1024,10 @@ exit: * Compute 2 argument operations. */ static PyObject * -rpmbc_ops2(const char *fname, char op, rpmbcObject *x, rpmbcObject *m) +mpw_ops2(const char *fname, char op, mpwObject *x, mpwObject *m) /*@*/ { - rpmbcObject * z = rpmbc_New(); + mpwObject * z = mpw_New(); mpbarrett b; mpw* wksp; int carry; @@ -1036,7 +1036,7 @@ rpmbc_ops2(const char *fname, char op, rpmbcObject *x, rpmbcObject *m) if (x == NULL || m == NULL || z == NULL) goto exit; -if (_bc_debug < 0) { +if (_mpw_debug < 0) { fprintf(stderr, " a %p[%d]:\t", x->n.data, x->n.size), mpprintln(stderr, x->n.size, x->n.data); fprintf(stderr, " b %p[%d]:\t", m->n.data, m->n.size), mpprintln(stderr, m->n.size, m->n.data); } @@ -1189,8 +1189,8 @@ fprintf(stderr, " b %p[%d]:\t", m->n.data, m->n.size), mpprintln(stderr, m->n break; } -if (_bc_debug) -fprintf(stderr, "*** rpmbc_%s %p[%d]\t", fname, z->n.data, z->n.size), mpprintln(stderr, z->n.size, z->n.data); +if (_mpw_debug) +fprintf(stderr, "*** mpw_%s %p[%d]\t", fname, z->n.data, z->n.size), mpprintln(stderr, z->n.size, z->n.data); exit: mpbfree(&b); @@ -1203,11 +1203,11 @@ exit: * Compute 3 argument operations. */ static PyObject * -rpmbc_ops3(const char *fname, char op, - rpmbcObject *x, rpmbcObject *y, rpmbcObject *m) +mpw_ops3(const char *fname, char op, + mpwObject *x, mpwObject *y, mpwObject *m) /*@*/ { - rpmbcObject * z = rpmbc_New(); + mpwObject * z = mpw_New(); mpbarrett b; size_t zsize; mpw* zdata; @@ -1217,7 +1217,7 @@ rpmbc_ops3(const char *fname, char op, if (x == NULL || y == NULL || m == NULL || z == NULL) goto exit; -if (_bc_debug < 0) { +if (_mpw_debug < 0) { fprintf(stderr, " a %p[%d]:\t", x->n.data, x->n.size), mpprintln(stderr, x->n.size, x->n.data); fprintf(stderr, " b %p[%d]:\t", y->n.data, y->n.size), mpprintln(stderr, y->n.size, y->n.data); fprintf(stderr, " c %p[%d]:\t", m->n.data, m->n.size), mpprintln(stderr, m->n.size, m->n.data); @@ -1257,8 +1257,8 @@ fprintf(stderr, " c %p[%d]:\t", m->n.data, m->n.size), mpprintln(stderr, m->n mpnset(&z->n, zsize, zdata); -if (_bc_debug < 0) -fprintf(stderr, "*** rpmbc_%s %p[%d]\t", fname, z->n.data, z->n.size), mpprintln(stderr, z->n.size, z->n.data); +if (_mpw_debug < 0) +fprintf(stderr, "*** mpw_%s %p[%d]\t", fname, z->n.data, z->n.size), mpprintln(stderr, z->n.size, z->n.data); exit: mpbfree(&b); @@ -1273,14 +1273,14 @@ exit: /** \ingroup py_c */ static PyObject * -rpmbc_Debug(/*@unused@*/ rpmbcObject * s, PyObject * args) +mpw_Debug(/*@unused@*/ mpwObject * s, PyObject * args) /*@globals _Py_NoneStruct @*/ /*@modifies _Py_NoneStruct @*/ { - if (!PyArg_ParseTuple(args, "i:Debug", &_bc_debug)) return NULL; + if (!PyArg_ParseTuple(args, "i:Debug", &_mpw_debug)) return NULL; -if (_bc_debug < 0) -fprintf(stderr, "*** rpmbc_Debug(%p)\n", s); +if (_mpw_debug < 0) +fprintf(stderr, "*** mpw_Debug(%p)\n", s); Py_INCREF(Py_None); return Py_None; @@ -1290,180 +1290,180 @@ fprintf(stderr, "*** rpmbc_Debug(%p)\n", s); * Compute gcd(x, y). */ static PyObject * -rpmbc_Gcd(rpmbcObject * s, PyObject * args) +mpw_Gcd(mpwObject * s, PyObject * args) /*@*/ { PyObject * xo, * mo; if (!PyArg_ParseTuple(args, "OO:Gcd", &xo, &mo)) return NULL; - return rpmbc_ops2("Gcd", 'G', rpmbc_i2bc(xo), rpmbc_i2bc(mo)); + return mpw_ops2("Gcd", 'G', mpw_i2mpw(xo), mpw_i2mpw(mo)); } /** \ingroup py_c * Compute inverse (modulo m) of x. */ static PyObject * -rpmbc_Invm(/*@unused@*/ rpmbcObject * s, PyObject * args) +mpw_Invm(/*@unused@*/ mpwObject * s, PyObject * args) /*@*/ { PyObject * xo, * mo; if (!PyArg_ParseTuple(args, "OO:Invm", &xo, &mo)) return NULL; - return rpmbc_ops2("Invm", 'I', rpmbc_i2bc(xo), rpmbc_i2bc(mo)); + return mpw_ops2("Invm", 'I', mpw_i2mpw(xo), mpw_i2mpw(mo)); } /** \ingroup py_c * Compute x*x (modulo m). */ static PyObject * -rpmbc_Sqrm(rpmbcObject * s, PyObject * args) +mpw_Sqrm(mpwObject * s, PyObject * args) /*@*/ { PyObject * xo, * mo; if (!PyArg_ParseTuple(args, "OO:Sqrm", &xo, &mo)) return NULL; - return rpmbc_ops2("Sqrm", 'S', rpmbc_i2bc(xo), rpmbc_i2bc(mo)); + return mpw_ops2("Sqrm", 'S', mpw_i2mpw(xo), mpw_i2mpw(mo)); } /** \ingroup py_c * Compute x+y (modulo m). */ static PyObject * -rpmbc_Addm(rpmbcObject * s, PyObject * args) +mpw_Addm(mpwObject * s, PyObject * args) /*@*/ { PyObject * xo, * yo, * mo; if (!PyArg_ParseTuple(args, "OOO:Addm", &xo, &yo, &mo)) return NULL; - return rpmbc_ops3("Addm", '+', - rpmbc_i2bc(xo), rpmbc_i2bc(yo), rpmbc_i2bc(mo)); + return mpw_ops3("Addm", '+', + mpw_i2mpw(xo), mpw_i2mpw(yo), mpw_i2mpw(mo)); } /** \ingroup py_c * Compute x-y (modulo m). */ static PyObject * -rpmbc_Subm(rpmbcObject * s, PyObject * args) +mpw_Subm(mpwObject * s, PyObject * args) /*@*/ { PyObject * xo, * yo, * mo; if (!PyArg_ParseTuple(args, "OOO:Subm", &xo, &yo, &mo)) return NULL; - return rpmbc_ops3("Subm", '-', - rpmbc_i2bc(xo), rpmbc_i2bc(yo), rpmbc_i2bc(mo)); + return mpw_ops3("Subm", '-', + mpw_i2mpw(xo), mpw_i2mpw(yo), mpw_i2mpw(mo)); } /** \ingroup py_c * Compute x*y (modulo m). */ static PyObject * -rpmbc_Mulm(rpmbcObject * s, PyObject * args) +mpw_Mulm(mpwObject * s, PyObject * args) /*@*/ { PyObject * xo, * yo, * mo; if (!PyArg_ParseTuple(args, "OOO:Mulm", &xo, &yo, &mo)) return NULL; - return rpmbc_ops3("Mulm", '*', - rpmbc_i2bc(xo), rpmbc_i2bc(yo), rpmbc_i2bc(mo)); + return mpw_ops3("Mulm", '*', + mpw_i2mpw(xo), mpw_i2mpw(yo), mpw_i2mpw(mo)); } /** \ingroup py_c * Compute x**y (modulo m). */ static PyObject * -rpmbc_Powm(rpmbcObject * s, PyObject * args) +mpw_Powm(mpwObject * s, PyObject * args) /*@*/ { PyObject * xo, * yo, * mo; if (!PyArg_ParseTuple(args, "OOO:Powm", &xo, &yo, &mo)) return NULL; - return rpmbc_ops3("Powm", 'P', - rpmbc_i2bc(xo), rpmbc_i2bc(yo), rpmbc_i2bc(mo)); + return mpw_ops3("Powm", 'P', + mpw_i2mpw(xo), mpw_i2mpw(yo), mpw_i2mpw(mo)); } /*@-fullinitblock@*/ /*@unchecked@*/ /*@observer@*/ -static struct PyMethodDef rpmbc_methods[] = { - {"Debug", (PyCFunction)rpmbc_Debug, METH_VARARGS, +static struct PyMethodDef mpw_methods[] = { + {"Debug", (PyCFunction)mpw_Debug, METH_VARARGS, NULL}, - {"gcd", (PyCFunction)rpmbc_Gcd, METH_VARARGS, + {"gcd", (PyCFunction)mpw_Gcd, METH_VARARGS, NULL}, - {"invm", (PyCFunction)rpmbc_Invm, METH_VARARGS, + {"invm", (PyCFunction)mpw_Invm, METH_VARARGS, NULL}, - {"sqrm", (PyCFunction)rpmbc_Sqrm, METH_VARARGS, + {"sqrm", (PyCFunction)mpw_Sqrm, METH_VARARGS, NULL}, - {"addm", (PyCFunction)rpmbc_Addm, METH_VARARGS, + {"addm", (PyCFunction)mpw_Addm, METH_VARARGS, NULL}, - {"subm", (PyCFunction)rpmbc_Subm, METH_VARARGS, + {"subm", (PyCFunction)mpw_Subm, METH_VARARGS, NULL}, - {"mulm", (PyCFunction)rpmbc_Mulm, METH_VARARGS, + {"mulm", (PyCFunction)mpw_Mulm, METH_VARARGS, NULL}, - {"powm", (PyCFunction)rpmbc_Powm, METH_VARARGS, + {"powm", (PyCFunction)mpw_Powm, METH_VARARGS, NULL}, {NULL, NULL} /* sentinel */ }; /*@=fullinitblock@*/ static PyObject * -rpmbc_getattr(PyObject * s, char * name) +mpw_getattr(PyObject * s, char * name) /*@*/ { - return Py_FindMethod(rpmbc_methods, s, name); + return Py_FindMethod(mpw_methods, s, name); } /* ---------- */ static PyObject * -rpmbc_add(rpmbcObject * a, rpmbcObject * b) +mpw_add(mpwObject * a, mpwObject * b) /*@*/ { Py_INCREF(a); Py_INCREF(b); - return rpmbc_ops2("add", '+', a, b); + return mpw_ops2("add", '+', a, b); } static PyObject * -rpmbc_subtract(rpmbcObject * a, rpmbcObject * b) +mpw_subtract(mpwObject * a, mpwObject * b) /*@*/ { Py_INCREF(a); Py_INCREF(b); - return rpmbc_ops2("sub", '-', a, b); + return mpw_ops2("sub", '-', a, b); } static PyObject * -rpmbc_multiply(rpmbcObject * a, rpmbcObject * b) +mpw_multiply(mpwObject * a, mpwObject * b) /*@*/ { Py_INCREF(a); Py_INCREF(b); - return rpmbc_ops2("mul", '*', a, b); + return mpw_ops2("mul", '*', a, b); } static PyObject * -rpmbc_divide(rpmbcObject * a, rpmbcObject * b) +mpw_divide(mpwObject * a, mpwObject * b) /*@*/ { if (mpz(b->n.size, b->n.data)) { - PyErr_SetString(PyExc_ZeroDivisionError, "rpmbc_divide by zero"); + PyErr_SetString(PyExc_ZeroDivisionError, "mpw_divide by zero"); return NULL; } Py_INCREF(a); Py_INCREF(b); - return rpmbc_ops2("div", '/', a, b); + return mpw_ops2("div", '/', a, b); } static PyObject * -rpmbc_remainder(rpmbcObject * a, rpmbcObject * b) +mpw_remainder(mpwObject * a, mpwObject * b) /*@*/ { Py_INCREF(a); Py_INCREF(b); - return rpmbc_ops2("rem", '%', a, b); + return mpw_ops2("rem", '%', a, b); } static PyObject * -rpmbc_divmod(rpmbcObject * a, rpmbcObject * b) +mpw_divmod(mpwObject * a, mpwObject * b) /*@*/ { PyObject * z = NULL; - rpmbcObject * q = NULL; - rpmbcObject * r = NULL; + mpwObject * q = NULL; + mpwObject * r = NULL; size_t asize = a->n.size; mpw* adata = a->n.data; size_t anorm = mpsize(asize, adata); @@ -1476,13 +1476,13 @@ rpmbc_divmod(rpmbcObject * a, rpmbcObject * b) mpw* wksp; if (mpz(bsize, bdata)) { - PyErr_SetString(PyExc_ZeroDivisionError, "rpmbc_divmod by zero"); + PyErr_SetString(PyExc_ZeroDivisionError, "mpw_divmod by zero"); return NULL; } if ((z = PyTuple_New(2)) == NULL - || (q = rpmbc_New()) == NULL - || (r = rpmbc_New()) == NULL) { + || (q = mpw_New()) == NULL + || (r = mpw_New()) == NULL) { Py_XDECREF(z); Py_XDECREF(q); Py_XDECREF(r); @@ -1503,7 +1503,7 @@ rpmbc_divmod(rpmbcObject * a, rpmbcObject * b) mpndivmod(zdata, asize, adata, bsize, bdata, wksp); -if (_bc_debug < 0) { +if (_mpw_debug < 0) { fprintf(stderr, " a %p[%d]:\t", adata, asize), mpprintln(stderr, asize, adata); fprintf(stderr, " b %p[%d]:\t", bdata, bsize), mpprintln(stderr, bsize, bdata); fprintf(stderr, " z %p[%d]:\t", zdata, zsize), mpprintln(stderr, zsize, zdata); @@ -1519,10 +1519,10 @@ fprintf(stderr, " z %p[%d]:\t", zdata, zsize), mpprintln(stderr, zsize, zdata } mpnset(&q->n, zsize, zdata); -if (_bc_debug) { +if (_mpw_debug) { fprintf(stderr, " q %p[%d]:\t", q->n.data, q->n.size), mpprintln(stderr, q->n.size, q->n.data); fprintf(stderr, " r %p[%d]:\t", r->n.data, r->n.size), mpprintln(stderr, r->n.size, r->n.data); -fprintf(stderr, "*** rpmbc_divmod(%p,%p)\n", a, b); +fprintf(stderr, "*** mpw_divmod(%p,%p)\n", a, b); } (void) PyTuple_SetItem(z, 0, (PyObject *)q); @@ -1531,129 +1531,129 @@ fprintf(stderr, "*** rpmbc_divmod(%p,%p)\n", a, b); } static PyObject * -rpmbc_power(rpmbcObject * a, rpmbcObject * b, rpmbcObject * c) +mpw_power(mpwObject * a, mpwObject * b, mpwObject * c) /*@*/ { Py_INCREF(a); Py_INCREF(b); #ifdef NOTYET if (c != NULL) { Py_INCREF(c); - return rpmbc_ops3("Powm", 'P', a, b, c); + return mpw_ops3("Powm", 'P', a, b, c); } else #endif - return rpmbc_ops2("pow", 'P', a, b); + return mpw_ops2("pow", 'P', a, b); } static PyObject * -rpmbc_negative(rpmbcObject * a) +mpw_negative(mpwObject * a) /*@*/ { Py_INCREF(a); - return rpmbc_ops1("neg", '-', a); + return mpw_ops1("neg", '-', a); } static PyObject * -rpmbc_positive(rpmbcObject * a) +mpw_positive(mpwObject * a) /*@*/ { Py_INCREF(a); -if (_bc_debug) -fprintf(stderr, "*** rpmbc_positive(%p):\t", a), mpprintln(stderr, a->n.size, a->n.data); +if (_mpw_debug) +fprintf(stderr, "*** mpw_positive(%p):\t", a), mpprintln(stderr, a->n.size, a->n.data); return (PyObject *)a; } static PyObject * -rpmbc_absolute(rpmbcObject * a) +mpw_absolute(mpwObject * a) /*@*/ { - rpmbcObject * z; + mpwObject * z; if (mpmsbset(a->n.size, a->n.data) == 0) { Py_INCREF(a); return (PyObject *)a; } - if ((z = rpmbc_New()) != NULL) { + if ((z = mpw_New()) != NULL) { mpninit(&z->n, a->n.size, a->n.data); mpneg(z->n.size, z->n.data); } -if (_bc_debug) -fprintf(stderr, "*** rpmbc_absolute(%p):\t", a), mpprintln(stderr, z->n.size, z->n.data); +if (_mpw_debug) +fprintf(stderr, "*** mpw_absolute(%p):\t", a), mpprintln(stderr, z->n.size, z->n.data); return (PyObject *)z; } static int -rpmbc_nonzero(rpmbcObject * a) +mpw_nonzero(mpwObject * a) /*@*/ { -if (_bc_debug) -fprintf(stderr, "*** rpmbc_nonzero(%p)\n", a); +if (_mpw_debug) +fprintf(stderr, "*** mpw_nonzero(%p)\n", a); return mpnz(a->n.size, a->n.data); } static PyObject * -rpmbc_invert(rpmbcObject * a) +mpw_invert(mpwObject * a) /*@*/ { Py_INCREF(a); - return rpmbc_ops1("not", '~', a); + return mpw_ops1("not", '~', a); } static PyObject * -rpmbc_lshift(rpmbcObject * a, rpmbcObject * b) +mpw_lshift(mpwObject * a, mpwObject * b) /*@*/ { Py_INCREF(a); Py_INCREF(b); - return rpmbc_ops2("lshift", '<', a, b); + return mpw_ops2("lshift", '<', a, b); } static PyObject * -rpmbc_rshift(rpmbcObject * a, rpmbcObject * b) +mpw_rshift(mpwObject * a, mpwObject * b) /*@*/ { Py_INCREF(a); Py_INCREF(b); - return rpmbc_ops2("rshift", '>', a, b); + return mpw_ops2("rshift", '>', a, b); } static PyObject * -rpmbc_and(rpmbcObject * a, rpmbcObject * b) +mpw_and(mpwObject * a, mpwObject * b) /*@*/ { Py_INCREF(a); Py_INCREF(b); - return rpmbc_ops2("and", '&', a, b); + return mpw_ops2("and", '&', a, b); } static PyObject * -rpmbc_xor(rpmbcObject * a, rpmbcObject * b) +mpw_xor(mpwObject * a, mpwObject * b) /*@*/ { Py_INCREF(a); Py_INCREF(b); - return rpmbc_ops2("xor", '^', a, b); + return mpw_ops2("xor", '^', a, b); } static PyObject * -rpmbc_or(rpmbcObject * a, rpmbcObject * b) +mpw_or(mpwObject * a, mpwObject * b) /*@*/ { Py_INCREF(a); Py_INCREF(b); - return rpmbc_ops2("or", '|', a, b); + return mpw_ops2("or", '|', a, b); } static int -rpmbc_coerce(PyObject ** pv, PyObject ** pw) +mpw_coerce(PyObject ** pv, PyObject ** pw) /*@modifies *pv, *pw @*/ { size_t words = 0; long l = 0; -if (_bc_debug) -fprintf(stderr, "*** rpmbc_coerce(%p[%s],%p[%s])\n", pv, lbl(*pv), pw, lbl(*pw)); +if (_mpw_debug) +fprintf(stderr, "*** mpw_coerce(%p[%s],%p[%s])\n", pv, lbl(*pv), pw, lbl(*pw)); - if (is_rpmbc(*pw)) { + if (is_mpw(*pw)) { Py_INCREF(*pw); } else if (PyInt_Check(*pw)) { l = PyInt_AsLong(*pw); @@ -1667,12 +1667,12 @@ fprintf(stderr, "*** rpmbc_coerce(%p[%s],%p[%s])\n", pv, lbl(*pv), pw, lbl(*pw)) l = (long) (d + 0.5); words = sizeof(l)/sizeof(words); } else { - PyErr_SetString(PyExc_TypeError, "non-numeric coercion failed (rpmbc_coerce)"); + PyErr_SetString(PyExc_TypeError, "non-numeric coercion failed (mpw_coerce)"); return 1; } if (words > 0) { - rpmbcObject * z = rpmbc_New(); + mpwObject * z = mpw_New(); mpnsize(&z->n, words); switch (words) { case 2: @@ -1693,7 +1693,7 @@ fprintf(stderr, "*** rpmbc_coerce(%p[%s],%p[%s])\n", pv, lbl(*pv), pw, lbl(*pw)) } static PyObject * -rpmbc_int(rpmbcObject * a) +mpw_int(mpwObject * a) /*@*/ { size_t anorm = a->n.size - (mpbitcnt(a->n.size, a->n.data) + 31)/32; @@ -1701,18 +1701,18 @@ rpmbc_int(rpmbcObject * a) mpw* adata = a->n.data + anorm; if (asize > 1) { - PyErr_SetString(PyExc_ValueError, "rpmbc_int: arg too long to convert"); + PyErr_SetString(PyExc_ValueError, "mpw_int: arg too long to convert"); return NULL; } -if (_bc_debug) -fprintf(stderr, "*** rpmbc_int(%p):\t%08x\n", a, (int)(asize ? adata[0] : 0)); +if (_mpw_debug) +fprintf(stderr, "*** mpw_int(%p):\t%08x\n", a, (int)(asize ? adata[0] : 0)); return Py_BuildValue("i", (asize ? adata[0] : 0)); } static PyObject * -rpmbc_long(rpmbcObject * a) +mpw_long(mpwObject * a) /*@*/ { size_t anorm = a->n.size - (mpbitcnt(a->n.size, a->n.data) + 31)/32; @@ -1720,21 +1720,21 @@ rpmbc_long(rpmbcObject * a) mpw* adata = a->n.data + anorm; if (asize > 1) { - PyErr_SetString(PyExc_ValueError, "rpmbc_long() arg too long to convert"); + PyErr_SetString(PyExc_ValueError, "mpw_long() arg too long to convert"); return NULL; } -if (_bc_debug) -fprintf(stderr, "*** rpmbc_long(%p):\t%08lx\n", a, (long)(asize ? adata[0] : 0)); +if (_mpw_debug) +fprintf(stderr, "*** mpw_long(%p):\t%08lx\n", a, (long)(asize ? adata[0] : 0)); return Py_BuildValue("l", (asize ? adata[0] : 0)); } static PyObject * -rpmbc_float(rpmbcObject * a) +mpw_float(mpwObject * a) /*@*/ { - PyObject * so = rpmbc_format(a, 10, 0); + PyObject * so = mpw_format(a, 10, 0); char * s, * se; double d; @@ -1744,65 +1744,65 @@ rpmbc_float(rpmbcObject * a) se = NULL; d = strtod(s, &se); -if (_bc_debug) -fprintf(stderr, "*** rpmbc_float(%p): s %p \"%s\" se %p d %g\n", a, s, s, se, d); +if (_mpw_debug) +fprintf(stderr, "*** mpw_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) +mpw_oct(mpwObject * a) /*@*/ { - PyObject * so = rpmbc_format(a, 8, 1); -if (_bc_debug && so != NULL) -fprintf(stderr, "*** rpmbc_oct(%p): \"%s\"\n", a, PyString_AS_STRING(so)); + PyObject * so = mpw_format(a, 8, 1); +if (_mpw_debug && so != NULL) +fprintf(stderr, "*** mpw_oct(%p): \"%s\"\n", a, PyString_AS_STRING(so)); return so; } static PyObject * -rpmbc_hex(rpmbcObject * a) +mpw_hex(mpwObject * a) /*@*/ { - PyObject * so = rpmbc_format(a, 16, 1); -if (_bc_debug && so != NULL) -fprintf(stderr, "*** rpmbc_hex(%p): \"%s\"\n", a, PyString_AS_STRING(so)); + PyObject * so = mpw_format(a, 16, 1); +if (_mpw_debug && so != NULL) +fprintf(stderr, "*** mpw_hex(%p): \"%s\"\n", a, PyString_AS_STRING(so)); return so; } static PyObject * -rpmbc_inplace_add(rpmbcObject * a, rpmbcObject * b) +mpw_inplace_add(mpwObject * a, mpwObject * b) /*@modifies a @*/ { int carry; carry = mpaddx(a->n.size, a->n.data, b->n.size, b->n.data); -if (_bc_debug) -fprintf(stderr, "*** rpmbc_inplace_add(%p,%p):\t", a, b), mpprintln(stderr, a->n.size, a->n.data); +if (_mpw_debug) +fprintf(stderr, "*** mpw_inplace_add(%p,%p):\t", a, b), mpprintln(stderr, a->n.size, a->n.data); Py_INCREF(a); return (PyObject *)a; } static PyObject * -rpmbc_inplace_subtract(rpmbcObject * a, rpmbcObject * b) +mpw_inplace_subtract(mpwObject * a, mpwObject * b) /*@modifies a @*/ { int carry; carry = mpsubx(a->n.size, a->n.data, b->n.size, b->n.data); -if (_bc_debug) -fprintf(stderr, "*** rpmbc_inplace_subtract(%p,%p):\t", a, b), mpprintln(stderr, a->n.size, a->n.data); +if (_mpw_debug) +fprintf(stderr, "*** mpw_inplace_subtract(%p,%p):\t", a, b), mpprintln(stderr, a->n.size, a->n.data); Py_INCREF(a); return (PyObject *)a; } static PyObject * -rpmbc_inplace_multiply(rpmbcObject * a, rpmbcObject * b) +mpw_inplace_multiply(mpwObject * a, mpwObject * b) /*@*/ { size_t zsize = a->n.size + b->n.size; @@ -1816,15 +1816,15 @@ rpmbc_inplace_multiply(rpmbcObject * a, rpmbcObject * b) mpnset(&a->n, zsize, zdata); -if (_bc_debug) -fprintf(stderr, "*** rpmbc_inplace_multiply(%p,%p):\t", a, b), mpprintln(stderr, a->n.size, a->n.data); +if (_mpw_debug) +fprintf(stderr, "*** mpw_inplace_multiply(%p,%p):\t", a, b), mpprintln(stderr, a->n.size, a->n.data); Py_INCREF(a); return (PyObject *)a; } static PyObject * -rpmbc_inplace_divide(rpmbcObject * a, rpmbcObject * b) +mpw_inplace_divide(mpwObject * a, mpwObject * b) /*@*/ { size_t asize = a->n.size; @@ -1851,7 +1851,7 @@ rpmbc_inplace_divide(rpmbcObject * a, rpmbcObject * b) wksp = alloca((bsize+1) * sizeof(*wksp)); mpndivmod(zdata, asize, adata, bsize, bdata, wksp); -if (_bc_debug < 0) +if (_mpw_debug < 0) fprintf(stderr, "*** a %p[%d] b %p[%d] z %p[%d]\t", adata, asize, bdata, bsize, zdata, zsize), mpprintln(stderr, zsize, zdata); zsize -= bsize; znorm = mpsize(zsize, zdata); @@ -1861,15 +1861,15 @@ fprintf(stderr, "*** a %p[%d] b %p[%d] z %p[%d]\t", adata, asize, bdata, bsize, } mpnset(&a->n, zsize, zdata); -if (_bc_debug) -fprintf(stderr, "*** rpmbc_inplace_divide(%p,%p):\t", a, b), mpprintln(stderr, a->n.size, a->n.data); +if (_mpw_debug) +fprintf(stderr, "*** mpw_inplace_divide(%p,%p):\t", a, b), mpprintln(stderr, a->n.size, a->n.data); Py_INCREF(a); return (PyObject *)a; } static PyObject * -rpmbc_inplace_remainder(rpmbcObject * a, rpmbcObject * b) +mpw_inplace_remainder(mpwObject * a, mpwObject * b) /*@*/ { size_t bsize = b->n.size; @@ -1888,26 +1888,26 @@ rpmbc_inplace_remainder(rpmbcObject * a, rpmbcObject * b) mpnmod(zdata, a->n.size, a->n.data, bsize, bdata, wksp); mpnset(&a->n, zsize, zdata); -if (_bc_debug) -fprintf(stderr, "*** rpmbc_inplace_remainder(%p,%p):\t", a, b), mpprintln(stderr, a->n.size, a->n.data); +if (_mpw_debug) +fprintf(stderr, "*** mpw_inplace_remainder(%p,%p):\t", a, b), mpprintln(stderr, a->n.size, a->n.data); Py_INCREF(a); return (PyObject *)a; } static PyObject * -rpmbc_inplace_power(rpmbcObject * a, rpmbcObject * b, rpmbcObject * c) +mpw_inplace_power(mpwObject * a, mpwObject * b, mpwObject * c) /*@*/ { -if (_bc_debug) -fprintf(stderr, "*** rpmbc_inplace_power(%p,%p,%p):\t", a, b, c), mpprintln(stderr, a->n.size, a->n.data); +if (_mpw_debug) +fprintf(stderr, "*** mpw_inplace_power(%p,%p,%p):\t", a, b, c), mpprintln(stderr, a->n.size, a->n.data); Py_INCREF(a); return (PyObject *)a; } static PyObject * -rpmbc_inplace_lshift(rpmbcObject * a, rpmbcObject * b) +mpw_inplace_lshift(mpwObject * a, mpwObject * b) /*@modifies a @*/ { size_t bnorm = b->n.size - (mpbitcnt(b->n.size, b->n.data) + 31)/32; @@ -1920,15 +1920,15 @@ rpmbc_inplace_lshift(rpmbcObject * a, rpmbcObject * b) count = bdata[0]; mplshift(a->n.size, a->n.data, count); -if (_bc_debug) -fprintf(stderr, "*** rpmbc_inplace_lshift(%p,%p):\t", a, b), mpprintln(stderr, a->n.size, a->n.data); +if (_mpw_debug) +fprintf(stderr, "*** mpw_inplace_lshift(%p,%p):\t", a, b), mpprintln(stderr, a->n.size, a->n.data); Py_INCREF(a); return (PyObject *)a; } static PyObject * -rpmbc_inplace_rshift(rpmbcObject * a, rpmbcObject * b) +mpw_inplace_rshift(mpwObject * a, mpwObject * b) /*@modifies a @*/ { size_t bnorm = b->n.size - (mpbitcnt(b->n.size, b->n.data) + 31)/32; @@ -1941,15 +1941,15 @@ rpmbc_inplace_rshift(rpmbcObject * a, rpmbcObject * b) count = bdata[0]; mprshift(a->n.size, a->n.data, count); -if (_bc_debug) -fprintf(stderr, "*** rpmbc_inplace_rshift(%p,%p):\t", a, b), mpprintln(stderr, a->n.size, a->n.data); +if (_mpw_debug) +fprintf(stderr, "*** mpw_inplace_rshift(%p,%p):\t", a, b), mpprintln(stderr, a->n.size, a->n.data); Py_INCREF(a); return (PyObject *)a; } static PyObject * -rpmbc_inplace_and(rpmbcObject * a, rpmbcObject * b) +mpw_inplace_and(mpwObject * a, mpwObject * b) /*@*/ { if (a->n.size <= b->n.size) @@ -1959,15 +1959,15 @@ rpmbc_inplace_and(rpmbcObject * a, rpmbcObject * b) mpand(a->n.size, a->n.data + (a->n.size - b->n.size), b->n.data); } -if (_bc_debug) -fprintf(stderr, "*** rpmbc_inplace_and(%p,%p):\t", a, b), mpprintln(stderr, a->n.size, a->n.data); +if (_mpw_debug) +fprintf(stderr, "*** mpw_inplace_and(%p,%p):\t", a, b), mpprintln(stderr, a->n.size, a->n.data); Py_INCREF(a); return (PyObject *)a; } static PyObject * -rpmbc_inplace_xor(rpmbcObject * a, rpmbcObject * b) +mpw_inplace_xor(mpwObject * a, mpwObject * b) { if (a->n.size <= b->n.size) mpxor(a->n.size, a->n.data, b->n.data + (b->n.size - a->n.size)); @@ -1976,15 +1976,15 @@ rpmbc_inplace_xor(rpmbcObject * a, rpmbcObject * b) mpxor(a->n.size, a->n.data + (a->n.size - b->n.size), b->n.data); } -if (_bc_debug) -fprintf(stderr, "*** rpmbc_inplace_xor(%p,%p):\t", a, b), mpprintln(stderr, a->n.size, a->n.data); +if (_mpw_debug) +fprintf(stderr, "*** mpw_inplace_xor(%p,%p):\t", a, b), mpprintln(stderr, a->n.size, a->n.data); Py_INCREF(a); return (PyObject *)a; } static PyObject * -rpmbc_inplace_or(rpmbcObject * a, rpmbcObject * b) +mpw_inplace_or(mpwObject * a, mpwObject * b) /*@*/ { if (a->n.size <= b->n.size) @@ -1994,94 +1994,94 @@ rpmbc_inplace_or(rpmbcObject * a, rpmbcObject * b) mpor(a->n.size, a->n.data + (a->n.size - b->n.size), b->n.data); } -if (_bc_debug) -fprintf(stderr, "*** rpmbc_inplace_or(%p,%p):\t", a, b), mpprintln(stderr, a->n.size, a->n.data); +if (_mpw_debug) +fprintf(stderr, "*** mpw_inplace_or(%p,%p):\t", a, b), mpprintln(stderr, a->n.size, a->n.data); Py_INCREF(a); return (PyObject *)a; } static PyObject * -rpmbc_floor_divide(rpmbcObject * a, rpmbcObject * b) +mpw_floor_divide(mpwObject * a, mpwObject * b) /*@*/ { -if (_bc_debug) -fprintf(stderr, "*** rpmbc_floor_divide(%p,%p)\n", a, b); +if (_mpw_debug) +fprintf(stderr, "*** mpw_floor_divide(%p,%p)\n", a, b); return NULL; } static PyObject * -rpmbc_true_divide(rpmbcObject * a, rpmbcObject * b) +mpw_true_divide(mpwObject * a, mpwObject * b) /*@*/ { -if (_bc_debug) -fprintf(stderr, "*** rpmbc_true_divide(%p,%p)\n", a, b); +if (_mpw_debug) +fprintf(stderr, "*** mpw_true_divide(%p,%p)\n", a, b); return NULL; } static PyObject * -rpmbc_inplace_floor_divide(rpmbcObject * a, rpmbcObject * b) +mpw_inplace_floor_divide(mpwObject * a, mpwObject * b) /*@*/ { -if (_bc_debug) -fprintf(stderr, "*** rpmbc_inplace_floor_divide(%p,%p)\n", a, b); +if (_mpw_debug) +fprintf(stderr, "*** mpw_inplace_floor_divide(%p,%p)\n", a, b); return NULL; } static PyObject * -rpmbc_inplace_true_divide(rpmbcObject * a, rpmbcObject * b) +mpw_inplace_true_divide(mpwObject * a, mpwObject * b) /*@*/ { -if (_bc_debug) -fprintf(stderr, "*** rpmbc_inplace_true_divide(%p,%p)\n", a, b); +if (_mpw_debug) +fprintf(stderr, "*** mpw_inplace_true_divide(%p,%p)\n", a, b); return NULL; } -static PyNumberMethods rpmbc_as_number = { - (binaryfunc) rpmbc_add, /* nb_add */ - (binaryfunc) rpmbc_subtract, /* nb_subtract */ - (binaryfunc) rpmbc_multiply, /* nb_multiply */ - (binaryfunc) rpmbc_divide, /* nb_divide */ - (binaryfunc) rpmbc_remainder, /* nb_remainder */ - (binaryfunc) rpmbc_divmod, /* nb_divmod */ - (ternaryfunc) rpmbc_power, /* nb_power */ - (unaryfunc) rpmbc_negative, /* nb_negative */ - (unaryfunc) rpmbc_positive, /* nb_positive */ - (unaryfunc) rpmbc_absolute, /* nb_absolute */ - (inquiry) rpmbc_nonzero, /* nb_nonzero */ - (unaryfunc) rpmbc_invert, /* nb_invert */ - (binaryfunc) rpmbc_lshift, /* nb_lshift */ - (binaryfunc) rpmbc_rshift, /* nb_rshift */ - (binaryfunc) rpmbc_and, /* nb_and */ - (binaryfunc) rpmbc_xor, /* nb_xor */ - (binaryfunc) rpmbc_or, /* nb_or */ - (coercion) rpmbc_coerce, /* nb_coerce */ - - (unaryfunc) rpmbc_int, /* nb_int */ - (unaryfunc) rpmbc_long, /* nb_long */ - (unaryfunc) rpmbc_float, /* nb_float */ - (unaryfunc) rpmbc_oct, /* nb_oct */ - (unaryfunc) rpmbc_hex, /* nb_hex */ +static PyNumberMethods mpw_as_number = { + (binaryfunc) mpw_add, /* nb_add */ + (binaryfunc) mpw_subtract, /* nb_subtract */ + (binaryfunc) mpw_multiply, /* nb_multiply */ + (binaryfunc) mpw_divide, /* nb_divide */ + (binaryfunc) mpw_remainder, /* nb_remainder */ + (binaryfunc) mpw_divmod, /* nb_divmod */ + (ternaryfunc) mpw_power, /* nb_power */ + (unaryfunc) mpw_negative, /* nb_negative */ + (unaryfunc) mpw_positive, /* nb_positive */ + (unaryfunc) mpw_absolute, /* nb_absolute */ + (inquiry) mpw_nonzero, /* nb_nonzero */ + (unaryfunc) mpw_invert, /* nb_invert */ + (binaryfunc) mpw_lshift, /* nb_lshift */ + (binaryfunc) mpw_rshift, /* nb_rshift */ + (binaryfunc) mpw_and, /* nb_and */ + (binaryfunc) mpw_xor, /* nb_xor */ + (binaryfunc) mpw_or, /* nb_or */ + (coercion) mpw_coerce, /* nb_coerce */ + + (unaryfunc) mpw_int, /* nb_int */ + (unaryfunc) mpw_long, /* nb_long */ + (unaryfunc) mpw_float, /* nb_float */ + (unaryfunc) mpw_oct, /* nb_oct */ + (unaryfunc) mpw_hex, /* nb_hex */ /* Added in release 2.0 */ - (binaryfunc) rpmbc_inplace_add, /* nb_inplace_add */ - (binaryfunc) rpmbc_inplace_subtract, /* nb_inplace_subtract */ - (binaryfunc) rpmbc_inplace_multiply, /* nb_inplace_multiply */ - (binaryfunc) rpmbc_inplace_divide, /* nb_inplace_divide */ - (binaryfunc) rpmbc_inplace_remainder, /* nb_inplace_remainder */ - (ternaryfunc) rpmbc_inplace_power, /* nb_inplace_power */ - (binaryfunc) rpmbc_inplace_lshift, /* nb_inplace_lshift */ - (binaryfunc) rpmbc_inplace_rshift, /* nb_inplace_rshift */ - (binaryfunc) rpmbc_inplace_and, /* nb_inplace_and */ - (binaryfunc) rpmbc_inplace_xor, /* nb_inplace_xor */ - (binaryfunc) rpmbc_inplace_or, /* nb_inplace_or */ + (binaryfunc) mpw_inplace_add, /* nb_inplace_add */ + (binaryfunc) mpw_inplace_subtract, /* nb_inplace_subtract */ + (binaryfunc) mpw_inplace_multiply, /* nb_inplace_multiply */ + (binaryfunc) mpw_inplace_divide, /* nb_inplace_divide */ + (binaryfunc) mpw_inplace_remainder, /* nb_inplace_remainder */ + (ternaryfunc) mpw_inplace_power, /* nb_inplace_power */ + (binaryfunc) mpw_inplace_lshift, /* nb_inplace_lshift */ + (binaryfunc) mpw_inplace_rshift, /* nb_inplace_rshift */ + (binaryfunc) mpw_inplace_and, /* nb_inplace_and */ + (binaryfunc) mpw_inplace_xor, /* nb_inplace_xor */ + (binaryfunc) mpw_inplace_or, /* nb_inplace_or */ /* Added in release 2.2 */ /* The following require the Py_TPFLAGS_HAVE_CLASS flag */ - (binaryfunc) rpmbc_floor_divide, /* nb_floor_divide */ - (binaryfunc) rpmbc_true_divide, /* nb_true_divide */ - (binaryfunc) rpmbc_inplace_floor_divide,/* nb_inplace_floor_divide */ - (binaryfunc) rpmbc_inplace_true_divide /* nb_inplace_true_divide */ + (binaryfunc) mpw_floor_divide, /* nb_floor_divide */ + (binaryfunc) mpw_true_divide, /* nb_true_divide */ + (binaryfunc) mpw_inplace_floor_divide,/* nb_inplace_floor_divide */ + (binaryfunc) mpw_inplace_true_divide /* nb_inplace_true_divide */ }; @@ -2090,34 +2090,34 @@ static PyNumberMethods rpmbc_as_number = { /** */ /*@unchecked@*/ /*@observer@*/ -static char rpmbc_doc[] = +static char mpw_doc[] = ""; /*@-fullinitblock@*/ -PyTypeObject rpmbc_Type = { +PyTypeObject mpw_Type = { PyObject_HEAD_INIT(&PyType_Type) 0, /* ob_size */ - "rpm.bc", /* tp_name */ - sizeof(rpmbcObject), /* tp_basicsize */ + "rpm.mpw", /* tp_name */ + sizeof(mpwObject), /* tp_basicsize */ 0, /* tp_itemsize */ /* methods */ - (destructor) rpmbc_dealloc, /* tp_dealloc */ - (printfunc) rpmbc_print, /* tp_print */ - (getattrfunc) rpmbc_getattr, /* tp_getattr */ + (destructor) mpw_dealloc, /* tp_dealloc */ + (printfunc) mpw_print, /* tp_print */ + (getattrfunc) mpw_getattr, /* tp_getattr */ (setattrfunc) 0, /* tp_setattr */ - (cmpfunc) rpmbc_compare, /* tp_compare */ - (reprfunc) rpmbc_repr, /* tp_repr */ - &rpmbc_as_number, /* tp_as_number */ + (cmpfunc) mpw_compare, /* tp_compare */ + (reprfunc) mpw_repr, /* tp_repr */ + &mpw_as_number, /* tp_as_number */ 0, /* tp_as_sequence */ 0, /* tp_as_mapping */ (hashfunc) 0, /* tp_hash */ (ternaryfunc) 0, /* tp_call */ - (reprfunc) rpmbc_str, /* tp_str */ + (reprfunc) mpw_str, /* tp_str */ 0, /* tp_getattro */ 0, /* tp_setattro */ 0, /* tp_as_buffer */ Py_TPFLAGS_DEFAULT, /* tp_flags */ - rpmbc_doc, /* tp_doc */ + mpw_doc, /* tp_doc */ #if Py_TPFLAGS_HAVE_ITER 0, /* tp_traverse */ 0, /* tp_clear */ @@ -2125,7 +2125,7 @@ PyTypeObject rpmbc_Type = { 0, /* tp_weaklistoffset */ (getiterfunc) 0, /* tp_iter */ (iternextfunc) 0, /* tp_iternext */ - rpmbc_methods, /* tp_methods */ + mpw_methods, /* tp_methods */ 0, /* tp_members */ 0, /* tp_getset */ 0, /* tp_base */ @@ -2133,10 +2133,10 @@ PyTypeObject rpmbc_Type = { 0, /* tp_descr_get */ 0, /* tp_descr_set */ 0, /* tp_dictoffset */ - (initproc) rpmbc_init, /* tp_init */ - (allocfunc) rpmbc_alloc, /* tp_alloc */ - (newfunc) rpmbc_new, /* tp_new */ - (destructor) rpmbc_free, /* tp_free */ + (initproc) mpw_init, /* tp_init */ + (allocfunc) mpw_alloc, /* tp_alloc */ + (newfunc) mpw_new, /* tp_new */ + (destructor) mpw_free, /* tp_free */ 0, /* tp_is_gc */ #endif }; diff --git a/python/rpmmpw-py.h b/python/rpmmpw-py.h index febf5fd07..230f545dd 100644 --- a/python/rpmmpw-py.h +++ b/python/rpmmpw-py.h @@ -1,5 +1,5 @@ -#ifndef H_RPMBC_PY -#define H_RPMBC_PY +#ifndef H_RPMMPW_PY +#define H_RPMMPW_PY #include "rpmio_internal.h" @@ -9,15 +9,15 @@ /** */ -typedef struct rpmbcObject_s { +typedef struct mpwObject_s { PyObject_HEAD PyObject *md_dict; /*!< to look like PyModuleObject */ mpnumber n; -} rpmbcObject; +} mpwObject; /** */ /*@unchecked@*/ -extern PyTypeObject rpmbc_Type; +extern PyTypeObject mpw_Type; #endif |