Every class has egzactly one vm_class struct in VM.
Signed-off-by: Tomek Grabiec <[email protected]>
---
include/vm/class.h | 1 -
vm/class.c | 29 +----------------------------
2 files changed, 1 insertions(+), 29 deletions(-)
diff --git a/include/vm/class.h b/include/vm/class.h
index bbee5c0..4693e3e 100644
--- a/include/vm/class.h
+++ b/include/vm/class.h
@@ -115,6 +115,5 @@ bool vm_class_is_primitive_type_name(const char
*class_name);
char *vm_class_get_array_element_class_name(const char *class_name);
struct vm_class *vm_class_get_array_element_class(const struct vm_class
*array_class);
enum vm_type vm_class_get_storage_vmtype(const struct vm_class *class);
-bool vm_class_is_equal_to(const struct vm_class *class, const struct vm_class
*class2);
#endif /* __CLASS_H */
diff --git a/vm/class.c b/vm/class.c
index aecda8a..fae5562 100644
--- a/vm/class.c
+++ b/vm/class.c
@@ -554,37 +554,10 @@ vm_class_resolve_method_recursive(const struct vm_class
*vmc, uint16_t i)
return result;
}
-bool vm_class_is_equal_to(const struct vm_class *class,
- const struct vm_class *class2)
-{
- enum vm_type type1;
- enum vm_type type2;
-
- if (class->kind != class2->kind)
- return false;
-
- if (class == class2)
- return true;
-
- switch (class->kind) {
- case VM_CLASS_KIND_REGULAR:
- return false;
- case VM_CLASS_KIND_PRIMITIVE:
- type1 = vm_class_get_storage_vmtype(class);
- type2 = vm_class_get_storage_vmtype(class2);
-
- return type1 == type2;
- case VM_CLASS_KIND_ARRAY:
- return strcmp(class->name, class2->name);
- default:
- error("Unknown class kind");
- }
-}
-
/* Reference:
http://java.sun.com/j2se/1.5.0/docs/api/java/lang/Class.html#isAssignableFrom(java.lang.Class)
*/
bool vm_class_is_assignable_from(const struct vm_class *vmc, const struct
vm_class *from)
{
- if (vm_class_is_equal_to(vmc, from))
+ if (vmc == from)
return true;
if (from->super && vm_class_is_assignable_from(vmc, from->super))
--
1.6.0.6
------------------------------------------------------------------------------
_______________________________________________
Jatovm-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jatovm-devel
