From 90f2e896987dc308b2df96597c8d4d8412d2bb69 Mon Sep 17 00:00:00 2001 From: Zoltan Varga Date: Sun, 7 Feb 2010 05:07:40 +0000 Subject: [PATCH] 2010-02-07 Zoltan Varga * aot-compiler.c aot-runtime.c: Add support for MONO_WRAPPER_WRITE_BARRIER. svn path=/trunk/mono/; revision=150992 --- mono/mini/ChangeLog | 2 ++ mono/mini/aot-compiler.c | 3 +++ mono/mini/aot-runtime.c | 3 +++ 3 files changed, 8 insertions(+) diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog index 3012d51b1ee..24f9b62b5be 100755 --- a/mono/mini/ChangeLog +++ b/mono/mini/ChangeLog @@ -1,5 +1,7 @@ 2010-02-07 Zoltan Varga + * aot-compiler.c aot-runtime.c: Add support for MONO_WRAPPER_WRITE_BARRIER. + * aot-compiler.c (encode_method_ref): Update after the removal of mono_gc_get_managed_allocator_type (). diff --git a/mono/mini/aot-compiler.c b/mono/mini/aot-compiler.c index e0848694187..2845df23a8b 100644 --- a/mono/mini/aot-compiler.c +++ b/mono/mini/aot-compiler.c @@ -1632,6 +1632,8 @@ encode_method_ref (MonoAotCompile *acfg, MonoMethod *method, guint8 *buf, guint8 encode_value (info->alloc_type, p, &p); break; } + case MONO_WRAPPER_WRITE_BARRIER: + break; case MONO_WRAPPER_STELEMREF: break; case MONO_WRAPPER_UNKNOWN: @@ -3872,6 +3874,7 @@ can_encode_patch (MonoAotCompile *acfg, MonoJumpInfo *patch_info) case MONO_WRAPPER_ALLOC: case MONO_WRAPPER_REMOTING_INVOKE: case MONO_WRAPPER_UNKNOWN: + case MONO_WRAPPER_WRITE_BARRIER: break; case MONO_WRAPPER_MANAGED_TO_MANAGED: if (!strcmp (method->name, "ElementAddr")) diff --git a/mono/mini/aot-runtime.c b/mono/mini/aot-runtime.c index af8894e170c..9c8fdc07d88 100644 --- a/mono/mini/aot-runtime.c +++ b/mono/mini/aot-runtime.c @@ -586,6 +586,9 @@ decode_method_ref (MonoAotModule *module, guint32 *token, MonoMethod **method, g *method = mono_gc_get_managed_allocator_by_type (atype); break; } + case MONO_WRAPPER_WRITE_BARRIER: + *method = mono_gc_get_write_barrier (); + break; case MONO_WRAPPER_STELEMREF: *method = mono_marshal_get_stelemref (); break; -- 2.25.1