[interp] kill MINT_LDTHISA

not required anymore with new internal ABI

diff --git a/mono/mini/interp/interp.c b/mono/mini/interp/interp.c
index 9f880b425d444d49d361f032948d757181c87e3d..72fcf9f131116d31561b06333ca06a5a7948cd09 100644 (file)
--- a/mono/mini/interp/interp.c
+++ b/mono/mini/interp/interp.c
@@ -3793,13 +3793,6 @@ array_constructed:
                        MINT_IN_BREAK;
                }
 
-               MINT_IN_CASE(MINT_LDTHISA)
-                       g_error ("should not happen");
-                       // sp->data.p = &frame->obj;
-                       ++ip;
-                       ++sp; 
-                       MINT_IN_BREAK;
-
 #define LDARG(datamem, argtype) \
        sp->data.datamem = * (argtype *)(frame->args + * (guint16 *)(ip + 1)); \
        ip += 2; \

diff --git a/mono/mini/interp/mintops.def b/mono/mini/interp/mintops.def
index f80f2a51acaf0dac3e43bfe9cf4294f2fd3a112d..a6afa577ebd66786f2dd9b42a27484a140b377c7 100644 (file)
--- a/mono/mini/interp/mintops.def
+++ b/mono/mini/interp/mintops.def
@@ -76,7 +76,6 @@ OPDEF(MINT_STINARG_P, "stinarg.p", 2, MintOpUShortInt)
 OPDEF(MINT_STINARG_VT, "stinarg.vt", 4, MintOpShortAndInt)
 
 OPDEF(MINT_LDARGA, "ldarga", 2, MintOpUShortInt)
-OPDEF(MINT_LDTHISA, "ldthisa", 1, MintOpNoArgs)
 
 OPDEF(MINT_LDFLD_I1, "ldfld.i1", 2, MintOpUShortInt)
 OPDEF(MINT_LDFLD_U1, "ldfld.u1", 2, MintOpUShortInt)

diff --git a/mono/mini/interp/transform.c b/mono/mini/interp/transform.c
index 6ce5fd1dcadfd72884b32c778fa287f65b9731a6..480fe0bdb3a38540a1f2e5fedce207efac955ab4 100644 (file)
--- a/mono/mini/interp/transform.c
+++ b/mono/mini/interp/transform.c
@@ -1070,15 +1070,9 @@ generate (MonoMethod *method, RuntimeMethod *rtm, unsigned char *is_bb_start, Mo
                        break;
                case CEE_LDARGA_S: {
                        /* NOTE: n includes this */
-                       int n = ((guint8 *)td.ip)[1];
-                       if (n == 0 && signature->hasthis) {
-                               g_error ("LDTHISA: NOPE");
-                               ADD_CODE(&td, MINT_LDTHISA);
-                       }
-                       else {
-                               ADD_CODE(&td, MINT_LDARGA);
-                               ADD_CODE(&td, td.rtm->arg_offsets [n]);
-                       }
+                       int n = ((guint8 *) td.ip) [1];
+                       ADD_CODE (&td, MINT_LDARGA);
+                       ADD_CODE (&td, td.rtm->arg_offsets [n]);
                        PUSH_SIMPLE_TYPE(&td, STACK_TYPE_MP);
                        td.ip += 2;
                        break;
@@ -3039,14 +3033,8 @@ generate (MonoMethod *method, RuntimeMethod *rtm, unsigned char *is_bb_start, Mo
                                break;
                        case CEE_LDARGA: {
                                int n = read16 (td.ip + 1);
-                               if (n == 0 && signature->hasthis) {
-                                       g_error ("LDTHISA: NOPE");
-                                       ADD_CODE(&td, MINT_LDTHISA);
-                               }
-                               else {
-                                       ADD_CODE(&td, MINT_LDARGA);
-                                       ADD_CODE(&td, td.rtm->arg_offsets [n]); /* FIX for large offsets */
-                               }
+                               ADD_CODE (&td, MINT_LDARGA);
+                               ADD_CODE (&td, td.rtm->arg_offsets [n]); /* FIX for large offsets */
                                PUSH_SIMPLE_TYPE(&td, STACK_TYPE_MP);
                                td.ip += 3;
                                break;