[vmkit-commits] [vmkit] r52959 - in /vmkit/trunk/lib/N3: PNetLib/PNetString.cpp VMCore/CLIJitMeta.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Tue Jul  1 09:04:24 2008
New Revision: 52959

URL: http://llvm.org/viewvc/llvm-project?rev=52959&view=rev
Log:
Put ClIString::llvmVar in classlib directory.


Modified:
    vmkit/trunk/lib/N3/PNetLib/PNetString.cpp
    vmkit/trunk/lib/N3/VMCore/CLIJitMeta.cpp

Modified: vmkit/trunk/lib/N3/PNetLib/PNetString.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/PNetLib/PNetString.cpp?rev=52959&r1=52958&r2=52959&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/PNetLib/PNetString.cpp (original)
+++ vmkit/trunk/lib/N3/PNetLib/PNetString.cpp Tue Jul  1 09:04:24 2008
@@ -7,6 +7,10 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "llvm/GlobalVariable.h"
+
+#include "mvm/JIT.h"
+
 #include "CLIString.h"
 #include "MSCorlib.h"
 #include "N3.h"
@@ -16,6 +20,7 @@
 #include "VMThread.h"
 
 using namespace n3;
+using namespace llvm;
 
 
 CLIString* CLIString::stringDup(const UTF8*& utf8, N3* vm) {
@@ -38,3 +43,21 @@
 const UTF8* CLIString::strToUTF8(N3* vm) {
   return ((PNetString*)this)->value;
 }
+
+GlobalVariable* CLIString::llvmVar() {
+  PNetString* str = (PNetString*)this;
+  if (!str->_llvmVar) {
+    VirtualMachine* vm = VMThread::get()->vm;
+    if (!str->_llvmVar) {
+      const Type* pty = mvm::jit::ptrType;
+      Constant* cons = 
+        ConstantExpr::getIntToPtr(ConstantInt::get(Type::Int64Ty, uint64_t (this)),
+                                  pty);
+      str->_llvmVar = new GlobalVariable(pty, true,
+                                    GlobalValue::ExternalLinkage,
+                                    cons, "",
+                                    vm->module);
+    }
+  }
+  return str->_llvmVar;
+}

Modified: vmkit/trunk/lib/N3/VMCore/CLIJitMeta.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/CLIJitMeta.cpp?rev=52959&r1=52958&r2=52959&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/CLIJitMeta.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/CLIJitMeta.cpp Tue Jul  1 09:04:24 2008
@@ -422,20 +422,3 @@
 ConstantInt* VMObject::classOffset() {
   return mvm::jit::constantOne;
 }
-
-GlobalVariable* CLIString::llvmVar() {
-  if (!_llvmVar) {
-    VirtualMachine* vm = VMThread::get()->vm;
-    if (!_llvmVar) {
-      const Type* pty = mvm::jit::ptrType;
-      Constant* cons = 
-        ConstantExpr::getIntToPtr(ConstantInt::get(Type::Int64Ty, uint64_t (this)),
-                                  pty);
-      _llvmVar = new GlobalVariable(pty, true,
-                                    GlobalValue::ExternalLinkage,
-                                    cons, "",
-                                    vm->module);
-    }
-  }
-  return _llvmVar;
-}