diff options
Diffstat (limited to 'vm/native')
| -rw-r--r-- | vm/native/java_lang_Class.c | 8 | ||||
| -rw-r--r-- | vm/native/java_lang_System.c | 4 |
2 files changed, 7 insertions, 5 deletions
diff --git a/vm/native/java_lang_Class.c b/vm/native/java_lang_Class.c index 1bb924176..3c772d9e3 100644 --- a/vm/native/java_lang_Class.c +++ b/vm/native/java_lang_Class.c @@ -320,11 +320,11 @@ static void Dalvik_java_lang_Class_getModifiers(const u4* args, JValue* pResult) } /* - * public String getName() + * private native String getNameNative() * * Return the class' name. */ -static void Dalvik_java_lang_Class_getName(const u4* args, JValue* pResult) +static void Dalvik_java_lang_Class_getNameNative(const u4* args, JValue* pResult) { ClassObject* clazz = (ClassObject*) args[0]; const char* descriptor = clazz->descriptor; @@ -772,8 +772,8 @@ const DalvikNativeMethod dvm_java_lang_Class[] = { Dalvik_java_lang_Class_getInterfaces }, { "getModifiers", "(Ljava/lang/Class;Z)I", Dalvik_java_lang_Class_getModifiers }, - { "getName", "()Ljava/lang/String;", - Dalvik_java_lang_Class_getName }, + { "getNameNative", "()Ljava/lang/String;", + Dalvik_java_lang_Class_getNameNative }, { "getSuperclass", "()Ljava/lang/Class;", Dalvik_java_lang_Class_getSuperclass }, { "isAssignableFrom", "(Ljava/lang/Class;)Z", diff --git a/vm/native/java_lang_System.c b/vm/native/java_lang_System.c index 064d6da04..96cc144a6 100644 --- a/vm/native/java_lang_System.c +++ b/vm/native/java_lang_System.c @@ -71,7 +71,9 @@ static void Dalvik_java_lang_System_arraycopy(const u4* args, JValue* pResult) srcPos > (int) srcArray->length - length || dstPos > (int) dstArray->length - length) { - dvmThrowException("Ljava/lang/ArrayIndexOutOfBoundsException;", NULL); + dvmThrowExceptionFmt("Ljava/lang/ArrayIndexOutOfBoundsException;", + "src.length=%d srcPos=%d dst.length=%d dstPos=%d length=%d", + srcArray->length, srcPos, dstArray->length, dstPos, length); RETURN_VOID(); } |