summaryrefslogtreecommitdiff
path: root/thread_local_alloc.c
diff options
context:
space:
mode:
authorhboehm <hboehm>2006-03-19 07:22:21 +0100
committerIvan Maidanski <ivmai@mail.ru>2011-07-26 19:06:36 +0200
commit21593b0324ba38cb6e1fcc4002c6d3fcc35f1b4e (patch)
tree165a69e35bf0fb5b98ab4bd164e607939434b878 /thread_local_alloc.c
parentb0c38aeafa4c346f9810bbe42d69c88dfd50bb20 (diff)
2006-03-18 Hans Boehm <Hans.Boehm@hp.com>
* configure.ac: Reenable gcj support. * configure: Regenerate. * thread_local_alloc.c(GC_gcj_malloc): fix. * gcj_mlc.c: (GC_gcj_malloc): fix printfs, delete dead lw assignment. * include/gc_gcj.h, tests/test.c: Remove gcj_fast_malloc references.
Diffstat (limited to 'thread_local_alloc.c')
-rw-r--r--thread_local_alloc.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/thread_local_alloc.c b/thread_local_alloc.c
index 34d2409..8cb105f 100644
--- a/thread_local_alloc.c
+++ b/thread_local_alloc.c
@@ -191,13 +191,15 @@ void * GC_gcj_malloc(size_t bytes,
{
size_t granules = ROUNDED_UP_GRANULES(bytes);
void *result;
- void **tiny_fl = (GC_tlfs)GC_getspecific(GC_thread_key)
- -> ptrfree_freelists;
+ void **tiny_fl = ((GC_tlfs)GC_getspecific(GC_thread_key))
+ -> gcj_freelists;
GC_ASSERT(GC_gcj_malloc_initialized);
GC_FAST_MALLOC_GRANS(result, bytes, tiny_fl, DIRECT_GRANULES,
- PTRFREE, GC_core_gcj_malloc(bytes),
- (AO_compiler_barrier(),
- *(void **)result = ptr_to_struct_containing_descr));
+ GC_gcj_kind,
+ GC_core_gcj_malloc(bytes,
+ ptr_to_struct_containing_descr),
+ {AO_compiler_barrier();
+ *(void **)result = ptr_to_struct_containing_descr;});
/* This forces the initialization of the "method ptr". */
/* This is necessary to ensure some very subtle properties */
/* required if a GC is run in the middle of such an allocation. */