X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fdescriptor.hpp;h=e1d0bc2a21eb6ade9b3125b4e3e5709c00ce3c1c;hb=4e25f6be9878154a9a7ae28917ed34427cb8ca6a;hp=bf6c69efb458d7d3360f72bf23170af3b75a18a7;hpb=946fb783a51a0b9fac59f829aa2609353204f9b5;p=cacao.git diff --git a/src/vm/descriptor.hpp b/src/vm/descriptor.hpp index bf6c69efb..e1d0bc2a2 100644 --- a/src/vm/descriptor.hpp +++ b/src/vm/descriptor.hpp @@ -1,6 +1,6 @@ /* src/vm/descriptor.h - checking and parsing of field / method descriptors - Copyright (C) 1996-2005, 2006, 2007, 2008 + Copyright (C) 1996-2011 CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO This file is part of CACAO. @@ -72,7 +72,6 @@ typedef struct methoddesc methoddesc; /* 5. call descriptor_pool_alloc_parsed_descriptors */ /* 6. for each field descriptor call descriptor_pool_parse_field_descriptor */ /* for each method descriptor call descriptor_pool_parse_method_descriptor */ -/* 7. call descriptor_pool_get_parsed_descriptors */ /* */ /* IMPORTANT: The descriptor_pool functions use DNEW and DMNEW for allocating */ /* memory which can be thrown away when the steps above have been */ @@ -129,6 +128,7 @@ struct methoddesc { #endif s4 memuse; /* number of stack slots used */ paramdesc *params; /* allocated parameter descriptions [3] */ + Mutex *pool_lock; /* synchronizes access to params */ typedesc returntype; /* parsed descriptor of the return type */ typedesc paramtypes[1]; /* parameter types, variable length! */ }; @@ -173,9 +173,8 @@ typedesc *descriptor_pool_parse_field_descriptor(descriptor_pool *pool, utf *des methoddesc *descriptor_pool_parse_method_descriptor(descriptor_pool *pool, utf *desc, s4 mflags, constant_classref *thisclass); -bool descriptor_params_from_paramtypes(methoddesc *md, s4 mflags); +void descriptor_params_from_paramtypes(methoddesc *md, s4 mflags); -void *descriptor_pool_get_parsed_descriptors(descriptor_pool *pool, s4 *size); void descriptor_pool_get_sizes(descriptor_pool *pool, u4 *classrefsize, u4 *descsize);