Increase an aot buffer size again.

[mono.git] / mono / mini / tramp-s390x.c

diff --git a/mono/mini/tramp-s390x.c b/mono/mini/tramp-s390x.c
index b635e7ce6b706970b1cf440d82c73976771d8813..bc9ba8cbba0b6c2d67561ab1d93deb41688c7f19 100644 (file)
--- a/mono/mini/tramp-s390x.c
+++ b/mono/mini/tramp-s390x.c
@@ -82,23 +82,18 @@
 /*                When value type methods are called through the    */
 /*               vtable we need to unbox the 'this' argument.      */
 /*                                                                 */
-/* Parameters   - gsctx  - Generic sharing context                 */
-/*                method - Methd pointer                           */
+/* Parameters   - method - Methd pointer                           */
 /*               addr   - Pointer to native code for method        */
 /*                                                                 */
 /*------------------------------------------------------------------*/
 
 gpointer
-mono_arch_get_unbox_trampoline (MonoGenericSharingContext *gsctx, MonoMethod *method, gpointer addr)
+mono_arch_get_unbox_trampoline (MonoMethod *method, gpointer addr)
 {
        guint8 *code, *start;
        int this_pos = s390_r2;
        MonoDomain *domain = mono_domain_get ();
 
-       start = addr;
-       if (MONO_TYPE_ISSTRUCT (mono_method_signature (method)->ret))
-               this_pos = s390_r3;
-
        start = code = mono_domain_code_reserve (domain, 28);
 
        s390_basr (code, s390_r1, 0);
@@ -209,99 +204,6 @@ mono_arch_nullify_plt_entry (guint8 *code, mgreg_t *regs)
 
 /*========================= End of Function ========================*/
 
-/*------------------------------------------------------------------*/
-/*                                                                  */
-/* Name                - mono_arch_get_vcall_slot                          */
-/*                                                                  */
-/* Function    - This method is called by the arch independent     */
-/*            trampoline code to determine the vtable slot used by  */
-/*            the call which invoked the trampoline.                */
-/*                                                                  */
-/* Parameters   - code   - Pointer into caller code                 */
-/*                regs   - Register state at the point of the call  */
-/*                displacement - Out parameter which will receive   */
-/*                the displacement of the vtable slot               */
-/*                                                                  */
-/*------------------------------------------------------------------*/
-
-gpointer
-mono_arch_get_vcall_slot (guint8 *code, mgreg_t *regs, int *displacement)
-{
-       int reg, lkReg;
-       guchar* base;
-       unsigned short opcode;
-       char *sp;
-       MonoLMF *lmf = (MonoLMF *) ((gchar *) regs - sizeof(MonoLMF));
-
-       // We are passed sp instead of the register array
-#if 0
-       sp = (char *) regs;
-#endif
-       sp = (char *) lmf->gregs[s390_r15];
-
-       *displacement = 0;
-
-       opcode = *((unsigned short *) (code - 6));
-       if (opcode == 0xc0e5)
-               /* This is the 'brasl' instruction */
-               return NULL;
-
-       /*-----------------------------------*/
-       /* This is a basr r14,Rz instruction */
-       /* If it's preceded by a LG Rx,d(Ry) */
-       /* If Rz == 1 then this is virtual   */
-       /* call.                             */
-       /*-----------------------------------*/
-       code    -= 6;
-
-       /*-----------------------------------*/
-       /* If call is preceded by LGR then   */
-       /* there's nothing to patch          */
-       /*-----------------------------------*/
-       if ((code[0] == 0xb9) && (code[1] == 0x04))
-               return NULL;
-
-       /*-----------------------------------*/
-       /* We back up until we're pointing at*/
-       /* the base/displacement portion of  */
-       /* the LG instruction                */
-       /*-----------------------------------*/
-       lkReg    = code[5] & 0x0f;
-
-       /*-----------------------------------*/
-       /* The LG instruction has format:    */
-       /* E3x0ylllhh04 - where:             */
-       /* x = Rx; y = Ry;                   */
-       /* lll = low 12 bits of displacement */
-       /* hh  = high 8 bits of displacement */
-       /*-----------------------------------*/
-       reg      = code[0] >> 4;
-       *displacement = (code[2] << 12) |
-                       ((code[0] & 0x0f) << 8) |
-                       code[1];
-
-       if (code[2] & 0x80)
-               *displacement |= 0xfff00000;
-
-       base = ((guchar *) lmf->gregs[reg]);
-#if 0
-       if (reg > 5)
-               base = *((guchar **) (sp + S390_REG_SAVE_OFFSET +
-                                                         sizeof(long)*(reg-6)));
-       else
-               base = *((guchar **) ((sp - CREATE_STACK_SIZE) +
-                                                         CREATE_GR_OFFSET +
-                                                         sizeof(long)*(reg-2)));
-#endif
-       if (lkReg != 1)
-               /* Non virtual call */
-               return NULL;
-
-       return base;
-}
-
-/*========================= End of Function ========================*/
-
 /*------------------------------------------------------------------*/
 /*                                                                  */
 /* Name                - mono_arch_create_trampoline_code                  */
@@ -311,13 +213,16 @@ mono_arch_get_vcall_slot (guint8 *code, mgreg_t *regs, int *displacement)
 /*                                                                  */
 /*------------------------------------------------------------------*/
 
-guchar *
-mono_arch_create_trampoline_code (MonoTrampolineType tramp_type)
+guchar*
+mono_arch_create_generic_trampoline (MonoTrampolineType tramp_type, MonoTrampInfo **info, gboolean aot)
 {
-
        guint8 *buf, *tramp, *code;
        int i, offset, lmfOffset;
 
+       g_assert (!aot);
+       if (info)
+               *info = NULL;
+
        /* Now we'll create in 'buf' the S/390 trampoline code. This
           is the trampoline code common to all methods  */
                
@@ -551,7 +456,7 @@ mono_arch_create_specific_trampoline (gpointer arg1, MonoTrampolineType tramp_ty
 /*------------------------------------------------------------------*/
 
 gpointer
-mono_arch_create_rgctx_lazy_fetch_trampoline (guint32 encoded_offset)
+mono_arch_create_rgctx_lazy_fetch_trampoline (guint32 slot, MonoTrampInfo **info, gboolean aot)
 {
        /* FIXME: implement! */
        g_assert_not_reached ();