[vmkit-commits] [vmkit] r117215 - in /vmkit/branches/precise: lib/J3/VMCore/JavaObject.cpp mmtk/config/copyms/ObjectHeader.h mmtk/config/marksweep/ObjectHeader.h
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Sat Oct 23 11:54:29 PDT 2010
Author: geoffray
Date: Sat Oct 23 13:54:29 2010
New Revision: 117215
URL: http://llvm.org/viewvc/llvm-project?rev=117215&view=rev
Log:
The header must now be 8 bits (since MMTk 3.1.1).
Modified:
vmkit/branches/precise/lib/J3/VMCore/JavaObject.cpp
vmkit/branches/precise/mmtk/config/copyms/ObjectHeader.h
vmkit/branches/precise/mmtk/config/marksweep/ObjectHeader.h
Modified: vmkit/branches/precise/lib/J3/VMCore/JavaObject.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/precise/lib/J3/VMCore/JavaObject.cpp?rev=117215&r1=117214&r2=117215&view=diff
==============================================================================
--- vmkit/branches/precise/lib/J3/VMCore/JavaObject.cpp (original)
+++ vmkit/branches/precise/lib/J3/VMCore/JavaObject.cpp Sat Oct 23 13:54:29 2010
@@ -45,7 +45,6 @@
}
assert(val > mvm::GCBitMask);
assert(val <= mvm::HashMask);
- assert(val != hashCodeGenerator);
do {
header = self->header;
Modified: vmkit/branches/precise/mmtk/config/copyms/ObjectHeader.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/precise/mmtk/config/copyms/ObjectHeader.h?rev=117215&r1=117214&r2=117215&view=diff
==============================================================================
--- vmkit/branches/precise/mmtk/config/copyms/ObjectHeader.h (original)
+++ vmkit/branches/precise/mmtk/config/copyms/ObjectHeader.h Sat Oct 23 13:54:29 2010
@@ -24,12 +24,12 @@
static const uint64_t ThinCountAdd = 0x1000;
static const uint64_t NonLockBitsMask = 0xFFF;
- static const uint64_t HashMask = 0xFF0;
- static const uint64_t GCBitMask = 0xF;
+ static const uint64_t HashMask = 0xF00;
+ static const uint64_t GCBitMask = 0xFF;
static const uint32_t NonLockBits = 12;
- static const uint32_t HashBits = 8;
- static const uint32_t GCBits = 4;
+ static const uint32_t HashBits = 4;
+ static const uint32_t GCBits = 8;
static const bool MovesObject = true;
}
Modified: vmkit/branches/precise/mmtk/config/marksweep/ObjectHeader.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/precise/mmtk/config/marksweep/ObjectHeader.h?rev=117215&r1=117214&r2=117215&view=diff
==============================================================================
--- vmkit/branches/precise/mmtk/config/marksweep/ObjectHeader.h (original)
+++ vmkit/branches/precise/mmtk/config/marksweep/ObjectHeader.h Sat Oct 23 13:54:29 2010
@@ -24,12 +24,12 @@
static const uint64_t ThinCountAdd = 0x1000;
static const uint64_t NonLockBitsMask = 0xFFF;
- static const uint64_t HashMask = 0xFF0;
- static const uint64_t GCBitMask = 0xF;
+ static const uint64_t HashMask = 0xF00;
+ static const uint64_t GCBitMask = 0xFF;
static const uint32_t NonLockBits = 12;
static const uint32_t HashBits = 0;
- static const uint32_t GCBits = 4;
+ static const uint32_t GCBits = 8;
static const bool MovesObject = false;
}
More information about the vmkit-commits
mailing list