revert allocation fast paths, to check whether it affects builds on various machines

svn: r3914
This commit is contained in:
Matthew Flatt 2006-08-01 04:32:09 +00:00
parent b603af9095
commit 38041e300a
3 changed files with 7 additions and 6 deletions

View File

@ -493,6 +493,8 @@ void *GC_malloc_one_small_tagged(size_t sizeb)
{
unsigned long newsize;
return GC_malloc_one_tagged(sizeb);
sizeb += WORD_SIZE;
sizeb = ALIGN_BYTES_SIZE(sizeb);
newsize = gen0_alloc_page->size + sizeb;
@ -537,9 +539,8 @@ void *GC_malloc_pair(void *car, void *cdr)
retval = PTR(NUM(gen0_alloc_page) + gen0_alloc_page->size);
info = (struct objhead *)retval;
((void **)retval)[0] = 0;
((void **)retval)[1] = 0;
bzero(retval, sizeb); /* <-- */
((void **)retval)[0] = NULL; /* objhead */
((void **)retval)[1] = 0; /* tag word */
/* info->type = type; */ /* We know that the type field is already 0 */
info->size = (sizeb >> gcLOG_WORD_SIZE);

View File

@ -2900,7 +2900,7 @@ static int generate_inlined_binary(mz_jit_state *jitter, Scheme_App3_Rec *app, i
mz_prepare(2);
jit_pusharg_p(JIT_R1);
jit_pusharg_p(JIT_R0);
#ifdef MZ_PRECISE_GC
#ifdef __MZ_PRECISE_GC
(void)mz_finish(GC_malloc_pair);
#else
(void)mz_finish(scheme_make_pair);

View File

@ -528,7 +528,7 @@ scheme_init_list (Scheme_Env *env)
Scheme_Object *scheme_make_pair(Scheme_Object *car, Scheme_Object *cdr)
{
#ifndef MZ_PRECISE_GC
#ifndef __MZ_PRECISE_GC
Scheme_Object *cons;
#endif
@ -541,7 +541,7 @@ Scheme_Object *scheme_make_pair(Scheme_Object *car, Scheme_Object *cdr)
*(long *)0x0 = 1;
#endif
#ifdef MZ_PRECISE_GC
#ifdef __MZ_PRECISE_GC
return GC_malloc_pair(car, cdr);
#else
cons = scheme_alloc_object();