cheng/mpir
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/wbhart/mpir

Browse Source
This commit is contained in:
BrianGladman 2014-03-28 17:55:53 +00:00
commit 8cab9b0e2e
3 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/memory.c
View File

@ -91,23 +91,23 @@ tests_reallocate (void *ptr, size_t old_size, size_t new_size)
if (new_size == 0) if (new_size == 0)
{ {
printf ("tests_reallocate(): attempt to reallocate 0x%lX to 0 bytes\n", printf ("tests_reallocate(): attempt to reallocate %p to 0 bytes\n",
(unsigned long) ptr); ptr);
abort (); abort ();
} }
hp = tests_memory_find (ptr); hp = tests_memory_find (ptr);
if (hp == NULL) if (hp == NULL)
{ {
printf ("tests_reallocate(): attempt to reallocate bad pointer 0x%lX\n", printf ("tests_reallocate(): attempt to reallocate bad pointer %p\n",
(unsigned long) ptr); ptr);
abort (); abort ();
} }
h = *hp; h = *hp;
if (h->size != old_size) if (h->size != old_size)
{ {
printf ("tests_reallocate(): bad old size %d, should be %d\n", printf ("tests_reallocate(): bad old size %lu, should be %lu\n",
old_size, h->size); old_size, h->size);
abort (); abort ();
} }
@ -123,8 +123,8 @@ tests_free_find (void *ptr)
struct header **hp = tests_memory_find (ptr); struct header **hp = tests_memory_find (ptr);
if (hp == NULL) if (hp == NULL)
{ {
printf ("tests_free(): attempt to free bad pointer 0x%lX\n", printf ("tests_free(): attempt to free bad pointer %p\n",
(unsigned long) ptr); ptr);
abort (); abort ();
} }
return hp; return hp;
@ -150,7 +150,7 @@ tests_free (void *ptr, size_t size)
if (h->size != size) if (h->size != size)
{ {
printf ("tests_free(): bad size %d, should be %d\n", size, h->size); printf ("tests_free(): bad size %lu, should be %lu\n", size, h->size);
abort (); abort ();
} }

4
tests/mpq/t-get_str.c
View File

@ -67,8 +67,8 @@ check_one (mpq_srcptr q, int base, const char *want)
{ {
printf ("mpq_get_str wrong return value (passing non-NULL)\n"); printf ("mpq_get_str wrong return value (passing non-NULL)\n");
printf (" base %d\n", base); printf (" base %d\n", base);
printf (" got 0x%lX\n", (unsigned long) ret); printf (" got %p\n", ret);
printf (" want 0x%lX\n", (unsigned long) want); printf (" want %p\n", want);
abort (); abort ();
} }
if (strcmp (str, want) != 0) if (strcmp (str, want) != 0)

26
tests/x86_64check.c
View File

@ -42,21 +42,21 @@ struct {
int tag; int tag;
int other[4]; int other[4];
} calling_conventions_fenv; } calling_conventions_fenv;
long calling_conventions_rbx; mpir_si calling_conventions_rbx;
long calling_conventions_rbp; mpir_si calling_conventions_rbp;
long calling_conventions_r12; mpir_si calling_conventions_r12;
long calling_conventions_r13; mpir_si calling_conventions_r13;
long calling_conventions_r14; mpir_si calling_conventions_r14;
long calling_conventions_r15; mpir_si calling_conventions_r15;
long calling_conventions_rflags; mpir_si calling_conventions_rflags;
/* expected values, as per x86_64call.asm */ /* expected values, as per x86_64call.asm */
const long calling_conventions_want_rbx = 0x1234567887654321L; const mpir_si calling_conventions_want_rbx = CNST_LIMB(0x1234567887654321);
const long calling_conventions_want_rbp = 0x89ABCDEFFEDCBA98L; const mpir_si calling_conventions_want_rbp = CNST_LIMB(0x89ABCDEFFEDCBA98);
const long calling_conventions_want_r12 = 0xDEADBEEFBADECAFEL; const mpir_si calling_conventions_want_r12 = CNST_LIMB(0xDEADBEEFBADECAFE);
const long calling_conventions_want_r13 = 0xFFEEDDCCBBAA9988L; const mpir_si calling_conventions_want_r13 = CNST_LIMB(0xFFEEDDCCBBAA9988);
const long calling_conventions_want_r14 = 0x0011223344556677L; const mpir_si calling_conventions_want_r14 = CNST_LIMB(0x0011223344556677);
const long calling_conventions_want_r15 = 0x1234432156788765L; const mpir_si calling_conventions_want_r15 = CNST_LIMB(0x1234432156788765);
#define DIR_BIT(rflags) (((rflags) & (1<<10)) != 0) #define DIR_BIT(rflags) (((rflags) & (1<<10)) != 0)