[vmkit-commits] [vmkit] r84023 - in /vmkit/trunk/lib/N3/VMCore: Assembly.cpp CLIJit.cpp CLIJit.h VMClass.h

[Gael Thomas]

Author: gthomas
Date: Tue Oct 13 15:55:45 2009
New Revision: 84023

URL: http://llvm.org/viewvc/llvm-project?rev=84023&view=rev
Log:
Rename VMMethod::offset on VMMethod::offsetInTextSection. Avoid any confusion with a futur offset in vt :)
Fix a compilation bug in CLIJit.h: add a definition of the new N3VirtualTable.


Modified:
    vmkit/trunk/lib/N3/VMCore/Assembly.cpp
    vmkit/trunk/lib/N3/VMCore/CLIJit.cpp
    vmkit/trunk/lib/N3/VMCore/CLIJit.h
    vmkit/trunk/lib/N3/VMCore/VMClass.h

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

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/Assembly.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/Assembly.cpp Tue Oct 13 15:55:45 2009
@@ -1400,10 +1400,10 @@
   meth->implFlags = implFlags;
 
   if (rva) {
-    meth->offset = textSection->rawAddress + 
-                   (rva - textSection->virtualAddress);
+    meth->offsetInTextSection = textSection->rawAddress + 
+			(rva - textSection->virtualAddress);
   } else {
-    meth->offset = 0;
+    meth->offsetInTextSection = 0;
   }
 
   if (paramList && paramTable != 0 && paramList <= paramSize) {

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

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/CLIJit.cpp (original)
+++ vmkit/trunk/lib/N3/VMCore/CLIJit.cpp Tue Oct 13 15:55:45 2009
@@ -1156,7 +1156,7 @@
 Function* CLIJit::compileFatOrTiny(VMGenericClass* genClass, VMGenericMethod* genMethod) {
   PRINT_DEBUG(N3_COMPILE, 1, COLOR_NORMAL, "tiny or fat compile %s\n",
               mvm::PrintBuffer(compilingMethod).cString());
-  uint32 offset = compilingMethod->offset;
+  uint32 offset = compilingMethod->offsetInTextSection;
 	ByteCode* bytes = compilingClass->assembly->bytes;
   uint8 header = READ_U1(bytes, offset);
   bool tiny = false;
@@ -1334,7 +1334,7 @@
   
   PRINT_DEBUG(N3_COMPILE, 1, COLOR_NORMAL, "tiny or fat inline compile %s\n",
               mvm::PrintBuffer(compilingMethod).cString());
-  uint32 offset = compilingMethod->offset;
+  uint32 offset = compilingMethod->offsetInTextSection;
   ByteCode* bytes = compilingClass->assembly->bytes;
   uint8 header = READ_U1(bytes, offset);
   bool tiny = false;
@@ -1463,7 +1463,7 @@
   
   if (isInternal(meth->implFlags)) {
     func = jit->compileNative(dynamic_cast<VMGenericMethod*>(meth));
-  } else if (meth->offset == 0) {
+  } else if (meth->offsetInTextSection == 0) {
     func = jit->compileIntern();
   } else {
     func = jit->compileFatOrTiny(dynamic_cast<VMGenericClass*>(cl), dynamic_cast<VMGenericMethod*>(meth));

Modified: vmkit/trunk/lib/N3/VMCore/CLIJit.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/CLIJit.h?rev=84023&r1=84022&r2=84023&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/CLIJit.h (original)
+++ vmkit/trunk/lib/N3/VMCore/CLIJit.h Tue Oct 13 15:55:45 2009
@@ -39,6 +39,7 @@
 class VMObject;
 class VMGenericClass;
 class VMGenericMethod;
+class N3VirtualTable;
 
 class ExceptionBlockDesc : public mvm::PermanentObject {
 public:

Modified: vmkit/trunk/lib/N3/VMCore/VMClass.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/N3/VMCore/VMClass.h?rev=84023&r1=84022&r2=84023&view=diff

==============================================================================
--- vmkit/trunk/lib/N3/VMCore/VMClass.h (original)
+++ vmkit/trunk/lib/N3/VMCore/VMClass.h Tue Oct 13 15:55:45 2009
@@ -203,7 +203,7 @@
   virtual void TRACER;
   
   uint32 flags;
-  uint32 offset;
+	uint32 offsetInTextSection;
   uint32 implFlags;
   uint32 token;