diff options
| author | Torbjorn Granlund <tege@gmplib.org> | 2008-09-21 15:10:27 +0200 |
|---|---|---|
| committer | Torbjorn Granlund <tege@gmplib.org> | 2008-09-21 15:10:27 +0200 |
| commit | 5853f020cbbf81a28edc36cde490792104fd8f86 (patch) | |
| tree | ca88ae5d72ecc2108b70651faaa6aed0e48d8a47 /mpn/generic/set_str.c | |
| parent | 4b73b345979e352a054262b84cdf6fc3acd042d9 (diff) | |
| download | gmp-5853f020cbbf81a28edc36cde490792104fd8f86.tar.gz | |
Revert:
(mpn_dc_set_str): Remove impossible case, replace by an ASSERT.
Diffstat (limited to 'mpn/generic/set_str.c')
| -rw-r--r-- | mpn/generic/set_str.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/mpn/generic/set_str.c b/mpn/generic/set_str.c index 9764af791..5760e7479 100644 --- a/mpn/generic/set_str.c +++ b/mpn/generic/set_str.c @@ -9,8 +9,8 @@ FACT, IT IS ALMOST GUARANTEED THAT THEY WILL CHANGE OR DISAPPEAR IN A FUTURE GNU MP RELEASE. -Copyright 1991, 1992, 1993, 1994, 1996, 2000, 2001, 2002, 2004, 2006, 2007 Free -Software Foundation, Inc. +Copyright 1991, 1992, 1993, 1994, 1996, 2000, 2001, 2002, 2004, 2006, 2007, +2008 Free Software Foundation, Inc. This file is part of the GNU MP Library. @@ -167,6 +167,7 @@ mpn_set_str_compute_powtab (powers_t *powtab, mp_ptr powtab_mem, mp_size_t un, i powtab[i].n = n; powtab[i].digits_in_base = digits_in_base; powtab[i].base = base; + powtab[i].shift = 0; shift = 0; for (pi = i - 1; pi >= 0; pi--) @@ -225,9 +226,16 @@ mpn_dc_set_str (mp_ptr rp, const unsigned char *str, size_t str_len, mp_size_t ln, hn, n, sn; len_lo = powtab->digits_in_base; - len_hi = str_len - len_lo; - ASSERT (str_len > len_lo); + if (str_len <= len_lo) + { + if (BELOW_THRESHOLD (str_len, SET_STR_DC_THRESHOLD)) + return mpn_bc_set_str (rp, str, str_len, powtab->base); + else + return mpn_dc_set_str (rp, str, str_len, powtab + 1, tp); + } + + len_hi = str_len - len_lo; ASSERT (len_lo >= len_hi); if (BELOW_THRESHOLD (len_hi, SET_STR_DC_THRESHOLD)) |