[vmkit-commits] [vmkit] r180281 - Added extra memory allocation for hidden GC header. Have to change pointer returned.

[Peter Senna Tschudin]

Author: peter.senna
Date: Thu Apr 25 11:46:54 2013
New Revision: 180281

URL: http://llvm.org/viewvc/llvm-project?rev=180281&view=rev
Log:
Added extra memory allocation for hidden GC header. Have to change pointer returned.
(cherry picked from commit cb88168006b8c12be66df37ad11adfcbc59a5ff5)

Modified:
    vmkit/trunk/lib/vmkit/MMTk/VmkitGC.cpp
    vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp

Modified: vmkit/trunk/lib/vmkit/MMTk/VmkitGC.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/vmkit/MMTk/VmkitGC.cpp?rev=180281&r1=180280&r2=180281&view=diff
==============================================================================
--- vmkit/trunk/lib/vmkit/MMTk/VmkitGC.cpp (original)
+++ vmkit/trunk/lib/vmkit/MMTk/VmkitGC.cpp Thu Apr 25 11:46:54 2013
@@ -22,6 +22,7 @@ int Collector::verbose = 0;
 extern "C" void* gcmalloc(uint32_t sz, void* _VT) {
   gc* res = 0;
   VirtualTable* VT = (VirtualTable*)_VT;
+  sz += gcHeader::hiddenHeaderSize();
   sz = llvm::RoundUpToAlignment(sz, sizeof(void*));
   res = (gc*)malloc(sz);
   memset((void*)res, 0, sz);

Modified: vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp?rev=180281&r1=180280&r2=180281&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp Thu Apr 25 11:46:54 2013
@@ -59,6 +59,7 @@ extern "C" void* JnJVM_org_j3_bindings_B
     int sz, void* VT) ALWAYS_INLINE;
 
 extern "C" void* gcmalloc(uint32_t sz, void* VT) {
+	sz += gcHeader::hiddenHeaderSize();
   sz = llvm::RoundUpToAlignment(sz, sizeof(void*));
   return (gc*)JnJVM_org_j3_bindings_Bindings_gcmalloc__ILorg_vmmagic_unboxed_ObjectReference_2(sz, VT);
 }