X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fmini%2Faot-runtime.c;h=97d22706db0440ac1d2d695d1bdcd26a93a57f43;hb=dbfee6a3404e684b1ce811ca3bdea45b01bb98b0;hp=e9b5f42668a6b634bee63d6e68043e4c050669d1;hpb=a68a79338360b04cd8a302154252b6e01c564a83;p=mono.git diff --git a/mono/mini/aot-runtime.c b/mono/mini/aot-runtime.c index e9b5f42668a..97d22706db0 100644 --- a/mono/mini/aot-runtime.c +++ b/mono/mini/aot-runtime.c @@ -4476,13 +4476,6 @@ mono_aot_get_trampoline (const char *name) #include static TrampolinePage* trampoline_pages [MONO_AOT_TRAMP_NUM]; -/* these sizes are for ARM code, parametrize if porting to other architectures (see arch_emit_specific_trampoline_pages) - * trampoline size is assumed to be 8 bytes below as well (8 is the minimum for 32 bit archs, since we need to store - * two pointers for trampoline in the data page). - * the minimum for the common code must be at least sizeof(TrampolinePage), since we store the page info at the - * beginning of the data page. - */ -static const int trampolines_pages_code_offsets [MONO_AOT_TRAMP_NUM] = {16, 16, 72, 16}; static unsigned char* get_new_trampoline_from_page (int tramp_type) @@ -4571,11 +4564,7 @@ get_new_trampoline_from_page (int tramp_type) page = (TrampolinePage*)addr; page->next = trampoline_pages [tramp_type]; trampoline_pages [tramp_type] = page; -#ifdef TARGET_ARM64 page->trampolines = (void*)(taddr + amodule->info.tramp_page_code_offsets [tramp_type]); -#else - page->trampolines = (void*)(taddr + trampolines_pages_code_offsets [tramp_type]); -#endif page->trampolines_end = (void*)(taddr + psize - 64); code = page->trampolines; page->trampolines += specific_trampoline_size;