Signed-off-by: Vegard Nossum <[email protected]>
---
include/vm/class.h | 18 +++++++++---------
test/vm/class-stub.c | 6 +++---
vm/class.c | 18 +++++++++---------
3 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/include/vm/class.h b/include/vm/class.h
index 2da182a..67b7477 100644
--- a/include/vm/class.h
+++ b/include/vm/class.h
@@ -52,26 +52,26 @@ static inline bool vm_class_is_array_class(const struct
vm_class *vmc)
return vmc->name && vmc->name[0] == '[';
}
-struct vm_class *vm_class_resolve_class(struct vm_class *vmc, uint16_t i);
+struct vm_class *vm_class_resolve_class(const struct vm_class *vmc, uint16_t
i);
-struct vm_field *vm_class_get_field(struct vm_class *vmc,
+struct vm_field *vm_class_get_field(const struct vm_class *vmc,
const char *name, const char *type);
-struct vm_field *vm_class_get_field_recursive(struct vm_class *vmc,
+struct vm_field *vm_class_get_field_recursive(const struct vm_class *vmc,
const char *name, const char *type);
-int vm_class_resolve_field(struct vm_class *vmc, uint16_t i,
+int vm_class_resolve_field(const struct vm_class *vmc, uint16_t i,
struct vm_class **r_vmc, char **r_name, char **r_type);
-struct vm_field *vm_class_resolve_field_recursive(struct vm_class *vmc,
+struct vm_field *vm_class_resolve_field_recursive(const struct vm_class *vmc,
uint16_t i);
-struct vm_method *vm_class_get_method(struct vm_class *vmc,
+struct vm_method *vm_class_get_method(const struct vm_class *vmc,
const char *name, const char *type);
-struct vm_method *vm_class_get_method_recursive(struct vm_class *vmc,
+struct vm_method *vm_class_get_method_recursive(const struct vm_class *vmc,
const char *name, const char *type);
-int vm_class_resolve_method(struct vm_class *vmc, uint16_t i,
+int vm_class_resolve_method(const struct vm_class *vmc, uint16_t i,
struct vm_class **r_vmc, char **r_name, char **r_type);
-struct vm_method *vm_class_resolve_method_recursive(struct vm_class *vmc,
+struct vm_method *vm_class_resolve_method_recursive(const struct vm_class *vmc,
uint16_t i);
bool vm_class_is_assignable_from(const struct vm_class *vmc, const struct
vm_class *from);
diff --git a/test/vm/class-stub.c b/test/vm/class-stub.c
index 4e8e9a5..95de492 100644
--- a/test/vm/class-stub.c
+++ b/test/vm/class-stub.c
@@ -4,20 +4,20 @@
#include <vm/field.h>
#include <vm/method.h>
-struct vm_class *vm_class_resolve_class(struct vm_class *vmc, uint16_t i)
+struct vm_class *vm_class_resolve_class(const struct vm_class *vmc, uint16_t i)
{
NOT_IMPLEMENTED;
return NULL;
}
-struct vm_field *vm_class_resolve_field_recursive(struct vm_class *vmc,
+struct vm_field *vm_class_resolve_field_recursive(const struct vm_class *vmc,
uint16_t i)
{
NOT_IMPLEMENTED;
return NULL;
}
-struct vm_method *vm_class_resolve_method_recursive(struct vm_class *vmc,
+struct vm_method *vm_class_resolve_method_recursive(const struct vm_class *vmc,
uint16_t i)
{
/* NOTE: For the tests, instead of going through the constant pool,
diff --git a/vm/class.c b/vm/class.c
index d1844ec..043d9a7 100644
--- a/vm/class.c
+++ b/vm/class.c
@@ -231,7 +231,7 @@ int vm_class_run_clinit(struct vm_class *vmc)
return 0;
}
-struct vm_class *vm_class_resolve_class(struct vm_class *vmc, uint16_t i)
+struct vm_class *vm_class_resolve_class(const struct vm_class *vmc, uint16_t i)
{
const struct cafebabe_constant_info_class *constant_class;
if (cafebabe_class_constant_get_class(vmc->class,
@@ -265,7 +265,7 @@ struct vm_class *vm_class_resolve_class(struct vm_class
*vmc, uint16_t i)
return class;
}
-int vm_class_resolve_field(struct vm_class *vmc, uint16_t i,
+int vm_class_resolve_field(const struct vm_class *vmc, uint16_t i,
struct vm_class **r_vmc, char **r_name, char **r_type)
{
const struct cafebabe_constant_info_field_ref *field;
@@ -323,7 +323,7 @@ int vm_class_resolve_field(struct vm_class *vmc, uint16_t i,
return 0;
}
-struct vm_field *vm_class_get_field(struct vm_class *vmc,
+struct vm_field *vm_class_get_field(const struct vm_class *vmc,
const char *name, const char *type)
{
unsigned int index = 0;
@@ -333,7 +333,7 @@ struct vm_field *vm_class_get_field(struct vm_class *vmc,
return NULL;
}
-struct vm_field *vm_class_get_field_recursive(struct vm_class *vmc,
+struct vm_field *vm_class_get_field_recursive(const struct vm_class *vmc,
const char *name, const char *type)
{
do {
@@ -348,7 +348,7 @@ struct vm_field *vm_class_get_field_recursive(struct
vm_class *vmc,
}
struct vm_field *
-vm_class_resolve_field_recursive(struct vm_class *vmc, uint16_t i)
+vm_class_resolve_field_recursive(const struct vm_class *vmc, uint16_t i)
{
struct vm_class *class;
char *name;
@@ -367,7 +367,7 @@ vm_class_resolve_field_recursive(struct vm_class *vmc,
uint16_t i)
return result;
}
-int vm_class_resolve_method(struct vm_class *vmc, uint16_t i,
+int vm_class_resolve_method(const struct vm_class *vmc, uint16_t i,
struct vm_class **r_vmc, char **r_name, char **r_type)
{
const struct cafebabe_constant_info_method_ref *method;
@@ -425,7 +425,7 @@ int vm_class_resolve_method(struct vm_class *vmc, uint16_t
i,
return 0;
}
-struct vm_method *vm_class_get_method(struct vm_class *vmc,
+struct vm_method *vm_class_get_method(const struct vm_class *vmc,
const char *name, const char *type)
{
unsigned int index = 0;
@@ -435,7 +435,7 @@ struct vm_method *vm_class_get_method(struct vm_class *vmc,
return NULL;
}
-struct vm_method *vm_class_get_method_recursive(struct vm_class *vmc,
+struct vm_method *vm_class_get_method_recursive(const struct vm_class *vmc,
const char *name, const char *type)
{
do {
@@ -450,7 +450,7 @@ struct vm_method *vm_class_get_method_recursive(struct
vm_class *vmc,
}
struct vm_method *
-vm_class_resolve_method_recursive(struct vm_class *vmc, uint16_t i)
+vm_class_resolve_method_recursive(const struct vm_class *vmc, uint16_t i)
{
struct vm_class *class;
char *name;
--
1.6.0.4
------------------------------------------------------------------------------
_______________________________________________
Jatovm-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jatovm-devel
