* Merged in twisti-branch.

[cacao.git] / src / vmcore / descriptor.h

diff --git a/src/vmcore/descriptor.h b/src/vmcore/descriptor.h
index 5ea3e2e3d80f5f8b01ccca84d1cdefa0a8229bf7..2b7893232620b515af7b17a94e4a35bea4dd2b15 100644 (file)
--- a/src/vmcore/descriptor.h
+++ b/src/vmcore/descriptor.h
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: descriptor.h 7246 2007-01-29 18:49:05Z twisti $
+   $Id: descriptor.h 7456 2007-03-05 16:13:11Z tbfg $
 
 */
 
@@ -50,6 +50,7 @@ typedef struct methoddesc      methoddesc;
 #include "vmcore/references.h"
 #include "vmcore/utf8.h"
 
+#include "arch.h"              /* needed for HAS_ADDRESS_REGISTER_FILE */
 
 /* data structures ************************************************************/
 
@@ -123,6 +124,9 @@ struct methoddesc {
        s2         paramslots;      /* like above but LONG,DOUBLE count twice     */
        s4         argintreguse;    /* number of used integer argument registers  */
        s4         argfltreguse;    /* number of used float argument registers    */
+#if defined(HAS_ADDRESS_REGISTER_FILE)
+       s4         argadrreguse;    /* number of used address registers */
+#endif
        s4         memuse;          /* number of stack slots used                 */
        paramdesc *params;          /* allocated parameter descriptions [3]       */
        typedesc   returntype;      /* parsed descriptor of the return type       */
@@ -178,9 +182,6 @@ void descriptor_debug_print_paramdesc(FILE *file,paramdesc *d);
 void descriptor_pool_debug_dump(descriptor_pool *pool, FILE *file);
 #endif /* !defined(NDEBUG) */
 
-/* machine dependent descriptor function */
-void md_param_alloc(methoddesc *md);
-
 #endif /* _DESCRIPTOR_H */