[vmkit-commits] [vmkit] r55073 - /vmkit/trunk/lib/N3/Mono/MonoMSCorlib.cpp

[Nicolas Geoffray]

Thanks Tilmann!

However, I get a sigsegv when running HelloWorld on Mono. Apparently 
that's because Mono wants to construct an array of a "dummy" class (as 
you describe in CLISignature.cpp). Since it uses the assembly of the 
dummy class, which is null, to construct the array, it returns a sigsegv.

I fixed it by assigning the current assembly to the dummy class.

Does that make sense?

Nicolas

Tilmann Scheller wrote:
> Author: tilmann
> Date: Wed Aug 20 14:40:25 2008
> New Revision: 55073
>
> URL: http://llvm.org/viewvc/llvm-project?rev=55073&view=rev
> Log:
> fix compilation errors in MonoMSCorlib.cpp
>
> Modified:
>     vmkit/trunk/lib/N3/Mono/MonoMSCorlib.cpp
>
> Modified: vmkit/trunk/lib/N3/Mono/MonoMSCorlib.cpp
> URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/Mono/MonoMSCorlib.cpp?rev=55073&r1=55072&r2=55073&view=diff
>
> ==============================================================================
> --- vmkit/trunk/lib/N3/Mono/MonoMSCorlib.cpp (original)
> +++ vmkit/trunk/lib/N3/Mono/MonoMSCorlib.cpp Wed Aug 20 14:40:25 2008
> @@ -25,9 +25,9 @@
>                                             vm->asciizConstructUTF8("System"),
>                                             false, false, false, true);
>    MSCorlib::pString = type;
> -  MSCorlib::pObject->resolveType(true, false);
> +  MSCorlib::pObject->resolveType(true, false, NULL);
>    MSCorlib::pObject->resolveVT();
> -  type->resolveType(true, false);
> +  type->resolveType(true, false, NULL);
>    type->resolveVT();
>  
>    uint64 size = mvm::jit::getTypeSize(type->virtualType->getContainedType(0)) + sizeof(const UTF8*) + sizeof(llvm::GlobalVariable*);
> @@ -64,7 +64,7 @@
>  #undef INIT
>    
>    {
> -  MSCorlib::clrType->resolveType(false, false);
> +  MSCorlib::clrType->resolveType(false, false, NULL);
>    MSCorlib::typeClrType = realClrType->lookupField(vm->asciizConstructUTF8("_impl"), runtimeTypeHandle, false, false);
>    }
>  
>
>
> _______________________________________________
> vmkit-commits mailing list
> vmkit-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/vmkit-commits
>