Author: kumpera
Date: 2007-12-05 17:07:09 -0500 (Wed, 05 Dec 2007)
New Revision: 90780
Added:
trunk/mono/mono/tests/verifier/make_ldelema_test.sh
Modified:
trunk/mono/mono/tests/verifier/ChangeLog
trunk/mono/mono/tests/verifier/make_tests.sh
Log:
2007-12-05 Rodrigo Kumpera <[EMAIL PROTECTED]>
* make_test.sh: added tests for ldelema
* make_ldelema_test.sh: new test generator
Modified: trunk/mono/mono/tests/verifier/ChangeLog
===================================================================
--- trunk/mono/mono/tests/verifier/ChangeLog 2007-12-05 20:41:38 UTC (rev
90779)
+++ trunk/mono/mono/tests/verifier/ChangeLog 2007-12-05 22:07:09 UTC (rev
90780)
@@ -1,5 +1,10 @@
2007-12-05 Rodrigo Kumpera <[EMAIL PROTECTED]>
+ * make_test.sh: added tests for ldelema
+ * make_ldelema_test.sh: new test generator
+
+2007-12-05 Rodrigo Kumpera <[EMAIL PROTECTED]>
+
* make_test.sh: added tests for ldlen
* make_ldlen_test.sh: new test generator
Added: trunk/mono/mono/tests/verifier/make_ldelema_test.sh
===================================================================
--- trunk/mono/mono/tests/verifier/make_ldelema_test.sh 2007-12-05 20:41:38 UTC
(rev 90779)
+++ trunk/mono/mono/tests/verifier/make_ldelema_test.sh 2007-12-05 22:07:09 UTC
(rev 90780)
@@ -0,0 +1,60 @@
+#! /bin/sh
+
+TEST_NAME=$1
+TEST_VALIDITY=$2
+TEST_ARR=$3
+TEST_IDX=$4
+TEST_TOKEN=$5
+
+
+TEST_NAME=${TEST_VALIDITY}_${TEST_NAME}
+TEST_FILE=${TEST_NAME}_generated.il
+echo $TEST_FILE
+sed -e "s/VALIDITY/${TEST_VALIDITY}/g" -e "s/ARR/${TEST_ARR}/g" -e
"s/IDX/${TEST_IDX}/g" -e "s/TOKEN/${TEST_TOKEN}/g" > $TEST_FILE <<//EOF
+
+// VALIDITY CIL which breaks the ECMA-335 rules.
+// this CIL should fail verification by a conforming CLI verifier.
+
+.assembly '${TEST_NAME}_generated'
+{
+ .hash algorithm 0x00008004
+ .ver 0:0:0:0
+}
+
+.class ClassA extends [mscorlib]System.Object
+{
+}
+
+.class ClassSubA extends ClassA
+{
+}
+
+
+.method public static void foo() cil managed
+{
+ .maxstack 2
+ ldc.i4.1
+ ARR
+ IDX
+ ldelema TOKEN // VALIDITY.
+ pop
+ ret
+}
+
+.method public static int32 Main() cil managed
+{
+ .maxstack 8
+ .entrypoint
+ .try {
+ call void foo ()
+ leave END
+ } catch [mscorlib]System.NullReferenceException {
+ pop
+ leave END
+
+ }
+
+END: ldc.i4.0
+ ret
+}
+//EOF
Property changes on: trunk/mono/mono/tests/verifier/make_ldelema_test.sh
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/mono/mono/tests/verifier/make_tests.sh
===================================================================
--- trunk/mono/mono/tests/verifier/make_tests.sh 2007-12-05 20:41:38 UTC
(rev 90779)
+++ trunk/mono/mono/tests/verifier/make_tests.sh 2007-12-05 22:07:09 UTC
(rev 90780)
@@ -2634,3 +2634,88 @@
I=`expr $I + 1`
done
+
+#ldelema
+
+#TODO add tests for CMMP (read only prefix)
+#TODO add tests for arrays that are not zero-based
+
+./make_ldelema_test.sh ldelema_int_array valid "newarr int32" "ldc.i4.0"
"int32"
+./make_ldelema_test.sh ldelema_null_array valid "pop\n\tldnull" "ldc.i4.0"
"int32"
+
+./make_ldelema_test.sh ldelema_int_array_native_int valid "newarr int32"
"ldc.i4.0\n\tconv.i" "int32"
+./make_ldelema_test.sh ldelema_null_array_native_int valid "pop\n\tldnull"
"ldc.i4.0\n\tconv.i" "int32"
+
+
+./make_ldelema_test.sh ldelema_empty_stack_1 invalid "pop" "nop" "int32"
+./make_ldelema_test.sh ldelema_empty_stack_2 invalid "newarr int32" "nop"
"int32"
+./make_ldelema_test.sh ldelema_empty_stack_3 invalid "pop" "ldc.i4.0" "int32"
+
+I=1
+for ARR in "int8" "int16" "int32" "native int"
+do
+ ./make_ldelema_test.sh ldelema_size_compat_${I} valid "newarr ${ARR}"
"ldc.i4.0" "unsigned ${ARR}"
+ I=`expr $I + 1`
+done
+
+for ARR in "int8" "int16" "int32"
+do
+ ./make_ldelema_test.sh ldelema_size_compat_${I} valid "newarr unsigned
${ARR}" "ldc.i4.0" "${ARR}"
+ I=`expr $I + 1`
+done
+
+./make_ldelema_test.sh ldelema_size_compat_nat_1 valid "newarr native int"
"ldc.i4.0" "native unsigned int"
+./make_ldelema_test.sh ldelema_size_compat_nat_2 valid "newarr native unsigned
int" "ldc.i4.0" "native int"
+
+
+./make_ldelema_test.sh ldelema_misc_size_compat_1 valid "newarr bool"
"ldc.i4.0" "int8"
+./make_ldelema_test.sh ldelema_misc_size_compat_2 valid "newarr char"
"ldc.i4.0" "int16"
+./make_ldelema_test.sh ldelema_misc_size_compat_3 valid "newarr native int"
"ldc.i4.0" "int32"
+./make_ldelema_test.sh ldelema_misc_size_compat_4 valid "newarr native
unsigned int" "ldc.i4.0" "int32"
+
+./make_ldelema_test.sh ldelema_misc_size_compat_5 valid "newarr int8"
"ldc.i4.0" "bool"
+./make_ldelema_test.sh ldelema_misc_size_compat_6 valid "newarr int16"
"ldc.i4.0" "char"
+./make_ldelema_test.sh ldelema_misc_size_compat_7 valid "newarr int32"
"ldc.i4.0" "native int"
+./make_ldelema_test.sh ldelema_misc_size_compat_8 valid "newarr int32"
"ldc.i4.0" "native unsigned int"
+
+./make_ldelema_test.sh ldelema_misc_size_compat_9 valid "newarr unsigned int8"
"ldc.i4.0" "bool"
+./make_ldelema_test.sh ldelema_misc_size_compat_10 valid "newarr unsigned
int16" "ldc.i4.0" "char"
+./make_ldelema_test.sh ldelema_misc_size_compat_11 valid "newarr unsigned
int32" "ldc.i4.0" "native int"
+./make_ldelema_test.sh ldelema_misc_size_compat_12 valid "newarr unsigned
int32" "ldc.i4.0" "native unsigned int"
+
+
+I=1
+for ARR in "newobj instance void object::.ctor()"
"ldc.i4.0\n\tldc.i4.0\n\tnewobj instance void string[,]::.ctor(int32, int32)"
"ldc.r4 0" "ldc.r8 0" "ldc.i8 0" "ldc.i4.0" "ldc.i4.0\n\tconv.i"
+do
+ ./make_ldelema_test.sh ldelema_bad_array_${I} unverifiable "pop\n\t${ARR}"
"ldc.i4.0" "int32"
+ I=`expr $I + 1`
+done
+
+
+I=1
+for IDX in "newobj instance void object::.ctor()" "ldc.i8 0" "ldc.r4 0"
+do
+ ./make_ldelema_test.sh ldelema_bad_index_${I} unverifiable "newarr int32"
"${IDX}" "int32"
+ I=`expr $I + 1`
+done
+
+I=1
+for TOKEN in "object" "int64" "int32[]"
+do
+./make_ldelema_test.sh ldelema_type_mismatch_${I} unverifiable "newarr int32"
"ldc.i4.0" "${TOKEN}"
+ I=`expr $I + 1`
+done
+
+for TOKEN in "object" "int32"
+do
+./make_ldelema_test.sh ldelema_type_mismatch_${I} unverifiable "newarr string"
"ldc.i4.0" "${TOKEN}"
+ I=`expr $I + 1`
+done
+
+for TOKEN in "object" "int32" "ClassSubA"
+do
+./make_ldelema_test.sh ldelema_type_mismatch_${I} unverifiable "newarr ClassA"
"ldc.i4.0" "${TOKEN}"
+ I=`expr $I + 1`
+done
+
+
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches