[vmkit-commits] [vmkit] r180559 - Final adjustments. Now this revision is equal to commit 7685d4f5973fa1850f80f50b3188cf5e86066aa6

[Peter Senna Tschudin]

Author: peter.senna
Date: Thu Apr 25 12:24:33 2013
New Revision: 180559

URL: http://llvm.org/viewvc/llvm-project?rev=180559&view=rev
Log:
Final adjustments. Now this revision is equal to commit 7685d4f5973fa1850f80f50b3188cf5e86066aa6

Modified:
    vmkit/trunk/include/j3/J3Intrinsics.h
    vmkit/trunk/include/j3/JavaLLVMCompiler.h
    vmkit/trunk/include/vmkit/VirtualMachine.h
    vmkit/trunk/lib/j3/LLVMRuntime/runtime-default.ll
    vmkit/trunk/tools/trainer/Makefile   (contents, props changed)

Modified: vmkit/trunk/include/j3/J3Intrinsics.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/j3/J3Intrinsics.h?rev=180559&r1=180558&r2=180559&view=diff
==============================================================================
--- vmkit/trunk/include/j3/J3Intrinsics.h (original)
+++ vmkit/trunk/include/j3/J3Intrinsics.h Thu Apr 25 12:24:33 2013
@@ -31,6 +31,7 @@ public:
   llvm::Type* JavaArrayObjectType;
   
   llvm::Type* VTType;
+  llvm::Type* ObjectHeaderType;
   llvm::Type* JavaObjectType;
   llvm::Type* JavaArrayType;
   llvm::Type* JavaCommonClassType;
@@ -110,7 +111,7 @@ public:
   
   llvm::Constant* JavaArraySizeOffsetConstant;
   llvm::Constant* JavaArrayElementsOffsetConstant;
-  llvm::Constant* JavaObjectLockOffsetConstant;
+  llvm::Constant* HeaderObjectLockOffsetConstant;
   llvm::Constant* JavaObjectVTOffsetConstant;
 
   llvm::Constant* OffsetAccessInCommonClassConstant;

Modified: vmkit/trunk/include/j3/JavaLLVMCompiler.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/j3/JavaLLVMCompiler.h?rev=180559&r1=180558&r2=180559&view=diff
==============================================================================
--- vmkit/trunk/include/j3/JavaLLVMCompiler.h (original)
+++ vmkit/trunk/include/j3/JavaLLVMCompiler.h Thu Apr 25 12:24:33 2013
@@ -51,7 +51,7 @@ protected:
   llvm::Module* TheModule;
   llvm::DIBuilder* DebugFactory;  
   J3Intrinsics JavaIntrinsics;
-  const llvm::TargetData* TheTargetData;
+  const llvm::DataLayout* TheDataLayout;
 
 private:  
   bool enabledException;

Modified: vmkit/trunk/include/vmkit/VirtualMachine.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/vmkit/VirtualMachine.h?rev=180559&r1=180558&r2=180559&view=diff
==============================================================================
--- vmkit/trunk/include/vmkit/VirtualMachine.h (original)
+++ vmkit/trunk/include/vmkit/VirtualMachine.h Thu Apr 25 12:24:33 2013
@@ -205,6 +205,7 @@ public:
   /// set the identity of the object (identity is determined by user).
   ///
   virtual void setType(gc* header, void* type) = 0;
+  virtual void setType(void* header, void* type) = 0;
 
   /// getType - Gets the type of given object.
   ///

Modified: vmkit/trunk/lib/j3/LLVMRuntime/runtime-default.ll
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/j3/LLVMRuntime/runtime-default.ll?rev=180559&r1=180558&r2=180559&view=diff
==============================================================================
--- vmkit/trunk/lib/j3/LLVMRuntime/runtime-default.ll (original)
+++ vmkit/trunk/lib/j3/LLVMRuntime/runtime-default.ll Thu Apr 25 12:24:33 2013
@@ -5,8 +5,8 @@
 ;;; A virtual table is an array of function pointers.
 %VT = type [0 x i32 (...)*]
 
-;;; The root of all Java Objects: a VT and a lock.
-%JavaObject = type { %VT*, i8* }
+;;; The root of all Java Objects: a VT (and a lock moved into GC header).
+%JavaObject = type { %VT* }
 
 ;;; Types for Java arrays. A size of 0 means an undefined size.
 %JavaArray = type { %JavaObject, i8* }
@@ -113,7 +113,7 @@ declare %VT* @getIMT(%VT*) readnone
 declare %JavaCommonClass* @getClass(%JavaObject*) readnone 
 
 ;;; getLock - Get the lock of an object.
-declare i8* @getLock(%JavaObject*)
+;;;declare i8* @getLock(%JavaObject*)
 
 ;;; getVTFromCommonClass - Get the VT of a class from its runtime
 ;;; representation.

Modified: vmkit/trunk/tools/trainer/Makefile
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/tools/trainer/Makefile?rev=180559&r1=180558&r2=180559&view=diff
==============================================================================
    (empty)

Propchange: vmkit/trunk/tools/trainer/Makefile
------------------------------------------------------------------------------
    svn:executable = *