/* -*-c-*-
*
- * $Id: mp-mem.c,v 1.3 2000/06/17 11:45:09 mdw Exp $
+ * $Id: mp-mem.c,v 1.8 2004/04/08 16:17:32 mdw Exp $
*
* Memory management for multiprecision numbers
*
* MA 02111-1307, USA.
*/
-/*----- Revision history --------------------------------------------------*
- *
- * $Log: mp-mem.c,v $
- * Revision 1.3 2000/06/17 11:45:09 mdw
- * Major memory management overhaul. Added arena support. Use the secure
- * arena for secret integers. Replace and improve the MP management macros
- * (e.g., replace MP_MODIFY by MP_DEST).
- *
- * Revision 1.2 1999/12/10 23:19:02 mdw
- * Improve error-checking.
- *
- * Revision 1.1 1999/11/17 18:02:16 mdw
- * New multiprecision integer arithmetic suite.
- *
- */
-
/*----- Header files ------------------------------------------------------*/
#include <mLib/sub.h>
* If there are no more references, the integer is destroyed.
*/
-void mp_drop(mp *m) { MP_DROP(m); }
+void mp_drop(mp *m) { if (m) MP_DROP(m); }
/* --- @mp_split@ --- *
*
* Use: Splits off a modifiable version of the integer referred to.
*/
-mp *mp_split(mp *m)
-{
-/* if ((m->f & MP_CONST) || m->ref > 1) { */
-/* size_t len = MP_LEN(m); */
-/* mp *mm = mp_new(len, m->f); */
-/* if (!(m->f & MP_UNDEF)) */
-/* memcpy(mm->v, m->v, MPWS(len)); */
-/* m->ref--; */
-/* m = mm; */
-/* } */
- MP_SPLIT(m);
- return (m);
-}
+mp *mp_split(mp *m) { MP_SPLIT(m); return (m); }
/* --- @mp_resize@ --- *
*
* changed. It is an error to
*/
-void mp_resize(mp *m, size_t sz)
-{
-/* mparena *a = (m->f & MP_BURN) ? MPARENA_SECURE : MPARENA_GLOBAL; */
-/* mpw *v; */
-/* size_t len = MP_LEN(m); */
-/* assert(((void)"can't make size less than length", sz >= len)); */
-/* v = mpalloc(a, sz); */
-/* if (!(m->f & MP_UNDEF)) */
-/* memcpy(v, m->v, MPWS(len)); */
-/* if (m->f & MP_BURN) */
-/* memset(m->v, 0, MPWS(m->sz)); */
-/* mpfree(m->a, m->v); */
-/* m->a = a; */
-/* m->v = v; */
-/* m->vl = v + len; */
-}
+void mp_resize(mp *m, size_t sz) { MP_RESIZE(m, sz); }
/* --- @mp_ensure@ --- *
*
* allocated for the new length then the size is increased. It
*/
-void mp_ensure(mp *m, size_t sz)
-{
-/* size_t len = MP_LEN(m); */
-/* if (sz >= len) { */
-/* if (sz > m->sz) */
-/* mp_resize(m, sz); */
-/* if (!(m->f & MP_UNDEF) && sz > len) */
-/* memset(m->vl, 0, MPWS(sz - len)); */
-/* m->vl = m->v + sz; */
-/* } */
-}
+void mp_ensure(mp *m, size_t sz) { MP_ENSURE(m, sz); }
/* --- @mp_dest@ --- *
*
/* --- Otherwise check whether the destination is suitable --- */
if (m->ref > 1 || (m->f & MP_CONST) ||
- m->sz > len || !((f & ~m->f) & MP_BURN)) {
+ sz > m->sz || ((f & ~m->f) & MP_BURN)) {
/* --- No -- allocate a new buffer --- *
*