[vmkit-commits] [vmkit] r83543 - in /vmkit/trunk/lib/JnJVM: Compiler/JnjvmModule.cpp LLVMRuntime/runtime-single.ll VMCore/JavaClass.h

[Nicolas Geoffray]

Author: geoffray
Date: Thu Oct  8 07:23:51 2009
New Revision: 83543

URL: http://llvm.org/viewvc/llvm-project?rev=83543&view=rev
Log:
Add a new field inf JavaClass for instance alignment.


Modified:
    vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp
    vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-single.ll
    vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h

Modified: vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp?rev=83543&r1=83542&r2=83543&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp (original)
+++ vmkit/trunk/lib/JnJVM/Compiler/JnjvmModule.cpp Thu Oct  8 07:23:51 2009
@@ -194,8 +194,8 @@
   OffsetObjectSizeInClassConstant = constantOne;
   OffsetVTInClassConstant =
     ConstantInt::get(Type::getInt32Ty(getGlobalContext()), 7);
-  OffsetTaskClassMirrorInClassConstant = constantTwo;
-  OffsetStaticInstanceInTaskClassMirrorConstant = constantTwo;
+  OffsetTaskClassMirrorInClassConstant = constantThree;
+  OffsetStaticInstanceInTaskClassMirrorConstant = constantThree;
   OffsetStatusInTaskClassMirrorConstant = constantZero;
   OffsetInitializedInTaskClassMirrorConstant = constantOne;
   

Modified: vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-single.ll
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-single.ll?rev=83543&r1=83542&r2=83543&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-single.ll (original)
+++ vmkit/trunk/lib/JnJVM/LLVMRuntime/runtime-single.ll Thu Oct  8 07:23:51 2009
@@ -6,7 +6,7 @@
                           %JavaClass**, i16, %UTF8*, %JavaClass*, i8*, %VT* }
 
 
-%JavaClass = type { %JavaCommonClass, i32, [1 x %TaskClassMirror], i8*,
+%JavaClass = type { %JavaCommonClass, i32, i32, [1 x %TaskClassMirror], i8*,
                     %JavaField*, i16, %JavaField*, i16, %JavaMethod*, i16,
                     %JavaMethod*, i16, i8*, %ArrayUInt8*, i8*, %Attribut*,
                     i16, %JavaClass**, i16, %JavaClass*, i16, i8, i8, i32, i32,

Modified: vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h?rev=83543&r1=83542&r2=83543&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JavaClass.h Thu Oct  8 07:23:51 2009
@@ -440,6 +440,10 @@
   /// 
   uint32 virtualSize;
 
+  /// aligment - Alignment of instances of this class.
+  ///
+  uint32 alignment;
+
   /// IsolateInfo - Per isolate informations for static instances and
   /// initialization state.
   ///