diff --git a/core/shared-lib/mem-alloc/ems/ems_gc.h b/core/shared-lib/mem-alloc/ems/ems_gc.h index d18fb2abff..2da6241a1c 100644 --- a/core/shared-lib/mem-alloc/ems/ems_gc.h +++ b/core/shared-lib/mem-alloc/ems/ems_gc.h @@ -46,30 +46,30 @@ extern "C" { /* Standalone GC is used for testing.*/ #ifndef GC_EMBEDDED -# ifndef GC_STANDALONE -# define GC_STANDALONE -# endif +# ifndef GC_STANDALONE +# define GC_STANDALONE +# endif #endif #if defined(GC_EMBEDDED) && defined(GC_STANDALONE) -# error "Can not define GC_EMBEDDED and GC_STANDALONE at the same time" +# error "Can not define GC_EMBEDDED and GC_STANDALONE at the same time" #endif #ifdef BH_TEST -# ifndef GC_TEST -# define GC_TEST -# endif +# ifndef GC_TEST +# define GC_TEST +# endif #endif #ifdef BH_DEBUG /*instrument mode ignore GC_DEBUG feature, for instrument testing gc_alloc_vo_i_heap only has func_name parameter*/ #if !defined INSTRUMENT_TEST_ENABLED && !defined GC_DEBUG -# define GC_DEBUG +# define GC_DEBUG #endif #endif #if defined(GC_EMBEDDED) && defined(GC_TEST) -# error "Can not defined GC_EMBEDDED and GC_TEST at the same time" +# error "Can not defined GC_EMBEDDED and GC_TEST at the same time" #endif typedef void *gc_handle_t; @@ -200,17 +200,17 @@ extern int gc_set_threshold_factor(void *heap, unsigned int factor); /* internally. Functions without _i suffix are just wrappers with the corresponded functions with*/ /* _i suffix. Allocation operation code position are record under DEBUG model for debugging.*/ #ifdef GC_DEBUG -# define ALLOC_EXTRA_PARAMETERS ,const char*file_name,int line_number -# define ALLOC_EXTRA_ARGUMENTS , __FILE__, __LINE__ -# define ALLOC_PASSDOWN_EXTRA_ARGUMENTS , file_name, line_number -# define gc_alloc_vo_h(heap, size) gc_alloc_vo_i_heap(heap, size, __FILE__, __LINE__) -# define gc_free_h(heap, obj) gc_free_i_heap(heap, obj, __FILE__, __LINE__) +# define ALLOC_EXTRA_PARAMETERS ,const char*file_name,int line_number +# define ALLOC_EXTRA_ARGUMENTS , __FILE__, __LINE__ +# define ALLOC_PASSDOWN_EXTRA_ARGUMENTS , file_name, line_number +# define gc_alloc_vo_h(heap, size) gc_alloc_vo_i_heap(heap, size, __FILE__, __LINE__) +# define gc_free_h(heap, obj) gc_free_i_heap(heap, obj, __FILE__, __LINE__) #else -# define ALLOC_EXTRA_PARAMETERS -# define ALLOC_EXTRA_ARGUMENTS -# define ALLOC_PASSDOWN_EXTRA_ARGUMENTS -# define gc_alloc_vo_h gc_alloc_vo_i_heap -# define gc_free_h gc_free_i_heap +# define ALLOC_EXTRA_PARAMETERS +# define ALLOC_EXTRA_ARGUMENTS +# define ALLOC_PASSDOWN_EXTRA_ARGUMENTS +# define gc_alloc_vo_h gc_alloc_vo_i_heap +# define gc_free_h gc_free_i_heap #endif /** diff --git a/core/shared-lib/mem-alloc/ems/ems_gc_internal.h b/core/shared-lib/mem-alloc/ems/ems_gc_internal.h index 42eff8ac0e..b717971aee 100644 --- a/core/shared-lib/mem-alloc/ems/ems_gc_internal.h +++ b/core/shared-lib/mem-alloc/ems/ems_gc_internal.h @@ -98,10 +98,10 @@ extern void hmu_verify(hmu_t *hmu); #define GETBIT(v, offset) ((v) & (1 << (offset)) ? 1 : 0) #define CLRBIT(v, offset) (v) &= ~(1 << (offset)) -#define SETBITS(v, offset, size, value) do { \ - (v) &= ~(((1 << size) - 1) << offset); \ - (v) |= value << offset; \ - } while(0) +#define SETBITS(v, offset, size, value) do { \ + (v) &= ~(((1 << size) - 1) << offset); \ + (v) |= value << offset; \ + } while(0) #define CLRBITS(v, offset, size) (v) &= ~(((1 << size) - 1) << offset) #define GETBITS(v, offset, size) (((v) & (((1 << size) - 1) << offset)) >> offset) @@ -112,8 +112,8 @@ extern void hmu_verify(hmu_t *hmu); #define hmu_to_obj(hmu) (gc_object_t)(SKIP_OBJ_PREFIX((hmu_t*) (hmu) + 1)) #define obj_to_hmu(obj) ((hmu_t *)((gc_uint8*)(obj) - OBJ_PREFIX_SIZE) - 1) -#define HMU_UT_SIZE 2 -#define HMU_UT_OFFSET 30 +#define HMU_UT_SIZE 2 +#define HMU_UT_OFFSET 30 #define hmu_get_ut(hmu) GETBITS ((hmu)->header, HMU_UT_OFFSET, HMU_UT_SIZE) #define hmu_set_ut(hmu, type) SETBITS ((hmu)->header, HMU_UT_OFFSET, HMU_UT_SIZE, type) @@ -126,7 +126,7 @@ extern void hmu_verify(hmu_t *hmu); #define hmu_unmark_pinuse(hmu) CLRBIT ((hmu)->header, HMU_P_OFFSET) #define hmu_get_pinuse(hmu) GETBIT ((hmu)->header, HMU_P_OFFSET) -#define HMU_JO_VT_SIZE 27 +#define HMU_JO_VT_SIZE 27 #define HMU_JO_VT_OFFSET 0 #define HMU_JO_MB_OFFSET 28 @@ -151,7 +151,7 @@ extern void hmu_verify(hmu_t *hmu); #define HMU_FC_NORMAL_MAX_SIZE ((HMU_NORMAL_NODE_CNT - 1) << 3) #define HMU_IS_FC_NORMAL(size) ((size) < HMU_FC_NORMAL_MAX_SIZE) #if HMU_FC_NORMAL_MAX_SIZE >= GC_MAX_HEAP_SIZE -# error "Too small GC_MAX_HEAP_SIZE" +#error "Too small GC_MAX_HEAP_SIZE" #endif typedef struct _hmu_normal_node @@ -264,14 +264,14 @@ extern gc_handle_t (*gct_vm_get_gc_handle_for_current_instance)(void); extern int (*gct_vm_begin_rootset_enumeration)(void* heap); extern int (*gct_vm_gc_finished)(void); #else -#define gct_vm_get_java_object_ref_list bh_get_java_object_ref_list -#define gct_vm_mutex_init vm_mutex_init -#define gct_vm_mutex_destroy vm_mutex_destroy -#define gct_vm_mutex_lock vm_mutex_lock -#define gct_vm_mutex_unlock vm_mutex_unlock -#define gct_vm_get_gc_handle_for_current_instance app_manager_get_cur_applet_heap -#define gct_vm_begin_rootset_enumeration vm_begin_rootset_enumeration -#define gct_vm_gc_finished jeff_runtime_gc_finished +#define gct_vm_get_java_object_ref_list bh_get_java_object_ref_list +#define gct_vm_mutex_init vm_mutex_init +#define gct_vm_mutex_destroy vm_mutex_destroy +#define gct_vm_mutex_lock vm_mutex_lock +#define gct_vm_mutex_unlock vm_mutex_unlock +#define gct_vm_get_gc_handle_for_current_instance app_manager_get_cur_applet_heap +#define gct_vm_begin_rootset_enumeration vm_begin_rootset_enumeration +#define gct_vm_gc_finished jeff_runtime_gc_finished #endif #ifdef __cplusplus diff --git a/core/shared-lib/platform/include/bh_assert.h b/core/shared-lib/platform/include/bh_assert.h index 7e9158c5c9..08cea79c79 100644 --- a/core/shared-lib/platform/include/bh_assert.h +++ b/core/shared-lib/platform/include/bh_assert.h @@ -21,16 +21,16 @@ #include "bh_platform.h" #ifdef BH_TEST -# ifndef BH_DEBUG -# error "BH_TEST should be defined under BH_DEBUG" -# endif +# ifndef BH_DEBUG +# error "BH_TEST should be defined under BH_DEBUG" +# endif #endif #ifdef BH_TEST -# if defined(WIN32) || defined(__linux__) -# else -# error "Test case can not run on the current platform" -# endif +# if defined(WIN32) || defined(__linux__) +# else +# error "Test case can not run on the current platform" +# endif #endif #ifdef __cplusplus @@ -44,14 +44,14 @@ extern void bh_assert_internal(int v, const char *file_name, int line_number, co extern void bh_debug_internal(const char *file_name, int line_number, const char *fmt, ...); #if defined(WIN32) || defined(EMU) -# define bh_debug(fmt, ...) bh_debug_internal(__FILE__, __LINE__, fmt, __VA_ARGS__) +# define bh_debug(fmt, ...) bh_debug_internal(__FILE__, __LINE__, fmt, __VA_ARGS__) #elif defined(__linux__) -/*# define bh_debug(...) bh_debug_internal(__FILE__, __LINE__, ## __VA_ARGS__)*/ +/*# define bh_debug(...) bh_debug_internal(__FILE__, __LINE__, ## __VA_ARGS__)*/ # define bh_debug bh_debug_internal(__FILE__, __LINE__, "");printf #elif defined(PLATFORM_SEC) -# define bh_debug(fmt, ...) bh_debug_internal(__FILE__, __LINE__, fmt, __VA_ARGS__) +# define bh_debug(fmt, ...) bh_debug_internal(__FILE__, __LINE__, fmt, __VA_ARGS__) #else -# error "Unsupported platform" +# error "Unsupported platform" #endif #else @@ -63,12 +63,12 @@ extern void bh_debug_internal(const char *file_name, int line_number, const char #define bh_assert_abort(x) do { \ if (!x) \ abort(); \ - } while (0) + } while (0) #ifdef BH_TEST -# define BH_STATIC +# define BH_STATIC #else -# define BH_STATIC static +# define BH_STATIC static #endif #ifdef __cplusplus