* Removed all Id tags.

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

diff --git a/src/vmcore/descriptor.c b/src/vmcore/descriptor.c
index 83f1a0c4942feb7636a6c652c98c4d7212c64fb8..9d476e271274c5a54f2d95d3781f525c37fdde0b 100644 (file)
--- a/src/vmcore/descriptor.c
+++ b/src/vmcore/descriptor.c
@@ -22,8 +22,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: descriptor.c 7329 2007-02-11 21:24:14Z twisti $
-
 */
 
 
@@ -38,12 +36,12 @@
 #include "mm/memory.h"
 
 #include "vm/exceptions.h"
-
-#include "vm/jit/abi.h"
+#include "vm/jit_interface.h"
+#include "vm/primitive.h"
+#include "vm/vm.h"
 
 #include "vmcore/descriptor.h"
 #include "vmcore/options.h"
-#include "vmcore/resolve.h"
 
 
 /* constants (private to descriptor.c) ****************************************/
@@ -145,29 +143,43 @@ struct descriptor_hash_entry {
 
 *******************************************************************************/
 
-u2 descriptor_to_basic_type(utf *descriptor)
+int descriptor_to_basic_type(utf *descriptor)
 {
        assert(descriptor->blength >= 1);
        
        switch (descriptor->text[0]) {
-               case 'B': 
-               case 'C':
-               case 'I':
-               case 'S':  
-               case 'Z':  return TYPE_INT;
-               case 'D':  return TYPE_DBL;
-               case 'F':  return TYPE_FLT;
-               case 'J':  return TYPE_LNG;
-               case 'L':
-               case '[':  return TYPE_ADR;
+       case 'Z':
+       case 'B':
+       case 'C':
+       case 'S':
+       case 'I':
+               return TYPE_INT;
+
+       case 'J':
+               return TYPE_LNG;
+
+       case 'F':
+               return TYPE_FLT;
+
+       case 'D':
+               return TYPE_DBL;
+
+       case 'L':
+       case '[':
+               return TYPE_ADR;
+
+       default:
+               vm_abort("descriptor_to_basic_type: invalid type %c",
+                                descriptor->text[0]);
        }
-                       
-       assert(0);
 
-       return 0; /* keep the compiler happy */
+       /* keep the compiler happy */
+
+       return 0;
 }
 
-/* descriptor_typesize**** ****************************************************
+
+/* descriptor_typesize *********************************************************
 
    Return the size in bytes needed for the given type.
 
@@ -179,23 +191,32 @@ u2 descriptor_to_basic_type(utf *descriptor)
 
 *******************************************************************************/
 
-u2 descriptor_typesize(typedesc *td)
+int descriptor_typesize(typedesc *td)
 {
        assert(td);
 
        switch (td->type) {
-               case TYPE_INT: return 4;
-               case TYPE_LNG: return 8;
-               case TYPE_FLT: return 4;
-               case TYPE_DBL: return 8;
-               case TYPE_ADR: return sizeof(voidptr);
+       case TYPE_INT:
+       case TYPE_FLT:
+               return 4;
+
+       case TYPE_LNG:
+       case TYPE_DBL:
+               return 8;
+
+       case TYPE_ADR:
+               return SIZEOF_VOID_P;
+
+       default:
+               vm_abort("descriptor_typesize: invalid type %d", td->type);
        }
 
-       assert(0);
+       /* keep the compiler happy */
 
-       return 0; /* keep the compiler happy */
+       return 0;
 }
 
+
 /* name_from_descriptor ********************************************************
 
    Return the class name indicated by the given descriptor
@@ -955,8 +976,8 @@ descriptor_pool_parse_method_descriptor(descriptor_pool *pool, utf *desc,
        md->paramcount = paramcount;
        md->paramslots = paramslots;
 
-       /* If m != ACC_UNDEF we parse a real loaded method, so do param prealloc. */
-       /* Otherwise we do this in stack analysis.                                */
+       /* If mflags != ACC_UNDEF we parse a real loaded method, so do
+          param prealloc.  Otherwise we do this in stack analysis. */
 
        if (mflags != ACC_UNDEF) {
                if (md->paramcount > 0) {
@@ -977,10 +998,18 @@ descriptor_pool_parse_method_descriptor(descriptor_pool *pool, utf *desc,
 # if defined(ENABLE_INTRP)
                if (!opt_intrp)
 # endif
-                       md_param_alloc(md);
+                       {
+                               /* As builtin-functions are native functions, we have
+                                  to pre-allocate for the native ABI. */
+
+                               if (mflags & ACC_METHOD_BUILTIN)
+                                       md_param_alloc_native(md);
+                               else
+                                       md_param_alloc(md);
+                       }
 #endif
-
-       } else {
+       }
+       else {
                /* params will be allocated later by
                   descriptor_params_from_paramtypes if necessary */
 
@@ -1071,7 +1100,15 @@ bool descriptor_params_from_paramtypes(methoddesc *md, s4 mflags)
 # if defined(ENABLE_INTRP)
        if (!opt_intrp)
 # endif
-               md_param_alloc(md);
+               {
+                       /* As builtin-functions are native functions, we have to
+                          pre-allocate for the native ABI. */
+
+                       if (mflags & ACC_METHOD_BUILTIN)
+                               md_param_alloc_native(md);
+                       else
+                               md_param_alloc(md);
+               }
 #endif
 
        return true;