[vmkit-commits] [vmkit] r83961 - in /vmkit/trunk/lib/N3: Mono/Mono.cpp Mono/MonoMSCorlib.cpp Mono/MonoString.cpp PNetLib/PNetLib.cpp PNetLib/PNetString.cpp VMCore/Assembly.cpp VMCore/CLIJit.cpp VMCore/CLIJitMeta.cpp VMCore/CLIRuntimeJIT.cpp VMCore/CLISignature.cpp VMCore/MSCorlib.inc VMCore/N3.cpp VMCore/N3Initialise.cpp VMCore/N3ModuleProvider.cpp VMCore/NativeUtil.cpp VMCore/Opcodes.cpp VMCore/Reader.cpp VMCore/VMClass.cpp VMCore/VMObject.cpp VMCore/VMObject.h VMCore/VMThread.cpp VMCore/VMThread.h
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Tue Oct 13 01:46:47 PDT 2009
Author: geoffray
Date: Tue Oct 13 03:46:46 2009
New Revision: 83961
URL: http://llvm.org/viewvc/llvm-project?rev=83961&view=rev
Log:
Fix build.
Modified:
vmkit/trunk/lib/N3/Mono/Mono.cpp
vmkit/trunk/lib/N3/Mono/MonoMSCorlib.cpp
vmkit/trunk/lib/N3/Mono/MonoString.cpp
vmkit/trunk/lib/N3/PNetLib/PNetLib.cpp
vmkit/trunk/lib/N3/PNetLib/PNetString.cpp
vmkit/trunk/lib/N3/VMCore/Assembly.cpp
vmkit/trunk/lib/N3/VMCore/CLIJit.cpp
vmkit/trunk/lib/N3/VMCore/CLIJitMeta.cpp
vmkit/trunk/lib/N3/VMCore/CLIRuntimeJIT.cpp
vmkit/trunk/lib/N3/VMCore/CLISignature.cpp
vmkit/trunk/lib/N3/VMCore/MSCorlib.inc
vmkit/trunk/lib/N3/VMCore/N3.cpp
vmkit/trunk/lib/N3/VMCore/N3Initialise.cpp
vmkit/trunk/lib/N3/VMCore/N3ModuleProvider.cpp
vmkit/trunk/lib/N3/VMCore/NativeUtil.cpp
vmkit/trunk/lib/N3/VMCore/Opcodes.cpp
vmkit/trunk/lib/N3/VMCore/Reader.cpp
vmkit/trunk/lib/N3/VMCore/VMClass.cpp
vmkit/trunk/lib/N3/VMCore/VMObject.cpp
vmkit/trunk/lib/N3/VMCore/VMObject.h
vmkit/trunk/lib/N3/VMCore/VMThread.cpp
vmkit/trunk/lib/N3/VMCore/VMThread.h
Modified: vmkit/trunk/lib/N3/Mono/Mono.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/Mono/Mono.cpp?rev=83961&r1=83960&r2=83961&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/Mono/Mono.cpp (original)
+++ vmkit/trunk/lib/N3/Mono/Mono.cpp Tue Oct 13 03:46:46 2009
@@ -111,7 +111,7 @@
free (codepage);
if (want_name && *int_code_page == -1) {
- N3 *vm = (N3*)VMThread::get()->vm;
+ N3 *vm = (N3*)VMThread::get()->getVM();
return (MonoString*)(vm->arrayToString(vm->asciizToArray(cset)));
} else
return NULL;
@@ -158,7 +158,7 @@
extern "C" MonoString *
System_Environment_get_NewLine (void)
{
- N3 *vm = (N3*)VMThread::get()->vm;
+ N3 *vm = (N3*)VMThread::get()->getVM();
#if defined (PLATFORM_WIN32)
return (MonoString*)(vm->arrayToString(vm->asciizToArray("\r\n")));
#else
@@ -281,7 +281,7 @@
extern "C" void
System_String__ctor(MonoString* str, ArrayChar* array, sint32 startIndex, sint32 count) {
- N3* vm = VMThread::get()->vm;
+ N3* vm = VMThread::get()->getVM();
const ArrayChar* value = vm->bufToArray(&(array->elements[startIndex]), count);
str->length = count;
str->startChar = array->elements[startIndex];
@@ -333,7 +333,7 @@
}
}
- N3* vm = (N3*)VMThread::get()->vm;
+ N3* vm = (N3*)VMThread::get()->getVM();
const ArrayChar* array = vm->bufToArray(dest, length);
return (MonoString*)vm->arrayToString(array);
}
Modified: vmkit/trunk/lib/N3/Mono/MonoMSCorlib.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/Mono/MonoMSCorlib.cpp?rev=83961&r1=83960&r2=83961&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/Mono/MonoMSCorlib.cpp (original)
+++ vmkit/trunk/lib/N3/Mono/MonoMSCorlib.cpp Tue Oct 13 03:46:46 2009
@@ -135,14 +135,14 @@
VMObject* Property::getPropertyDelegatee() {
if (!delegatee) {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
}
return delegatee;
}
VMObject* VMMethod::getMethodDelegatee() {
if (!delegatee) {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
}
return delegatee;
}
@@ -157,7 +157,7 @@
VMObject* Assembly::getAssemblyDelegatee() {
if (!delegatee) {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
}
return delegatee;
}
Modified: vmkit/trunk/lib/N3/Mono/MonoString.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/Mono/MonoString.cpp?rev=83961&r1=83960&r2=83961&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/Mono/MonoString.cpp (original)
+++ vmkit/trunk/lib/N3/Mono/MonoString.cpp Tue Oct 13 03:46:46 2009
@@ -44,7 +44,7 @@
GlobalVariable* CLIString::llvmVar() {
MonoString* str = (MonoString*)this;
if (!str->_llvmVar) {
- N3* vm = VMThread::get()->vm;
+ N3* vm = VMThread::get()->getVM();
if (!str->_llvmVar) {
const Type* pty = mvm::MvmModule::ptrType;
Module* Mod = vm->getLLVMModule();
Modified: vmkit/trunk/lib/N3/PNetLib/PNetLib.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/PNetLib/PNetLib.cpp?rev=83961&r1=83960&r2=83961&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/PNetLib/PNetLib.cpp (original)
+++ vmkit/trunk/lib/N3/PNetLib/PNetLib.cpp Tue Oct 13 03:46:46 2009
@@ -163,7 +163,7 @@
extern "C" VMObject* System_Globalization_CultureInfo_InternalCultureName() {
char* val = ILGetCultureName();
- N3* vm = (N3*)(VMThread::get()->vm);
+ N3* vm = (N3*)(VMThread::get()->getVM());
if (val) {
VMObject* ret = vm->arrayToString(vm->asciizToArray(val));
free(val);
@@ -196,13 +196,13 @@
extern "C" VMObject* System_String_NewBuilder(PNetString* value,
uint32 length) {
- N3* vm = (N3*)(VMThread::get()->vm);
+ N3* vm = (N3*)(VMThread::get()->getVM());
PNetString* str = (PNetString*)vm->arrayToString(newBuilder(vm, value, length));
return str;
}
extern "C" VMObject* Platform_SysCharInfo_GetNewLine() {
- N3* vm = (N3*)(VMThread::get()->vm);
+ N3* vm = (N3*)(VMThread::get()->getVM());
return vm->arrayToString(vm->asciizToArray("\n"));
}
@@ -249,7 +249,7 @@
extern "C" VMObject* System_Reflection_ClrType_GetElementType(VMObject* Klass) {
VMCommonClass* cl = (VMCommonClass*)((*Klass)(MSCorlib::typeClrType).PointerVal);
if (!cl->isArray) {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
return 0;
} else {
return ((VMClassArray*)cl)->baseClass->getClassDelegatee();
@@ -302,9 +302,9 @@
else
dest->length = top;
- dest->value = VMThread::get()->vm->bufToArray(buf, dest->length);
+ dest->value = VMThread::get()->getVM()->bufToArray(buf, dest->length);
}
- // printf("---> %s\n", mvm::PrintBuffer(VMThread::get()->vm->arrayToUTF8(dest->value)).cString());
+ // printf("---> %s\n", mvm::PrintBuffer(VMThread::get()->getVM()->arrayToUTF8(dest->value)).cString());
}
extern "C" void System_Threading_Monitor_Enter(VMObject* obj) {
@@ -331,11 +331,11 @@
extern "C" sint32 System_String_IndexOf(PNetString* str, uint16 value,
sint32 startIndex, sint32 count) {
if (startIndex < 0) {
- VMThread::get()->vm->error("shoud throw arg range");
+ VMThread::get()->getVM()->error("shoud throw arg range");
}
if ((count < 0) || (str->length - startIndex < count)) {
- VMThread::get()->vm->error("shoud throw arg range");
+ VMThread::get()->getVM()->error("shoud throw arg range");
}
sint32 i = startIndex;
@@ -361,7 +361,7 @@
StringBuilder* obj,
sint32 index,
uint16 value) {
- N3* vm = (N3*)(VMThread::get()->vm);
+ N3* vm = (N3*)(VMThread::get()->getVM());
PNetString* buildString = obj->buildString;
const ArrayChar* array = buildString->value;
sint32 strLength = buildString->length;
@@ -388,7 +388,7 @@
StringBuilder* obj,
sint32 index,
PNetString* str) {
- N3* vm = (N3*)(VMThread::get()->vm);
+ N3* vm = (N3*)(VMThread::get()->getVM());
PNetString* buildString = obj->buildString;
const ArrayChar* strArray = str->value;
const ArrayChar* buildArray = buildString->value;
@@ -419,7 +419,7 @@
extern "C" VMObject* System_Text_StringBuilder_Append_System_Text_StringBuilder_System_Char(
StringBuilder* obj,
uint16 value) {
- N3* vm = (N3*)(VMThread::get()->vm);
+ N3* vm = (N3*)(VMThread::get()->getVM());
PNetString* buildString = obj->buildString;
const ArrayChar* array = buildString->value;
sint32 length = buildString->length;
@@ -437,7 +437,7 @@
extern "C" VMObject* System_Text_StringBuilder_Append_System_Text_StringBuilder_System_String(
StringBuilder* obj,
PNetString* str) {
- N3* vm = (N3*)(VMThread::get()->vm);
+ N3* vm = (N3*)(VMThread::get()->getVM());
PNetString* buildString = obj->buildString;
const ArrayChar* buildArray = buildString->value;
const ArrayChar* strArray = str->value;
@@ -507,7 +507,7 @@
}
extern "C" VMObject* System_Reflection_Assembly_LoadFromName(PNetString* str, sint32 & error, VMObject* parent) {
- N3* vm = (N3*)(VMThread::get()->vm);
+ N3* vm = (N3*)(VMThread::get()->getVM());
Assembly* ass = vm->constructAssembly(vm->arrayToUTF8(str->value));
if(!ass->resolve(1, "dll"))
@@ -518,7 +518,7 @@
}
extern "C" PNetString* System_String_Concat_2(PNetString* str1, PNetString* str2) {
- N3* vm = (N3*)(VMThread::get()->vm);
+ N3* vm = (N3*)(VMThread::get()->getVM());
const ArrayChar* a1 = str1->value;
const ArrayChar* a2 = str2->value;
sint32 len1 = str1->length;
@@ -534,7 +534,7 @@
}
extern "C" PNetString* System_String_Concat_3(PNetString* str1, PNetString* str2, PNetString* str3) {
- N3* vm = (N3*)(VMThread::get()->vm);
+ N3* vm = (N3*)(VMThread::get()->getVM());
const ArrayChar* a1 = str1->value;
const ArrayChar* a2 = str2->value;
const ArrayChar* a3 = str3->value;
@@ -576,7 +576,7 @@
memcpy(&(buf[j]), &(array->elements[index + length]), (strLength - (index + length)) * sizeof(uint16));
}
- const ArrayChar* res = VMThread::get()->vm->bufToArray(buf, j);
+ const ArrayChar* res = VMThread::get()->getVM()->bufToArray(buf, j);
str->value = res;
str->length = j;
}
@@ -617,7 +617,7 @@
index[0] = 0;
++index;
VMCommonClass* cl = ass->loadTypeFromName(vm->asciizToUTF8(index), vm->asciizToUTF8(asciiz), true, true, true, onError);
- if (!cl) VMThread::get()->vm->error("implement me");
+ if (!cl) VMThread::get()->getVM()->error("implement me");
return cl->getClassDelegatee();
}
@@ -634,7 +634,7 @@
extern "C" VMObject* System_Reflection_ClrType_GetMemberImpl(VMObject* Type, PNetString* str, sint32 memberTypes, sint32 bindingFlags, VMObject* binder,
sint32 callingConventions, ArrayObject* types, VMObject* modifiers) {
VMCommonClass* type = (VMCommonClass*)((*MSCorlib::typeClrType)(Type).PointerVal);
- N3* vm = (N3*)(VMThread::get()->vm);
+ N3* vm = (N3*)(VMThread::get()->getVM());
const UTF8* name = vm->arrayToUTF8(str->value);
if (memberTypes == MEMBER_TYPES_PROPERTY) {
std::vector<Property*, gc_allocator<Property*> > properties =
@@ -647,7 +647,7 @@
break;
}
}
- if (res == 0) VMThread::get()->vm->error("implement me");
+ if (res == 0) VMThread::get()->getVM()->error("implement me");
return res->getPropertyDelegatee();
} else if (memberTypes == MEMBER_TYPES_METHOD) {
std::vector<VMMethod*> virtualMethods = type->virtualMethods;
@@ -674,7 +674,7 @@
}
} else {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
}
return 0;
}
@@ -686,12 +686,12 @@
const char* asciiz = _asciiz.cString();
char* buf = (char*)alloca(strlen(asciiz) + 5);
sprintf(buf, "get_%s", asciiz);
- N3* vm = VMThread::get()->vm;
+ N3* vm = VMThread::get()->getVM();
VMMethod* meth = prop->type->lookupMethod(vm->asciizToUTF8(buf), prop->parameters, true, false);
assert(meth);
return meth->getMethodDelegatee();
} else {
- VMThread::get()->vm->error("implement me: GetSemantics: %d", attributes);
+ VMThread::get()->getVM()->error("implement me: GetSemantics: %d", attributes);
return 0;
}
}
@@ -732,7 +732,7 @@
llvm::GenericValue gv(((void**)arg)[VALUE_OFFSET]);
args.push_back(gv);
} else {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
}
}
@@ -747,7 +747,7 @@
if ((obj != 0) && virt) {
if (!(obj->classOf->isAssignableFrom(type))) {
- VMThread::get()->vm->illegalArgumentException(mvm::PrintBuffer(meth->name).cString());
+ VMThread::get()->getVM()->illegalArgumentException(mvm::PrintBuffer(meth->name).cString());
}
verifyNull(obj);
}
@@ -828,7 +828,7 @@
(*MSCorlib::ctorDouble)(res, gv.DoubleVal);
} else {
if (retType->super == MSCorlib::pValue || retType->super == MSCorlib::pEnum)
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
res = (VMObject*)gv.PointerVal;
}
@@ -879,7 +879,7 @@
extern "C" VMObject* System_Reflection_Assembly_GetManifestResourceStream(VMObject* Ass, PNetString* str) {
Assembly* ass = (Assembly*)(*MSCorlib::assemblyAssemblyReflection)(Ass).PointerVal;
- N3* vm = (N3*)(VMThread::get()->vm);
+ N3* vm = (N3*)(VMThread::get()->getVM());
const UTF8* id = vm->arrayToUTF8(str->value);
Header* header = ass->CLIHeader;
uint32 stringOffset = header->stringStream->realOffset;
@@ -918,7 +918,7 @@
uint16* buf = (uint16*)alloca(length * sizeof(uint16));
- N3* vm = VMThread::get()->vm;
+ N3* vm = VMThread::get()->getVM();
memcpy(buf, array->elements, length * sizeof(uint16));
ILUnicodeStringToLower((void*)buf, (void*)array->elements, length);
@@ -937,7 +937,7 @@
if (buf[i] == c1) buf[i] = c2;
}
- N3* vm = (N3*)VMThread::get()->vm;
+ N3* vm = (N3*)VMThread::get()->getVM();
const ArrayChar* res = vm->bufToArray(buf, length);
return vm->arrayToString(res);
}
@@ -997,7 +997,7 @@
buf[i + start] = ch;
}
- N3* vm = VMThread::get()->vm;
+ N3* vm = VMThread::get()->getVM();
const ArrayChar* val = vm->bufToArray(buf, length);
str->value = val;
str->length = length;
Modified: vmkit/trunk/lib/N3/PNetLib/PNetString.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/PNetLib/PNetString.cpp?rev=83961&r1=83960&r2=83961&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/PNetLib/PNetString.cpp (original)
+++ vmkit/trunk/lib/N3/PNetLib/PNetString.cpp Tue Oct 13 03:46:46 2009
@@ -44,7 +44,7 @@
GlobalVariable* CLIString::llvmVar() {
PNetString* str = (PNetString*)this;
if (!str->_llvmVar) {
- N3* vm = VMThread::get()->vm;
+ N3* vm = VMThread::get()->getVM();
if (!str->_llvmVar) {
const Type* pty = mvm::MvmModule::ptrType;
Constant* cons =
Modified: vmkit/trunk/lib/N3/VMCore/Assembly.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/Assembly.cpp?rev=83961&r1=83960&r2=83961&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/VMCore/Assembly.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/Assembly.cpp Tue Oct 13 03:46:46 2009
@@ -307,7 +307,7 @@
VMClassArray* Assembly::constructArray(const UTF8* name, const UTF8* nameSpace,
uint32 dims) {
- assert(this == ((N3*)VMThread::get()->vm)->coreAssembly);
+ assert(this == ((N3*)VMThread::get()->getVM())->coreAssembly);
ClassNameCmp CC(VMClassArray::constructArrayName(name, dims),
nameSpace);
VMClassArray* cl = (VMClassArray*)(loadedNameClasses->lookupOrCreate(CC, this, arrayDup));
@@ -373,7 +373,7 @@
buf[i++] = ',';
}
buf[i] = '>';
- const UTF8* genName = VMThread::get()->vm->bufToUTF8(buf, size);
+ const UTF8* genName = VMThread::get()->getVM()->bufToUTF8(buf, size);
//printf("%s\n", mvm::PrintBuffer(genName).cString());
ClassNameCmp CC(genName, nameSpace);
@@ -479,7 +479,7 @@
static void unimplemented(uint32 index,
std::vector<Table*, gc_allocator<Table*> >& tables,
uint32 heapSizes) {
- VMThread::get()->vm->error("Unknown table %x", index);
+ VMThread::get()->getVM()->error("Unknown table %x", index);
}
maskVector_t Assembly::maskVector[64] = {
@@ -624,10 +624,10 @@
for (uint32 i = 0; i < count; ++i) {
uint32 size = EXTRACT_SIZE(sizeMask, i);
switch(size) {
- case 1: VMThread::get()->vm->error("implement me"); break;
+ case 1: VMThread::get()->getVM()->error("implement me"); break;
case 2: result[i] = READ_U2(array, rowOffset); break;
case 4: result[i] = READ_U4(array, rowOffset); break;
- default: VMThread::get()->vm->error("unknown size %d", size); break;
+ default: VMThread::get()->getVM()->error("unknown size %d", size); break;
}
}
}
@@ -641,10 +641,10 @@
uint32 size = EXTRACT_SIZE(sizeMask, index);
switch(size) {
- case 1: VMThread::get()->vm->error("implement me"); break;
+ case 1: VMThread::get()->getVM()->error("implement me"); break;
case 2: return READ_U2(array, indexOffset);
case 4: return READ_U4(array, indexOffset);
- default: VMThread::get()->vm->error("unknown size %d", size); break;
+ default: VMThread::get()->getVM()->error("unknown size %d", size); break;
}
// unreachable
@@ -699,7 +699,7 @@
else if (!(strcmp(str, "#US"))) usStream = stream;
else if (!(strcmp(str, "#Blob"))) blobStream = stream;
else if (!(strcmp(str, "#GUID"))) guidStream = stream;
- else VMThread::get()->vm->error("invalid stream %s", str);
+ else VMThread::get()->getVM()->error("invalid stream %s", str);
}
}
@@ -1008,7 +1008,7 @@
ref = vm->constructAssembly(name);
if(!ref->resolve(1, "dll"))
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
assemblyRefs[index - 1] = ref;
}
@@ -1033,17 +1033,17 @@
VMCommonClass* type = 0;
switch (val) {
- case 0: VMThread::get()->vm->error("implement me %d %d", val, entry); break;
- case 1: VMThread::get()->vm->error("implement me %d, %d", val, entry); break;
+ case 0: VMThread::get()->getVM()->error("implement me %d %d", val, entry); break;
+ case 1: VMThread::get()->getVM()->error("implement me %d, %d", val, entry); break;
case 2: {
Assembly* refAssembly = readAssemblyRef(vm, entry);
type = refAssembly->getClassFromName(vm, readString(vm, stringOffset + name),
readString(vm, stringOffset + nameSpace));
break;
}
- case 3: VMThread::get()->vm->error("implement me %d %d",val, entry); break;
+ case 3: VMThread::get()->getVM()->error("implement me %d %d",val, entry); break;
default:
- VMThread::get()->vm->error("unkknown resolution scope %x", val);
+ VMThread::get()->getVM()->error("unkknown resolution scope %x", val);
break;
}
return type;
@@ -1102,11 +1102,11 @@
break;
}
case 2: {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
default: {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
}
@@ -1138,7 +1138,7 @@
case 0: interfaceToken += (CONSTANT_TypeDef << 24); break;
case 1: interfaceToken += (CONSTANT_TypeRef << 24); break;
case 2: interfaceToken += (CONSTANT_TypeSpec << 24); break;
- default: VMThread::get()->vm->error("unknown table %x", table); break;
+ default: VMThread::get()->getVM()->error("unknown table %x", table); break;
}
tokens.push_back(interfaceToken);
}
@@ -1167,11 +1167,11 @@
} else if (table == CONSTANT_TypeSpec) {
type = readTypeSpec(vm, index, genClass, genMethod);
} else {
- VMThread::get()->vm->error("implement me %x", token);
+ VMThread::get()->getVM()->error("implement me %x", token);
}
}
- if (type == 0) VMThread::get()->vm->error("implement me");
+ if (type == 0) VMThread::get()->getVM()->error("implement me");
if (type->status == hashed) {
type->aquire();
if (type->status == hashed) {
@@ -1245,7 +1245,7 @@
uncompressSignature(offset);
uint16 prolog = READ_U2(bytes, offset);
- if (prolog != 0x1) VMThread::get()->vm->error("unknown prolog");
+ if (prolog != 0x1) VMThread::get()->getVM()->error("unknown prolog");
uint32 start = meth->virt ? 1 : 0;
@@ -1255,7 +1255,7 @@
gv.IntVal = llvm::APInt(32, READ_U4(bytes, offset));
args.push_back(gv);
} else {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
}
}
@@ -1276,7 +1276,7 @@
switch(table) {
default:
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
case 2:
cons = getMethodFromToken(index + (CONSTANT_MethodDef << 24), NULL, NULL);
@@ -1355,7 +1355,7 @@
uint32 type = propArray[CONSTANT_PROPERTY_TYPE];
Property* prop = new(allocator, "Property") Property();
- prop->name = readString(VMThread::get()->vm, stringOffset + nameIndex);
+ prop->name = readString(VMThread::get()->getVM(), stringOffset + nameIndex);
prop->flags = flags;
prop->type = cl;
uint32 offset = blobOffset + type;
@@ -1472,9 +1472,9 @@
bool clinit, bool dothrow) {
VMCommonClass* cl = lookupClassFromName(name, nameSpace);
if (cl == 0 || cl->status == hashed) {
- cl = getClassFromName(((N3*)VMThread::get()->vm), name, nameSpace);
+ cl = getClassFromName(((N3*)VMThread::get()->getVM()), name, nameSpace);
- if (cl == 0) VMThread::get()->vm->error("implement me");
+ if (cl == 0) VMThread::get()->getVM()->error("implement me");
if (cl->status == hashed) {
cl->aquire();
@@ -1495,7 +1495,7 @@
uint32 table = localVarSig >> 24;
uint32 index = localVarSig & 0xffff;
if (table != CONSTANT_StandaloneSig) {
- VMThread::get()->vm->error("locals do not point to a StandAloneSig table");
+ VMThread::get()->getVM()->error("locals do not point to a StandAloneSig table");
}
Table* signatures = CLIHeader->tables[CONSTANT_StandaloneSig];
uint32* array = (uint32*)alloca(sizeof(uint32) * signatures->rowSize);
@@ -1518,16 +1518,16 @@
uint32 newTable = typeToken >> 24;
switch (newTable) {
case CONSTANT_TypeDef : {
- loadType((N3*)(VMThread::get()->vm), typeToken, true, true, false,
+ loadType((N3*)(VMThread::get()->getVM()), typeToken, true, true, false,
true, genClass, genMethod);
field = lookupFieldFromToken(token);
if (!field) {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
}
break;
}
default : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
}
}
break;
@@ -1539,7 +1539,7 @@
}
default : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
}
}
}
@@ -1590,7 +1590,7 @@
}
if (!found)
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
return size;
}
@@ -1605,7 +1605,7 @@
uint32 stringOffset = CLIHeader->stringStream->realOffset;
uint32 blobOffset = CLIHeader->blobStream->realOffset;
- const UTF8* name = readString((N3*)(VMThread::get()->vm), stringOffset +
+ const UTF8* name = readString((N3*)(VMThread::get()->getVM()), stringOffset +
memberArray[CONSTANT_MEMBERREF_NAME]);
@@ -1618,28 +1618,28 @@
switch (table) {
case 0 : {
uint32 typeToken = index + (CONSTANT_TypeDef << 24);
- type = loadType(((N3*)VMThread::get()->vm), typeToken,
+ type = loadType(((N3*)VMThread::get()->getVM()), typeToken,
true, false, false, true, genClass, genMethod);
break;
}
case 1 : {
uint32 typeToken = index + (CONSTANT_TypeRef << 24);
- type = loadType(((N3*)VMThread::get()->vm), typeToken,
+ type = loadType(((N3*)VMThread::get()->getVM()), typeToken,
true, false, false, true, genClass, genMethod);
break;
}
case 2:
- case 3: VMThread::get()->vm->error("implement me"); break;
+ case 3: VMThread::get()->getVM()->error("implement me"); break;
case 4: {
uint32 typeToken = index + (CONSTANT_TypeSpec << 24);
- type = loadType(((N3*)VMThread::get()->vm), typeToken,
+ type = loadType(((N3*)VMThread::get()->getVM()), typeToken,
true, false, false, true, genClass, genMethod);
break;
}
default:
- VMThread::get()->vm->error("unknown MemberRefParent tag %d", table);
+ VMThread::get()->getVM()->error("unknown MemberRefParent tag %d", table);
}
@@ -1672,16 +1672,16 @@
uint32 newTable = typeToken >> 24;
switch (newTable) {
case CONSTANT_TypeDef : {
- loadType((N3*)(VMThread::get()->vm), typeToken, true, true, false,
+ loadType((N3*)(VMThread::get()->getVM()), typeToken, true, true, false,
true, genClass, genMethod);
meth = lookupMethodFromToken(token);
if (!meth) {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
}
break;
}
default : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
}
}
break;
@@ -1698,7 +1698,7 @@
}
default : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
}
}
}
@@ -1740,7 +1740,7 @@
VMClass* cl = dynamic_cast<VMClass*> (type);
if (cl == NULL) {
- VMThread::get()->vm->error(
+ VMThread::get()->getVM()->error(
"Only instances of generic classes are allowed.");
}
@@ -1774,7 +1774,7 @@
uint32 stringOffset = CLIHeader->stringStream->realOffset;
uint32 blobOffset = CLIHeader->blobStream->realOffset;
- const UTF8* name = readString((N3*)(VMThread::get()->vm), stringOffset +
+ const UTF8* name = readString((N3*)(VMThread::get()->getVM()), stringOffset +
memberArray[CONSTANT_MEMBERREF_NAME]);
uint32 offset = blobOffset + memberArray[CONSTANT_MEMBERREF_SIGNATURE];
@@ -1788,7 +1788,7 @@
switch (table) {
case 0 : {
uint32 typeToken = index + (CONSTANT_TypeDef << 24);
- VMCommonClass* type = loadType(((N3*)(VMThread::get()->vm)), typeToken, true, false, false, true, genClass, genMethod);
+ VMCommonClass* type = loadType(((N3*)(VMThread::get()->getVM())), typeToken, true, false, false, true, genClass, genMethod);
bool virt = extractMethodSignature(offset, type, args, genClass, genMethod);
VMMethod *meth = instantiateGenericMethod(genArgs, type, name, args, token, virt, genClass);
return meth;
@@ -1796,7 +1796,7 @@
case 1 : {
uint32 typeToken = index + (CONSTANT_TypeRef << 24);
- VMCommonClass* type = loadType(((N3*)VMThread::get()->vm), typeToken,
+ VMCommonClass* type = loadType(((N3*)VMThread::get()->getVM()), typeToken,
true, false, false, true, genClass, genMethod);
bool virt = extractMethodSignature(offset, type, args, genClass, genMethod);
VMMethod *meth = instantiateGenericMethod(genArgs, type, name, args, token, virt, genClass);
@@ -1804,7 +1804,7 @@
}
case 2:
- case 3: VMThread::get()->vm->error("implement me %d", table); break;
+ case 3: VMThread::get()->getVM()->error("implement me %d", table); break;
case 4: {
VMClass* type = (VMClass*) readTypeSpec(vm, index, genClass, genMethod);
@@ -1836,7 +1836,7 @@
}
}
default:
- VMThread::get()->vm->error("unknown MemberRefParent tag %d", table);
+ VMThread::get()->getVM()->error("unknown MemberRefParent tag %d", table);
}
@@ -1868,7 +1868,7 @@
switch (table) {
case 0 : {
methodToken = index + (CONSTANT_MethodDef << 24);
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
case 1 : {
@@ -1876,7 +1876,7 @@
return readMemberRefAsMethod(methodToken, &genArgs, genClass, genMethod);
}
default:
- VMThread::get()->vm->error("Invalid MethodSpec!");
+ VMThread::get()->getVM()->error("Invalid MethodSpec!");
}
return NULL;
@@ -1897,7 +1897,7 @@
}
}
- return readUTF16((N3*)(VMThread::get()->vm), size, bytes, offset);
+ return readUTF16((N3*)(VMThread::get()->getVM()), size, bytes, offset);
}
uint32 Assembly::getRVAFromField(uint32 token) {
Modified: vmkit/trunk/lib/N3/VMCore/CLIJit.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/CLIJit.cpp?rev=83961&r1=83960&r2=83961&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/VMCore/CLIJit.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/CLIJit.cpp Tue Oct 13 03:46:46 2009
@@ -495,7 +495,7 @@
if (meth->classDef->isArray) {
uint8 func = 0;
- N3* vm = VMThread::get()->vm;
+ N3* vm = VMThread::get()->getVM();
if (meth->name == vm->asciizToUTF8("Set")) {
func = 0;
} else if (meth->name == vm->asciizToUTF8("Get")) {
@@ -625,7 +625,7 @@
Value* obj = 0;
if (type->isPointer) {
- VMThread::get()->vm->error("implement me %s", mvm::PrintBuffer(type).cString());
+ VMThread::get()->getVM()->error("implement me %s", mvm::PrintBuffer(type).cString());
} else if (type->isArray) {
VMClassArray* arrayType = (VMClassArray*)type;
Value* valCl = new LoadInst(arrayType->llvmVar(), "", currentBlock);
@@ -874,11 +874,11 @@
}
Constant* VMArray::sizeOffset() {
- return VMThread::get()->vm->module->constantOne;
+ return VMThread::get()->getVM()->module->constantOne;
}
Constant* VMArray::elementsOffset() {
- return VMThread::get()->vm->module->constantTwo;
+ return VMThread::get()->getVM()->module->constantTwo;
}
Value* CLIJit::arraySize(Value* array) {
@@ -923,7 +923,7 @@
return func;
}
Function* CLIJit::invokeDelegate() {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
return 0;
}
@@ -935,9 +935,9 @@
const UTF8* name = compilingMethod->name;
if (name == N3::ctorName) return createDelegate();
else if (name == N3::invokeName) return invokeDelegate();
- else VMThread::get()->vm->error("implement me");
+ else VMThread::get()->getVM()->error("implement me");
} else {
- VMThread::get()->vm->error("implement me %s", mvm::PrintBuffer(compilingClass).cString());
+ VMThread::get()->getVM()->error("implement me %s", mvm::PrintBuffer(compilingClass).cString());
}
return 0;
}
@@ -1032,7 +1032,7 @@
if (flags == CONSTANT_COR_ILEXCEPTION_CLAUSE_EXCEPTION) {
ex->test = createBasicBlock("testException");
if (classToken) {
- ex->catchClass = ass->loadType((N3*)VMThread::get()->vm, classToken,
+ ex->catchClass = ass->loadType((N3*)VMThread::get()->getVM(), classToken,
true, false, false, true, genClass, genMethod);
} else {
ex->catchClass = MSCorlib::pException;
@@ -1050,7 +1050,7 @@
ex->catchClass = 0;
finallyHandlers.push_back(ex);
} else {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
}
}
@@ -1142,7 +1142,7 @@
#if N3_EXECUTE > 1
static void printArgs(std::vector<llvm::Value*> args, BasicBlock* insertAt) {
- N3 *vm = VMThread::get()->vm;
+ N3 *vm = VMThread::get()->getVM();
for (std::vector<llvm::Value*>::iterator i = args.begin(),
e = args.end(); i!= e; ++i) {
@@ -1182,7 +1182,7 @@
tiny = true;
codeLen = (header & 0xfffc) >> 2;
} else if ((header & 3) != CONSTANT_CorILMethod_FatFormat) {
- VMThread::get()->vm->error("unknown Method Format");
+ VMThread::get()->getVM()->error("unknown Method Format");
} else {
header += (READ_U1(bytes, offset) << 8); //header
maxStack = READ_U2(bytes, offset);
@@ -1359,7 +1359,7 @@
tiny = true;
codeLen = (header & 0xfffc) >> 2;
} else if ((header & 3) != CONSTANT_CorILMethod_FatFormat) {
- VMThread::get()->vm->error("unknown Method Format");
+ VMThread::get()->getVM()->error("unknown Method Format");
} else {
header += (READ_U1(bytes, offset) << 8); //header
maxStack = READ_U2(bytes, offset);
@@ -1503,7 +1503,7 @@
}
VMMethod* CLIJit::getMethod(llvm::Function* F) {
- VMMethod* meth = VMThread::get()->vm->functions->lookup(F);
+ VMMethod* meth = VMThread::get()->getVM()->functions->lookup(F);
return meth;
}
Modified: vmkit/trunk/lib/N3/VMCore/CLIJitMeta.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/CLIJitMeta.cpp?rev=83961&r1=83960&r2=83961&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/VMCore/CLIJitMeta.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/CLIJitMeta.cpp Tue Oct 13 03:46:46 2009
@@ -45,7 +45,7 @@
if (signature->naturalType == Type::getFloatTy(getGlobalContext())) {
((float*)ptr)[0] = val;
} else {
- VMThread::get()->vm->unknownError("wrong type in field assignment");
+ VMThread::get()->getVM()->unknownError("wrong type in field assignment");
}
return;
@@ -63,7 +63,7 @@
if (signature->naturalType == Type::getDoubleTy(getGlobalContext())) {
((double*)ptr)[0] = val;
} else {
- VMThread::get()->vm->unknownError("wrong type in field assignment");
+ VMThread::get()->getVM()->unknownError("wrong type in field assignment");
}
return;
@@ -81,7 +81,7 @@
if (signature->naturalType == Type::getInt64Ty(getGlobalContext())) {
((uint64*)ptr)[0] = val;
} else {
- VMThread::get()->vm->unknownError("wrong type in field assignment");
+ VMThread::get()->getVM()->unknownError("wrong type in field assignment");
}
return;
@@ -99,7 +99,7 @@
if (signature->naturalType == Type::getInt32Ty(getGlobalContext())) {
((uint32*)ptr)[0] = val;
} else {
- VMThread::get()->vm->unknownError("wrong type in field assignment");
+ VMThread::get()->getVM()->unknownError("wrong type in field assignment");
}
return;
@@ -117,7 +117,7 @@
if (llvm::isa<PointerType>(signature->naturalType)) {
((VMObject**)ptr)[0] = val;
} else {
- VMThread::get()->vm->unknownError("wrong type in field assignment");
+ VMThread::get()->getVM()->unknownError("wrong type in field assignment");
}
return;
@@ -134,7 +134,7 @@
if (signature->naturalType == Type::getInt1Ty(getGlobalContext())) {
((bool*)ptr)[0] = val;
} else {
- VMThread::get()->vm->unknownError("wrong type in field assignment");
+ VMThread::get()->getVM()->unknownError("wrong type in field assignment");
}
return;
@@ -420,5 +420,5 @@
}
Constant* VMObject::classOffset() {
- return VMThread::get()->vm->module->constantOne;
+ return VMThread::get()->getVM()->module->constantOne;
}
Modified: vmkit/trunk/lib/N3/VMCore/CLIRuntimeJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/CLIRuntimeJIT.cpp?rev=83961&r1=83960&r2=83961&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/VMCore/CLIRuntimeJIT.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/CLIRuntimeJIT.cpp Tue Oct 13 03:46:46 2009
@@ -55,7 +55,7 @@
}
extern "C" VMObject* newString(const ArrayChar* utf8) {
- N3 *vm = (N3*)VMThread::get()->vm;
+ N3 *vm = (N3*)VMThread::get()->getVM();
return vm->arrayToString(utf8);
}
@@ -84,9 +84,9 @@
}
static VMObject* doMultiNewIntern(VMClassArray* cl, uint32 dim, sint32* buf) {
- if (dim <= 0) VMThread::get()->vm->error("Can't happen");
+ if (dim <= 0) VMThread::get()->getVM()->error("Can't happen");
sint32 n = buf[0];
- if (n < 0) VMThread::get()->vm->negativeArraySizeException(n);
+ if (n < 0) VMThread::get()->getVM()->negativeArraySizeException(n);
VMArray* res = (VMArray*)cl->doNew(n);
if (dim > 1) {
@@ -97,7 +97,7 @@
}
}
for (uint32 i = 1; i < dim; ++i) {
- if (buf[i] < 0) VMThread::get()->vm->negativeArraySizeException(buf[i]);
+ if (buf[i] < 0) VMThread::get()->getVM()->negativeArraySizeException(buf[i]);
}
}
return res;
@@ -150,7 +150,7 @@
strlen(nameAsciiz) +
strlen(nameSpaceAsciiz));
sprintf(buf, "%s.%s.%s", nameSpaceAsciiz, nameAsciiz, methAsciiz);
- const UTF8* newName = VMThread::get()->vm->asciizToUTF8(buf);
+ const UTF8* newName = VMThread::get()->getVM()->asciizToUTF8(buf);
dmeth = ocl->lookupMethod(newName, orig->parameters, false, true);
}
Modified: vmkit/trunk/lib/N3/VMCore/CLISignature.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/CLISignature.cpp?rev=83961&r1=83960&r2=83961&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/VMCore/CLISignature.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/CLISignature.cpp Tue Oct 13 03:46:46 2009
@@ -24,7 +24,7 @@
static VMCommonClass* METHOD_ElementTypeEnd(uint32 op, Assembly* ass,
uint32& offset, VMGenericClass* genClass, VMGenericMethod* genMethod) {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
return 0;
}
@@ -128,12 +128,12 @@
table = CONSTANT_TypeSpec;
break;
default:
- VMThread::get()->vm->error("unknown TypeDefOrRefEncoded %d", index);
+ VMThread::get()->getVM()->error("unknown TypeDefOrRefEncoded %d", index);
break;
}
token = (table << 24) + index;
- VMCommonClass* cl = ass->loadType((N3*) (VMThread::get()->vm), token, false,
+ VMCommonClass* cl = ass->loadType((N3*) (VMThread::get()->getVM()), token, false,
false, false, true, genClass, genMethod);
return cl;
}
@@ -156,12 +156,12 @@
table = CONSTANT_TypeSpec;
break;
default:
- VMThread::get()->vm->error("unknown TypeDefOrRefEncoded %d", index);
+ VMThread::get()->getVM()->error("unknown TypeDefOrRefEncoded %d", index);
break;
}
token = (table << 24) + index;
- VMCommonClass* cl = ass->loadType((N3*) (VMThread::get()->vm), token, false,
+ VMCommonClass* cl = ass->loadType((N3*) (VMThread::get()->getVM()), token, false,
false, false, true, genClass, genMethod);
return cl;
}
@@ -183,7 +183,7 @@
if (numSizes != 0) {
printf("type = %s\n", mvm::PrintBuffer(cl).cString());
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
}
for (uint32 i = 0; i < numSizes; ++i) {
@@ -192,7 +192,7 @@
uint32 numObounds = ass->uncompressSignature(offset);
if (numObounds != 0)
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
for (uint32 i = 0; i < numObounds; ++i) {
ass->uncompressSignature(offset);
@@ -247,12 +247,12 @@
table = CONSTANT_TypeSpec;
break;
default:
- VMThread::get()->vm->error("unknown TypeDefOrRefEncoded %d", index);
+ VMThread::get()->getVM()->error("unknown TypeDefOrRefEncoded %d", index);
break;
}
token = (table << 24) + index;
- VMCommonClass* cl = ass->loadType((N3*) (VMThread::get()->vm), token, false,
+ VMCommonClass* cl = ass->loadType((N3*) (VMThread::get()->getVM()), token, false,
false, false, true, args, genClass, genMethod);
// restore endOffset
offset = endOffset;
@@ -277,7 +277,7 @@
static VMCommonClass* METHOD_ElementTypeFnptr(uint32 op, Assembly* ass,
uint32& offset, VMGenericClass* genClass, VMGenericMethod* genMethod) {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
return 0;
}
@@ -308,7 +308,7 @@
cl->nameSpace = ass->name;
char *tmp = (char *) alloca(100);
snprintf(tmp, 100, "!!%d", number);
- cl->name = VMThread::get()->vm->asciizToUTF8(tmp);
+ cl->name = VMThread::get()->getVM()->asciizToUTF8(tmp);
return cl;
} else {
return currGenericMethod->genericParams[number];
@@ -317,31 +317,31 @@
static VMCommonClass* METHOD_ElementTypeCmodReqd(uint32 op, Assembly* ass,
uint32& offset, VMGenericClass* genClass, VMGenericMethod* genMethod) {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
return 0;
}
static VMCommonClass* METHOD_ElementTypeCmodOpt(uint32 op, Assembly* ass,
uint32& offset, VMGenericClass* genClass, VMGenericMethod* genMethod) {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
return 0;
}
static VMCommonClass* METHOD_ElementTypeInternal(uint32 op, Assembly* ass,
uint32& offset, VMGenericClass* genClass, VMGenericMethod* genMethod) {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
return 0;
}
static VMCommonClass* METHOD_ElementTypeModifier(uint32 op, Assembly* ass,
uint32& offset, VMGenericClass* genClass, VMGenericMethod* genMethod) {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
return 0;
}
static VMCommonClass* METHOD_ElementTypeSentinel(uint32 op, Assembly* ass,
uint32& offset, VMGenericClass* genClass, VMGenericMethod* genMethod) {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
return 0;
}
@@ -352,7 +352,7 @@
static VMCommonClass* unimplemented(uint32 op, Assembly* ass, uint32& offset,
VMGenericClass* genClass, VMGenericMethod* genMethod) {
- VMThread::get()->vm->error("unknown signature");
+ VMThread::get()->getVM()->error("unknown signature");
return 0;
}
@@ -474,7 +474,7 @@
uint32 genericSig = uncompressSignature(offset);
if (genericSig != 0x0a) {
- VMThread::get()->vm->error("unknown methodSpec sig %x", genericSig);
+ VMThread::get()->getVM()->error("unknown methodSpec sig %x", genericSig);
}
uint32 genArgCount = uncompressSignature(offset);
@@ -492,7 +492,7 @@
uint32 nbLocals = uncompressSignature(offset);
if (localSig != 0x7) {
- VMThread::get()->vm->error("unknown local sig %x", localSig);
+ VMThread::get()->getVM()->error("unknown local sig %x", localSig);
}
for (uint32 i = 0; i < nbLocals; ++i) {
@@ -510,7 +510,7 @@
uint32 fieldSig = uncompressSignature(offset);
if (fieldSig != 0x6) {
- VMThread::get()->vm->error("unknown field sig %x", fieldSig);
+ VMThread::get()->getVM()->error("unknown field sig %x", fieldSig);
}
// TODO implement support for custom modifiers
Modified: vmkit/trunk/lib/N3/VMCore/MSCorlib.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/MSCorlib.inc?rev=83961&r1=83960&r2=83961&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/VMCore/MSCorlib.inc (original)
+++ vmkit/trunk/lib/N3/VMCore/MSCorlib.inc Tue Oct 13 03:46:46 2009
@@ -64,7 +64,7 @@
((ArrayDouble*)array)->elements[i] = READ_U8(bytes, offset);
}
} else {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
}
}
@@ -86,7 +86,7 @@
// The caller of the CLI function;
cur = (void**)cur[0];
- N3* vm = VMThread::get()->vm;
+ N3* vm = VMThread::get()->getVM();
VMMethod* meth = vm->IPToMethod<VMMethod>(FRAME_IP(cur));
@@ -105,7 +105,7 @@
// The CLI function.
cur = (void**)cur[0];
- N3* vm = VMThread::get()->vm;
+ N3* vm = VMThread::get()->getVM();
VMMethod* meth = vm->IPToMethod<VMMethod>(FRAME_IP(cur));
@@ -115,13 +115,13 @@
}
extern "C" void System_Reflection_Assembly_LoadFromFile() {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
}
extern "C" void System_Array_InternalCopy(VMArray* src, sint32 sstart,
VMArray* dst, sint32 dstart,
sint32 len) {
- N3* vm = (N3*)(VMThread::get()->vm);
+ N3* vm = (N3*)(VMThread::get()->getVM());
verifyNull(src);
verifyNull(dst);
@@ -185,7 +185,7 @@
if (arr->classOf->isArray) {
return ((VMClassArray*)(arr->classOf))->dims;
} else {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
return 0;
}
}
@@ -195,7 +195,7 @@
if (arr->classOf->isArray) {
return ((VMArray*)arr)->size;
} else {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
return 0;
}
}
@@ -210,7 +210,7 @@
}
extern "C" double System_Decimal_ToDouble(void* ptr) {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
return 0.0;
}
Modified: vmkit/trunk/lib/N3/VMCore/N3.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/N3.cpp?rev=83961&r1=83960&r2=83961&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/VMCore/N3.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/N3.cpp Tue Oct 13 03:46:46 2009
@@ -306,7 +306,7 @@
bootstrapThread = VMThread::TheThread;
- bootstrapThread->vm = this;
+ bootstrapThread->MyVM = this;
bootstrapThread->start((void (*)(mvm::Thread*))mainCLIStart);
} else {
@@ -315,7 +315,7 @@
}
void N3::mainCLIStart(VMThread* th) {
- N3* vm = (N3*)th->vm;
+ N3* vm = (N3*)th->getVM();
MSCorlib::loadBootstrap(vm);
ClArgumentsInfo& info = vm->argumentsInfo;
Modified: vmkit/trunk/lib/N3/VMCore/N3Initialise.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/N3Initialise.cpp?rev=83961&r1=83960&r2=83961&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/VMCore/N3Initialise.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/N3Initialise.cpp Tue Oct 13 03:46:46 2009
@@ -211,7 +211,7 @@
Assembly* ass = vm->constructAssembly(vm->asciizToUTF8("mscorlib"));
if(!ass->resolve(1, "dll"))
- VMThread::get()->vm->error("can not load mscorlib.dll. Abort");
+ VMThread::get()->getVM()->error("can not load mscorlib.dll. Abort");
vm->coreAssembly = ass;
Modified: vmkit/trunk/lib/N3/VMCore/N3ModuleProvider.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/N3ModuleProvider.cpp?rev=83961&r1=83960&r2=83961&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/VMCore/N3ModuleProvider.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/N3ModuleProvider.cpp Tue Oct 13 03:46:46 2009
@@ -40,7 +40,7 @@
CLIJit::compile(meth->classDef, meth);
void* res = mvm::MvmModule::executionEngine->getPointerToGlobal(meth->methPtr);
meth->code = res;
- N3* vm = VMThread::get()->vm;
+ N3* vm = VMThread::get()->getVM();
vm->addMethodInFunctionMap(meth, res);
}
meth->classDef->release();
Modified: vmkit/trunk/lib/N3/VMCore/NativeUtil.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/NativeUtil.cpp?rev=83961&r1=83960&r2=83961&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/VMCore/NativeUtil.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/NativeUtil.cpp Tue Oct 13 03:46:46 2009
@@ -50,7 +50,7 @@
void* res = dlsym(0, buf);
if (!res) {
- VMThread::get()->vm->error("unable to find native method %s",
+ VMThread::get()->getVM()->error("unable to find native method %s",
mvm::PrintBuffer(meth).cString());
}
Modified: vmkit/trunk/lib/N3/VMCore/Opcodes.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/Opcodes.cpp?rev=83961&r1=83960&r2=83961&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/VMCore/Opcodes.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/Opcodes.cpp Tue Oct 13 03:46:46 2009
@@ -256,12 +256,12 @@
}
case ADD_OVF: {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
case ADD_OVF_UN: {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
@@ -365,12 +365,12 @@
}
case CALLI: {
- VMThread::get()->vm->unknownError("implement me");
+ VMThread::get()->getVM()->unknownError("implement me");
break;
}
case CKFINITE : {
- VMThread::get()->vm->unknownError("implement me");
+ VMThread::get()->getVM()->unknownError("implement me");
break;
}
@@ -383,7 +383,7 @@
type == Type::getInt64Ty(getGlobalContext())) {
push(new TruncInst(val, Type::getInt8Ty(getGlobalContext()), "", currentBlock));
} else {
- VMThread::get()->vm->unknownError("implement me");
+ VMThread::get()->getVM()->unknownError("implement me");
}
break;
}
@@ -398,7 +398,7 @@
} else if (type == Type::getInt8Ty(getGlobalContext())) {
push(new SExtInst(val, Type::getInt16Ty(getGlobalContext()), "", currentBlock));
} else {
- VMThread::get()->vm->unknownError("implement me");
+ VMThread::get()->getVM()->unknownError("implement me");
}
break;
}
@@ -415,7 +415,7 @@
} else if (type == Type::getInt32Ty(getGlobalContext())) {
push(val);
} else {
- VMThread::get()->vm->unknownError("implement me");
+ VMThread::get()->getVM()->unknownError("implement me");
}
break;
}
@@ -429,7 +429,7 @@
type == Type::getInt32Ty(getGlobalContext())) {
push(new SExtInst(val, Type::getInt64Ty(getGlobalContext()), "", currentBlock));
} else {
- VMThread::get()->vm->unknownError("implement me");
+ VMThread::get()->getVM()->unknownError("implement me");
}
break;
}
@@ -442,7 +442,7 @@
} else if (type->isInteger()) {
push(new SIToFPInst(val, Type::getFloatTy(getGlobalContext()), "", currentBlock));
} else {
- VMThread::get()->vm->unknownError("implement me");
+ VMThread::get()->getVM()->unknownError("implement me");
}
break;
}
@@ -457,7 +457,7 @@
} else if (type == Type::getDoubleTy(getGlobalContext())) {
push(val);
} else {
- VMThread::get()->vm->unknownError("implement me");
+ VMThread::get()->getVM()->unknownError("implement me");
}
break;
}
@@ -471,7 +471,7 @@
type == Type::getInt64Ty(getGlobalContext())) {
push(new TruncInst(val, Type::getInt8Ty(getGlobalContext()), "", currentBlock));
} else {
- VMThread::get()->vm->unknownError("implement me");
+ VMThread::get()->getVM()->unknownError("implement me");
}
break;
}
@@ -486,7 +486,7 @@
} else if (type == Type::getInt8Ty(getGlobalContext())) {
push(new ZExtInst(val, Type::getInt16Ty(getGlobalContext()), "", currentBlock));
} else {
- VMThread::get()->vm->unknownError("implement me");
+ VMThread::get()->getVM()->unknownError("implement me");
}
break;
}
@@ -501,7 +501,7 @@
} else if (type == Type::getInt8Ty(getGlobalContext()) || type == Type::getInt16Ty(getGlobalContext())) {
push(new ZExtInst(val, Type::getInt16Ty(getGlobalContext()), "", currentBlock));
} else {
- VMThread::get()->vm->unknownError("implement me");
+ VMThread::get()->getVM()->unknownError("implement me");
}
break;
}
@@ -515,7 +515,7 @@
type == Type::getInt32Ty(getGlobalContext())) {
push(new ZExtInst(val, Type::getInt64Ty(getGlobalContext()), "", currentBlock));
} else {
- VMThread::get()->vm->unknownError("implement me");
+ VMThread::get()->getVM()->unknownError("implement me");
}
break;
}
@@ -532,7 +532,7 @@
} else if (!val->getType()->isFloatingPoint()) {
res = new BitCastInst(val, PointerType::getUnqual(Type::getInt8Ty(getGlobalContext())), "", currentBlock);
} else {
- VMThread::get()->vm->unknownError("implement me");
+ VMThread::get()->getVM()->unknownError("implement me");
}
push(res);
@@ -540,7 +540,7 @@
}
case CONV_U : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
@@ -554,68 +554,68 @@
} else if (type == Type::getDoubleTy(getGlobalContext())) {
push(val);
} else {
- VMThread::get()->vm->unknownError("implement me");
+ VMThread::get()->getVM()->unknownError("implement me");
}
break;
}
case CONV_OVF_I1 : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
case CONV_OVF_I2 : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
case CONV_OVF_I4 : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
case CONV_OVF_I8 : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
case CONV_OVF_U1 : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
case CONV_OVF_U2 : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
case CONV_OVF_U4 : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
case CONV_OVF_U8 : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
case CONV_OVF_I : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
case CONV_OVF_U : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
case CONV_OVF_I1_UN : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
case CONV_OVF_I2_UN : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
@@ -631,33 +631,33 @@
} else if (type == Type::getInt32Ty(getGlobalContext())) {
push(val);
} else {
- VMThread::get()->vm->unknownError("implement me");
+ VMThread::get()->getVM()->unknownError("implement me");
}
break;
}
case CONV_OVF_I8_UN : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
case CONV_OVF_U1_UN : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
case CONV_OVF_U2_UN : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
case CONV_OVF_U4_UN : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
case CONV_OVF_U8_UN : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
@@ -708,7 +708,7 @@
}
case JMP : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
@@ -1004,12 +1004,12 @@
}
case MUL_OVF : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
case MUL_OVF_UN : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
@@ -1236,12 +1236,12 @@
}
case SUB_OVF : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
case SUB_OVF_UN : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
@@ -1272,7 +1272,7 @@
case BOX : {
uint32 token = readU4(bytecodes, i);
Assembly* assembly = compilingClass->assembly;
- N3* vm = (N3*)(VMThread::get()->vm);
+ N3* vm = (N3*)(VMThread::get()->getVM());
VMCommonClass* type = assembly->loadType(vm, token, true, false, false,
true, genClass, genMethod);
assert(type);
@@ -1324,7 +1324,7 @@
case CASTCLASS : {
Assembly* assembly = compilingClass->assembly;
- N3* vm = (N3*)(VMThread::get()->vm);
+ N3* vm = (N3*)(VMThread::get()->getVM());
uint32 token = readU4(bytecodes, i);
VMCommonClass* dcl = assembly->loadType(vm, token, true, false,
false, true, genClass, genMethod);
@@ -1366,13 +1366,13 @@
case CPOBJ : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
case ISINST : {
Assembly* assembly = compilingClass->assembly;
- N3* vm = (N3*)(VMThread::get()->vm);
+ N3* vm = (N3*)(VMThread::get()->getVM());
uint32 token = readU4(bytecodes, i);
VMCommonClass* dcl = assembly->loadType(vm, token, true, false,
false, true, genClass, genMethod);
@@ -1420,12 +1420,12 @@
}
case LDELEM : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
case LDELEM_I1 : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
@@ -1511,7 +1511,7 @@
case LDELEMA : {
Assembly* assembly = compilingClass->assembly;
- N3* vm = (N3*)(VMThread::get()->vm);
+ N3* vm = (N3*)(VMThread::get()->getVM());
uint32 token = readU4(bytecodes, i);
VMCommonClass* cl = assembly->loadType(vm, token, true, false,
false, true, genClass, genMethod);
@@ -1545,7 +1545,7 @@
case LDOBJ : {
Assembly* assembly = compilingClass->assembly;
- N3* vm = (N3*)(VMThread::get()->vm);
+ N3* vm = (N3*)(VMThread::get()->getVM());
uint32 token = readU4(bytecodes, i);
VMCommonClass* cl = assembly->loadType(vm, token, true, false,
false, true, genClass, genMethod);
@@ -1578,7 +1578,7 @@
module->ptrType);
Value* res = CallInst::Create(newStringLLVM, val, "", currentBlock);
/*CLIString * str =
- (CLIString*)(((N3*)VMThread::get()->vm)->UTF8ToStr(utf8));
+ (CLIString*)(((N3*)VMThread::get()->getVM())->UTF8ToStr(utf8));
GlobalVariable* gv = str->llvmVar();
push(new BitCastInst(new LoadInst(gv, "", currentBlock),
MSCorlib::pString->naturalType, "", currentBlock));*/
@@ -1590,14 +1590,14 @@
uint32 token = readU4(bytecodes, i);
uint32 table = token >> 24;
Assembly* assembly = compilingClass->assembly;
- N3* vm = (N3*)(VMThread::get()->vm);
+ N3* vm = (N3*)(VMThread::get()->getVM());
switch (table) {
case CONSTANT_Field : {
uint32 typeToken = assembly->getTypedefTokenFromField(token);
assembly->loadType(vm, typeToken, true, true, false, true, genClass, genMethod);
VMField* field = assembly->lookupFieldFromToken(token);
if (!field) {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
}
Value* arg = new LoadInst(field->llvmVar(), "", currentBlock);
push(arg);
@@ -1609,7 +1609,7 @@
assembly->loadType(vm, typeToken, true, true, false, true, genClass, genMethod);
VMMethod* meth = assembly->lookupMethodFromToken(token);
if (!meth) {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
}
Value* arg = new LoadInst(meth->llvmVar(), "", currentBlock);
push(arg);
@@ -1626,20 +1626,20 @@
}
default :
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
}
break;
}
case MKREFANY : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
case NEWARR : {
uint32 value = readU4(bytecodes, i);
Assembly* ass = compilingClass->assembly;
- VMCommonClass* baseType = ass->loadType((N3*)(VMThread::get()->vm),
+ VMCommonClass* baseType = ass->loadType((N3*)(VMThread::get()->getVM()),
value, true, false, false,
true, genClass, genMethod);
@@ -1662,12 +1662,12 @@
}
case REFANYVAL : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
case STELEM : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
@@ -1732,7 +1732,7 @@
}
case STELEM_I : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
@@ -1754,7 +1754,7 @@
}
case STOBJ : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
isVolatile = false;
break;
}
@@ -1783,7 +1783,7 @@
case UNBOX : {
uint32 token = readU4(bytecodes, i);
Assembly* assembly = compilingClass->assembly;
- N3* vm = (N3*)(VMThread::get()->vm);
+ N3* vm = (N3*)(VMThread::get()->getVM());
VMCommonClass* type = assembly->loadType(vm, token, true, false, false,
true, genClass, genMethod);
assert(type);
@@ -1816,7 +1816,7 @@
}
case UNBOX_ANY : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
@@ -1866,7 +1866,7 @@
}
case ENDFILTER: {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
@@ -1882,18 +1882,18 @@
case LDFTN : {
Assembly* assembly = compilingClass->assembly;
- N3* vm = (N3*)(VMThread::get()->vm);
+ N3* vm = (N3*)(VMThread::get()->getVM());
uint32 token = readU4(bytecodes, i);
uint32 table = token >> 24;
if (table == CONSTANT_MethodDef) {
uint32 typeToken = assembly->getTypedefTokenFromMethod(token);
assembly->loadType(vm, typeToken, true, false, false, true, genClass, genMethod);
VMMethod* meth = assembly->lookupMethodFromToken(token);
- if (!meth) VMThread::get()->vm->error("implement me");
+ if (!meth) VMThread::get()->getVM()->error("implement me");
Value* arg = new LoadInst(meth->llvmVar(), "", currentBlock);
push(arg);
} else {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
}
break;
}
@@ -1940,14 +1940,14 @@
}
case ARGLIST : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
case INITOBJ : {
uint32 token = readU4(bytecodes, i);
Assembly* assembly = compilingClass->assembly;
- N3* vm = (N3*)(VMThread::get()->vm);
+ N3* vm = (N3*)(VMThread::get()->getVM());
VMCommonClass* type = assembly->loadType(vm, token, true, false, false,
true, genClass, genMethod);
if (type->super == MSCorlib::pValue) {
@@ -1967,12 +1967,12 @@
}
case LDVIRTFTN : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
case REFANYTYPE : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
@@ -1993,7 +1993,7 @@
}
case SIZEOF : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
@@ -2002,13 +2002,13 @@
break;
}
default :
- VMThread::get()->vm->unknownError("unknown bytecode");
+ VMThread::get()->getVM()->unknownError("unknown bytecode");
}
break;
}
default :
- VMThread::get()->vm->unknownError("unknown bytecode");
+ VMThread::get()->getVM()->unknownError("unknown bytecode");
}
}
}
@@ -2096,12 +2096,12 @@
}
case CALLI: {
- VMThread::get()->vm->unknownError("implement me");
+ VMThread::get()->getVM()->unknownError("implement me");
break;
}
case CKFINITE : {
- VMThread::get()->vm->unknownError("implement me");
+ VMThread::get()->getVM()->unknownError("implement me");
break;
}
@@ -2142,7 +2142,7 @@
case ENDFINALLY : break;
case JMP : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
@@ -2328,7 +2328,7 @@
}
case CPOBJ : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
@@ -2338,12 +2338,12 @@
}
case LDELEM : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
case LDELEM_I1 : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
@@ -2397,7 +2397,7 @@
}
case MKREFANY : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
@@ -2412,12 +2412,12 @@
}
case REFANYVAL : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
case STELEM : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
@@ -2436,7 +2436,7 @@
}
case STOBJ : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
@@ -2455,7 +2455,7 @@
}
case UNBOX_ANY : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
@@ -2477,7 +2477,7 @@
case CPBLK : break;
case ENDFILTER: {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
@@ -2521,7 +2521,7 @@
}
case ARGLIST : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
@@ -2531,12 +2531,12 @@
}
case LDVIRTFTN : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
case REFANYTYPE : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
@@ -2545,7 +2545,7 @@
}
case SIZEOF : {
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
break;
}
@@ -2553,13 +2553,13 @@
break;
}
default :
- VMThread::get()->vm->unknownError("unknown bytecode");
+ VMThread::get()->getVM()->unknownError("unknown bytecode");
}
break;
}
default :
- VMThread::get()->vm->unknownError("unknown bytecode");
+ VMThread::get()->getVM()->unknownError("unknown bytecode");
}
}
}
Modified: vmkit/trunk/lib/N3/VMCore/Reader.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/Reader.cpp?rev=83961&r1=83960&r2=83961&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/VMCore/Reader.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/Reader.cpp Tue Oct 13 03:46:46 2009
@@ -74,7 +74,7 @@
uint8 Reader::readU1() {
if(cursor >= (uint32)bytes->size)
- VMThread::get()->vm->error("readU1 outside the buffer");
+ VMThread::get()->getVM()->error("readU1 outside the buffer");
return bytes->elements[cursor++];
}
@@ -141,7 +141,7 @@
if ((n < start) || (n > end))
- VMThread::get()->vm->unknownError("out of range %d %d", n, end);
+ VMThread::get()->getVM()->unknownError("out of range %d %d", n, end);
cursor = n;
}
Modified: vmkit/trunk/lib/N3/VMCore/VMClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/VMClass.cpp?rev=83961&r1=83960&r2=83961&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/VMCore/VMClass.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/VMClass.cpp Tue Oct 13 03:46:46 2009
@@ -181,7 +181,7 @@
sprintf(res, "%s[]", res);
}
- return VMThread::get()->vm->asciizToUTF8(res);
+ return VMThread::get()->getVM()->asciizToUTF8(res);
}
const UTF8* VMClassPointer::constructPointerName(const UTF8* name, uint32 dims) {
@@ -194,7 +194,7 @@
sprintf(res, "%s*", res);
}
- return VMThread::get()->vm->asciizToUTF8(res);
+ return VMThread::get()->getVM()->asciizToUTF8(res);
}
@@ -262,7 +262,7 @@
cl->broadcastClass();
} else if (status < static_resolved) {
cl->release();
- VMThread::get()->vm->unknownError("try to clinit a not-readed class...");
+ VMThread::get()->getVM()->unknownError("try to clinit a not-readed class...");
} else {
if (!cl->ownerClass()) {
while (status < ready) cl->waitClass();
@@ -323,7 +323,7 @@
if (super == MSCorlib::pValue) {
uint32 size = virtualFields.size();
if (size == 1) {
- virtualFields[0]->offset = VMThread::get()->vm->module->constantZero;
+ virtualFields[0]->offset = VMThread::get()->getVM()->module->constantZero;
ResultTy = virtualFields[0]->signature->naturalType;
} else if (size == 0) {
ResultTy = llvm::Type::getVoidTy(llvm::getGlobalContext());
@@ -413,7 +413,7 @@
cl->release();
} else if (status < loaded) {
cl->release();
- VMThread::get()->vm->unknownError("try to resolve a not-readed class");
+ VMThread::get()->getVM()->unknownError("try to resolve a not-readed class");
} else if (status == loaded) {
if (cl->isArray) {
VMClassArray* arrayCl = (VMClassArray*)cl;
@@ -498,7 +498,7 @@
cl->release();
// printf("Will throw an exception: %s....\n", mvm::PrintBuffer::objectToString(this));
// ((char *)0)[0] = 22;
- VMThread::get()->vm->unknownError("try to resolve static of a not virtual-resolved class");
+ VMThread::get()->getVM()->unknownError("try to resolve static of a not virtual-resolved class");
} else if (status == virtual_resolved) {
if (cl->isArray) {
VMClassArray* arrayCl = (VMClassArray*)cl;
@@ -570,7 +570,7 @@
VMMethod* res = lookupMethodDontThrow(name, args, isStatic, recurse);
if (!res) {
- VMThread::get()->vm->error(N3::MissingMethodException,
+ VMThread::get()->getVM()->error(N3::MissingMethodException,
"unable to find %s in %s",
mvm::PrintBuffer(name).cString(), mvm::PrintBuffer(this).cString());
}
@@ -617,7 +617,7 @@
VMField* res = lookupFieldDontThrow(name, type, isStatic, recurse);
if (!res) {
- VMThread::get()->vm->error(N3::MissingFieldException,
+ VMThread::get()->getVM()->error(N3::MissingFieldException,
"unable to find %s in %s",
mvm::PrintBuffer(name).cString(), mvm::PrintBuffer(this).cString());
}
@@ -774,7 +774,7 @@
} else if (cl->isArray) {
return this->instantiationOfArray(cl);
} else if (cl->isPointer){
- VMThread::get()->vm->error("implement me");
+ VMThread::get()->getVM()->error("implement me");
return false;
} else {
return this->subclassOf(cl);
Modified: vmkit/trunk/lib/N3/VMCore/VMObject.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/VMObject.cpp?rev=83961&r1=83960&r2=83961&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/VMCore/VMObject.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/VMObject.cpp Tue Oct 13 03:46:46 2009
@@ -137,7 +137,7 @@
if (thread->interruptFlag != 0) {
mutexThread->unlock();
thread->interruptFlag = 0;
- thread->vm->interruptedException(this);
+ thread->getVM()->interruptedException(this);
} else {
unsigned int recur = l->lock.recursionCount();
bool timeout = false;
@@ -163,11 +163,11 @@
if (interrupted) {
thread->interruptFlag = 0;
- thread->vm->interruptedException(this);
+ thread->getVM()->interruptedException(this);
}
}
} else {
- VMThread::get()->vm->illegalMonitorStateException(this);
+ VMThread::get()->getVM()->illegalMonitorStateException(this);
}
}
@@ -184,7 +184,7 @@
if (l->owner()) {
l->varcond.notify();
} else {
- VMThread::get()->vm->illegalMonitorStateException(this);
+ VMThread::get()->getVM()->illegalMonitorStateException(this);
}
}
@@ -193,7 +193,7 @@
if (l->owner()) {
l->varcond.notifyAll();
} else {
- VMThread::get()->vm->illegalMonitorStateException(this);
+ VMThread::get()->getVM()->illegalMonitorStateException(this);
}
}
Modified: vmkit/trunk/lib/N3/VMCore/VMObject.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/VMObject.h?rev=83961&r1=83960&r2=83961&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/VMCore/VMObject.h (original)
+++ vmkit/trunk/lib/N3/VMCore/VMObject.h Tue Oct 13 03:46:46 2009
@@ -86,7 +86,7 @@
#define verifyNull(obj) {}
#else
#define verifyNull(obj) \
- if (obj == 0) VMThread::get()->vm->nullPointerException("");
+ if (obj == 0) VMThread::get()->getVM()->nullPointerException("");
#endif
llvm::GenericValue operator()(VMField* field);
Modified: vmkit/trunk/lib/N3/VMCore/VMThread.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/VMThread.cpp?rev=83961&r1=83960&r2=83961&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/VMCore/VMThread.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/VMThread.cpp Tue Oct 13 03:46:46 2009
@@ -44,7 +44,7 @@
llvm_gcroot(thread, 0);
this->perFunctionPasses = 0;
this->vmThread = thread;
- this->vm = vm;
+ this->MyVM = vm;
this->lock = new mvm::LockNormal();
this->varcond = new mvm::Cond();
this->interruptFlag = 0;
Modified: vmkit/trunk/lib/N3/VMCore/VMThread.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/VMThread.h?rev=83961&r1=83960&r2=83961&view=diff
==============================================================================
--- vmkit/trunk/lib/N3/VMCore/VMThread.h (original)
+++ vmkit/trunk/lib/N3/VMCore/VMThread.h Tue Oct 13 03:46:46 2009
@@ -30,7 +30,11 @@
class VMThread : public mvm::MutatorThread {
public:
VMObject* vmThread;
- N3* vm;
+
+ N3* getVM() {
+ return (N3*)MyVM;
+ }
+
mvm::Lock* lock;
mvm::Cond* varcond;
VMObject* pendingException;
More information about the vmkit-commits
mailing list