[PATCH 09/19] vm: introduce struct vm_class.kind field

[Tomek Grabiec]

This field allows to distinguish between regular classes, array classes and
primitive type classes.

Signed-off-by: Tomek Grabiec <tgrab...@gmail.com>
---
 include/vm/class.h |   14 +++++++++++++-
 vm/class.c         |    1 +
 vm/classloader.c   |    3 +++
 3 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/include/vm/class.h b/include/vm/class.h
index d70cc83..69dc484 100644
--- a/include/vm/class.h
+++ b/include/vm/class.h
@@ -18,10 +18,17 @@ enum vm_class_state {
        VM_CLASS_INITIALIZED,
 };
 
+enum vm_class_kind {
+       VM_CLASS_KIND_PRIMITIVE,
+       VM_CLASS_KIND_ARRAY,
+       VM_CLASS_KIND_REGULAR
+};
+
 struct vm_class {
        const struct cafebabe_class *class;
 
        enum vm_class_state state;
+       enum vm_class_kind kind;
 
        char *name;
 
@@ -67,7 +74,12 @@ static inline bool vm_class_is_interface(const struct 
vm_class *vmc)
 
 static inline bool vm_class_is_array_class(const struct vm_class *vmc)
 {
-       return vmc->name && vmc->name[0] == '[';
+       return vmc->kind == VM_CLASS_KIND_ARRAY;
+}
+
+static inline bool vm_class_is_primitive_class(const struct vm_class *vmc)
+{
+       return vmc->kind == VM_CLASS_KIND_PRIMITIVE;
 }
 
 struct vm_class *vm_class_resolve_class(const struct vm_class *vmc, uint16_t 
i);
diff --git a/vm/class.c b/vm/class.c
index b48e43a..91ba8da 100644
--- a/vm/class.c
+++ b/vm/class.c
@@ -121,6 +121,7 @@ extern struct vm_class *vm_java_lang_Class;
 int vm_class_link(struct vm_class *vmc, const struct cafebabe_class *class)
 {
        vmc->class = class;
+       vmc->kind = VM_CLASS_KIND_REGULAR;
 
        const struct cafebabe_constant_info_class *constant_class;
        if (cafebabe_class_constant_get_class(class,
diff --git a/vm/classloader.c b/vm/classloader.c
index 3096d7e..eff2815 100644
--- a/vm/classloader.c
+++ b/vm/classloader.c
@@ -331,6 +331,7 @@ struct vm_class *load_primitive_array_class(const char 
*class_name,
        array_class->object_size = 0;
        array_class->vtable_size = 0;
        array_class->primitive_vm_type = class_name_to_vm_type(class_name);
+       array_class->kind = VM_CLASS_KIND_ARRAY;
 
        return array_class;
 }
@@ -354,6 +355,7 @@ struct vm_class *load_class_array_class(const char 
*array_class_name,
        array_class->methods = NULL;
        array_class->object_size = 0;
        array_class->vtable_size = 0;
+       array_class->kind = VM_CLASS_KIND_ARRAY;
 
        return array_class;
 }
@@ -376,6 +378,7 @@ struct vm_class *classloader_load_primitive(const char 
*class_name)
        class->methods = NULL;
        class->object_size = 0;
        class->vtable_size = 0;
+       class->kind = VM_CLASS_KIND_PRIMITIVE;
 
        return class;
 }
-- 
1.6.0.6


------------------------------------------------------------------------------
_______________________________________________
Jatovm-devel mailing list
Jatovm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jatovm-devel