Signed-off-by: Vegard Nossum <vegard.nos...@gmail.com>
---
arch/x86/insn-selector.brg | 4 ++--
include/vm/object.h | 2 +-
vm/object.c | 8 ++++----
vm/stack-trace.c | 2 +-
vm/utf8.c | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/arch/x86/insn-selector.brg b/arch/x86/insn-selector.brg
index e827395..d101707 100644
--- a/arch/x86/insn-selector.brg
+++ b/arch/x86/insn-selector.brg
@@ -1095,7 +1095,7 @@ reg: EXPR_NEWARRAY(reg)
select_insn(s, tree, reg_insn(INSN_PUSH_REG, size));
select_insn(s, tree, imm_insn(INSN_PUSH_IMM, expr->array_type));
select_insn(s, tree, rel_insn(INSN_CALL_REL,
- (unsigned long) vm_object_alloc_native_array));
+ (unsigned long) vm_object_alloc_primitive_array));
method_args_cleanup(s, tree, 2);
select_exception_test(s, tree);
@@ -1120,7 +1120,7 @@ reg: EXPR_NEWARRAY(reg)
select_insn(s, tree, imm_reg_insn(INSN_MOV_IMM_REG,
expr->array_type, rsi));
select_insn(s, tree, rel_insn(INSN_CALL_REL,
- (unsigned long) vm_object_alloc_native_array));
+ (unsigned long) vm_object_alloc_primiive_array));
select_exception_test(s, tree);
}
diff --git a/include/vm/object.h b/include/vm/object.h
index a97282f..1fc65ab 100644
--- a/include/vm/object.h
+++ b/include/vm/object.h
@@ -55,7 +55,7 @@ struct vm_object {
int init_vm_objects(void);
struct vm_object *vm_object_alloc(struct vm_class *class);
-struct vm_object *vm_object_alloc_native_array(int type, int count);
+struct vm_object *vm_object_alloc_primitive_array(int type, int count);
struct vm_object *vm_object_alloc_multi_array(struct vm_class *class,
int nr_dimensions, int *count);
struct vm_object *vm_object_alloc_array(struct vm_class *class, int count);
diff --git a/vm/object.c b/vm/object.c
index 1a5136a..fb22d4c 100644
--- a/vm/object.c
+++ b/vm/object.c
@@ -60,7 +60,7 @@ struct vm_object *vm_object_alloc(struct vm_class *class)
return res;
}
-struct vm_object *vm_object_alloc_native_array(int type, int count)
+struct vm_object *vm_object_alloc_primitive_array(int type, int count)
{
struct vm_object *res;
int vm_type;
@@ -221,8 +221,8 @@ static struct vm_object *clone_array(struct vm_object *obj)
type = vmtype_to_bytecode_type(vmtype);
/* XXX: This could be optimized by not doing the memset() in
- * object_alloc_native_array. */
- new = vm_object_alloc_native_array(type, count);
+ * object_alloc_primitive_array. */
+ new = vm_object_alloc_primitive_array(type, count);
if (new) {
memcpy(new + 1, obj + 1,
get_vmtype_size(vmtype) * count);
@@ -313,7 +313,7 @@ vm_object_alloc_string_from_c(const char *bytes)
unsigned int n = strlen(bytes);
struct vm_object *array
- = vm_object_alloc_native_array(T_CHAR, n);
+ = vm_object_alloc_primitive_array(T_CHAR, n);
if (!array) {
NOT_IMPLEMENTED;
return NULL;
diff --git a/vm/stack-trace.c b/vm/stack-trace.c
index df870bb..306746d 100644
--- a/vm/stack-trace.c
+++ b/vm/stack-trace.c
@@ -395,7 +395,7 @@ static struct vm_object *get_intermediate_stack_trace(void)
return NULL;
array_type = sizeof(unsigned long) == 4 ? T_INT : T_LONG;
- array = vm_object_alloc_native_array(array_type, depth * 2);
+ array = vm_object_alloc_primitive_array(array_type, depth * 2);
if (!array)
return NULL;
diff --git a/vm/utf8.c b/vm/utf8.c
index 5dc396a..c9caf88 100644
--- a/vm/utf8.c
+++ b/vm/utf8.c
@@ -53,7 +53,7 @@ struct vm_object *utf8_to_char_array(const uint8_t *bytes,
unsigned int n)
return NULL;
struct vm_object *array
- = vm_object_alloc_native_array(T_CHAR, utf16_count);
+ = vm_object_alloc_primitive_array(T_CHAR, utf16_count);
if (!array) {
NOT_IMPLEMENTED;
return array;
--
1.6.0.4
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Jatovm-devel mailing list
Jatovm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jatovm-devel
