2004-11-19 Atsushi Enomoto <atsushi@ximian.com>

[mono.git] / ikvm-jni / mono-jni.c

diff --git a/ikvm-jni/mono-jni.c b/ikvm-jni/mono-jni.c
index 2a628b443019fa44cc68987b1b4ac49c10d5eeac..77c8afadbd265b8b01e6b9a618bceb3046b0d530 100644 (file)
--- a/ikvm-jni/mono-jni.c
+++ b/ikvm-jni/mono-jni.c
@@ -149,8 +149,8 @@ StringFromUTF8 (const char* psz)
        /* TODO: */
        return mono_string_new (mono_domain_get (), psz);
 #if 0
-       // Sun's modified UTF8 encoding is not compatible with System::Text::Encoding::UTF8, so
-       // we need to roll our own
+       /* Sun's modified UTF8 encoding is not compatible with System::Text::Encoding::UTF8, so */
+       /* we need to roll our own */
        int len, res_len, i;
        int *res;
 
@@ -163,16 +163,16 @@ StringFromUTF8 (const char* psz)
                switch (c >> 4)
                {
                case 0: case 1: case 2: case 3: case 4: case 5: case 6: case 7:
-                       // 0xxxxxxx
+                       /* 0xxxxxxx */
                        break;
                case 12: case 13:
-                       // 110x xxxx   10xx xxxx
+                       /* 110x xxxx   10xx xxxx */
                        char2 = *psz++;
                        i++;
                        c = (((c & 0x1F) << 6) | (char2 & 0x3F));
                        break;
                case 14:
-                       // 1110 xxxx  10xx xxxx  10xx xxxx
+                       /* 1110 xxxx  10xx xxxx  10xx xxxx */
                        char2 = *psz++;
                        char3 = *psz++;
                        i++;
@@ -263,50 +263,50 @@ static jobject JNICALL CallObjectMethodA (JNIEnv *env, jobject obj, jmethodID me
 static MonoObject *
 box_Boolean (jboolean val)
 {
-       return mono_value_box (mono_domain_get (), mono_defaults.boolean_class, &val);
+       return mono_value_box (mono_domain_get (), mono_get_boolean_class (), &val);
 }
 
 static MonoObject *
 box_Byte (jbyte val)
 {
        /* Sbyte ! */
-       return mono_value_box (mono_domain_get (), mono_defaults.sbyte_class, &val);
+       return mono_value_box (mono_domain_get (), mono_get_sbyte_class (), &val);
 }
 
 static MonoObject *
 box_Char (jchar val)
 {
-       return mono_value_box (mono_domain_get (), mono_defaults.char_class, &val);
+       return mono_value_box (mono_domain_get (), mono_get_char_class (), &val);
 }
 
 static MonoObject *
 box_Short (jshort val)
 {
-       return mono_value_box (mono_domain_get (), mono_defaults.int16_class, &val);
+       return mono_value_box (mono_domain_get (), mono_get_int16_class (), &val);
 }
 
 static MonoObject *
 box_Int (jint val)
 {
-       return mono_value_box (mono_domain_get (), mono_defaults.int32_class, &val);
+       return mono_value_box (mono_domain_get (), mono_get_int32_class (), &val);
 }
 
 static MonoObject *
 box_Long (jlong val)
 {
-       return mono_value_box (mono_domain_get (), mono_defaults.int64_class, &val);
+       return mono_value_box (mono_domain_get (), mono_get_int64_class (), &val);
 }
 
 static MonoObject *
 box_Float (jfloat val)
 {
-       return mono_value_box (mono_domain_get (), mono_defaults.single_class, &val);
+       return mono_value_box (mono_domain_get (), mono_get_single_class (), &val);
 }
 
 static MonoObject *
 box_Double (jdouble val)
 {
-       return mono_value_box (mono_domain_get (), mono_defaults.double_class, &val);
+       return mono_value_box (mono_domain_get (), mono_get_double_class (), &val);
 }
 
 static int 
@@ -327,7 +327,7 @@ InvokeHelper (JNIEnv *env, jobject object, jmethodID methodID, jvalue* args)
        MonoObject **argarray;
        MonoArray *args2;
 
-//     assert(!pLocalRefs->PendingException);
+/* assert(!pLocalRefs->PendingException); */
        g_assert(methodID);
 
        argc = GetMethodArgs(methodID, sig);
@@ -368,7 +368,7 @@ InvokeHelper (JNIEnv *env, jobject object, jmethodID methodID, jvalue* args)
                }
        }
 
-       args2 = mono_array_new (mono_domain_get (), mono_defaults.object_class, argc);
+       args2 = mono_array_new (mono_domain_get (), mono_get_object_class (), argc);
        for (i = 0; i < argc; ++i)
                mono_array_set (args2, MonoObject*, i, argarray [i]);
 
@@ -475,7 +475,7 @@ METHOD_IMPL(Double,jdouble)
 
 
 
-// TODO: These should be put into the macros above... 
+/* TODO: These should be put into the macros above...  */
 static void JNICALL CallVoidMethodA (JNIEnv *env, jobject obj, jmethodID methodID, jvalue * args) { 
        InvokeHelper(env, obj, methodID, args);
 }
@@ -581,7 +581,7 @@ static type JNICALL GetStatic##Type##Field(JNIEnv *env, jclass clazz, jfieldID f
 
 
 
-//    return *(cpptype*)BOXED_VALUE (jniFuncs.GetFieldValue (fieldID, jniFuncs.UnwrapRef (obj))); 
+/*    return *(cpptype*)BOXED_VALUE (jniFuncs.GetFieldValue (fieldID, jniFuncs.UnwrapRef (obj)));  */
 
 GET_SET_FIELD(Boolean,jboolean,gboolean)
 GET_SET_FIELD(Byte,jbyte, gchar)
@@ -734,42 +734,42 @@ static jobjectArray JNICALL NewObjectArray (JNIEnv *env, jsize len, jclass clazz
 
 static jbooleanArray JNICALL NewBooleanArray (JNIEnv *env, jsize len)
 {
-       return (jbooleanArray)new_java_array (env, mono_defaults.boolean_class, len);
+       return (jbooleanArray)new_java_array (env, mono_get_boolean_class (), len);
 }      
 
 static jbyteArray JNICALL NewByteArray (JNIEnv *env, jsize len)
 {
-       return (jbyteArray)new_java_array (env, mono_defaults.sbyte_class, len);
+       return (jbyteArray)new_java_array (env, mono_get_sbyte_class (), len);
 }
        
 static jcharArray JNICALL NewCharArray (JNIEnv *env, jsize len)
 {
-       return (jcharArray)new_java_array (env, mono_defaults.char_class, len);
+       return (jcharArray)new_java_array (env, mono_get_char_class (), len);
 }
        
 static jshortArray JNICALL NewShortArray (JNIEnv *env, jsize len)
 {
-       return (jshortArray)new_java_array (env, mono_defaults.int16_class, len);
+       return (jshortArray)new_java_array (env, mono_get_int16_class (), len);
 }      
 
 static jintArray JNICALL NewIntArray (JNIEnv *env, jsize len)
 {
-       return (jintArray)new_java_array (env, mono_defaults.int32_class, len);
+       return (jintArray)new_java_array (env, mono_get_int32_class (), len);
 }
 
 static jlongArray JNICALL NewLongArray (JNIEnv *env, jsize len)
 {
-       return (jlongArray)new_java_array (env, mono_defaults.int64_class, len);
+       return (jlongArray)new_java_array (env, mono_get_int64_class (), len);
 }
 
 static jfloatArray JNICALL NewFloatArray (JNIEnv *env, jsize len)
 {
-       return (jfloatArray)new_java_array (env, mono_defaults.single_class, len);
+       return (jfloatArray)new_java_array (env, mono_get_single_class (), len);
 }
 
 static jdoubleArray JNICALL NewDoubleArray (JNIEnv *env, jsize len)
 {
-       return (jdoubleArray)new_java_array (env, mono_defaults.double_class, len);
+       return (jdoubleArray)new_java_array (env, mono_get_double_class (), len);
 }
 
 /* Original version with copy */
@@ -841,13 +841,13 @@ static void JNICALL Get##Type##ArrayRegion (JNIEnv *env, type##Array array, jsiz
 {\
     MonoArray *obj; \
        obj = jniFuncs.UnwrapRef (env, (void*)array); \
-    memcpy (buf, mono_array_addr (obj, sizeof (type), start), (sizeof (type) * l)); \
+    memcpy (buf, mono_array_addr (obj, type, start), (sizeof (type) * l)); \
 } \
 static void JNICALL Set##Type##ArrayRegion (JNIEnv *env, type##Array array, jsize start, jsize l, type *buf) \
 { \
     MonoArray *obj; \
        obj = jniFuncs.UnwrapRef (env, (void*)array); \
-    memcpy (mono_array_addr (obj, sizeof (type), start), buf, (sizeof (type) * l)); \
+    memcpy (mono_array_addr (obj, type, start), buf, (sizeof (type) * l)); \
 }
 
 GET_SET_ARRAY_ELEMENTS(Boolean,jboolean,gboolean)