summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Barzilay <eli@barzilay.org>2010-05-21 21:10:53 -0400
committerIvan Maidanski <ivmai@mail.ru>2013-11-03 14:06:18 +0400
commit60f22dba66d1171edb130f614f1429f5ebf51060 (patch)
tree71a78b23f192ef58307a3d90826526ad145621ba
parent228343f7972f136b2beb39fec99ebdabde490399 (diff)
downloadbdwgc-60f22dba66d1171edb130f614f1429f5ebf51060.tar.gz
Fixing some tab damage from Jay's commit
-rw-r--r--alloc.c8
-rw-r--r--mark.c10
-rw-r--r--mark_rts.c2
-rw-r--r--new_hblk.c70
-rw-r--r--os_dep.c2
-rw-r--r--pthread_stop_world.c2
6 files changed, 47 insertions, 47 deletions
diff --git a/alloc.c b/alloc.c
index 3d0169b0..16b20e21 100644
--- a/alloc.c
+++ b/alloc.c
@@ -335,7 +335,7 @@ GC_collect_end_callback_Proc GC_set_collect_end_callback(GC_collect_end_callback
GC_bool GC_try_to_collect_inner(GC_stop_func stop_func)
{
CLOCK_TYPE start_time = CLOCK_ZERO;
- CLOCK_TYPE current_time;
+ CLOCK_TYPE current_time;
if (GC_dont_gc) return FALSE;
/* PLTSCHEME */
if (GC_collect_start_callback)
@@ -483,10 +483,10 @@ GC_bool GC_stopped_mark(GC_stop_func stop_func)
unsigned i;
int dummy;
CLOCK_TYPE start_time = CLOCK_ZERO;
- CLOCK_TYPE current_time;
-
+ CLOCK_TYPE current_time;
+
if (GC_print_stats)
- GET_TIME(start_time);
+ GET_TIME(start_time);
# if !defined(REDIRECT_MALLOC) && (defined(MSWIN32) || defined(MSWINCE))
GC_add_current_malloc_heap();
diff --git a/mark.c b/mark.c
index 5ab35b66..c53a307b 100644
--- a/mark.c
+++ b/mark.c
@@ -617,11 +617,11 @@ void GC_mark_overflow_recover(void *p)
*/
mse * GC_mark_from(mse *mark_stack_top, mse *mark_stack, mse *mark_stack_limit)
{
- signed_word credit = HBLKSIZE; /* Remaining credit for marking work */
- ptr_t current_p; /* Pointer to current candidate ptr. */
- word current; /* Candidate pointer. */
- ptr_t limit = NULL; /* (Incl) limit of current candidate */
- /* range */
+ signed_word credit = HBLKSIZE; /* Remaining credit for marking work */
+ ptr_t current_p; /* Pointer to current candidate ptr. */
+ word current; /* Candidate pointer. */
+ ptr_t limit = NULL; /* (Incl) limit of current candidate */
+ /* range */
word descr;
ptr_t greatest_ha = GC_greatest_plausible_heap_addr;
ptr_t least_ha = GC_least_plausible_heap_addr;
diff --git a/mark_rts.c b/mark_rts.c
index ef60d807..f426799c 100644
--- a/mark_rts.c
+++ b/mark_rts.c
@@ -369,7 +369,7 @@ ptr_t GC_approx_sp(void)
# ifdef _MSC_VER
# pragma warning(disable:4172)
# endif
- ptr_t addr = ((ptr_t)(&dummy));
+ ptr_t addr = ((ptr_t)(&dummy));
return addr;
# ifdef _MSC_VER
# pragma warning(default:4172)
diff --git a/new_hblk.c b/new_hblk.c
index 9d6810e4..dd188550 100644
--- a/new_hblk.c
+++ b/new_hblk.c
@@ -118,55 +118,55 @@ ptr_t GC_build_fl(struct hblk *h, size_t sz, GC_bool clear, ptr_t list)
/* If we were more serious about it, these should go inside */
/* the loops. But write prefetches usually don't seem to */
/* matter much. */
- PREFETCH_FOR_WRITE((ptr_t)h);
- PREFETCH_FOR_WRITE((ptr_t)h + 128);
- PREFETCH_FOR_WRITE((ptr_t)h + 256);
- PREFETCH_FOR_WRITE((ptr_t)h + 378);
+ PREFETCH_FOR_WRITE((ptr_t)h);
+ PREFETCH_FOR_WRITE((ptr_t)h + 128);
+ PREFETCH_FOR_WRITE((ptr_t)h + 256);
+ PREFETCH_FOR_WRITE((ptr_t)h + 378);
/* Handle small objects sizes more efficiently. For larger objects */
/* the difference is less significant. */
# ifndef SMALL_CONFIG
- switch (sz) {
- case 2: if (clear) {
- return GC_build_fl_clear2(h, list);
- } else {
- return GC_build_fl2(h, list);
- }
- case 4: if (clear) {
- return GC_build_fl_clear4(h, list);
- } else {
- return GC_build_fl4(h, list);
- }
- default:
- break;
+ switch (sz) {
+ case 2: if (clear) {
+ return GC_build_fl_clear2(h, list);
+ } else {
+ return GC_build_fl2(h, list);
}
+ case 4: if (clear) {
+ return GC_build_fl_clear4(h, list);
+ } else {
+ return GC_build_fl4(h, list);
+ }
+ default:
+ break;
+ }
# endif /* !SMALL_CONFIG */
-
+
/* Clear the page if necessary. */
- if (clear) BZERO(h, HBLKSIZE);
-
+ if (clear) BZERO(h, HBLKSIZE);
+
/* Add objects to free list */
- p = (word *)(h -> hb_body) + sz; /* second object in *h */
- prev = (word *)(h -> hb_body); /* One object behind p */
- last_object = (word *)((char *)h + HBLKSIZE);
- last_object -= sz;
- /* Last place for last object to start */
+ p = (word *)(h -> hb_body) + sz; /* second object in *h */
+ prev = (word *)(h -> hb_body); /* One object behind p */
+ last_object = (word *)((char *)h + HBLKSIZE);
+ last_object -= sz;
+ /* Last place for last object to start */
/* make a list of all objects in *h with head as last object */
- while (p <= last_object) {
- /* current object's link points to last object */
- obj_link(p) = (ptr_t)prev;
- prev = p;
- p += sz;
- }
- p -= sz; /* p now points to last object */
+ while (p <= last_object) {
+ /* current object's link points to last object */
+ obj_link(p) = (ptr_t)prev;
+ prev = p;
+ p += sz;
+ }
+ p -= sz; /* p now points to last object */
/*
* put p (which is now head of list of objects in *h) as first
* pointer in the appropriate free list for this size.
*/
- word *tmp = (word *)h->hb_body;
- obj_link(tmp) = list;
- return ((ptr_t)p);
+ word *tmp = (word *)h->hb_body;
+ obj_link(tmp) = list;
+ return ((ptr_t)p);
}
diff --git a/os_dep.c b/os_dep.c
index 48f28569..4e647a28 100644
--- a/os_dep.c
+++ b/os_dep.c
@@ -1217,7 +1217,7 @@ ptr_t GC_get_main_stack_base(void)
# if defined(HEURISTIC1) || defined(HEURISTIC2)
MAYBE_UNUSED word dummy;
# endif
- MAYBE_UNUSED ptr_t result;
+ MAYBE_UNUSED ptr_t result;
# define STACKBOTTOM_ALIGNMENT_M1 ((word)STACK_GRAN - 1)
diff --git a/pthread_stop_world.c b/pthread_stop_world.c
index 2b8d6443..62241e6d 100644
--- a/pthread_stop_world.c
+++ b/pthread_stop_world.c
@@ -223,7 +223,7 @@ void GC_suspend_handler_inner(ptr_t sig_arg, void *context)
void GC_restart_handler(int sig)
{
MAYBE_UNUSED pthread_t my_thread = pthread_self();
- MAYBE_UNUSED GC_thread me;
+ MAYBE_UNUSED GC_thread me;
if (sig != SIG_THR_RESTART) ABORT("Bad signal in suspend_handler");