X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fdescriptor.cpp;h=ec71b8095a016024947f6fb49640db1cb2e80264;hb=ae82ad99e3a6280a3df05d8ce5fd39db38729d17;hp=f939c60129416f8ad34bab9092ad0ca0f2d7ac90;hpb=b73d7f714a51aa8a9715380f4eb5314185dba6ae;p=cacao.git diff --git a/src/vm/descriptor.cpp b/src/vm/descriptor.cpp index f939c6012..ec71b8095 100644 --- a/src/vm/descriptor.cpp +++ b/src/vm/descriptor.cpp @@ -1,6 +1,6 @@ /* src/vm/descriptor.c - 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. @@ -31,7 +31,7 @@ #include "md-abi.h" -#include "mm/memory.h" +#include "mm/memory.hpp" #include "vm/descriptor.hpp" #include "vm/exceptions.hpp" @@ -1117,39 +1117,6 @@ bool descriptor_params_from_paramtypes(methoddesc *md, s4 mflags) } -/* descriptor_pool_get_parsed_descriptors ************************************** - - Return a pointer to the block of parsed descriptors - - IN: - pool.............the descriptor_pool - - OUT: - *size............if size is non-NULL, this is set to the size of the - parsed descriptor block (in u1) - - RETURN VALUE: - a pointer to the block of parsed descriptors - - NOTE: - descriptor_pool_alloc_parsed_descriptors must be called (once) - before this function is used. - -*******************************************************************************/ - -void * -descriptor_pool_get_parsed_descriptors(descriptor_pool *pool, s4 *size) -{ - assert(pool); - assert((!pool->fieldcount && !pool->methodcount) || pool->descriptors); - - if (size) - *size = pool->descriptorsize; - - return pool->descriptors; -} - - /* descriptor_pool_get_sizes *************************************************** Get the sizes of the class reference table and the parsed descriptors