From 9fd553ccd98c72998a4e8e634ab4f05986d2ed10 Mon Sep 17 00:00:00 2001 From: Nicola Pero Date: Wed, 22 Dec 2010 00:17:21 +0000 Subject: [PATCH] In libobjc/: 2010-12-22 Nicola Pero In libobjc/: 2010-12-22 Nicola Pero * objc-private/objc-list.h: Reindented file. No code changes. * objc-private/sarray.h: Same change. From-SVN: r168150 --- libobjc/ChangeLog | 5 ++ libobjc/objc-private/objc-list.h | 53 +++++++------- libobjc/objc-private/sarray.h | 146 +++++++++++++++++++++------------------ 3 files changed, 112 insertions(+), 92 deletions(-) diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index 9f37dafc6c2..e75730251d0 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,5 +1,10 @@ 2010-12-22 Nicola Pero + * objc-private/objc-list.h: Reindented file. No code changes. + * objc-private/sarray.h: Same change. + +2010-12-22 Nicola Pero + * objc-private/accessors.h: Removed 'extern "C"' guards. This file is never compiled with C++. * objc-private/hash.h: Same change. diff --git a/libobjc/objc-private/objc-list.h b/libobjc/objc-private/objc-list.h index 523919cc9c4..989b9c9d4cb 100644 --- a/libobjc/objc-private/objc-list.h +++ b/libobjc/objc-private/objc-list.h @@ -1,5 +1,5 @@ /* Generic single linked list to keep various information - Copyright (C) 1993, 1994, 1996, 2009 Free Software Foundation, Inc. + Copyright (C) 1993, 1994, 1996, 2009, 2010 Free Software Foundation, Inc. Contributed by Kresten Krab Thorup. This file is part of GCC. @@ -23,68 +23,71 @@ a copy of the GCC Runtime Library Exception along with this program; see the files COPYING3 and COPYING.RUNTIME respectively. If not, see . */ - #ifndef __GNU_OBJC_LIST_H #define __GNU_OBJC_LIST_H -struct objc_list { +struct objc_list +{ void *head; struct objc_list *tail; }; -/* Return a cons cell produced from (head . tail) */ - +/* Return a cons cell produced from (head . tail). */ static inline struct objc_list* -list_cons(void* head, struct objc_list* tail) +list_cons (void* head, struct objc_list* tail) { struct objc_list* cell; - cell = (struct objc_list*)objc_malloc(sizeof(struct objc_list)); + cell = (struct objc_list*)objc_malloc (sizeof (struct objc_list)); cell->head = head; cell->tail = tail; return cell; } -/* Remove the element at the head by replacing it by its successor */ - +/* Remove the element at the head by replacing it by its + successor. */ static inline void -list_remove_head(struct objc_list** list) +list_remove_head (struct objc_list** list) { if ((*list)->tail) { - struct objc_list* tail = (*list)->tail; /* fetch next */ - *(*list) = *tail; /* copy next to list head */ - objc_free(tail); /* free next */ + /* Fetch next. */ + struct objc_list* tail = (*list)->tail; + + /* Copy next to list head. */ + *(*list) = *tail; + + /* Free next. */ + objc_free (tail); } - else /* only one element in list */ + else { - objc_free(*list); + /* Inly one element in list. */ + objc_free (*list); (*list) = 0; } } -/* Map FUNCTION over all elements in LIST */ - +/* Map FUNCTION over all elements in LIST. */ static inline void -list_mapcar(struct objc_list* list, void(*function)(void*)) +list_mapcar (struct objc_list* list, void(*function)(void*)) { - while(list) + while (list) { - (*function)(list->head); + (*function) (list->head); list = list->tail; } } -/* Free list (backwards recursive) */ - +/* Free list (backwards recursive). */ static inline void -list_free(struct objc_list* list) +list_free (struct objc_list* list) { if(list) { - list_free(list->tail); - objc_free(list); + list_free (list->tail); + objc_free (list); } } diff --git a/libobjc/objc-private/sarray.h b/libobjc/objc-private/sarray.h index 4d27fade609..12fad921f28 100644 --- a/libobjc/objc-private/sarray.h +++ b/libobjc/objc-private/sarray.h @@ -1,5 +1,5 @@ /* Sparse Arrays for Objective C dispatch tables - Copyright (C) 1993, 1995, 1996, 2004, 2009 Free Software Foundation, Inc. + Copyright (C) 1993, 1995, 1996, 2004, 2009, 2010 Free Software Foundation, Inc. Contributed by Kresten Krab Thorup. This file is part of GCC. @@ -26,8 +26,8 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #ifndef __sarray_INCLUDE_GNU #define __sarray_INCLUDE_GNU -#define OBJC_SPARSE2 /* 2-level sparse array */ -/* #define OBJC_SPARSE3 */ /* 3-level sparse array */ +#define OBJC_SPARSE2 /* 2-level sparse array. */ +/* #define OBJC_SPARSE3 */ /* 3-level sparse array. */ #ifdef OBJC_SPARSE2 extern const char* __objc_sparse2_id; @@ -44,33 +44,33 @@ extern int nindices; extern int narrays; extern int idxsize; -/* An unsigned integer of same size as a pointer */ -#define SIZET_BITS (sizeof(size_t)*8) +/* An unsigned integer of same size as a pointer. */ +#define SIZET_BITS (sizeof (size_t) * 8) -#if defined(__sparc__) || defined(OBJC_SPARSE2) +#if defined (__sparc__) || defined (OBJC_SPARSE2) #define PRECOMPUTE_SELECTORS #endif #ifdef OBJC_SPARSE3 -/* Buckets are 8 words each */ +/* Buckets are 8 words each. */ #define BUCKET_BITS 3 -#define BUCKET_SIZE (1< - indices[x.off.ioffset]-> - buckets[x.off.boffset]-> - elems[x.off.eoffset]; + return array-> + indices[x.off.ioffset]-> + buckets[x.off.boffset]-> + elems[x.off.eoffset]; #else /* OBJC_SPARSE2 */ return array->buckets[x.off.boffset]->elems[x.off.eoffset]; #endif /* OBJC_SPARSE2 */ #else /* not PRECOMPUTE_SELECTORS */ #ifdef OBJC_SPARSE3 return array-> - indices[indx/INDEX_CAPACITY]-> - buckets[(indx/BUCKET_SIZE)%INDEX_SIZE]-> - elems[indx%BUCKET_SIZE]; + indices[indx / INDEX_CAPACITY]-> + buckets[(indx / BUCKET_SIZE) % INDEX_SIZE]-> + elems[indx % BUCKET_SIZE]; #else /* OBJC_SPARSE2 */ - return array->buckets[indx/BUCKET_SIZE]->elems[indx%BUCKET_SIZE]; + return array->buckets[indx / BUCKET_SIZE]->elems[indx % BUCKET_SIZE]; #endif /* not OBJC_SPARSE3 */ #endif /* not PRECOMPUTE_SELECTORS */ } -static inline void* sarray_get_safe(struct sarray* array, sidx indx) +static inline void* sarray_get_safe (struct sarray* array, sidx indx) { - if(soffset_decode(indx) < array->capacity) - return sarray_get(array, indx); + if (soffset_decode (indx) < array->capacity) + return sarray_get (array, indx); else return (array->empty_bucket->elems[0]); } -- 2.11.4.GIT