From 50ef20b935808fba1ce77b881e6d40847ac210ea Mon Sep 17 00:00:00 2001 From: twisti Date: Fri, 20 Apr 2007 13:28:27 +0000 Subject: [PATCH] * src/toolbox/list.h (listnode): Renamed to listnode_t. (list): Renamed to list_t. * src/toolbox/list.c, src/vm/jit/codegen-common.c, src/vm/jit/codegen-common.h, src/vm/jit/emit-common.c, src/vm/jit/optimizing/profile.c, src/vm/jit/optimizing/recompile.c, src/vm/jit/optimizing/recompile.h, src/vm/properties.c, src/vmcore/class.c, src/vmcore/class.h, src/vmcore/suck.c, src/vmcore/suck.h: Likewise. --- src/toolbox/list.c | 70 +++++++++++++++---------------- src/toolbox/list.h | 56 ++++++++++++------------- src/vm/jit/codegen-common.c | 6 +-- src/vm/jit/codegen-common.h | 8 ++-- src/vm/jit/emit-common.c | 4 +- src/vm/jit/optimizing/profile.c | 2 +- src/vm/jit/optimizing/recompile.c | 2 +- src/vm/jit/optimizing/recompile.h | 12 ++---- src/vm/properties.c | 10 ++--- src/vmcore/class.c | 4 +- src/vmcore/class.h | 6 +-- src/vmcore/suck.c | 4 +- src/vmcore/suck.h | 6 +-- 13 files changed, 92 insertions(+), 98 deletions(-) diff --git a/src/toolbox/list.c b/src/toolbox/list.c index d6da79efb..9d569f6b9 100644 --- a/src/toolbox/list.c +++ b/src/toolbox/list.c @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - $Id: list.c 7596 2007-03-28 21:05:53Z twisti $ + $Id: list.c 7783 2007-04-20 13:28:27Z twisti $ */ @@ -50,11 +50,11 @@ *******************************************************************************/ -list *list_create(s4 nodeoffset) +list_t *list_create(s4 nodeoffset) { - list *l; + list_t *l; - l = NEW(list); + l = NEW(list_t); #if defined(ENABLE_THREADS) lock_init_object_lock((java_objectheader *) l); @@ -76,11 +76,11 @@ list *list_create(s4 nodeoffset) *******************************************************************************/ -list *list_create_dump(s4 nodeoffset) +list_t *list_create_dump(s4 nodeoffset) { - list *l; + list_t *l; - l = DNEW(list); + l = DNEW(list_t); l->first = NULL; l->last = NULL; @@ -90,11 +90,11 @@ list *list_create_dump(s4 nodeoffset) } -void list_add_first(list *l, void *element) +void list_add_first(list_t *l, void *element) { - listnode *ln; + listnode_t *ln; - ln = (listnode *) (((u1 *) element) + l->nodeoffset); + ln = (listnode_t *) (((u1 *) element) + l->nodeoffset); LOCK_MONITOR_ENTER(l); @@ -121,7 +121,7 @@ void list_add_first(list *l, void *element) *******************************************************************************/ -void list_add_last(list *l, void *element) +void list_add_last(list_t *l, void *element) { LOCK_MONITOR_ENTER(l); @@ -139,11 +139,11 @@ void list_add_last(list *l, void *element) *******************************************************************************/ -void list_add_last_unsynced(list *l, void *element) +void list_add_last_unsynced(list_t *l, void *element) { - listnode *ln; + listnode_t *ln; - ln = (listnode *) (((u1 *) element) + l->nodeoffset); + ln = (listnode_t *) (((u1 *) element) + l->nodeoffset); if (l->last) { ln->prev = l->last; @@ -168,13 +168,13 @@ void list_add_last_unsynced(list *l, void *element) *******************************************************************************/ -void list_add_before(list *l, void *element, void *newelement) +void list_add_before(list_t *l, void *element, void *newelement) { - listnode *ln; - listnode *newln; + listnode_t *ln; + listnode_t *newln; - ln = (listnode *) (((u1 *) element) + l->nodeoffset); - newln = (listnode *) (((u1 *) newelement) + l->nodeoffset); + ln = (listnode_t *) (((u1 *) element) + l->nodeoffset); + newln = (listnode_t *) (((u1 *) newelement) + l->nodeoffset); LOCK_MONITOR_ENTER(l); @@ -206,7 +206,7 @@ void list_add_before(list *l, void *element, void *newelement) *******************************************************************************/ -void list_remove(list *l, void *element) +void list_remove(list_t *l, void *element) { LOCK_MONITOR_ENTER(l); @@ -224,11 +224,11 @@ void list_remove(list *l, void *element) *******************************************************************************/ -void list_remove_unsynced(list *l, void *element) +void list_remove_unsynced(list_t *l, void *element) { - listnode *ln; + listnode_t *ln; - ln = (listnode *) (((u1 *) element) + l->nodeoffset); + ln = (listnode_t *) (((u1 *) element) + l->nodeoffset); if (ln->next) ln->next->prev = ln->prev; @@ -251,7 +251,7 @@ void list_remove_unsynced(list *l, void *element) *******************************************************************************/ -void *list_first(list *l) +void *list_first(list_t *l) { void *el; @@ -273,7 +273,7 @@ void *list_first(list *l) *******************************************************************************/ -void *list_first_unsynced(list *l) +void *list_first_unsynced(list_t *l) { void *el; @@ -292,7 +292,7 @@ void *list_first_unsynced(list *l) *******************************************************************************/ -void *list_last(list *l) +void *list_last(list_t *l) { void *el; @@ -314,7 +314,7 @@ void *list_last(list *l) *******************************************************************************/ -void *list_last_unsynced(list *l) +void *list_last_unsynced(list_t *l) { void *el; @@ -333,7 +333,7 @@ void *list_last_unsynced(list *l) *******************************************************************************/ -void *list_next(list *l, void *element) +void *list_next(list_t *l, void *element) { void *el; @@ -356,12 +356,12 @@ void *list_next(list *l, void *element) *******************************************************************************/ -void *list_next_unsynced(list *l, void *element) +void *list_next_unsynced(list_t *l, void *element) { - listnode *ln; + listnode_t *ln; void *el; - ln = (listnode *) (((u1 *) element) + l->nodeoffset); + ln = (listnode_t *) (((u1 *) element) + l->nodeoffset); if (ln->next == NULL) el = NULL; @@ -378,7 +378,7 @@ void *list_next_unsynced(list *l, void *element) *******************************************************************************/ -void *list_prev(list *l, void *element) +void *list_prev(list_t *l, void *element) { void *el; @@ -401,12 +401,12 @@ void *list_prev(list *l, void *element) *******************************************************************************/ -void *list_prev_unsynced(list *l, void *element) +void *list_prev_unsynced(list_t *l, void *element) { - listnode *ln; + listnode_t *ln; void *el; - ln = (listnode *) (((u1 *) element) + l->nodeoffset); + ln = (listnode_t *) (((u1 *) element) + l->nodeoffset); if (ln->prev == NULL) el = NULL; diff --git a/src/toolbox/list.h b/src/toolbox/list.h index 1feaa1b03..15d159673 100644 --- a/src/toolbox/list.h +++ b/src/toolbox/list.h @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - $Id: list.h 7596 2007-03-28 21:05:53Z twisti $ + $Id: list.h 7783 2007-04-20 13:28:27Z twisti $ */ @@ -93,56 +93,56 @@ distinct list). */ -/* listnode *******************************************************************/ +/* listnode_t *****************************************************************/ -typedef struct listnode listnode; +typedef struct listnode_t listnode_t; -struct listnode { - listnode *next; - listnode *prev; +struct listnode_t { + listnode_t *next; + listnode_t *prev; }; -/* list ***********************************************************************/ +/* list_t *********************************************************************/ -typedef struct list list; +typedef struct list_t list_t; -struct list { +struct list_t { #if defined(ENABLE_THREADS) java_objectheader lock; /* threads lock object */ #endif - listnode *first; - listnode *last; + listnode_t *first; + listnode_t *last; s4 nodeoffset; }; /* function prototypes ********************************************************/ -list *list_create(s4 nodeoffset); -list *list_create_dump(s4 nodeoffset); +list_t *list_create(s4 nodeoffset); +list_t *list_create_dump(s4 nodeoffset); -void list_add_first(list *l, void *element); +void list_add_first(list_t *l, void *element); -void list_add_last(list *l, void *element); -void list_add_last_unsynced(list *l, void *element); +void list_add_last(list_t *l, void *element); +void list_add_last_unsynced(list_t *l, void *element); -void list_add_before(list *l, void *element, void *newelement); +void list_add_before(list_t *l, void *element, void *newelement); -void list_remove(list *l, void *element); -void list_remove_unsynced(list *l, void *element); - -void *list_first(list *l); -void *list_first_unsynced(list *l); +void list_remove(list_t *l, void *element); +void list_remove_unsynced(list_t *l, void *element); -void *list_last(list *l); -void *list_last_unsynced(list *l); +void *list_first(list_t *l); +void *list_first_unsynced(list_t *l); -void *list_next(list *l, void *element); -void *list_next_unsynced(list *l, void *element); +void *list_last(list_t *l); +void *list_last_unsynced(list_t *l); -void *list_prev(list *l, void *element); -void *list_prev_unsynced(list *l, void *element); +void *list_next(list_t *l, void *element); +void *list_next_unsynced(list_t *l, void *element); + +void *list_prev(list_t *l, void *element); +void *list_prev_unsynced(list_t *l, void *element); #endif /* _LIST_H */ diff --git a/src/vm/jit/codegen-common.c b/src/vm/jit/codegen-common.c index 04567a958..9ee08b65a 100644 --- a/src/vm/jit/codegen-common.c +++ b/src/vm/jit/codegen-common.c @@ -39,7 +39,7 @@ memory. All functions writing values into the data area return the offset relative the begin of the code area (start of procedure). - $Id: codegen-common.c 7778 2007-04-20 12:40:05Z twisti $ + $Id: codegen-common.c 7783 2007-04-20 13:28:27Z twisti $ */ @@ -490,7 +490,7 @@ void codegen_resolve_branchrefs(codegendata *cd, basicblock *bptr) void codegen_branch_label_add(codegendata *cd, s4 label, s4 condition, s4 reg, u4 options) { - list *list; + list_t *list; branch_label_ref_t *br; s4 mpc; @@ -1249,8 +1249,8 @@ java_objectheader *codegen_finish_native_call(u1 *datasp) #if defined(ENABLE_JAVASE) localref_table *lrt; localref_table *plrt; -#endif s4 localframes; +#endif java_objectheader *e; /* get data structures from stack */ diff --git a/src/vm/jit/codegen-common.h b/src/vm/jit/codegen-common.h index d4d1e9b06..450bf1c40 100644 --- a/src/vm/jit/codegen-common.h +++ b/src/vm/jit/codegen-common.h @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - $Id: codegen-common.h 7731 2007-04-16 22:24:30Z twisti $ + $Id: codegen-common.h 7783 2007-04-20 13:28:27Z twisti $ */ @@ -145,9 +145,9 @@ struct codegendata { dataref *datareferences; /* list of data segment references */ #endif -/* list *patchrefs; */ +/* list_t *patchrefs; */ patchref *patchrefs; - list *brancheslabel; + list_t *brancheslabel; linenumberref *linenumberreferences; /* list of line numbers and the */ /* program counters of their first */ @@ -200,7 +200,7 @@ struct branch_label_ref_t { s4 condition; /* conditional branch condition */ s4 reg; /* register number to check */ u4 options; /* branch options */ - listnode linkage; + listnode_t linkage; }; diff --git a/src/vm/jit/emit-common.c b/src/vm/jit/emit-common.c index 243109adc..dec288b7d 100644 --- a/src/vm/jit/emit-common.c +++ b/src/vm/jit/emit-common.c @@ -454,7 +454,7 @@ void emit_bnan(codegendata *cd, basicblock *target) void emit_label_bccz(codegendata *cd, s4 label, s4 condition, s4 reg, u4 options) { - list *list; + list_t *list; branch_label_ref_t *br; s4 mpc; s4 disp; @@ -509,7 +509,7 @@ void emit_label_bccz(codegendata *cd, s4 label, s4 condition, s4 reg, u4 options void emit_label(codegendata *cd, s4 label) { - list *list; + list_t *list; branch_label_ref_t *br; s4 mpc; s4 disp; diff --git a/src/vm/jit/optimizing/profile.c b/src/vm/jit/optimizing/profile.c index 6a50fa9ad..898d8710a 100644 --- a/src/vm/jit/optimizing/profile.c +++ b/src/vm/jit/optimizing/profile.c @@ -206,7 +206,7 @@ bool profile_start_thread(void) #if !defined(NDEBUG) void profile_printstats(void) { - list *l; + list_t *l; list_method_entry *lme; list_method_entry *tlme; classinfo *c; diff --git a/src/vm/jit/optimizing/recompile.c b/src/vm/jit/optimizing/recompile.c index 5ae566954..fe596c1d8 100644 --- a/src/vm/jit/optimizing/recompile.c +++ b/src/vm/jit/optimizing/recompile.c @@ -61,7 +61,7 @@ static threadobject *thread_recompile; static java_objectheader *lock_thread_recompile; -static list *list_recompile_methods; +static list_t *list_recompile_methods; /* recompile_init ************************************************************** diff --git a/src/vm/jit/optimizing/recompile.h b/src/vm/jit/optimizing/recompile.h index 73cec302b..cb1e4fedb 100644 --- a/src/vm/jit/optimizing/recompile.h +++ b/src/vm/jit/optimizing/recompile.h @@ -1,6 +1,6 @@ -/* src/vm/jit/recompile.h - recompilation system +/* src/vm/jit/optimizing/recompile.h - recompilation system - Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel, + Copyright (C) 1996-2005, 2006, 2007 R. Grafl, A. Krall, C. Kruegel, C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring, E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich, J. Wenninger, J. Wenninger, Institut f. Computersprachen - TU Wien @@ -22,12 +22,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - Contact: cacao@cacaojvm.org - - Authors: Christian Thalinger - - Changes: - $Id: cacao.c 4357 2006-01-22 23:33:38Z twisti $ */ @@ -48,7 +42,7 @@ typedef struct list_method_entry list_method_entry; struct list_method_entry { methodinfo *m; - listnode linkage; + listnode_t linkage; }; diff --git a/src/vm/properties.c b/src/vm/properties.c index 25301d77c..32b064f66 100644 --- a/src/vm/properties.c +++ b/src/vm/properties.c @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - $Id: properties.c 7257 2007-01-29 23:07:40Z twisti $ + $Id: properties.c 7783 2007-04-20 13:28:27Z twisti $ */ @@ -61,15 +61,15 @@ typedef struct list_properties_entry list_properties_entry; struct list_properties_entry { - char *key; - char *value; - listnode linkage; + char *key; + char *value; + listnode_t linkage; }; /* global variables ***********************************************************/ -static list *list_properties = NULL; +static list_t *list_properties = NULL; /* properties_init ************************************************************* diff --git a/src/vmcore/class.c b/src/vmcore/class.c index a9e7ad938..bc77f9130 100644 --- a/src/vmcore/class.c +++ b/src/vmcore/class.c @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - $Id: class.c 7563 2007-03-23 21:33:53Z twisti $ + $Id: class.c 7783 2007-04-20 13:28:27Z twisti $ */ @@ -66,7 +66,7 @@ /* global variables ***********************************************************/ -list unlinkedclasses; /* this is only used for eager class */ +list_t unlinkedclasses; /* this is only used for eager class */ /* loading */ diff --git a/src/vmcore/class.h b/src/vmcore/class.h index 312ef0aa5..7ee2800a9 100644 --- a/src/vmcore/class.h +++ b/src/vmcore/class.h @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - $Id: class.h 7563 2007-03-23 21:33:53Z twisti $ + $Id: class.h 7783 2007-04-20 13:28:27Z twisti $ */ @@ -114,7 +114,7 @@ struct classinfo { /* class structure */ s4 methodscount; /* number of methods */ methodinfo *methods; /* method table */ - listnode listnode; /* linkage */ + listnode_t listnode; /* linkage */ s4 state; /* current class state */ s4 index; /* hierarchy depth (classes) or index */ @@ -177,7 +177,7 @@ struct castinfo { /* global variables ***********************************************************/ -extern list unlinkedclasses; /* this is only used for eager class loading */ +extern list_t unlinkedclasses; /* this is only used for eager class loading */ /* frequently used classes ****************************************************/ diff --git a/src/vmcore/suck.c b/src/vmcore/suck.c index 21987f0d6..2fb8fee62 100644 --- a/src/vmcore/suck.c +++ b/src/vmcore/suck.c @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - $Id: suck.c 7272 2007-02-01 15:35:09Z twisti $ + $Id: suck.c 7783 2007-04-20 13:28:27Z twisti $ */ @@ -62,7 +62,7 @@ /* global variables ***********************************************************/ -list *list_classpath_entries; +list_t *list_classpath_entries; /* suck_init ******************************************************************* diff --git a/src/vmcore/suck.h b/src/vmcore/suck.h index 8d24a0955..1913e5f7f 100644 --- a/src/vmcore/suck.h +++ b/src/vmcore/suck.h @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - $Id: suck.h 7246 2007-01-29 18:49:05Z twisti $ + $Id: suck.h 7783 2007-04-20 13:28:27Z twisti $ */ @@ -61,7 +61,7 @@ struct list_classpath_entry { #if defined(ENABLE_ZLIB) hashtable *htclasses; #endif - listnode linkage; + listnode_t linkage; }; @@ -160,7 +160,7 @@ struct list_classpath_entry { /* export variables ***********************************************************/ -extern list *list_classpath_entries; +extern list_t *list_classpath_entries; /* function prototypes ********************************************************/ -- 2.25.1