mercurylang/mercury
1
0
Fork 0
mirror of https://github.com/Mercury-Language/mercury.git synced 2025-12-12 20:34:19 +00:00
Code Issues Projects Releases Wiki Activity

Fix the condition protecting the definition of MR_GC_MALLOC_INLINE,

Browse Source 
Branches: 11.07, main

runtime/mercury.h:
	Fix the condition protecting the definition of MR_GC_MALLOC_INLINE,
	since we are calling the Boehm collector directly we require
 	MR_BOEHM_GC to be defined, not just MR_CONSERVATIVE_GC.

	MR_GC_MALLOC_ATOMIC does not exist; use GC_MALLOC_ATOMIC instead.

	Add a couple of XXXs regarding the definition of MR_new_object_atomic
	in the case where inline allocation is enabled.
This commit is contained in:
Julien Fischer
2011-09-19 08:46:23 +00:00
parent 3c224f478f
commit afaea7c1ba
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runtime/mercury.h
View File

@@ -176,7 +176,7 @@ extern MR_Word mercury__private_builtin__dummy_var;
** Allocates memory on the garbage-collected heap. ** Allocates memory on the garbage-collected heap.
*/ */
#ifdef MR_CONSERVATIVE_GC #ifdef MR_BOEHM_GC
#ifdef MR_INLINE_ALLOC #ifdef MR_INLINE_ALLOC
#ifndef MR_GNUC #ifndef MR_GNUC
#error "MR_INLINE_ALLOC requires GNU C" #error "MR_INLINE_ALLOC requires GNU C"
@@ -209,9 +209,12 @@ extern MR_Word mercury__private_builtin__dummy_var;
** GC_MALLOC_WORDS_ATOMIC, we can define MR_new_object_atomic here ** GC_MALLOC_WORDS_ATOMIC, we can define MR_new_object_atomic here
** to call either MR_GC_MALLOC_ATOMIC or MR_GC_MALLOC_INLINE, ** to call either MR_GC_MALLOC_ATOMIC or MR_GC_MALLOC_INLINE,
** depending on whether we value atomicity or inline expansion more. ** depending on whether we value atomicity or inline expansion more.
** XXX the above is out-of-date: Bohem GC does now provide
** GC_MALLOC_ATOMIC_WORDS.
** XXX we don't provide MR_GC_MALLOC_ATOMIC.
*/ */
#define MR_new_object_atomic(type, size, alloc_id, name) \ #define MR_new_object_atomic(type, size, alloc_id, name) \
((type *) MR_GC_MALLOC_ATOMIC(size)) ((type *) GC_MALLOC_ATOMIC(size))
#else /* !MR_INLINE_ALLOC */ #else /* !MR_INLINE_ALLOC */
#ifdef MR_MPROF_PROFILE_MEMORY_ATTRIBUTION #ifdef MR_MPROF_PROFILE_MEMORY_ATTRIBUTION
@@ -227,7 +230,7 @@ extern MR_Word mercury__private_builtin__dummy_var;
#endif #endif
#endif /* !MR_INLINE_ALLOC */ #endif /* !MR_INLINE_ALLOC */
#else /* !MR_CONSERVATIVE_GC */ #else /* !MR_BOEHM_GC */
#ifndef MR_GNUC #ifndef MR_GNUC
/* /*
@@ -235,7 +238,7 @@ extern MR_Word mercury__private_builtin__dummy_var;
** It's not worth worrying about compilers other than GNU C for ** It's not worth worrying about compilers other than GNU C for
** this obscure combination of options. ** this obscure combination of options.
*/ */
#error "For C compilers other than GNU C, `--high-level-code' requires `--gc conservative'" #error "For C compilers other than GNU C, `--high-level-code' requires `--gc boehm'"
#endif #endif
/* /*