mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-27 08:43:40 -07:00
Code Issues Projects Releases Wiki Activity

Added mps_word_const and other fixes to get zcoll test to work

Browse source 
Copied from Perforce
 Change: 178193
 ServerID: perforce.ravenbrook.com
This commit is contained in:
David Lovemore 2012-05-17 14:55:18 +01:00
parent 4bb3e3365e
commit fe9e093f48
3 changed files with 31 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

4
mps/code/fmtdytst.h
View file

@ -23,9 +23,9 @@ extern mps_res_t make_dylan_vector(mps_word_t *v, mps_ap_t ap, size_t slots);
#define DYLAN_VECTOR_SLOT(o,n) (((mps_word_t *) (o))[(n)+2])
#define DYLAN_INT(n) (((n) << 2) | 1)
#define DYLAN_INT(n) (((mps_word_t)(n) << 2) | 1)
#define DYLAN_INT_INT(d) ((d) >> 2)
#define DYLAN_INT_INT(d) ((mps_word_t)(d) >> 2)
#endif /* fmtdy_h */

7
mps/code/testlib.h
View file

@ -90,11 +90,13 @@
#define PRIXLONGEST "llX"
#define PRIwLONGEST "16"
typedef unsigned long long ulongest_t;
#define MPS_WORD_CONST(n) (n##ull)
#else
#define PRIuLONGEST "lu"
#define PRIXLONGEST "lX"
#define PRIwLONGEST "8"
typedef unsigned long ulongest_t;
#define MPS_WORD_CONST(n) (n##ul)
#endif
#define PRIXPTR "0"PRIwLONGEST PRIXLONGEST
@ -157,7 +159,10 @@ extern void verror(const char *format, va_list args);
#define Insist(cond) insist1(cond, #cond)
#define insist1(cond, condstring) \
cdie(cond, condstring "\n" __FILE__ "\n" STR(__LINE__))
if(cond) \
do {} while(0); \
else \
cdie(cond, condstring "\n" __FILE__ "\n" STR(__LINE__))
/* rnd -- random number generator

46
mps/code/zcoll.c
View file

@ -107,12 +107,12 @@ static ulongest_t cols(size_t bytes)
*/
static void showStatsAscii(size_t notcon, size_t con, size_t live, size_t alimit)
{
int n = cols(notcon);
int c = cols(notcon + con);
int l = cols(notcon + live); /* a fraction of con */
int a = cols(alimit);
int count;
int i;
ulongest_t n = cols(notcon);
ulongest_t c = cols(notcon + con);
ulongest_t l = cols(notcon + live); /* a fraction of con */
ulongest_t a = cols(alimit);
ulongest_t count;
ulongest_t i;
/* if we can show alimit within 200 cols, do so */
count = (a < 200) ? a + 1 : c;
@ -280,21 +280,21 @@ static void get(mps_arena_t arena)
* - how the mutator accesses objects (barrier hits).
*/
enum {
CatalogRootIndex = 0,
CatalogSig = 0x0000CA2A, /* CATAlog */
CatalogFix = 1,
CatalogVar = 10,
PageSig = 0x0000BA9E, /* PAGE */
PageFix = 1,
PageVar = 100,
ArtSig = 0x0000A621, /* ARTIcle */
ArtFix = 1,
ArtVar = 100,
PolySig = 0x0000B071, /* POLYgon */
PolyFix = 1,
PolyVar = 100
};
#define CatalogRootIndex 0
#define CatalogSig MPS_WORD_CONST(0x0000CA2A) /* CATAlog */
#define CatalogFix 1
#define CatalogVar 10
#define PageSig MPS_WORD_CONST(0x0000BA9E) /* PAGE */
#define PageFix 1
#define PageVar 100
#define ArtSig MPS_WORD_CONST(0x0000A621) /* ARTIcle */
#define ArtFix 1
#define ArtVar 100
#define PolySig MPS_WORD_CONST(0x0000B071) /* POLYgon */
#define PolyFix 1
#define PolyVar 100
static void CatalogCheck(void)
{
@ -326,7 +326,7 @@ static void CatalogCheck(void)
if(w == DYLAN_INT(0))
break;
Art = (void *)w;
Insist(DYLAN_VECTOR_SLOT(Art, 0) = DYLAN_INT(ArtSig));
Insist(DYLAN_VECTOR_SLOT(Art, 0) == DYLAN_INT(ArtSig));
Arts += 1;
for(k = 0; k < ArtVar; k += 1) {
@ -335,7 +335,7 @@ static void CatalogCheck(void)
if(w == DYLAN_INT(0))
break;
Poly = (void *)w;
Insist(DYLAN_VECTOR_SLOT(Poly, 0) = DYLAN_INT(PolySig));
Insist(DYLAN_VECTOR_SLOT(Poly, 0) == DYLAN_INT(PolySig));
Polys += 1;
}
}