Attachment #654162 for bug #722618

View | Details | Raw Unified | Return to bug 722618
Collapse All | Expand All

Lines 108-114 Boolean grow_dynamic_area(natural); Link Here

(-)a/lisp-kernel/area.h (-1 / +1 lines)
108	Boolean shrink_dynamic_area(natural);	108	Boolean shrink_dynamic_area(natural);
109		109
110	/* serialize add_area/remove_area, and also the tcr queue */	110	/* serialize add_area/remove_area, and also the tcr queue */
111	void *tcr_area_lock;	111	extern void *tcr_area_lock;
112		112
113	#define reserved_area ((area *)(all_areas))	113	#define reserved_area ((area *)(all_areas))
114	#define active_dynamic_area ((area *)(reserved_area->succ))	114	#define active_dynamic_area ((area *)(reserved_area->succ))

Lines 92-97 LispObj GCarealow = 0, GCareadynamiclow = 0; Link Here

(-)a/lisp-kernel/gc-common.c (+1 lines)
92	natural GCndnodes_in_area = 0, GCndynamic_dnodes_in_area = 0;	92	natural GCndnodes_in_area = 0, GCndynamic_dnodes_in_area = 0;
93	LispObj GCweakvll = (LispObj)NULL;	93	LispObj GCweakvll = (LispObj)NULL;
94	LispObj GCdwsweakvll = (LispObj)NULL;	94	LispObj GCdwsweakvll = (LispObj)NULL;
		95	LispObj GCfirstunmarked = (LispObj) NULL;
95	LispObj GCephemeral_low = 0;	96	LispObj GCephemeral_low = 0;
96	natural GCn_ephemeral_dnodes = 0;	97	natural GCn_ephemeral_dnodes = 0;
97	natural GCstack_limit = 0;	98	natural GCstack_limit = 0;




extern LispObj GCarealow, GCareadynamiclow;
extern natural GCndnodes_in_area, GCndynamic_dnodes_in_area;
extern bitvector GCmarkbits, GCdynamic_markbits,managed_static_refbits,global_refidx,dynamic_refidx,managed_static_refidx;
extern LispObj *global_reloctab, *GCrelocptr;
extern LispObj GCfirstunmarked;

extern natural lisp_heap_gc_threshold;
extern natural lisp_heap_notify_threshold;

#define GC_TRAP_FUNCTION_FREEZE 129
#define GC_TRAP_FUNCTION_THAW 130

extern Boolean GCDebug, GCverbose, just_purified_p;
extern bitvector GCmarkbits, GCdynamic_markbits;
extern LispObj GCarealow, GCareadynamiclow;
extern natural GCndnodes_in_area, GCndynamic_dnodes_in_area;
extern LispObj GCweakvll, GCdwsweakvll;
extern LispObj GCephemeral_low;
extern natural GCn_ephemeral_dnodes;
extern natural GCstack_limit;

#if WORD_SIZE == 64
extern unsigned short *_one_bits;
#else
extern const unsigned char _one_bits[256];
#endif

#define one_bits(x) _one_bits[x]

/* backend-interface */

typedef void (*weak_mark_fun) (LispObj);
extern weak_mark_fun mark_weak_htabv, dws_mark_weak_htabv;

typedef void (*weak_process_fun)(void);
extern weak_process_fun markhtabvs;
weak_process_fun markhtabvs;


#define hash_table_vector_header_count (sizeof(hash_table_vector_header)/sizeof(LispObj))

Lines 151-156 wperror(char* message) Link Here

(-)a/lisp-kernel/pmcl-kernel.c (-1 / +2 lines)
151		151
152	LispObj lisp_nil = (LispObj) 0;	152	LispObj lisp_nil = (LispObj) 0;
153	bitvector global_mark_ref_bits = NULL, dynamic_mark_ref_bits = NULL, relocatable_mark_ref_bits = NULL, global_refidx = NULL, dynamic_refidx = NULL,managed_static_refidx = NULL;	153	bitvector global_mark_ref_bits = NULL, dynamic_mark_ref_bits = NULL, relocatable_mark_ref_bits = NULL, global_refidx = NULL, dynamic_refidx = NULL,managed_static_refidx = NULL;
		154	LispObj global_reloctab = (LispObj) NULL, GCrelocptr = (LispObj) NULL;
		155	void *tcr_area_lock = NULL;
154		156
155		157
156	/* These are all "persistent" : they're initialized when	158	/* These are all "persistent" : they're initialized when
157	<smuglispweenie@gmail.com>	159	<smuglispweenie@gmail.com>
158	--
159	lisp-kernel/gc.h \| 1 -	160	lisp-kernel/gc.h \| 1 -
160	lisp-kernel/threads.h \| 1 -	161	lisp-kernel/threads.h \| 1 -
161	2 files changed, 2 deletions(-)	162	2 files changed, 2 deletions(-)

Lines 83-89 void gc(TCR *, signed_natural); Link Here

(-)a/lisp-kernel/gc.h (-1 lines)
83	int change_hons_area_size(TCR *, signed_natural);	83	int change_hons_area_size(TCR *, signed_natural);
84	void delete_protected_area(protected_area_ptr);	84	void delete_protected_area(protected_area_ptr);
85	Boolean egc_control(Boolean, BytePtr);	85	Boolean egc_control(Boolean, BytePtr);
86	Boolean free_segments_zero_filled_by_OS;
87	Boolean new_heap_segment(ExceptionInformation , natural, Boolean , TCR , Boolean *);	86	Boolean new_heap_segment(ExceptionInformation , natural, Boolean , TCR , Boolean *);
88	void platform_new_heap_segment(ExceptionInformation , TCR, BytePtr, BytePtr);	87	void platform_new_heap_segment(ExceptionInformation , TCR, BytePtr, BytePtr);
89	/* an type representing 1/4 of a natural word */	88	/* an type representing 1/4 of a natural word */

Lines 187-193 void tsd_set(LispObj, void *); Link Here

(-)a/lisp-kernel/threads.h (-2 lines)
187	void *tsd_get(LispObj);	187	void *tsd_get(LispObj);
188	TCR *new_tcr(natural, natural);	188	TCR *new_tcr(natural, natural);
189	void thread_init_tcr(TCR tcr, void stack_base, natural stack_size);	189	void thread_init_tcr(TCR tcr, void stack_base, natural stack_size);
190	TCR *initial_thread_tcr;
191		190
192	#define DEFAULT_THREAD_STACK_SIZE ((size_t) -1)	191	#define DEFAULT_THREAD_STACK_SIZE ((size_t) -1)
193	#define MINIMAL_THREAD_STACK_SIZE ((size_t) 0)	192	#define MINIMAL_THREAD_STACK_SIZE ((size_t) 0)
194	<smuglispweenie@gmail.com>	193	<smuglispweenie@gmail.com>
195	--
196	lisp-kernel/pmcl-kernel.c \| 2 +-	194	lisp-kernel/pmcl-kernel.c \| 2 +-
197	1 file changed, 1 insertion(+), 1 deletion(-)	195	1 file changed, 1 insertion(+), 1 deletion(-)

Lines 151-157 wperror(char* message) Link Here

(-)a/lisp-kernel/pmcl-kernel.c (-2 / +1 lines)
151		151
152	LispObj lisp_nil = (LispObj) 0;	152	LispObj lisp_nil = (LispObj) 0;
153	bitvector global_mark_ref_bits = NULL, dynamic_mark_ref_bits = NULL, relocatable_mark_ref_bits = NULL, global_refidx = NULL, dynamic_refidx = NULL,managed_static_refidx = NULL;	153	bitvector global_mark_ref_bits = NULL, dynamic_mark_ref_bits = NULL, relocatable_mark_ref_bits = NULL, global_refidx = NULL, dynamic_refidx = NULL,managed_static_refidx = NULL;
154	LispObj global_reloctab = (LispObj) NULL, GCrelocptr = (LispObj) NULL;	154	LispObj global_reloctab = (LispObj) 0, GCrelocptr = (LispObj) 0;
155	void *tcr_area_lock = NULL;	155	void *tcr_area_lock = NULL;
156		156
157		157
158	<smuglispweenie@gmail.com>	158	<smuglispweenie@gmail.com>
159	--
160	lisp-kernel/pmcl-kernel.c \| 2 +-	159	lisp-kernel/pmcl-kernel.c \| 2 +-
161	1 file changed, 1 insertion(+), 1 deletion(-)	160	1 file changed, 1 insertion(+), 1 deletion(-)

Lines 151-157 wperror(char* message) Link Here

(-)a/lisp-kernel/pmcl-kernel.c (-1 / +1 lines)
151		151
152	LispObj lisp_nil = (LispObj) 0;	152	LispObj lisp_nil = (LispObj) 0;
153	bitvector global_mark_ref_bits = NULL, dynamic_mark_ref_bits = NULL, relocatable_mark_ref_bits = NULL, global_refidx = NULL, dynamic_refidx = NULL,managed_static_refidx = NULL;	153	bitvector global_mark_ref_bits = NULL, dynamic_mark_ref_bits = NULL, relocatable_mark_ref_bits = NULL, global_refidx = NULL, dynamic_refidx = NULL,managed_static_refidx = NULL;
154	LispObj global_reloctab = (LispObj) 0, GCrelocptr = (LispObj) 0;	154	LispObj global_reloctab = (LispObj) 0, GCrelocptr = (LispObj) 0;
155	void *tcr_area_lock = NULL;	155	void *tcr_area_lock = NULL;
156		156
157		157

Return to bug 722618

Lines 62-69 Link Here

(-)a/lisp-kernel/gc.h (-15 / +14 lines)
62	extern LispObj GCarealow, GCareadynamiclow;	62	extern LispObj GCarealow, GCareadynamiclow;
63	extern natural GCndnodes_in_area, GCndynamic_dnodes_in_area;	63	extern natural GCndnodes_in_area, GCndynamic_dnodes_in_area;
64	extern bitvector GCmarkbits, GCdynamic_markbits,managed_static_refbits,global_refidx,dynamic_refidx,managed_static_refidx;	64	extern bitvector GCmarkbits, GCdynamic_markbits,managed_static_refbits,global_refidx,dynamic_refidx,managed_static_refidx;
65	LispObj global_reloctab, GCrelocptr;	65	extern LispObj global_reloctab, GCrelocptr;
66	LispObj GCfirstunmarked;	66	extern LispObj GCfirstunmarked;
67		67
68	extern natural lisp_heap_gc_threshold;	68	extern natural lisp_heap_gc_threshold;
69	extern natural lisp_heap_notify_threshold;	69	extern natural lisp_heap_notify_threshold;
Lines 153-171 void report_paging_info_delta(FILE, paging_info , paging_info *); Link Here
153	#define GC_TRAP_FUNCTION_FREEZE 129	153	#define GC_TRAP_FUNCTION_FREEZE 129
154	#define GC_TRAP_FUNCTION_THAW 130	154	#define GC_TRAP_FUNCTION_THAW 130
155		155
156	Boolean GCDebug, GCverbose, just_purified_p;	156	extern Boolean GCDebug, GCverbose, just_purified_p;
157	bitvector GCmarkbits, GCdynamic_markbits;	157	extern bitvector GCmarkbits, GCdynamic_markbits;
158	LispObj GCarealow, GCareadynamiclow;	158	extern LispObj GCarealow, GCareadynamiclow;
159	natural GCndnodes_in_area, GCndynamic_dnodes_in_area;	159	extern natural GCndnodes_in_area, GCndynamic_dnodes_in_area;
160	LispObj GCweakvll,GCdwsweakvll;	160	extern LispObj GCweakvll, GCdwsweakvll;
161	LispObj GCephemeral_low;	161	extern LispObj GCephemeral_low;
162	natural GCn_ephemeral_dnodes;	162	extern natural GCn_ephemeral_dnodes;
163	natural GCstack_limit;	163	extern natural GCstack_limit;
164		164
165	#if WORD_SIZE == 64	165	#if WORD_SIZE == 64
166	unsigned short *_one_bits;	166	extern unsigned short *_one_bits;
167	#else	167	#else
168	const unsigned char _one_bits[256];	168	extern const unsigned char _one_bits[256];
169	#endif	169	#endif
170		170
171	#define one_bits(x) _one_bits[x]	171	#define one_bits(x) _one_bits[x]
Lines 195-205 void gc(TCR *, signed_natural); Link Here
195	/* backend-interface */	195	/* backend-interface */
196		196
197	typedef void (*weak_mark_fun) (LispObj);	197	typedef void (*weak_mark_fun) (LispObj);
198	weak_mark_fun mark_weak_htabv, dws_mark_weak_htabv;	198	extern weak_mark_fun mark_weak_htabv, dws_mark_weak_htabv;
199		199
200	typedef void (*weak_process_fun)(void);	200	typedef void (*weak_process_fun)(void);
201		201	extern weak_process_fun markhtabvs;
202	weak_process_fun markhtabvs;
203		202
204		203
205	#define hash_table_vector_header_count (sizeof(hash_table_vector_header)/sizeof(LispObj))	204	#define hash_table_vector_header_count (sizeof(hash_table_vector_header)/sizeof(LispObj))