[vmkit-commits] [vmkit] r141509 - in /vmkit/trunk: include/j3/ include/mvm/ include/mvm/GC/ include/mvm/Threads/ lib/J3/Classpath/ lib/J3/Compiler/ lib/J3/VMCore/ lib/Mvm/CommonThread/ lib/Mvm/MMTk/ lib/Mvm/Runtime/ lib/Mvm/StaticGCPrinter/ mmtk/mmtk-alloc/ mmtk/mmtk-j3/
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Sun Oct 9 10:23:23 PDT 2011
Author: geoffray
Date: Sun Oct 9 12:23:23 2011
New Revision: 141509
URL: http://llvm.org/viewvc/llvm-project?rev=141509&view=rev
Log:
Define word_t, to please MacOS that is completely confused about uintptr_t and intptr_t.
Modified:
vmkit/trunk/include/j3/JavaJITCompiler.h
vmkit/trunk/include/mvm/GC/GC.h
vmkit/trunk/include/mvm/MethodInfo.h
vmkit/trunk/include/mvm/System.h
vmkit/trunk/include/mvm/Threads/CollectionRV.h
vmkit/trunk/include/mvm/Threads/ObjectLocks.h
vmkit/trunk/include/mvm/Threads/Thread.h
vmkit/trunk/include/mvm/VirtualMachine.h
vmkit/trunk/lib/J3/Classpath/ClasspathReflect.h
vmkit/trunk/lib/J3/Classpath/JavaUpcalls.cpp
vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp
vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp
vmkit/trunk/lib/J3/Compiler/JavaJIT.h
vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp
vmkit/trunk/lib/J3/VMCore/JNIReferences.h
vmkit/trunk/lib/J3/VMCore/JavaArray.h
vmkit/trunk/lib/J3/VMCore/JavaClass.cpp
vmkit/trunk/lib/J3/VMCore/JavaClass.h
vmkit/trunk/lib/J3/VMCore/JavaObject.cpp
vmkit/trunk/lib/J3/VMCore/JavaObject.h
vmkit/trunk/lib/J3/VMCore/JavaRuntimeJIT.cpp
vmkit/trunk/lib/J3/VMCore/JavaThread.h
vmkit/trunk/lib/J3/VMCore/JavaTypes.cpp
vmkit/trunk/lib/J3/VMCore/JavaTypes.h
vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp
vmkit/trunk/lib/J3/VMCore/Jnjvm.h
vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.cpp
vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.h
vmkit/trunk/lib/J3/VMCore/Precompiled.cpp
vmkit/trunk/lib/J3/VMCore/ReferenceQueue.cpp
vmkit/trunk/lib/J3/VMCore/ReferenceQueue.h
vmkit/trunk/lib/J3/VMCore/VirtualTables.cpp
vmkit/trunk/lib/Mvm/CommonThread/CollectionRV.cpp
vmkit/trunk/lib/Mvm/CommonThread/ObjectLocks.cpp
vmkit/trunk/lib/Mvm/CommonThread/Sigsegv.cpp
vmkit/trunk/lib/Mvm/CommonThread/ctthread.cpp
vmkit/trunk/lib/Mvm/MMTk/MutatorThread.h
vmkit/trunk/lib/Mvm/MMTk/MvmGC.cpp
vmkit/trunk/lib/Mvm/MMTk/MvmGC.h
vmkit/trunk/lib/Mvm/Runtime/MethodInfo.cpp
vmkit/trunk/lib/Mvm/StaticGCPrinter/VmkitGCPrinter.cpp
vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp
vmkit/trunk/mmtk/mmtk-j3/FinalizableProcessor.cpp
vmkit/trunk/mmtk/mmtk-j3/MMTkObject.h
vmkit/trunk/mmtk/mmtk-j3/MMTk_Events.cpp
vmkit/trunk/mmtk/mmtk-j3/Memory.cpp
vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp
vmkit/trunk/mmtk/mmtk-j3/ReferenceProcessor.cpp
vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp
vmkit/trunk/mmtk/mmtk-j3/TraceInterface.cpp
Modified: vmkit/trunk/include/j3/JavaJITCompiler.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/j3/JavaJITCompiler.h?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/include/j3/JavaJITCompiler.h (original)
+++ vmkit/trunk/include/j3/JavaJITCompiler.h Sun Oct 9 12:23:23 2011
@@ -77,7 +77,7 @@
virtual llvm::Value* addCallback(Class* cl, uint16 index, Signdef* sign,
bool stat, llvm::BasicBlock* insert) = 0;
- virtual uintptr_t getPointerOrStub(JavaMethod& meth, int type) = 0;
+ virtual word_t getPointerOrStub(JavaMethod& meth, int type) = 0;
static JavaJITCompiler* CreateCompiler(const std::string& ModuleID);
};
@@ -87,7 +87,7 @@
virtual bool needsCallback(JavaMethod* meth, Class* customizeFor, bool* needsInit);
virtual llvm::Value* addCallback(Class* cl, uint16 index, Signdef* sign,
bool stat, llvm::BasicBlock* insert);
- virtual uintptr_t getPointerOrStub(JavaMethod& meth, int side);
+ virtual word_t getPointerOrStub(JavaMethod& meth, int side);
virtual JavaCompiler* Create(const std::string& ModuleID) {
return new JavaJ3LazyJITCompiler(ModuleID);
Modified: vmkit/trunk/include/mvm/GC/GC.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/GC/GC.h?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/GC/GC.h (original)
+++ vmkit/trunk/include/mvm/GC/GC.h Sun Oct 9 12:23:23 2011
@@ -12,14 +12,15 @@
#define MVM_GC_H
#include <stdint.h>
+#include "mvm/System.h"
class VirtualTable;
class gcRoot {
public:
virtual ~gcRoot() {}
- virtual void tracer(uintptr_t closure) {}
- uintptr_t header;
+ virtual void tracer(word_t closure) {}
+ word_t header;
/// getVirtualTable - Returns the virtual table of this object.
///
Modified: vmkit/trunk/include/mvm/MethodInfo.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/MethodInfo.h?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/MethodInfo.h (original)
+++ vmkit/trunk/include/mvm/MethodInfo.h Sun Oct 9 12:23:23 2011
@@ -19,7 +19,7 @@
class FrameInfo {
public:
void* Metadata;
- intptr_t ReturnAddress;
+ word_t ReturnAddress;
uint16_t SourceIndex;
uint16_t FrameSize;
uint16_t NumLiveOffsets;
@@ -28,9 +28,9 @@
class MethodInfoHelper {
public:
- static void print(intptr_t ip, intptr_t addr);
+ static void print(word_t ip, word_t addr);
- static void scan(uintptr_t closure, FrameInfo* FI, intptr_t ip, intptr_t addr);
+ static void scan(word_t closure, FrameInfo* FI, word_t ip, word_t addr);
static uint32_t FrameInfoSize(uint32_t NumOffsets) {
uint32_t FrameInfoSize = sizeof(FrameInfo) + (NumOffsets - 1) * sizeof(int16_t);
@@ -45,13 +45,13 @@
uint32_t NumDescriptors;
FrameInfo* frames() const {
return reinterpret_cast<FrameInfo*>(
- reinterpret_cast<uintptr_t>(this) + kWordSize);
+ reinterpret_cast<word_t>(this) + kWordSize);
}
void* operator new(size_t sz, mvm::BumpPtrAllocator& allocator, uint32_t NumDescriptors, uint32_t NumOffsets) {
Frames* res = reinterpret_cast<Frames*>(
allocator.Allocate(kWordSize + NumDescriptors * MethodInfoHelper::FrameInfoSize(NumOffsets), "Frames"));
- assert(System::IsWordAligned(reinterpret_cast<uintptr_t>(res)));
+ assert(System::IsWordAligned(reinterpret_cast<word_t>(res)));
return res;
}
};
@@ -61,7 +61,7 @@
uint32_t NumCompiledFrames;
Frames* frames() const {
return reinterpret_cast<Frames*>(
- reinterpret_cast<uintptr_t>(this) + kWordSize);
+ reinterpret_cast<word_t>(this) + kWordSize);
}
};
@@ -82,8 +82,8 @@
void advance(int NumLiveOffsets) {
++currentFrameNumber;
if (!hasNext()) return;
- uintptr_t ptr =
- reinterpret_cast<uintptr_t>(currentFrame) + MethodInfoHelper::FrameInfoSize(NumLiveOffsets);
+ word_t ptr =
+ reinterpret_cast<word_t>(currentFrame) + MethodInfoHelper::FrameInfoSize(NumLiveOffsets);
currentFrame = reinterpret_cast<FrameInfo*>(ptr);
}
Modified: vmkit/trunk/include/mvm/System.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/System.h?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/System.h (original)
+++ vmkit/trunk/include/mvm/System.h Sun Oct 9 12:23:23 2011
@@ -16,10 +16,6 @@
#include <stdint.h>
#include <unistd.h>
-namespace mvm {
-
-const int kWordSize = sizeof(intptr_t);
-const int kWordSizeLog2 = kWordSize == 4 ? 2 : 3;
#if defined(__linux__) || defined(__FreeBSD__)
#define LINUX_OS 1
@@ -33,6 +29,8 @@
#define ARCH_32 1
#elif (__WORDSIZE == 64)
#define ARCH_64 1
+#elif defined(__LP64__)
+#define ARCH_64 1
#else
#error Word size not supported.
#endif
@@ -51,16 +49,25 @@
#error Architecture detection failed.
#endif
+#if ARCH_X64
+typedef uint64_t word_t;
+#else
+typedef uint32_t word_t;
+#endif
+
+namespace mvm {
+const int kWordSize = sizeof(word_t);
+const int kWordSizeLog2 = kWordSize == 4 ? 2 : 3;
#if ARCH_X64
-const intptr_t kThreadStart = 0x0000000110000000LL;
-const intptr_t kThreadIDMask = 0xFFFFFFFFFFF00000LL;
-const intptr_t kMvmThreadMask = 0xFFFFFFFFF0000000LL;
-#else
-const intptr_t kThreadStart = 0x10000000;
-const intptr_t kThreadIDMask = 0x7FF00000;
-const intptr_t kMvmThreadMask = 0xF0000000;
+const word_t kThreadStart = 0x0000000110000000LL;
+const word_t kThreadIDMask = 0xFFFFFFFFFFF00000LL;
+const word_t kMvmThreadMask = 0xFFFFFFFFF0000000LL;
+#else
+const word_t kThreadStart = 0x10000000;
+const word_t kThreadIDMask = 0x7FF00000;
+const word_t kMvmThreadMask = 0xF0000000;
#endif
#if MACOS_OS
@@ -77,15 +84,15 @@
#if MACOS_OS
#if ARCH_X64
- const uintptr_t kGCMemoryStart = 0x300000000LL;
+ const word_t kGCMemoryStart = 0x300000000LL;
#else
- const uintptr_t kGCMemoryStart = 0x30000000;
+ const word_t kGCMemoryStart = 0x30000000;
#endif
#else
- const uintptr_t kGCMemoryStart = 0x50000000;
+ const word_t kGCMemoryStart = 0x50000000;
#endif
-const uintptr_t kGCMemorySize = 0x30000000;
+const word_t kGCMemorySize = 0x30000000;
#define TRY { mvm::ExceptionBuffer __buffer__; if (!SETJMP(__buffer__.buffer))
#define CATCH else
@@ -94,11 +101,11 @@
class System {
public:
- static bool IsWordAligned(intptr_t ptr) {
+ static bool IsWordAligned(word_t ptr) {
return (ptr & (kWordSize - 1)) == 0;
}
- static intptr_t WordAlignUp(intptr_t ptr) {
+ static word_t WordAlignUp(word_t ptr) {
if (!IsWordAligned(ptr)) {
return (ptr & ~(kWordSize - 1)) + kWordSize;
}
@@ -106,37 +113,37 @@
}
// Apply this mask to the stack pointer to get the Thread object.
- static intptr_t GetThreadIDMask() {
+ static word_t GetThreadIDMask() {
return kThreadIDMask;
}
// Apply this mask to verify that the current thread was created by Mvm.
- static intptr_t GetMvmThreadMask() {
+ static word_t GetMvmThreadMask() {
return kMvmThreadMask;
}
// Get the memory start of thread stack addresses.
- static intptr_t GetThreadStart() {
+ static word_t GetThreadStart() {
return kThreadStart;
}
- static intptr_t GetCallerAddress() {
+ static word_t GetCallerAddress() {
#if defined(ARCH_X86) || defined(ARCH_X64)
- return (intptr_t)__builtin_frame_address(0);
+ return (word_t)__builtin_frame_address(0);
#else
- return ((intptr_t*)__builtin_frame_address(0))[0];
+ return ((word_t*)__builtin_frame_address(0))[0];
#endif
}
- static intptr_t GetCallerOfAddress(intptr_t addr) {
- return ((intptr_t*)addr)[0];
+ static word_t GetCallerOfAddress(word_t addr) {
+ return ((word_t*)addr)[0];
}
- static intptr_t GetIPFromCallerAddress(intptr_t addr) {
+ static word_t GetIPFromCallerAddress(word_t addr) {
#if defined(MACOS_OS) && defined(ARCH_PPC)
- return ((intptr_t*)addr)[2];
+ return ((word_t*)addr)[2];
#else
- return ((intptr_t*)addr)[1];
+ return ((word_t*)addr)[1];
#endif
}
@@ -192,7 +199,7 @@
return res[0];
}
- static uint8_t* GetLastBytePtr(uintptr_t ptr) {
+ static uint8_t* GetLastBytePtr(word_t ptr) {
#if ARCH_PPC
return ((uint8_t*)ptr) + 2 * mvm::kWordSize - 1;
#else
Modified: vmkit/trunk/include/mvm/Threads/CollectionRV.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/Threads/CollectionRV.h?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/Threads/CollectionRV.h (original)
+++ vmkit/trunk/include/mvm/Threads/CollectionRV.h Sun Oct 9 12:23:23 2011
@@ -62,7 +62,7 @@
virtual void synchronize() = 0;
virtual void join() = 0;
- virtual void joinAfterUncooperative(intptr_t SP) = 0;
+ virtual void joinAfterUncooperative(word_t SP) = 0;
virtual void joinBeforeUncooperative() = 0;
virtual void addThread(Thread* th) = 0;
@@ -74,7 +74,7 @@
void synchronize();
void join();
- void joinAfterUncooperative(intptr_t SP);
+ void joinAfterUncooperative(word_t SP);
void joinBeforeUncooperative();
void addThread(Thread* th);
Modified: vmkit/trunk/include/mvm/Threads/ObjectLocks.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/Threads/ObjectLocks.h?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/Threads/ObjectLocks.h (original)
+++ vmkit/trunk/include/mvm/Threads/ObjectLocks.h Sun Oct 9 12:23:23 2011
@@ -77,10 +77,10 @@
FatLock* nextFreeLock;
public:
FatLock(uint32_t index, gc* object);
- uintptr_t getID();
+ word_t getID();
int tryAcquire() { return internalLock.tryLock(); }
bool acquire(gc* object);
- void acquireAll(gc* object, uintptr_t count);
+ void acquireAll(gc* object, word_t count);
void release(gc* object, LockSystem& table);
mvm::Thread* getOwner();
bool owner();
@@ -147,7 +147,7 @@
return LockTable[index >> BitIndex][index & BitMask];
}
- FatLock* getFatLockFromID(uintptr_t ID);
+ FatLock* getFatLockFromID(word_t ID);
};
class ThinLock {
Modified: vmkit/trunk/include/mvm/Threads/Thread.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/Threads/Thread.h?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/Threads/Thread.h (original)
+++ vmkit/trunk/include/mvm/Threads/Thread.h Sun Oct 9 12:23:23 2011
@@ -101,8 +101,8 @@
class KnownFrame {
public:
- intptr_t currentFP;
- intptr_t currentIP;
+ word_t currentFP;
+ word_t currentIP;
KnownFrame* previousFrame;
};
@@ -153,7 +153,7 @@
/// baseSP - The base stack pointer.
///
- intptr_t baseSP;
+ word_t baseSP;
/// doYield - Flag to tell the thread to yield for GC reasons.
///
@@ -179,7 +179,7 @@
/// interrupted, lastSP is not null and contains the value of the
/// stack pointer before entering native.
///
- intptr_t lastSP;
+ word_t lastSP;
/// internalThreadID - The implementation specific thread id.
///
@@ -199,19 +199,19 @@
/// tracer - Does nothing. Used for child classes which may defined
/// a tracer.
///
- virtual void tracer(uintptr_t closure) {}
- void scanStack(uintptr_t closure);
+ virtual void tracer(word_t closure) {}
+ void scanStack(word_t closure);
- intptr_t getLastSP() { return lastSP; }
- void setLastSP(intptr_t V) { lastSP = V; }
+ word_t getLastSP() { return lastSP; }
+ void setLastSP(word_t V) { lastSP = V; }
void joinRVBeforeEnter();
- void joinRVAfterLeave(intptr_t savedSP);
+ void joinRVAfterLeave(word_t savedSP);
void enterUncooperativeCode(unsigned level = 0) __attribute__ ((noinline));
- void enterUncooperativeCode(intptr_t SP);
+ void enterUncooperativeCode(word_t SP);
void leaveUncooperativeCode();
- intptr_t waitOnSP();
+ word_t waitOnSP();
/// clearException - Clear any pending exception of the current thread.
@@ -221,11 +221,11 @@
bool isMvmThread() {
if (!baseAddr) return false;
- else return (((uintptr_t)this) & System::GetMvmThreadMask()) == baseAddr;
+ else return (((word_t)this) & System::GetMvmThreadMask()) == baseAddr;
}
/// baseAddr - The base address for all threads.
- static uintptr_t baseAddr;
+ static word_t baseAddr;
/// OverflowMask - Apply this mask to implement overflow checks. For
/// efficiency, we lower the available size of the stack: it can never go
@@ -259,7 +259,7 @@
/// getFrameContext - Fill the buffer with frames currently on the stack.
///
- void getFrameContext(intptr_t* buffer);
+ void getFrameContext(word_t* buffer);
/// getFrameContextLength - Get the length of the frame context.
///
@@ -303,14 +303,14 @@
///
class StackWalker {
public:
- intptr_t addr;
- intptr_t ip;
+ word_t addr;
+ word_t ip;
KnownFrame* frame;
mvm::Thread* thread;
StackWalker(mvm::Thread* th) __attribute__ ((noinline));
void operator++();
- intptr_t operator*();
+ word_t operator*();
FrameInfo* get();
};
Modified: vmkit/trunk/include/mvm/VirtualMachine.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/VirtualMachine.h?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/VirtualMachine.h (original)
+++ vmkit/trunk/include/mvm/VirtualMachine.h Sun Oct 9 12:23:23 2011
@@ -32,7 +32,7 @@
/// used when walking the stack so that VMKit knows which applicative method
/// is executing on the stack.
///
- llvm::DenseMap<intptr_t, FrameInfo*> Functions;
+ llvm::DenseMap<word_t, FrameInfo*> Functions;
/// FunctionMapLock - Spin lock to protect the Functions map.
///
@@ -40,12 +40,12 @@
/// IPToFrameInfo - Map a code start instruction instruction to the FrameInfo.
///
- FrameInfo* IPToFrameInfo(intptr_t ip);
+ FrameInfo* IPToFrameInfo(word_t ip);
/// addFrameInfo - A new instruction pointer in the function map.
///
- void addFrameInfo(intptr_t ip, FrameInfo* meth);
- void addFrameInfoNoLock(intptr_t ip, FrameInfo* meth) {
+ void addFrameInfo(word_t ip, FrameInfo* meth);
+ void addFrameInfoNoLock(word_t ip, FrameInfo* meth) {
Functions[ip] = meth;
}
/// removeFrameInfos - Remove all FrameInfo owned by the given owner.
@@ -164,22 +164,22 @@
/// scanWeakReferencesQueue - Scan all weak references. Called by the GC
/// before scanning the finalization queue.
///
- virtual void scanWeakReferencesQueue(uintptr_t closure) {}
+ virtual void scanWeakReferencesQueue(word_t closure) {}
/// scanSoftReferencesQueue - Scan all soft references. Called by the GC
/// before scanning the finalization queue.
///
- virtual void scanSoftReferencesQueue(uintptr_t closure) {}
+ virtual void scanSoftReferencesQueue(word_t closure) {}
/// scanPhantomReferencesQueue - Scan all phantom references. Called by the GC
/// after the finalization queue.
///
- virtual void scanPhantomReferencesQueue(uintptr_t closure) {}
+ virtual void scanPhantomReferencesQueue(word_t closure) {}
/// scanFinalizationQueue - Scan objets with a finalized method and schedule
/// them for finalization if they are not live.
///
- virtual void scanFinalizationQueue(uintptr_t closure) {}
+ virtual void scanFinalizationQueue(word_t closure) {}
/// addFinalizationCandidate - Add an object to the queue of objects with
/// a finalization method.
@@ -188,7 +188,7 @@
/// tracer - Trace this virtual machine's GC-objects.
///
- virtual void tracer(uintptr_t closure) {}
+ virtual void tracer(word_t closure) {}
/// getObjectSize - Get the size of this object. Used by copying collectors.
///
@@ -208,14 +208,14 @@
//===----------------------------------------------------------------------===//
FunctionMap FunctionsCache;
- FrameInfo* IPToFrameInfo(intptr_t ip) {
+ FrameInfo* IPToFrameInfo(word_t ip) {
return FunctionsCache.IPToFrameInfo(ip);
}
void removeFrameInfos(void* owner) {
FunctionsCache.removeFrameInfos(owner);
}
- virtual void printMethod(FrameInfo* FI, intptr_t ip, intptr_t addr) = 0;
+ virtual void printMethod(FrameInfo* FI, word_t ip, word_t addr) = 0;
//===----------------------------------------------------------------------===//
// (4) Launch-related methods.
Modified: vmkit/trunk/lib/J3/Classpath/ClasspathReflect.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/ClasspathReflect.h?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Classpath/ClasspathReflect.h (original)
+++ vmkit/trunk/lib/J3/Classpath/ClasspathReflect.h Sun Oct 9 12:23:23 2011
@@ -51,7 +51,7 @@
return cl->pd;
}
- static void staticTracer(JavaObjectClass* obj, uintptr_t closure) {
+ static void staticTracer(JavaObjectClass* obj, word_t closure) {
mvm::Collector::markAndTrace(obj, &obj->pd, closure);
mvm::Collector::markAndTrace(obj, &obj->signers, closure);
mvm::Collector::markAndTrace(obj, &obj->constructor, closure);
@@ -71,7 +71,7 @@
public:
- static void staticTracer(JavaObjectField* obj, uintptr_t closure) {
+ static void staticTracer(JavaObjectField* obj, word_t closure) {
mvm::Collector::markAndTrace(obj, &obj->name, closure);
mvm::Collector::markAndTrace(obj, &obj->declaringClass, closure);
}
@@ -99,7 +99,7 @@
public:
- static void staticTracer(JavaObjectMethod* obj, uintptr_t closure) {
+ static void staticTracer(JavaObjectMethod* obj, word_t closure) {
mvm::Collector::markAndTrace(obj, &obj->name, closure);
mvm::Collector::markAndTrace(obj, &obj->declaringClass, closure);
}
@@ -121,7 +121,7 @@
uint32 slot;
public:
- static void staticTracer(JavaObjectConstructor* obj, uintptr_t closure) {
+ static void staticTracer(JavaObjectConstructor* obj, word_t closure) {
mvm::Collector::markAndTrace(obj, &obj->declaringClass, closure);
}
@@ -142,7 +142,7 @@
JavaThread* vmdata;
public:
- static void staticTracer(JavaObjectVMThread* obj, uintptr_t closure) {
+ static void staticTracer(JavaObjectVMThread* obj, word_t closure) {
mvm::Collector::markAndTrace(obj, &obj->thread, closure);
}
Modified: vmkit/trunk/lib/J3/Classpath/JavaUpcalls.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/JavaUpcalls.cpp?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Classpath/JavaUpcalls.cpp (original)
+++ vmkit/trunk/lib/J3/Classpath/JavaUpcalls.cpp Sun Oct 9 12:23:23 2011
@@ -492,27 +492,27 @@
}
extern "C" void nativeJavaObjectClassTracer(
- JavaObjectClass* obj, uintptr_t closure) {
+ JavaObjectClass* obj, word_t closure) {
JavaObjectClass::staticTracer(obj, closure);
}
extern "C" void nativeJavaObjectFieldTracer(
- JavaObjectField* obj, uintptr_t closure) {
+ JavaObjectField* obj, word_t closure) {
JavaObjectField::staticTracer(obj, closure);
}
extern "C" void nativeJavaObjectMethodTracer(
- JavaObjectMethod* obj, uintptr_t closure) {
+ JavaObjectMethod* obj, word_t closure) {
JavaObjectMethod::staticTracer(obj, closure);
}
extern "C" void nativeJavaObjectConstructorTracer(
- JavaObjectConstructor* obj, uintptr_t closure) {
+ JavaObjectConstructor* obj, word_t closure) {
JavaObjectConstructor::staticTracer(obj, closure);
}
extern "C" void nativeJavaObjectVMThreadTracer(
- JavaObjectVMThread* obj, uintptr_t closure) {
+ JavaObjectVMThread* obj, word_t closure) {
JavaObjectVMThread::staticTracer(obj, closure);
}
@@ -1005,23 +1005,23 @@
//===----------------------------------------------------------------------===//
newClass->getVirtualVT()->setNativeTracer(
- (uintptr_t)nativeJavaObjectClassTracer,
+ (word_t)nativeJavaObjectClassTracer,
"nativeJavaObjectClassTracer");
newConstructor->getVirtualVT()->setNativeTracer(
- (uintptr_t)nativeJavaObjectConstructorTracer,
+ (word_t)nativeJavaObjectConstructorTracer,
"nativeJavaObjectConstructorTracer");
newMethod->getVirtualVT()->setNativeTracer(
- (uintptr_t)nativeJavaObjectMethodTracer,
+ (word_t)nativeJavaObjectMethodTracer,
"nativeJavaObjectMethodTracer");
newField->getVirtualVT()->setNativeTracer(
- (uintptr_t)nativeJavaObjectFieldTracer,
+ (word_t)nativeJavaObjectFieldTracer,
"nativeJavaObjectFieldTracer");
newVMThread->getVirtualVT()->setNativeTracer(
- (uintptr_t)nativeJavaObjectVMThreadTracer,
+ (word_t)nativeJavaObjectVMThreadTracer,
"nativeJavaObjectVMThreadTracer");
newReference = UPCALL_CLASS(loader, "java/lang/ref/Reference");
Modified: vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp Sun Oct 9 12:23:23 2011
@@ -371,14 +371,14 @@
name->equals(ExtentArray) || name->equals(ObjectReferenceArray) ||
name->equals(OffsetArray)) {
- intptr_t* realObj = (intptr_t*)obj;
- intptr_t size = realObj[0];
+ word_t* realObj = (word_t*)obj;
+ word_t size = realObj[0];
ArrayType* ATy = ArrayType::get(JavaIntrinsics.JavaObjectType,
size + 1);
std::vector<Constant*> Vals;
- for (sint32 i = 0; i < size + 1; ++i) {
+ for (uint32 i = 0; i < size + 1; ++i) {
Constant* CI = ConstantInt::get(Type::getInt64Ty(getLLVMContext()),
uint64_t(realObj[i]));
CI = ConstantExpr::getIntToPtr(CI, JavaIntrinsics.JavaObjectType);
@@ -2034,7 +2034,7 @@
uint32 size = cl->super->virtualTableSize -
JavaVirtualTable::getFirstJavaMethodIndex();
memcpy(VT->getFirstJavaMethod(), cl->super->virtualVT->getFirstJavaMethod(),
- size * sizeof(uintptr_t));
+ size * sizeof(word_t));
VT->destructor = cl->super->virtualVT->destructor;
}
@@ -2043,7 +2043,7 @@
((void**)VT)[meth.offset] = &meth;
}
- if (!cl->super) VT->destructor = reinterpret_cast<uintptr_t>(EmptyDestructor);
+ if (!cl->super) VT->destructor = reinterpret_cast<word_t>(EmptyDestructor);
}
void JavaAOTCompiler::makeIMT(Class* cl) {
@@ -2210,7 +2210,7 @@
ee = classes.end(); ii != ee; ++ii) {
Class* cl = *ii;
static const std::string magic = "org/vmmagic";
- static void* ptr = (void*)(uintptr_t)UnreachableMagicMMTk;
+ static void* ptr = (void*)(word_t)UnreachableMagicMMTk;
if (!strncmp(UTF8Buffer(cl->name).cString(),
magic.c_str(),
magic.length() - 1)) {
Modified: vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJIT.cpp Sun Oct 9 12:23:23 2011
@@ -352,7 +352,7 @@
return callee;
}
-llvm::Function* JavaJIT::nativeCompile(intptr_t natPtr) {
+llvm::Function* JavaJIT::nativeCompile(word_t natPtr) {
PRINT_DEBUG(JNJVM_COMPILE, 1, COLOR_NORMAL, "native compile %s.%s\n",
UTF8Buffer(compilingClass->name).cString(),
Modified: vmkit/trunk/lib/J3/Compiler/JavaJIT.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJIT.h?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJIT.h (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJIT.h Sun Oct 9 12:23:23 2011
@@ -100,7 +100,7 @@
llvm::Function* javaCompile();
/// nativeCompile - Compile the native method.
- llvm::Function* nativeCompile(intptr_t natPtr = 0);
+ llvm::Function* nativeCompile(word_t natPtr = 0);
/// isCustomizable - Whether we found the method to be customizable.
bool isCustomizable;
Modified: vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaJITCompiler.cpp Sun Oct 9 12:23:23 2011
@@ -187,7 +187,7 @@
}
Class* current = cl;
- uintptr_t* functions = VT->getFunctions();
+ word_t* functions = VT->getFunctions();
while (current != NULL) {
// Fill the virtual table with function pointers.
for (uint32 i = 0; i < current->nbVirtualMethods; ++i) {
@@ -244,7 +244,7 @@
if (meth) {
IMT->contents[i] = getPointerOrStub(*meth, JavaMethod::Interface);
} else {
- IMT->contents[i] = (uintptr_t)ThrowUnfoundInterface;
+ IMT->contents[i] = (word_t)ThrowUnfoundInterface;
}
} else if (size > 1) {
std::vector<JavaMethod*> methods;
@@ -268,17 +268,17 @@
IMT->contents[i] = getPointerOrStub(*(methods[0]),
JavaMethod::Interface);
} else {
- IMT->contents[i] = (uintptr_t)ThrowUnfoundInterface;
+ IMT->contents[i] = (word_t)ThrowUnfoundInterface;
}
} else {
// Add one to have a NULL-terminated table.
- uint32_t length = (2 * size + 1) * sizeof(uintptr_t);
+ uint32_t length = (2 * size + 1) * sizeof(word_t);
- uintptr_t* table = (uintptr_t*)
+ word_t* table = (word_t*)
cl->classLoader->allocator.Allocate(length, "IMT");
- IMT->contents[i] = (uintptr_t)table | 1;
+ IMT->contents[i] = (word_t)table | 1;
uint32_t j = 0;
std::set<JavaMethod*>::iterator Interf = atIndex.begin();
@@ -288,11 +288,11 @@
JavaMethod* Cmeth = *it;
assert(Imeth != NULL);
assert(j < 2 * size - 1);
- table[j] = (uintptr_t)Imeth;
+ table[j] = (word_t)Imeth;
if (Cmeth) {
table[j + 1] = getPointerOrStub(*Cmeth, JavaMethod::Interface);
} else {
- table[j + 1] = (uintptr_t)ThrowUnfoundInterface;
+ table[j + 1] = (word_t)ThrowUnfoundInterface;
}
}
assert(Interf == atIndex.end());
@@ -372,7 +372,7 @@
return 0;
}
-uintptr_t JavaJ3LazyJITCompiler::getPointerOrStub(JavaMethod& meth,
+word_t JavaJ3LazyJITCompiler::getPointerOrStub(JavaMethod& meth,
int side) {
return meth.getSignature()->getVirtualCallStub();
}
@@ -383,11 +383,11 @@
LLVMSignatureInfo* LSI = getSignatureInfo(sign);
// Set the stub in the constant pool.
JavaConstantPool* ctpInfo = cl->ctpInfo;
- uintptr_t stub = stat ? sign->getStaticCallStub() : sign->getSpecialCallStub();
+ word_t stub = stat ? sign->getStaticCallStub() : sign->getSpecialCallStub();
if (!ctpInfo->ctpRes[index]) {
// Do a compare and swap, so that we do not overwrtie what a stub might
// have just updated.
- uintptr_t val = (uintptr_t)
+ word_t val = (word_t)
__sync_val_compare_and_swap(&(ctpInfo->ctpRes[index]), NULL, (void*)stub);
// If there is something in the the constant pool that is not NULL nor
// the stub, then it's the method.
Modified: vmkit/trunk/lib/J3/VMCore/JNIReferences.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JNIReferences.h?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JNIReferences.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JNIReferences.h Sun Oct 9 12:23:23 2011
@@ -75,8 +75,8 @@
}
void removeJNIReference(JavaObject** obj) {
- if (((uintptr_t)obj >= (uintptr_t)globalReferences) &&
- ((uintptr_t)obj) < (uintptr_t)(globalReferences + MAXIMUM_REFERENCES)) {
+ if (((word_t)obj >= (word_t)globalReferences) &&
+ ((word_t)obj) < (word_t)(globalReferences + MAXIMUM_REFERENCES)) {
*obj = NULL;
--count;
} else {
Modified: vmkit/trunk/lib/J3/VMCore/JavaArray.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaArray.h?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaArray.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaArray.h Sun Oct 9 12:23:23 2011
@@ -120,7 +120,7 @@
ARRAYCLASS(ArrayLong, sint64);
ARRAYCLASS(ArrayFloat, float);
ARRAYCLASS(ArrayDouble, double);
-ARRAYCLASS(ArrayPtr, intptr_t);
+ARRAYCLASS(ArrayPtr, word_t);
#undef ARRAYCLASS
Modified: vmkit/trunk/lib/J3/VMCore/JavaClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaClass.cpp?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaClass.cpp Sun Oct 9 12:23:23 2011
@@ -280,11 +280,11 @@
access |= ACC_NATIVE;
}
-void JavaVirtualTable::setNativeTracer(uintptr_t ptr, const char* name) {
+void JavaVirtualTable::setNativeTracer(word_t ptr, const char* name) {
tracer = ptr;
}
-void JavaVirtualTable::setNativeDestructor(uintptr_t ptr, const char* name) {
+void JavaVirtualTable::setNativeDestructor(word_t ptr, const char* name) {
if (!cl->classLoader->getCompiler()->isStaticCompiling()) {
destructor = ptr;
operatorDelete = ptr;
@@ -1336,7 +1336,7 @@
#define COPY(CLASS) \
memcpy(CLASS->virtualVT->getFirstJavaMethod(), \
javaLangObject->virtualVT->getFirstJavaMethod(), \
- sizeof(uintptr_t) * JavaVirtualTable::getNumJavaMethods()); \
+ sizeof(word_t) * JavaVirtualTable::getNumJavaMethods()); \
CLASS->super = javaLangObject; \
CLASS->virtualVT->display[0] = javaLangObject->virtualVT; \
CLASS->virtualVT->secondaryTypes = \
@@ -1362,9 +1362,9 @@
Class* referenceClass =
C->classLoader->bootstrapLoader->upcalls->newReference;
if (referenceClass != NULL && C->super->isAssignableFrom(referenceClass)) {
- tracer = (uintptr_t)ReferenceObjectTracer;
+ tracer = (word_t)ReferenceObjectTracer;
} else {
- tracer = (uintptr_t)RegularObjectTracer;
+ tracer = (word_t)RegularObjectTracer;
}
operatorDelete = 0;
@@ -1433,7 +1433,7 @@
} else {
// Set the tracer, destructor and delete.
- tracer = (uintptr_t)JavaObjectTracer;
+ tracer = (word_t)JavaObjectTracer;
operatorDelete = 0;
// Set the class of this VT.
@@ -1460,8 +1460,8 @@
uint32 size = (getBaseSize() - getFirstJavaMethodIndex());
memcpy(this->getFirstJavaMethod(),
C->super->virtualVT->getFirstJavaMethod(),
- size * sizeof(uintptr_t));
- tracer = (uintptr_t)ArrayObjectTracer;
+ size * sizeof(word_t));
+ tracer = (word_t)ArrayObjectTracer;
// Set the class of this VT.
cl = C;
@@ -1630,7 +1630,7 @@
} else {
// Set the tracer, destructor and delete
- tracer = (uintptr_t)JavaObjectTracer;
+ tracer = (word_t)JavaObjectTracer;
operatorDelete = 0;
// Set the class of this VT.
Modified: vmkit/trunk/lib/J3/VMCore/JavaClass.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaClass.h?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaClass.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaClass.h Sun Oct 9 12:23:23 2011
@@ -280,7 +280,7 @@
/// tracer - The tracer of this GC-allocated class.
///
- void tracer(uintptr_t closure);
+ void tracer(word_t closure);
/// inheritName - Does this class in its class hierarchy inherits
/// the given name? Equality is on the name. This function does not take
@@ -587,7 +587,7 @@
/// tracer - Tracer function of instances of Class.
///
- void tracer(uintptr_t closure);
+ void tracer(word_t closure);
~Class();
Class();
Modified: vmkit/trunk/lib/J3/VMCore/JavaObject.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaObject.cpp?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaObject.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaObject.cpp Sun Oct 9 12:23:23 2011
@@ -33,11 +33,11 @@
assert(HashMask != 0);
assert(mvm::HashBits != 0);
- uintptr_t header = self->header;
- uintptr_t GCBits = header & mvm::GCBitMask;
- uintptr_t val = header & HashMask;
+ word_t header = self->header;
+ word_t GCBits = header & mvm::GCBitMask;
+ word_t val = header & HashMask;
if (val != 0) {
- return val ^ (uintptr_t)getClass(self);
+ return val ^ (word_t)getClass(self);
}
val = hashCodeGenerator;
hashCodeGenerator += hashCodeIncrement;
@@ -54,14 +54,14 @@
do {
header = self->header;
if ((header & HashMask) != 0) break;
- uintptr_t newHeader = header | val;
+ word_t newHeader = header | val;
assert((newHeader & ~HashMask) == header);
__sync_val_compare_and_swap(&(self->header), header, newHeader);
} while (true);
assert((self->header & HashMask) != 0);
assert(GCBits == (self->header & mvm::GCBitMask));
- return (self->header & HashMask) ^ (uintptr_t)getClass(self);
+ return (self->header & HashMask) ^ (word_t)getClass(self);
}
Modified: vmkit/trunk/lib/J3/VMCore/JavaObject.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaObject.h?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaObject.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaObject.h Sun Oct 9 12:23:23 2011
@@ -33,7 +33,7 @@
class InterfaceMethodTable : public mvm::PermanentObject {
public:
static const uint32_t NumIndexes = 29;
- uintptr_t contents[NumIndexes];
+ word_t contents[NumIndexes];
static uint32_t getIndex(const mvm::UTF8* name, const mvm::UTF8* type) {
return (name->hash() + type->hash()) % NumIndexes;
@@ -90,18 +90,18 @@
InterfaceMethodTable* IMT;
/// Java methods for the virtual table functions.
- uintptr_t init;
- uintptr_t equals;
- uintptr_t hashCode;
- uintptr_t toString;
- uintptr_t clone;
- uintptr_t getClass;
- uintptr_t notify;
- uintptr_t notifyAll;
- uintptr_t waitIndefinitely;
- uintptr_t waitMs;
- uintptr_t waitMsNs;
- uintptr_t virtualMethods[1];
+ word_t init;
+ word_t equals;
+ word_t hashCode;
+ word_t toString;
+ word_t clone;
+ word_t getClass;
+ word_t notify;
+ word_t notifyAll;
+ word_t waitIndefinitely;
+ word_t waitMs;
+ word_t waitMsNs;
+ word_t virtualMethods[1];
/// operator new - Allocates a JavaVirtualTable with the given size. The
/// size must contain the additional information for type checking, as well
@@ -109,7 +109,7 @@
///
void* operator new(size_t sz, mvm::BumpPtrAllocator& allocator,
uint32 nbMethods) {
- return allocator.Allocate(sizeof(uintptr_t) * (nbMethods), "Virtual table");
+ return allocator.Allocate(sizeof(word_t) * (nbMethods), "Virtual table");
}
/// JavaVirtualTable - Create JavaVirtualTable objects for classes, array
@@ -123,7 +123,7 @@
/// getFirstJavaMethod - Get the byte offset of the first Java method
/// (<init>).
///
- uintptr_t* getFirstJavaMethod() {
+ word_t* getFirstJavaMethod() {
return &init;
}
@@ -216,12 +216,12 @@
/// setNativeTracer - Set the tracer of this virtual table as a method
/// defined by JnJVM.
///
- void setNativeTracer(uintptr_t tracer, const char* name);
+ void setNativeTracer(word_t tracer, const char* name);
/// setNativeDestructor - Set the destructor of this virtual table as a method
/// defined by JnJVM.
///
- void setNativeDestructor(uintptr_t tracer, const char* name);
+ void setNativeDestructor(word_t tracer, const char* name);
};
Modified: vmkit/trunk/lib/J3/VMCore/JavaRuntimeJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaRuntimeJIT.cpp?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaRuntimeJIT.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaRuntimeJIT.cpp Sun Oct 9 12:23:23 2011
@@ -343,13 +343,13 @@
th->currentAddedReferences = *oldLRN;
}
-extern "C" intptr_t j3StartJNI(uint32* localReferencesNumber,
+extern "C" word_t j3StartJNI(uint32* localReferencesNumber,
uint32** oldLocalReferencesNumber,
mvm::KnownFrame* Frame)
__attribute__((noinline));
// Never throws. Does not call Java code. Can not yield a GC. May join a GC.
-extern "C" intptr_t j3StartJNI(uint32* localReferencesNumber,
+extern "C" word_t j3StartJNI(uint32* localReferencesNumber,
uint32** oldLocalReferencesNumber,
mvm::KnownFrame* Frame) {
@@ -598,15 +598,15 @@
InterfaceMethodTable* IMT = cl->virtualVT->IMT;
uint32_t index = InterfaceMethodTable::getIndex(Virt->name, Virt->type);
if ((IMT->contents[index] & 1) == 0) {
- IMT->contents[index] = (uintptr_t)result;
+ IMT->contents[index] = (word_t)result;
} else {
JavaMethod* Imeth =
ctpCl->asClass()->lookupInterfaceMethodDontThrow(utf8, sign->keyName);
assert(Imeth && "Method not in hierarchy?");
- uintptr_t* table = (uintptr_t*)(IMT->contents[index] & ~1);
+ word_t* table = (word_t*)(IMT->contents[index] & ~1);
uint32 i = 0;
- while (table[i] != (uintptr_t)Imeth) { i += 2; }
- table[i + 1] = (uintptr_t)result;
+ while (table[i] != (word_t)Imeth) { i += 2; }
+ table[i + 1] = (word_t)result;
}
}
@@ -699,14 +699,14 @@
// Does not throw an exception.
extern "C" void* j3ResolveInterface(JavaObject* obj, JavaMethod* meth, uint32_t index) {
- uintptr_t result = NULL;
+ word_t result = NULL;
InterfaceMethodTable* IMT = JavaObject::getClass(obj)->virtualVT->IMT;
if ((IMT->contents[index] & 1) == 0) {
result = IMT->contents[index];
} else {
- uintptr_t* table = (uintptr_t*)(IMT->contents[index] & ~1);
+ word_t* table = (word_t*)(IMT->contents[index] & ~1);
uint32 i = 0;
- while (table[i] != (uintptr_t)meth && table[i] != 0) { i += 2; }
+ while (table[i] != (word_t)meth && table[i] != 0) { i += 2; }
assert(table[i] != 0);
result = table[i + 1];
}
Modified: vmkit/trunk/lib/J3/VMCore/JavaThread.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaThread.h?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaThread.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaThread.h Sun Oct 9 12:23:23 2011
@@ -39,7 +39,7 @@
#define BEGIN_JNI_EXCEPTION \
JavaThread* th = JavaThread::get(); \
- intptr_t SP = th->getLastSP(); \
+ word_t SP = th->getLastSP(); \
th->leaveUncooperativeCode(); \
mvm::KnownFrame Frame; \
th->startKnownFrame(Frame); \
@@ -106,7 +106,7 @@
/// tracer - Traces GC-objects pointed by this thread object.
///
- virtual void tracer(uintptr_t closure);
+ virtual void tracer(word_t closure);
/// JavaThread - Empty constructor, used to get the VT.
///
@@ -157,7 +157,7 @@
/// throwFromJNI - Throw an exception after executing JNI code.
///
- void throwFromJNI(intptr_t SP) {
+ void throwFromJNI(word_t SP) {
endKnownFrame();
enterUncooperativeCode(SP);
}
Modified: vmkit/trunk/lib/J3/VMCore/JavaTypes.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaTypes.cpp?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaTypes.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaTypes.cpp Sun Oct 9 12:23:23 2011
@@ -57,13 +57,13 @@
pseudoAssocClassName = name->extract(map, 1, name->size - 1);
}
-intptr_t Signdef::staticCallBuf() {
+word_t Signdef::staticCallBuf() {
if (!_staticCallBuf) {
mvm::ThreadAllocator allocator;
char* buf = (char*)allocator.Allocate((keyName->size << 1) + 1 + 11);
nativeName(buf, "static_buf");
bool unused = false;
- intptr_t res = initialLoader->loadInLib(buf, unused);
+ word_t res = initialLoader->loadInLib(buf, unused);
if (res) {
_staticCallBuf = res;
} else {
@@ -73,13 +73,13 @@
return _staticCallBuf;
}
-intptr_t Signdef::virtualCallBuf() {
+word_t Signdef::virtualCallBuf() {
if (!_virtualCallBuf) {
mvm::ThreadAllocator allocator;
char* buf = (char*)allocator.Allocate((keyName->size << 1) + 1 + 11);
nativeName(buf, "virtual_buf");
bool unused = false;
- intptr_t res = initialLoader->loadInLib(buf, unused);
+ word_t res = initialLoader->loadInLib(buf, unused);
if (res) {
_virtualCallBuf = res;
} else {
@@ -89,13 +89,13 @@
return _virtualCallBuf;
}
-intptr_t Signdef::staticCallAP() {
+word_t Signdef::staticCallAP() {
if (!_staticCallAP) {
mvm::ThreadAllocator allocator;
char* buf = (char*)allocator.Allocate((keyName->size << 1) + 1 + 11);
nativeName(buf, "static_ap");
bool unused = false;
- intptr_t res = initialLoader->loadInLib(buf, unused);
+ word_t res = initialLoader->loadInLib(buf, unused);
if (res) {
_staticCallAP = res;
} else {
@@ -105,13 +105,13 @@
return _staticCallAP;
}
-intptr_t Signdef::virtualCallAP() {
+word_t Signdef::virtualCallAP() {
if (!_virtualCallAP) {
mvm::ThreadAllocator allocator;
char* buf = (char*)allocator.Allocate((keyName->size << 1) + 1 + 11);
nativeName(buf, "virtual_ap");
bool unused = false;
- intptr_t res = initialLoader->loadInLib(buf, unused);
+ word_t res = initialLoader->loadInLib(buf, unused);
if (res) {
_virtualCallAP = res;
} else {
@@ -121,13 +121,13 @@
return _virtualCallAP;
}
-intptr_t Signdef::virtualCallStub() {
+word_t Signdef::virtualCallStub() {
if (!_virtualCallAP) {
mvm::ThreadAllocator allocator;
char* buf = (char*)allocator.Allocate((keyName->size << 1) + 1 + 11);
nativeName(buf, "virtual_stub");
bool unused = false;
- intptr_t res = initialLoader->loadInLib(buf, unused);
+ word_t res = initialLoader->loadInLib(buf, unused);
if (res) {
_virtualCallStub = res;
} else {
@@ -137,13 +137,13 @@
return _virtualCallStub;
}
-intptr_t Signdef::specialCallStub() {
+word_t Signdef::specialCallStub() {
if (!_specialCallStub) {
mvm::ThreadAllocator allocator;
char* buf = (char*)allocator.Allocate((keyName->size << 1) + 1 + 11);
nativeName(buf, "special_stub");
bool unused = false;
- intptr_t res = initialLoader->loadInLib(buf, unused);
+ word_t res = initialLoader->loadInLib(buf, unused);
if (res) {
_specialCallStub = res;
} else {
@@ -153,13 +153,13 @@
return _specialCallStub;
}
-intptr_t Signdef::staticCallStub() {
+word_t Signdef::staticCallStub() {
if (!_staticCallStub) {
mvm::ThreadAllocator allocator;
char* buf = (char*)allocator.Allocate((keyName->size << 1) + 1 + 11);
nativeName(buf, "static_stub");
bool unused = false;
- intptr_t res = initialLoader->loadInLib(buf, unused);
+ word_t res = initialLoader->loadInLib(buf, unused);
if (res) {
_staticCallStub = res;
} else {
Modified: vmkit/trunk/lib/J3/VMCore/JavaTypes.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaTypes.h?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaTypes.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaTypes.h Sun Oct 9 12:23:23 2011
@@ -281,38 +281,38 @@
/// function with the specific signature and receive the arguments in a
/// buffer.
///
- intptr_t _staticCallBuf;
- intptr_t staticCallBuf();
+ word_t _staticCallBuf;
+ word_t staticCallBuf();
/// _virtualCallBuf - A dynamically generated method which calls a virtual
/// Java function with the specific signature and receive the arguments in a
/// buffer.
///
- intptr_t _virtualCallBuf;
- intptr_t virtualCallBuf();
+ word_t _virtualCallBuf;
+ word_t virtualCallBuf();
/// _staticCallAP - A dynamically generated method which calls a static Java
/// function with the specific signature and receive the arguments in a
/// variable argument handle.
///
- intptr_t _staticCallAP;
- intptr_t staticCallAP();
+ word_t _staticCallAP;
+ word_t staticCallAP();
/// _virtualCallBuf - A dynamically generated method which calls a virtual
/// Java function with the specific signature and receive the arguments in a
/// variable argument handle.
///
- intptr_t _virtualCallAP;
- intptr_t virtualCallAP();
+ word_t _virtualCallAP;
+ word_t virtualCallAP();
- intptr_t _virtualCallStub;
- intptr_t virtualCallStub();
+ word_t _virtualCallStub;
+ word_t virtualCallStub();
- intptr_t _specialCallStub;
- intptr_t specialCallStub();
+ word_t _specialCallStub;
+ word_t specialCallStub();
- intptr_t _staticCallStub;
- intptr_t staticCallStub();
+ word_t _staticCallStub;
+ word_t staticCallStub();
public:
@@ -350,67 +350,67 @@
//
//===----------------------------------------------------------------------===//
- intptr_t getStaticCallBuf() {
+ word_t getStaticCallBuf() {
if(!_staticCallBuf) return staticCallBuf();
return _staticCallBuf;
}
- intptr_t getVirtualCallBuf() {
+ word_t getVirtualCallBuf() {
if(!_virtualCallBuf) return virtualCallBuf();
return _virtualCallBuf;
}
- intptr_t getStaticCallAP() {
+ word_t getStaticCallAP() {
if (!_staticCallAP) return staticCallAP();
return _staticCallAP;
}
- intptr_t getVirtualCallAP() {
+ word_t getVirtualCallAP() {
if (!_virtualCallAP) return virtualCallAP();
return _virtualCallAP;
}
- intptr_t getVirtualCallStub() {
+ word_t getVirtualCallStub() {
if (!_virtualCallStub) return virtualCallStub();
return _virtualCallStub;
}
- intptr_t getSpecialCallStub() {
+ word_t getSpecialCallStub() {
if (!_specialCallStub) return specialCallStub();
return _specialCallStub;
}
- intptr_t getStaticCallStub() {
+ word_t getStaticCallStub() {
if (!_staticCallStub) return staticCallStub();
return _staticCallStub;
}
void setStaticCallBuf(void* code) {
- _staticCallBuf = (intptr_t)code;
+ _staticCallBuf = (word_t)code;
}
void setVirtualCallBuf(void* code) {
- _virtualCallBuf = (intptr_t)code;
+ _virtualCallBuf = (word_t)code;
}
void setStaticCallAP(void* code) {
- _staticCallAP = (intptr_t)code;
+ _staticCallAP = (word_t)code;
}
void setVirtualCallAP(void* code) {
- _virtualCallAP = (intptr_t)code;
+ _virtualCallAP = (word_t)code;
}
void setVirtualCallStub(void* code) {
- _virtualCallStub = (intptr_t)code;
+ _virtualCallStub = (word_t)code;
}
void setSpecialCallStub(void* code) {
- _specialCallStub = (intptr_t)code;
+ _specialCallStub = (word_t)code;
}
void setStaticCallStub(void* code) {
- _staticCallStub = (intptr_t)code;
+ _staticCallStub = (word_t)code;
}
//===----------------------------------------------------------------------===//
Modified: vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp Sun Oct 9 12:23:23 2011
@@ -1081,7 +1081,7 @@
upcalls->newString->resolveClass();
if (JavaString::internStringVT == NULL) {
JavaVirtualTable* stringVT = upcalls->newString->getVirtualVT();
- uint32 size = upcalls->newString->virtualTableSize * sizeof(uintptr_t);
+ uint32 size = upcalls->newString->virtualTableSize * sizeof(word_t);
JavaString::internStringVT =
(JavaVirtualTable*)bootstrapLoader->allocator.Allocate(size, "String VT");
@@ -1089,11 +1089,11 @@
memcpy(JavaString::internStringVT, stringVT, size);
JavaString::internStringVT->destructor =
- (uintptr_t)JavaString::stringDestructor;
+ (word_t)JavaString::stringDestructor;
// Tell the finalizer that this is a native destructor.
JavaString::internStringVT->operatorDelete =
- (uintptr_t)JavaString::stringDestructor;
+ (word_t)JavaString::stringDestructor;
}
upcalls->newString->initialiseClass(this);
@@ -1364,19 +1364,19 @@
referenceThread->EnqueueCond.broadcast();
}
-void Jnjvm::scanWeakReferencesQueue(uintptr_t closure) {
+void Jnjvm::scanWeakReferencesQueue(word_t closure) {
referenceThread->WeakReferencesQueue.scan(referenceThread, closure);
}
-void Jnjvm::scanSoftReferencesQueue(uintptr_t closure) {
+void Jnjvm::scanSoftReferencesQueue(word_t closure) {
referenceThread->SoftReferencesQueue.scan(referenceThread, closure);
}
-void Jnjvm::scanPhantomReferencesQueue(uintptr_t closure) {
+void Jnjvm::scanPhantomReferencesQueue(word_t closure) {
referenceThread->PhantomReferencesQueue.scan(referenceThread, closure);
}
-void Jnjvm::scanFinalizationQueue(uintptr_t closure) {
+void Jnjvm::scanFinalizationQueue(word_t closure) {
finalizerThread->scanFinalizationQueue(closure);
}
@@ -1445,7 +1445,7 @@
return 0;
}
-void Jnjvm::printMethod(mvm::FrameInfo* FI, intptr_t ip, intptr_t addr) {
+void Jnjvm::printMethod(mvm::FrameInfo* FI, word_t ip, word_t addr) {
if (FI->Metadata == NULL) {
mvm::MethodInfoHelper::print(ip, addr);
return;
Modified: vmkit/trunk/lib/J3/VMCore/Jnjvm.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Jnjvm.h?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Jnjvm.h (original)
+++ vmkit/trunk/lib/J3/VMCore/Jnjvm.h Sun Oct 9 12:23:23 2011
@@ -123,14 +123,14 @@
virtual void startCollection();
virtual void endCollection();
- virtual void scanWeakReferencesQueue(uintptr_t closure);
- virtual void scanSoftReferencesQueue(uintptr_t closure);
- virtual void scanPhantomReferencesQueue(uintptr_t closure);
- virtual void scanFinalizationQueue(uintptr_t closure);
+ virtual void scanWeakReferencesQueue(word_t closure);
+ virtual void scanSoftReferencesQueue(word_t closure);
+ virtual void scanPhantomReferencesQueue(word_t closure);
+ virtual void scanFinalizationQueue(word_t closure);
virtual void addFinalizationCandidate(gc* obj);
virtual size_t getObjectSize(gc* obj);
virtual const char* getObjectTypeName(gc* obj);
- virtual void printMethod(mvm::FrameInfo* FI, intptr_t ip, intptr_t addr);
+ virtual void printMethod(mvm::FrameInfo* FI, word_t ip, word_t addr);
/// CreateError - Creates a Java object of the specified exception class
@@ -178,7 +178,7 @@
/// tracer - Traces instances of this class.
///
- virtual void tracer(uintptr_t closure);
+ virtual void tracer(word_t closure);
/// dirSeparator - Directory separator for file paths, e.g. '\' for windows,
/// '/' for Unix.
Modified: vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.cpp?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.cpp Sun Oct 9 12:23:23 2011
@@ -973,13 +973,13 @@
return res;
}
-intptr_t JnjvmClassLoader::loadInLib(const char* buf, bool& j3) {
- uintptr_t res = (uintptr_t)TheCompiler->loadMethod(mvm::System::GetSelfHandle(), buf);
+word_t JnjvmClassLoader::loadInLib(const char* buf, bool& j3) {
+ word_t res = (word_t)TheCompiler->loadMethod(mvm::System::GetSelfHandle(), buf);
if (!res) {
for (std::vector<void*>::iterator i = nativeLibs.begin(),
e = nativeLibs.end(); i!= e; ++i) {
- res = (uintptr_t)TheCompiler->loadMethod((*i), buf);
+ res = (word_t)TheCompiler->loadMethod((*i), buf);
if (res) break;
}
} else {
@@ -989,7 +989,7 @@
if (!res && this != bootstrapLoader)
res = bootstrapLoader->loadInLib(buf, j3);
- return (intptr_t)res;
+ return (word_t)res;
}
void* JnjvmClassLoader::loadLib(const char* buf) {
@@ -998,15 +998,15 @@
return handle;
}
-intptr_t JnjvmClassLoader::loadInLib(const char* name, void* handle) {
- return (intptr_t)TheCompiler->loadMethod(handle, name);
+word_t JnjvmClassLoader::loadInLib(const char* name, void* handle) {
+ return (word_t)TheCompiler->loadMethod(handle, name);
}
-intptr_t JnjvmClassLoader::nativeLookup(JavaMethod* meth, bool& j3,
+word_t JnjvmClassLoader::nativeLookup(JavaMethod* meth, bool& j3,
char* buf) {
meth->jniConsFromMeth(buf);
- intptr_t res = loadInLib(buf, j3);
+ word_t res = loadInLib(buf, j3);
if (!res) {
meth->jniConsFromMethOverloaded(buf);
res = loadInLib(buf, j3);
Modified: vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.h?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.h (original)
+++ vmkit/trunk/lib/J3/VMCore/JnjvmClassLoader.h Sun Oct 9 12:23:23 2011
@@ -137,7 +137,7 @@
/// tracer - Traces a JnjvmClassLoader for GC.
///
- virtual void tracer(uintptr_t closure);
+ virtual void tracer(word_t closure);
/// getJnjvmLoaderFromJavaObject - Return the Jnjvm runtime representation
/// of the given class loader.
@@ -266,11 +266,11 @@
/// by this class loader. The last argument tells if the returned method
/// is defined in j3.
///
- intptr_t loadInLib(const char* buf, bool& j3);
+ word_t loadInLib(const char* buf, bool& j3);
/// loadInLib - Loads a native function out of the given native library.
///
- intptr_t loadInLib(const char* buf, void* handle);
+ word_t loadInLib(const char* buf, void* handle);
/// loadLib - Loads the library with the given name.
///
@@ -280,7 +280,7 @@
/// method. Also set in the j3 parameter is the function is defined in
/// JnJVM.
///
- intptr_t nativeLookup(JavaMethod* meth, bool& j3, char* buf);
+ word_t nativeLookup(JavaMethod* meth, bool& j3, char* buf);
/// insertAllMethodsInVM - Insert all methods defined by this class loader
/// in the VM.
@@ -334,7 +334,7 @@
/// tracer - Traces instances of this class.
///
- virtual void tracer(uintptr_t closure);
+ virtual void tracer(word_t closure);
/// libClasspathEnv - The paths for dynamic libraries of Classpath, separated
/// by ':'.
@@ -469,7 +469,7 @@
/// staticTracer - Trace the internal class loader.
///
- static void staticTracer(VMClassLoader* obj, uintptr_t closure) {
+ static void staticTracer(VMClassLoader* obj, word_t closure) {
llvm_gcroot(obj, 0);
if (obj->JCL != NULL) obj->JCL->tracer(closure);
}
Modified: vmkit/trunk/lib/J3/VMCore/Precompiled.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Precompiled.cpp?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Precompiled.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/Precompiled.cpp Sun Oct 9 12:23:23 2011
@@ -38,7 +38,7 @@
if (handle) {
Class* cl = (Class*)dlsym(handle, file);
if (cl) {
- static_init_t init = (static_init_t)(uintptr_t)cl->classLoader;
+ static_init_t init = (static_init_t)(word_t)cl->classLoader;
assert(init && "Loaded the wrong library");
init(this);
insertAllMethodsInVM(vm);
@@ -57,7 +57,7 @@
if (handle) {
Class* cl = (Class*)dlsym(handle, name);
if (cl) {
- static_init_t init = (static_init_t)(uintptr_t)cl->classLoader;
+ static_init_t init = (static_init_t)(word_t)cl->classLoader;
init(this);
insertAllMethodsInVM(vm);
}
@@ -69,7 +69,7 @@
assert(classes->map.size() == 0);
Class* cl = (Class*)dlsym(SELF_HANDLE, name);
if (cl) {
- static_init_t init = (static_init_t)(uintptr_t)cl->classLoader;
+ static_init_t init = (static_init_t)(word_t)cl->classLoader;
init(this);
insertAllMethodsInVM(vm);
}
@@ -89,7 +89,7 @@
*ptr = JCL->constructArray(name);
}
-extern "C" intptr_t vmjcNativeLoader(JavaMethod* meth) {
+extern "C" word_t vmjcNativeLoader(JavaMethod* meth) {
bool j3 = false;
const UTF8* jniConsClName = meth->classDef->name;
const UTF8* jniConsName = meth->name;
@@ -101,7 +101,7 @@
mvm::ThreadAllocator threadAllocator;
char* buf = (char*)threadAllocator.Allocate(
3 + JNI_NAME_PRE_LEN + 1 + ((mnlen + clen + mtlen) << 3));
- intptr_t res = meth->classDef->classLoader->nativeLookup(meth, j3, buf);
+ word_t res = meth->classDef->classLoader->nativeLookup(meth, j3, buf);
assert(res && "Could not find required native method");
return res;
}
Modified: vmkit/trunk/lib/J3/VMCore/ReferenceQueue.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/ReferenceQueue.cpp?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/ReferenceQueue.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/ReferenceQueue.cpp Sun Oct 9 12:23:23 2011
@@ -108,7 +108,7 @@
JavaObjectReference::setReferent(obj, NULL);
}
-gc* ReferenceQueue::processReference(gc* reference, ReferenceThread* th, uintptr_t closure) {
+gc* ReferenceQueue::processReference(gc* reference, ReferenceThread* th, word_t closure) {
if (!mvm::Collector::isLive(reference, closure)) {
clearReferent(reference);
return NULL;
@@ -143,7 +143,7 @@
}
-void ReferenceQueue::scan(ReferenceThread* th, uintptr_t closure) {
+void ReferenceQueue::scan(ReferenceThread* th, word_t closure) {
uint32 NewIndex = 0;
for (uint32 i = 0; i < CurrentIndex; ++i) {
@@ -210,7 +210,7 @@
}
-void FinalizerThread::scanFinalizationQueue(uintptr_t closure) {
+void FinalizerThread::scanFinalizationQueue(word_t closure) {
uint32 NewIndex = 0;
for (uint32 i = 0; i < CurrentIndex; ++i) {
gc* obj = FinalizationQueue[i];
Modified: vmkit/trunk/lib/J3/VMCore/ReferenceQueue.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/ReferenceQueue.h?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/ReferenceQueue.h (original)
+++ vmkit/trunk/lib/J3/VMCore/ReferenceQueue.h Sun Oct 9 12:23:23 2011
@@ -31,7 +31,7 @@
mvm::SpinLock QueueLock;
uint8_t semantics;
- gc* processReference(gc*, ReferenceThread*, uintptr_t closure);
+ gc* processReference(gc*, ReferenceThread*, word_t closure);
public:
static const uint8_t WEAK = 1;
@@ -79,7 +79,7 @@
QueueLock.release();
}
- void scan(ReferenceThread* thread, uintptr_t closure);
+ void scan(ReferenceThread* thread, word_t closure);
};
class ReferenceThread : public JavaThread {
@@ -197,7 +197,7 @@
/// scanFinalizationQueue - Scan objets with a finalized method and schedule
/// them for finalization if they are not live.
///
- void scanFinalizationQueue(uintptr_t closure);
+ void scanFinalizationQueue(word_t closure);
FinalizerThread(Jnjvm* vm);
Modified: vmkit/trunk/lib/J3/VMCore/VirtualTables.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/VirtualTables.cpp?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/VirtualTables.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/VirtualTables.cpp Sun Oct 9 12:23:23 2011
@@ -54,9 +54,9 @@
// Classpath with the vmdata field).
//===----------------------------------------------------------------------===//
-VirtualTable VMClassLoader::VT((uintptr_t)VMClassLoader::staticDestructor,
- (uintptr_t)VMClassLoader::staticDestructor,
- (uintptr_t)VMClassLoader::staticTracer);
+VirtualTable VMClassLoader::VT((word_t)VMClassLoader::staticDestructor,
+ (word_t)VMClassLoader::staticDestructor,
+ (word_t)VMClassLoader::staticTracer);
//===----------------------------------------------------------------------===//
// Trace methods for Java objects. There are four types of objects:
@@ -70,11 +70,11 @@
//===----------------------------------------------------------------------===//
/// Scanning java.lang.Object and primitive arrays.
-extern "C" void JavaObjectTracer(JavaObject* obj, uintptr_t closure) {
+extern "C" void JavaObjectTracer(JavaObject* obj, word_t closure) {
}
/// Method for scanning regular objects.
-extern "C" void RegularObjectTracer(JavaObject* obj, uintptr_t closure) {
+extern "C" void RegularObjectTracer(JavaObject* obj, word_t closure) {
Class* cl = JavaObject::getClass(obj)->asClass();
assert(cl && "Not a class in regular tracer");
mvm::Collector::markAndTraceRoot(
@@ -94,7 +94,7 @@
/// Method for scanning an array whose elements are JavaObjects. This method is
/// called for all non-native Java arrays.
-extern "C" void ArrayObjectTracer(ArrayObject* obj, uintptr_t closure) {
+extern "C" void ArrayObjectTracer(ArrayObject* obj, word_t closure) {
CommonClass* cl = JavaObject::getClass(obj);
assert(cl && "No class");
mvm::Collector::markAndTraceRoot(
@@ -111,7 +111,7 @@
/// Method for scanning Java java.lang.ref.Reference objects.
extern "C" void ReferenceObjectTracer(
- JavaObjectReference* obj, uintptr_t closure) {
+ JavaObjectReference* obj, word_t closure) {
Class* cl = JavaObject::getClass(obj)->asClass();
assert(cl && "Not a class in reference tracer");
mvm::Collector::markAndTraceRoot(
@@ -146,7 +146,7 @@
// (3) The static instance.
//===----------------------------------------------------------------------===//
-void CommonClass::tracer(uintptr_t closure) {
+void CommonClass::tracer(word_t closure) {
if (super != NULL && super->classLoader != NULL) {
JavaObject** Obj = super->classLoader->getJavaClassLoaderPtr();
@@ -172,7 +172,7 @@
}
}
-void Class::tracer(uintptr_t closure) {
+void Class::tracer(word_t closure) {
CommonClass::tracer(closure);
for (uint32 i = 0; i < NR_ISOLATES; ++i) {
@@ -206,7 +206,7 @@
// referenced by the delegatees.
//===----------------------------------------------------------------------===//
-void JnjvmClassLoader::tracer(uintptr_t closure) {
+void JnjvmClassLoader::tracer(word_t closure) {
for (ClassMap::iterator i = classes->map.begin(), e = classes->map.end();
i!= e; ++i) {
@@ -227,7 +227,7 @@
mvm::Collector::markAndTraceRoot(&javaLoader, closure);
}
-void JnjvmBootstrapLoader::tracer(uintptr_t closure) {
+void JnjvmBootstrapLoader::tracer(word_t closure) {
JnjvmClassLoader::tracer(closure);
upcalls->OfVoid->tracer(closure);
@@ -255,7 +255,7 @@
//===----------------------------------------------------------------------===//
-void Jnjvm::tracer(uintptr_t closure) {
+void Jnjvm::tracer(word_t closure) {
// (1) Trace the bootrap loader.
bootstrapLoader->tracer(closure);
@@ -314,7 +314,7 @@
}
}
-void JavaThread::tracer(uintptr_t closure) {
+void JavaThread::tracer(word_t closure) {
mvm::Collector::markAndTraceRoot(&pendingException, closure);
mvm::Collector::markAndTraceRoot(&javaThread, closure);
mvm::Collector::markAndTraceRoot(&vmThread, closure);
Modified: vmkit/trunk/lib/Mvm/CommonThread/CollectionRV.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/CommonThread/CollectionRV.cpp?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/CommonThread/CollectionRV.cpp (original)
+++ vmkit/trunk/lib/Mvm/CommonThread/CollectionRV.cpp Sun Oct 9 12:23:23 2011
@@ -120,7 +120,7 @@
th->inRV = false;
}
-void CooperativeCollectionRV::joinAfterUncooperative(intptr_t SP) {
+void CooperativeCollectionRV::joinAfterUncooperative(word_t SP) {
mvm::Thread* th = mvm::Thread::get();
assert((th->getLastSP() == 0) &&
"SP set after entering uncooperative code");
Modified: vmkit/trunk/lib/Mvm/CommonThread/ObjectLocks.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/CommonThread/ObjectLocks.cpp?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/CommonThread/ObjectLocks.cpp (original)
+++ vmkit/trunk/lib/Mvm/CommonThread/ObjectLocks.cpp Sun Oct 9 12:23:23 2011
@@ -25,12 +25,12 @@
void ThinLock::overflowThinLock(gc* object, LockSystem& table) {
llvm_gcroot(object, 0);
FatLock* obj = table.allocate(object);
- uintptr_t ID = obj->getID();
+ word_t ID = obj->getID();
// 1 because we start at 0, and 1 for this lock request.
obj->acquireAll(object, (ThinCountMask >> ThinCountShift) + 2);
- uintptr_t oldValue = 0;
- uintptr_t newValue = 0;
- uintptr_t yieldedValue = 0;
+ word_t oldValue = 0;
+ word_t newValue = 0;
+ word_t yieldedValue = 0;
do {
oldValue = object->header;
newValue = obj->getID() | (oldValue & NonLockBitsMask);
@@ -45,10 +45,10 @@
void ThinLock::removeFatLock(FatLock* fatLock, LockSystem& table) {
gc* object = fatLock->associatedObject;
llvm_gcroot(object, 0);
- uintptr_t ID = fatLock->getID();
- uintptr_t oldValue = 0;
- uintptr_t newValue = 0;
- uintptr_t yieldedValue = 0;
+ word_t ID = fatLock->getID();
+ word_t oldValue = 0;
+ word_t newValue = 0;
+ word_t yieldedValue = 0;
do {
oldValue = object->header;
newValue = oldValue & NonLockBitsMask;
@@ -64,10 +64,10 @@
FatLock* obj = table.allocate(object);
uint32 count = (object->header & ThinCountMask) >> ThinCountShift;
obj->acquireAll(object, count + 1);
- uintptr_t oldValue = 0;
- uintptr_t newValue = 0;
- uintptr_t yieldedValue = 0;
- uintptr_t ID = obj->getID();
+ word_t oldValue = 0;
+ word_t newValue = 0;
+ word_t yieldedValue = 0;
+ word_t ID = obj->getID();
do {
oldValue = object->header;
newValue = ID | (oldValue & NonLockBitsMask);
@@ -105,9 +105,9 @@
void ThinLock::acquire(gc* object, LockSystem& table) {
llvm_gcroot(object, 0);
uint64_t id = mvm::Thread::get()->getThreadID();
- uintptr_t oldValue = 0;
- uintptr_t newValue = 0;
- uintptr_t yieldedValue = 0;
+ word_t oldValue = 0;
+ word_t newValue = 0;
+ word_t yieldedValue = 0;
if ((object->header & System::GetThreadIDMask()) == id) {
assert(owner(object, table) && "Inconsistent lock");
@@ -192,9 +192,9 @@
llvm_gcroot(object, 0);
assert(owner(object, table) && "Not owner when entering release!");
uint64 id = mvm::Thread::get()->getThreadID();
- uintptr_t oldValue = 0;
- uintptr_t newValue = 0;
- uintptr_t yieldedValue = 0;
+ word_t oldValue = 0;
+ word_t newValue = 0;
+ word_t yieldedValue = 0;
if ((object->header & ~NonLockBitsMask) == id) {
do {
oldValue = object->header;
@@ -240,7 +240,7 @@
}
}
-void FatLock::acquireAll(gc* object, uintptr_t nb) {
+void FatLock::acquireAll(gc* object, word_t nb) {
assert(associatedObject == object);
llvm_gcroot(object, 0);
internalLock.lockAll(nb);
@@ -265,7 +265,7 @@
nextFreeLock = NULL;
}
-uintptr_t FatLock::getID() {
+word_t FatLock::getID() {
return (index << ThinLock::NonLockBits) | ThinLock::FatMask;
}
@@ -368,7 +368,7 @@
}
-FatLock* LockSystem::getFatLockFromID(uintptr_t ID) {
+FatLock* LockSystem::getFatLockFromID(word_t ID) {
if (ID & ThinLock::FatMask) {
uint32_t index = (ID & ~ThinLock::FatMask) >> ThinLock::NonLockBits;
FatLock* res = getLock(index);
Modified: vmkit/trunk/lib/Mvm/CommonThread/Sigsegv.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/CommonThread/Sigsegv.cpp?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/CommonThread/Sigsegv.cpp (original)
+++ vmkit/trunk/lib/Mvm/CommonThread/Sigsegv.cpp Sun Oct 9 12:23:23 2011
@@ -21,7 +21,7 @@
#endif
void sigsegvHandler(int n, siginfo_t *_info, void *context) {
- uintptr_t addr = (uintptr_t)_info->si_addr;
+ word_t addr = (word_t)_info->si_addr;
#if defined(__i386__)
struct frame {
struct frame *caller;
@@ -47,7 +47,7 @@
#endif
mvm::Thread* th = mvm::Thread::get();
- if (addr > (uintptr_t)th->getThreadID() && addr < (uintptr_t)th->baseSP) {
+ if (addr > (word_t)th->getThreadID() && addr < (word_t)th->baseSP) {
fprintf(stderr, "Stack overflow in VM code or in JNI code. If it is from\n"
"the VM, it is either from the JIT, the GC or the runtime."
"\nThis has to be fixed in the VM: VMKit makes sure that\n"
Modified: vmkit/trunk/lib/Mvm/CommonThread/ctthread.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/CommonThread/ctthread.cpp?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/CommonThread/ctthread.cpp (original)
+++ vmkit/trunk/lib/Mvm/CommonThread/ctthread.cpp Sun Oct 9 12:23:23 2011
@@ -53,13 +53,13 @@
MyVM->rendezvous.joinBeforeUncooperative();
}
-void Thread::joinRVAfterLeave(intptr_t savedSP) {
+void Thread::joinRVAfterLeave(word_t savedSP) {
MyVM->rendezvous.joinAfterUncooperative(savedSP);
}
void Thread::startKnownFrame(KnownFrame& F) {
// Get the caller of this function
- intptr_t cur = System::GetCallerAddress();
+ word_t cur = System::GetCallerAddress();
F.previousFrame = lastKnownFrame;
F.currentFP = cur;
// This is used as a marker.
@@ -74,7 +74,7 @@
void Thread::startUnknownFrame(KnownFrame& F) {
// Get the caller of this function
- intptr_t cur = System::GetCallerAddress();
+ word_t cur = System::GetCallerAddress();
// Get the caller of the caller.
cur = System::GetCallerOfAddress(cur);
F.previousFrame = lastKnownFrame;
@@ -101,11 +101,11 @@
}
}
-void Thread::getFrameContext(intptr_t* buffer) {
+void Thread::getFrameContext(word_t* buffer) {
mvm::StackWalker Walker(this);
uint32_t i = 0;
- while (intptr_t ip = *Walker) {
+ while (word_t ip = *Walker) {
buffer[i++] = ip;
++Walker;
}
@@ -128,7 +128,7 @@
return thread->MyVM->IPToFrameInfo(ip);
}
-intptr_t StackWalker::operator*() {
+word_t StackWalker::operator*() {
if (addr == thread->baseSP) return 0;
ip = System::GetIPFromCallerAddress(addr);
return ip;
@@ -171,7 +171,7 @@
}
-void Thread::scanStack(uintptr_t closure) {
+void Thread::scanStack(word_t closure) {
StackWalker Walker(this);
while (FrameInfo* MI = Walker.get()) {
MethodInfoHelper::scan(closure, MI, Walker.ip, Walker.addr);
@@ -184,7 +184,7 @@
if (!inRV) {
assert(!lastSP && "SP already set when entering uncooperative code");
// Get the caller.
- intptr_t temp = System::GetCallerAddress();
+ word_t temp = System::GetCallerAddress();
// Make sure to at least get the caller of the caller.
++level;
while (level--) temp = System::GetCallerOfAddress(temp);
@@ -196,7 +196,7 @@
}
}
-void Thread::enterUncooperativeCode(intptr_t SP) {
+void Thread::enterUncooperativeCode(word_t SP) {
if (isMvmThread()) {
if (!inRV) {
assert(!lastSP && "SP already set when entering uncooperative code");
@@ -212,7 +212,7 @@
if (isMvmThread()) {
if (!inRV) {
assert(lastSP && "No last SP when leaving uncooperative code");
- intptr_t savedSP = lastSP;
+ word_t savedSP = lastSP;
// The cas is not necessary, but it does a memory barrier.
__sync_bool_compare_and_swap(&lastSP, lastSP, 0);
// A rendezvous has just been initiated, join it.
@@ -222,9 +222,9 @@
}
}
-intptr_t Thread::waitOnSP() {
+word_t Thread::waitOnSP() {
// First see if we can get lastSP directly.
- intptr_t sp = lastSP;
+ word_t sp = lastSP;
if (sp) return sp;
// Then loop a fixed number of iterations to get lastSP.
@@ -241,7 +241,7 @@
}
-uintptr_t Thread::baseAddr = 0;
+word_t Thread::baseAddr = 0;
// These could be set at runtime.
#define STACK_SIZE 0x100000
@@ -260,20 +260,20 @@
///
class StackThreadManager {
public:
- uintptr_t baseAddr;
+ word_t baseAddr;
uint32 allocPtr;
uint32 used[NR_THREADS];
LockNormal stackLock;
StackThreadManager() {
baseAddr = 0;
- uintptr_t ptr = kThreadStart;
+ word_t ptr = kThreadStart;
uint32 flags = MAP_PRIVATE | MAP_ANON | MAP_FIXED;
- baseAddr = (uintptr_t)mmap((void*)ptr, STACK_SIZE * NR_THREADS,
+ baseAddr = (word_t)mmap((void*)ptr, STACK_SIZE * NR_THREADS,
PROT_READ | PROT_WRITE, flags, -1, 0);
- if (baseAddr == (uintptr_t) MAP_FAILED) {
+ if (baseAddr == (word_t) MAP_FAILED) {
fprintf(stderr, "Can not allocate thread memory\n");
abort();
}
@@ -283,7 +283,7 @@
// overflows.
uint32 pagesize = getpagesize();
for (uint32 i = 0; i < NR_THREADS; ++i) {
- uintptr_t addr = baseAddr + (i * STACK_SIZE) + pagesize;
+ word_t addr = baseAddr + (i * STACK_SIZE) + pagesize;
mprotect((void*)addr, pagesize, PROT_NONE);
}
@@ -292,7 +292,7 @@
mvm::Thread::baseAddr = baseAddr;
}
- uintptr_t allocate() {
+ word_t allocate() {
stackLock.lock();
uint32 myIndex = 0;
do {
@@ -371,7 +371,7 @@
// Wait for the thread to die.
pthread_join((pthread_t)thread_id, NULL);
}
- uintptr_t index = ((uintptr_t)th & System::GetThreadIDMask());
+ word_t index = ((word_t)th & System::GetThreadIDMask());
index = (index & ~TheStackManager.baseAddr) >> 20;
TheStackManager.used[index] = 0;
}
Modified: vmkit/trunk/lib/Mvm/MMTk/MutatorThread.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/MMTk/MutatorThread.h?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/MMTk/MutatorThread.h (original)
+++ vmkit/trunk/lib/Mvm/MMTk/MutatorThread.h Sun Oct 9 12:23:23 2011
@@ -23,7 +23,7 @@
CollectionAttempts = 0;
}
mvm::ThreadAllocator Allocator;
- uintptr_t MutatorContext;
+ word_t MutatorContext;
/// realRoutine - The function to invoke when the thread starts.
///
Modified: vmkit/trunk/lib/Mvm/MMTk/MvmGC.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/MMTk/MvmGC.cpp?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/MMTk/MvmGC.cpp (original)
+++ vmkit/trunk/lib/Mvm/MMTk/MvmGC.cpp Sun Oct 9 12:23:23 2011
@@ -67,44 +67,44 @@
th->realRoutine(_th);
}
-bool Collector::isLive(gc* ptr, uintptr_t closure) {
+bool Collector::isLive(gc* ptr, word_t closure) {
abort();
return false;
}
-void Collector::scanObject(void** ptr, uintptr_t closure) {
+void Collector::scanObject(void** ptr, word_t closure) {
abort();
}
-void Collector::markAndTrace(void* source, void* ptr, uintptr_t closure) {
+void Collector::markAndTrace(void* source, void* ptr, word_t closure) {
abort();
}
-void Collector::markAndTraceRoot(void* ptr, uintptr_t closure) {
+void Collector::markAndTraceRoot(void* ptr, word_t closure) {
abort();
}
-gc* Collector::retainForFinalize(gc* val, uintptr_t closure) {
+gc* Collector::retainForFinalize(gc* val, word_t closure) {
abort();
return NULL;
}
-gc* Collector::retainReferent(gc* val, uintptr_t closure) {
+gc* Collector::retainReferent(gc* val, word_t closure) {
abort();
return NULL;
}
-gc* Collector::getForwardedFinalizable(gc* val, uintptr_t closure) {
+gc* Collector::getForwardedFinalizable(gc* val, word_t closure) {
abort();
return NULL;
}
-gc* Collector::getForwardedReference(gc* val, uintptr_t closure) {
+gc* Collector::getForwardedReference(gc* val, word_t closure) {
abort();
return NULL;
}
-gc* Collector::getForwardedReferent(gc* val, uintptr_t closure) {
+gc* Collector::getForwardedReferent(gc* val, word_t closure) {
abort();
return NULL;
}
Modified: vmkit/trunk/lib/Mvm/MMTk/MvmGC.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/MMTk/MvmGC.h?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/MMTk/MvmGC.h (original)
+++ vmkit/trunk/lib/Mvm/MMTk/MvmGC.h Sun Oct 9 12:23:23 2011
@@ -18,10 +18,10 @@
class VirtualTable {
public:
- uintptr_t destructor;
- uintptr_t operatorDelete;
- uintptr_t tracer;
- uintptr_t specializedTracers[1];
+ word_t destructor;
+ word_t operatorDelete;
+ word_t tracer;
+ word_t specializedTracers[1];
static uint32_t numberOfBaseFunctions() {
return 4;
@@ -31,22 +31,22 @@
return 1;
}
- uintptr_t* getFunctions() {
+ word_t* getFunctions() {
return &destructor;
}
- VirtualTable(uintptr_t d, uintptr_t o, uintptr_t t) {
+ VirtualTable(word_t d, word_t o, word_t t) {
destructor = d;
operatorDelete = o;
tracer = t;
}
VirtualTable() {
- destructor = reinterpret_cast<uintptr_t>(EmptyDestructor);
+ destructor = reinterpret_cast<word_t>(EmptyDestructor);
}
bool hasDestructor() {
- return destructor != reinterpret_cast<uintptr_t>(EmptyDestructor);
+ return destructor != reinterpret_cast<word_t>(EmptyDestructor);
}
static void emptyTracer(void*) {}
@@ -74,15 +74,15 @@
public:
static int verbose;
- static bool isLive(gc* ptr, uintptr_t closure) __attribute__ ((always_inline));
- static void scanObject(void** ptr, uintptr_t closure) __attribute__ ((always_inline));
- static void markAndTrace(void* source, void* ptr, uintptr_t closure) __attribute__ ((always_inline));
- static void markAndTraceRoot(void* ptr, uintptr_t closure) __attribute__ ((always_inline));
- static gc* retainForFinalize(gc* val, uintptr_t closure) __attribute__ ((always_inline));
- static gc* retainReferent(gc* val, uintptr_t closure) __attribute__ ((always_inline));
- static gc* getForwardedFinalizable(gc* val, uintptr_t closure) __attribute__ ((always_inline));
- static gc* getForwardedReference(gc* val, uintptr_t closure) __attribute__ ((always_inline));
- static gc* getForwardedReferent(gc* val, uintptr_t closure) __attribute__ ((always_inline));
+ static bool isLive(gc* ptr, word_t closure) __attribute__ ((always_inline));
+ static void scanObject(void** ptr, word_t closure) __attribute__ ((always_inline));
+ static void markAndTrace(void* source, void* ptr, word_t closure) __attribute__ ((always_inline));
+ static void markAndTraceRoot(void* ptr, word_t closure) __attribute__ ((always_inline));
+ static gc* retainForFinalize(gc* val, word_t closure) __attribute__ ((always_inline));
+ static gc* retainReferent(gc* val, word_t closure) __attribute__ ((always_inline));
+ static gc* getForwardedFinalizable(gc* val, word_t closure) __attribute__ ((always_inline));
+ static gc* getForwardedReference(gc* val, word_t closure) __attribute__ ((always_inline));
+ static gc* getForwardedReferent(gc* val, word_t closure) __attribute__ ((always_inline));
static void objectReferenceWriteBarrier(gc* ref, gc** slot, gc* value) __attribute__ ((always_inline));
static void objectReferenceArrayWriteBarrier(gc* ref, gc** slot, gc* value) __attribute__ ((always_inline));
static void objectReferenceNonHeapWriteBarrier(gc** slot, gc* value) __attribute__ ((always_inline));
Modified: vmkit/trunk/lib/Mvm/Runtime/MethodInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Runtime/MethodInfo.cpp?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/Runtime/MethodInfo.cpp (original)
+++ vmkit/trunk/lib/Mvm/Runtime/MethodInfo.cpp Sun Oct 9 12:23:23 2011
@@ -19,11 +19,11 @@
namespace mvm {
-void MethodInfoHelper::scan(uintptr_t closure, FrameInfo* FI, intptr_t ip, intptr_t addr) {
- //uintptr_t spaddr = (uintptr_t)addr + FI->FrameSize + sizeof(void*);
- uintptr_t spaddr = System::GetCallerOfAddress(addr);
+void MethodInfoHelper::scan(word_t closure, FrameInfo* FI, word_t ip, word_t addr) {
+ //word_t spaddr = (word_t)addr + FI->FrameSize + sizeof(void*);
+ word_t spaddr = System::GetCallerOfAddress(addr);
for (uint16 i = 0; i < FI->NumLiveOffsets; ++i) {
- intptr_t obj = *(intptr_t*)(spaddr + FI->LiveOffsets[i]);
+ word_t obj = *(word_t*)(spaddr + FI->LiveOffsets[i]);
// Verify that obj does not come from a JSR bytecode.
if (!(obj & 1)) {
Collector::scanObject((void**)(spaddr + FI->LiveOffsets[i]), closure);
@@ -31,7 +31,7 @@
}
}
-void MethodInfoHelper::print(intptr_t ip, intptr_t addr) {
+void MethodInfoHelper::print(word_t ip, word_t addr) {
Dl_info info;
int res = dladdr((void*)ip, &info);
if (res != 0 && info.dli_sname != NULL) {
@@ -59,10 +59,10 @@
}
if (frame != NULL) {
currentFrames = reinterpret_cast<Frames*>(
- reinterpret_cast<uintptr_t>(frame) + MethodInfoHelper::FrameInfoSize(frame->NumLiveOffsets));
+ reinterpret_cast<word_t>(frame) + MethodInfoHelper::FrameInfoSize(frame->NumLiveOffsets));
} else {
currentFrames = reinterpret_cast<Frames*>(System::WordAlignUp(
- reinterpret_cast<uintptr_t>(currentFrames) + sizeof(Frames)));
+ reinterpret_cast<word_t>(currentFrames) + sizeof(Frames)));
}
}
}
@@ -71,9 +71,9 @@
// Create a dummy FrameInfo, so that methods don't have to null check.
static FrameInfo emptyInfo;
-FrameInfo* FunctionMap::IPToFrameInfo(intptr_t ip) {
+FrameInfo* FunctionMap::IPToFrameInfo(word_t ip) {
FunctionMapLock.acquire();
- llvm::DenseMap<intptr_t, FrameInfo*>::iterator I = Functions.find(ip);
+ llvm::DenseMap<word_t, FrameInfo*>::iterator I = Functions.find(ip);
FrameInfo* res = NULL;
if (I != Functions.end()) {
res = I->second;
@@ -87,7 +87,7 @@
}
-void FunctionMap::addFrameInfo(intptr_t ip, FrameInfo* meth) {
+void FunctionMap::addFrameInfo(word_t ip, FrameInfo* meth) {
FunctionMapLock.acquire();
addFrameInfoNoLock(ip, meth);
FunctionMapLock.release();
Modified: vmkit/trunk/lib/Mvm/StaticGCPrinter/VmkitGCPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/StaticGCPrinter/VmkitGCPrinter.cpp?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/StaticGCPrinter/VmkitGCPrinter.cpp (original)
+++ vmkit/trunk/lib/Mvm/StaticGCPrinter/VmkitGCPrinter.cpp Sun Oct 9 12:23:23 2011
@@ -235,9 +235,9 @@
/// emitAssembly - Print the frametable. The ocaml frametable format is thus:
///
-/// extern "C" struct align(sizeof(intptr_t)) {
+/// extern "C" struct align(sizeof(word_t)) {
/// uint32_t NumDescriptors;
-/// struct align(sizeof(intptr_t)) {
+/// struct align(sizeof(word_t)) {
/// void *ReturnAddress;
/// void *Metadata;
/// uint16_t BytecodeIndex;
Modified: vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-alloc/Selected.cpp Sun Oct 9 12:23:23 2011
@@ -21,31 +21,31 @@
using namespace mvm;
int Collector::verbose = 0;
-extern "C" void Java_org_j3_mmtk_Collection_triggerCollection__I(uintptr_t, int32_t) ALWAYS_INLINE;
+extern "C" void Java_org_j3_mmtk_Collection_triggerCollection__I(word_t, int32_t) ALWAYS_INLINE;
-extern "C" intptr_t JnJVM_org_j3_bindings_Bindings_allocateMutator__I(int32_t) ALWAYS_INLINE;
-extern "C" void JnJVM_org_j3_bindings_Bindings_freeMutator__Lorg_mmtk_plan_MutatorContext_2(intptr_t) ALWAYS_INLINE;
-extern "C" void JnJVM_org_j3_bindings_Bindings_boot__Lorg_vmmagic_unboxed_Extent_2Lorg_vmmagic_unboxed_Extent_2_3Ljava_lang_String_2(intptr_t, intptr_t, mmtk::MMTkObjectArray*) ALWAYS_INLINE;
+extern "C" word_t JnJVM_org_j3_bindings_Bindings_allocateMutator__I(int32_t) ALWAYS_INLINE;
+extern "C" void JnJVM_org_j3_bindings_Bindings_freeMutator__Lorg_mmtk_plan_MutatorContext_2(word_t) ALWAYS_INLINE;
+extern "C" void JnJVM_org_j3_bindings_Bindings_boot__Lorg_vmmagic_unboxed_Extent_2Lorg_vmmagic_unboxed_Extent_2_3Ljava_lang_String_2(word_t, word_t, mmtk::MMTkObjectArray*) ALWAYS_INLINE;
extern "C" void JnJVM_org_j3_bindings_Bindings_processEdge__Lorg_mmtk_plan_TransitiveClosure_2Lorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_Address_2(
- uintptr_t closure, void* source, void* slot) ALWAYS_INLINE;
+ word_t closure, void* source, void* slot) ALWAYS_INLINE;
extern "C" void JnJVM_org_j3_bindings_Bindings_reportDelayedRootEdge__Lorg_mmtk_plan_TraceLocal_2Lorg_vmmagic_unboxed_Address_2(
- uintptr_t TraceLocal, void** slot) ALWAYS_INLINE;
+ word_t TraceLocal, void** slot) ALWAYS_INLINE;
extern "C" void JnJVM_org_j3_bindings_Bindings_processRootEdge__Lorg_mmtk_plan_TraceLocal_2Lorg_vmmagic_unboxed_Address_2Z(
- uintptr_t TraceLocal, void* slot, uint8_t untraced) ALWAYS_INLINE;
+ word_t TraceLocal, void* slot, uint8_t untraced) ALWAYS_INLINE;
extern "C" gc* JnJVM_org_j3_bindings_Bindings_retainForFinalize__Lorg_mmtk_plan_TraceLocal_2Lorg_vmmagic_unboxed_ObjectReference_2(
- uintptr_t TraceLocal, void* obj) ALWAYS_INLINE;
+ word_t TraceLocal, void* obj) ALWAYS_INLINE;
extern "C" gc* JnJVM_org_j3_bindings_Bindings_retainReferent__Lorg_mmtk_plan_TraceLocal_2Lorg_vmmagic_unboxed_ObjectReference_2(
- uintptr_t TraceLocal, void* obj) ALWAYS_INLINE;
+ word_t TraceLocal, void* obj) ALWAYS_INLINE;
extern "C" gc* JnJVM_org_j3_bindings_Bindings_getForwardedReference__Lorg_mmtk_plan_TraceLocal_2Lorg_vmmagic_unboxed_ObjectReference_2(
- uintptr_t TraceLocal, void* obj) ALWAYS_INLINE;
+ word_t TraceLocal, void* obj) ALWAYS_INLINE;
extern "C" gc* JnJVM_org_j3_bindings_Bindings_getForwardedReferent__Lorg_mmtk_plan_TraceLocal_2Lorg_vmmagic_unboxed_ObjectReference_2(
- uintptr_t TraceLocal, void* obj) ALWAYS_INLINE;
+ word_t TraceLocal, void* obj) ALWAYS_INLINE;
extern "C" gc* JnJVM_org_j3_bindings_Bindings_getForwardedFinalizable__Lorg_mmtk_plan_TraceLocal_2Lorg_vmmagic_unboxed_ObjectReference_2(
- uintptr_t TraceLocal, void* obj) ALWAYS_INLINE;
+ word_t TraceLocal, void* obj) ALWAYS_INLINE;
extern "C" uint8_t JnJVM_org_j3_bindings_Bindings_isLive__Lorg_mmtk_plan_TraceLocal_2Lorg_vmmagic_unboxed_ObjectReference_2(
- uintptr_t TraceLocal, void* obj) ALWAYS_INLINE;
+ word_t TraceLocal, void* obj) ALWAYS_INLINE;
extern "C" uint8_t JnJVM_org_j3_bindings_Bindings_writeBarrierCAS__Lorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_Address_2Lorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_ObjectReference_2(gc* ref, gc** slot, gc* old, gc* value) ALWAYS_INLINE;
@@ -100,23 +100,23 @@
th->MutatorContext =
JnJVM_org_j3_bindings_Bindings_allocateMutator__I((int32_t)_th->getThreadID());
th->realRoutine(_th);
- uintptr_t context = th->MutatorContext;
+ word_t context = th->MutatorContext;
th->MutatorContext = 0;
JnJVM_org_j3_bindings_Bindings_freeMutator__Lorg_mmtk_plan_MutatorContext_2(context);
}
-bool Collector::isLive(gc* ptr, uintptr_t closure) {
+bool Collector::isLive(gc* ptr, word_t closure) {
return JnJVM_org_j3_bindings_Bindings_isLive__Lorg_mmtk_plan_TraceLocal_2Lorg_vmmagic_unboxed_ObjectReference_2(closure, ptr);
}
-void Collector::scanObject(void** ptr, uintptr_t closure) {
+void Collector::scanObject(void** ptr, word_t closure) {
if ((*ptr) != NULL) {
assert(((gc*)(*ptr))->getVirtualTable());
}
JnJVM_org_j3_bindings_Bindings_reportDelayedRootEdge__Lorg_mmtk_plan_TraceLocal_2Lorg_vmmagic_unboxed_Address_2(closure, ptr);
}
-void Collector::markAndTrace(void* source, void* ptr, uintptr_t closure) {
+void Collector::markAndTrace(void* source, void* ptr, word_t closure) {
void** ptr_ = (void**)ptr;
if ((*ptr_) != NULL) {
assert(((gc*)(*ptr_))->getVirtualTable());
@@ -125,7 +125,7 @@
JnJVM_org_j3_bindings_Bindings_processEdge__Lorg_mmtk_plan_TransitiveClosure_2Lorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_Address_2(closure, source, ptr);
}
-void Collector::markAndTraceRoot(void* ptr, uintptr_t closure) {
+void Collector::markAndTraceRoot(void* ptr, word_t closure) {
void** ptr_ = (void**)ptr;
if ((*ptr_) != NULL) {
assert(((gc*)(*ptr_))->getVirtualTable());
@@ -133,23 +133,23 @@
JnJVM_org_j3_bindings_Bindings_processRootEdge__Lorg_mmtk_plan_TraceLocal_2Lorg_vmmagic_unboxed_Address_2Z(closure, ptr, true);
}
-gc* Collector::retainForFinalize(gc* val, uintptr_t closure) {
+gc* Collector::retainForFinalize(gc* val, word_t closure) {
return JnJVM_org_j3_bindings_Bindings_retainForFinalize__Lorg_mmtk_plan_TraceLocal_2Lorg_vmmagic_unboxed_ObjectReference_2(closure, val);
}
-gc* Collector::retainReferent(gc* val, uintptr_t closure) {
+gc* Collector::retainReferent(gc* val, word_t closure) {
return JnJVM_org_j3_bindings_Bindings_retainReferent__Lorg_mmtk_plan_TraceLocal_2Lorg_vmmagic_unboxed_ObjectReference_2(closure, val);
}
-gc* Collector::getForwardedFinalizable(gc* val, uintptr_t closure) {
+gc* Collector::getForwardedFinalizable(gc* val, word_t closure) {
return JnJVM_org_j3_bindings_Bindings_getForwardedFinalizable__Lorg_mmtk_plan_TraceLocal_2Lorg_vmmagic_unboxed_ObjectReference_2(closure, val);
}
-gc* Collector::getForwardedReference(gc* val, uintptr_t closure) {
+gc* Collector::getForwardedReference(gc* val, word_t closure) {
return JnJVM_org_j3_bindings_Bindings_getForwardedReference__Lorg_mmtk_plan_TraceLocal_2Lorg_vmmagic_unboxed_ObjectReference_2(closure, val);
}
-gc* Collector::getForwardedReferent(gc* val, uintptr_t closure) {
+gc* Collector::getForwardedReferent(gc* val, word_t closure) {
return JnJVM_org_j3_bindings_Bindings_getForwardedReferent__Lorg_mmtk_plan_TraceLocal_2Lorg_vmmagic_unboxed_ObjectReference_2(closure, val);
}
Modified: vmkit/trunk/mmtk/mmtk-j3/FinalizableProcessor.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/FinalizableProcessor.cpp?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/FinalizableProcessor.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/FinalizableProcessor.cpp Sun Oct 9 12:23:23 2011
@@ -19,14 +19,14 @@
}
extern "C" void
-Java_org_j3_mmtk_FinalizableProcessor_forward__Lorg_mmtk_plan_TraceLocal_2Z (MMTkObject* P, uintptr_t TL, uint8_t nursery) {
+Java_org_j3_mmtk_FinalizableProcessor_forward__Lorg_mmtk_plan_TraceLocal_2Z (MMTkObject* P, word_t TL, uint8_t nursery) {
UNIMPLEMENTED();
}
extern "C" void
Java_org_j3_mmtk_FinalizableProcessor_scan__Lorg_mmtk_plan_TraceLocal_2Z (MMTkObject* FP, MMTkObject* TL, uint8_t nursery) {
mvm::Thread* th = mvm::Thread::get();
- th->MyVM->scanFinalizationQueue(reinterpret_cast<uintptr_t>(TL));
+ th->MyVM->scanFinalizationQueue(reinterpret_cast<word_t>(TL));
}
}
Modified: vmkit/trunk/mmtk/mmtk-j3/MMTkObject.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/MMTkObject.h?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/MMTkObject.h (original)
+++ vmkit/trunk/mmtk/mmtk-j3/MMTkObject.h Sun Oct 9 12:23:23 2011
@@ -28,16 +28,16 @@
struct MMTkObject {
MMTkVirtualTable* virtualTable;
- uintptr_t header;
+ word_t header;
};
struct MMTkArray : public MMTkObject {
- uintptr_t size;
+ word_t size;
uint16_t elements[1];
};
struct MMTkObjectArray : public MMTkObject {
- uintptr_t size;
+ word_t size;
MMTkObject* elements[1];
};
Modified: vmkit/trunk/mmtk/mmtk-j3/MMTk_Events.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/MMTk_Events.cpp?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/MMTk_Events.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/MMTk_Events.cpp Sun Oct 9 12:23:23 2011
@@ -12,21 +12,21 @@
namespace mmtk {
extern "C" void Java_org_j3_mmtk_MMTk_1Events_tracePageAcquired__Lorg_mmtk_policy_Space_2Lorg_vmmagic_unboxed_Address_2I(
- MMTkObject* event, MMTkObject* space, uintptr_t address, int numPages) {
+ MMTkObject* event, MMTkObject* space, word_t address, int numPages) {
#if 0
fprintf(stderr, "Pages acquired by thread %p from space %p at %x (%d)\n", (void*)mvm::Thread::get(), (void*)space, address, numPages);
#endif
}
extern "C" void Java_org_j3_mmtk_MMTk_1Events_tracePageReleased__Lorg_mmtk_policy_Space_2Lorg_vmmagic_unboxed_Address_2I(
- MMTkObject* event, MMTkObject* space, uintptr_t address, int numPages) {
+ MMTkObject* event, MMTkObject* space, word_t address, int numPages) {
#if 0
fprintf(stderr, "Pages released by thread %p from space %p at %x (%d)\n", (void*)mvm::Thread::get(), (void*)space, address, numPages);
#endif
}
extern "C" void Java_org_j3_mmtk_MMTk_1Events_heapSizeChanged__Lorg_vmmagic_unboxed_Extent_2(
- MMTkObject* event, uintptr_t heapSize) {
+ MMTkObject* event, word_t heapSize) {
#if 0
fprintf(stderr, "New heap size : %d\n", (int)heapSize);
#endif
Modified: vmkit/trunk/mmtk/mmtk-j3/Memory.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Memory.cpp?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Memory.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Memory.cpp Sun Oct 9 12:23:23 2011
@@ -31,19 +31,19 @@
// Allocate the memory for MMTk right now, to avoid conflicts with other allocators.
InitCollector initCollector;
-extern "C" uintptr_t Java_org_j3_mmtk_Memory_getHeapStartConstant__ (MMTkObject* M) {
+extern "C" word_t Java_org_j3_mmtk_Memory_getHeapStartConstant__ (MMTkObject* M) {
return mvm::kGCMemoryStart;
}
-extern "C" uintptr_t Java_org_j3_mmtk_Memory_getHeapEndConstant__ (MMTkObject* M) {
+extern "C" word_t Java_org_j3_mmtk_Memory_getHeapEndConstant__ (MMTkObject* M) {
return mvm::kGCMemoryStart + mvm::kGCMemorySize;
}
-extern "C" uintptr_t Java_org_j3_mmtk_Memory_getAvailableStartConstant__ (MMTkObject* M) {
+extern "C" word_t Java_org_j3_mmtk_Memory_getAvailableStartConstant__ (MMTkObject* M) {
return Java_org_j3_mmtk_Memory_getHeapStartConstant__ (M);
}
-extern "C" uintptr_t Java_org_j3_mmtk_Memory_getAvailableEndConstant__ (MMTkObject* M) {
+extern "C" word_t Java_org_j3_mmtk_Memory_getAvailableEndConstant__ (MMTkObject* M) {
return Java_org_j3_mmtk_Memory_getHeapEndConstant__ (M);
}
@@ -56,13 +56,13 @@
}
extern "C" uint8_t
-Java_org_j3_mmtk_Memory_mprotect__Lorg_vmmagic_unboxed_Address_2I (MMTkObject* M, uintptr_t address, sint32 size) {
+Java_org_j3_mmtk_Memory_mprotect__Lorg_vmmagic_unboxed_Address_2I (MMTkObject* M, word_t address, sint32 size) {
int val = mprotect((void*)address, size, PROT_NONE);
return (val == 0);
}
extern "C" uint8_t
-Java_org_j3_mmtk_Memory_munprotect__Lorg_vmmagic_unboxed_Address_2I (MMTkObject* M, uintptr_t address, sint32 size) {
+Java_org_j3_mmtk_Memory_munprotect__Lorg_vmmagic_unboxed_Address_2I (MMTkObject* M, word_t address, sint32 size) {
int val = mprotect((void*)address, size, PROT_READ | PROT_WRITE);
return (val == 0);
}
@@ -70,17 +70,17 @@
extern "C" void
Java_org_j3_mmtk_Memory_zero__Lorg_vmmagic_unboxed_Address_2Lorg_vmmagic_unboxed_Extent_2(MMTkObject* M,
void* addr,
- uintptr_t len) {
+ word_t len) {
memset(addr, 0, len);
}
extern "C" void
-Java_org_j3_mmtk_Memory_zeroPages__Lorg_vmmagic_unboxed_Address_2I (MMTkObject* M, uintptr_t address, sint32 size) {
+Java_org_j3_mmtk_Memory_zeroPages__Lorg_vmmagic_unboxed_Address_2I (MMTkObject* M, word_t address, sint32 size) {
UNIMPLEMENTED();
}
extern "C" void
-Java_org_j3_mmtk_Memory_dumpMemory__Lorg_vmmagic_unboxed_Address_2II (MMTkObject* M, uintptr_t address, sint32 before, sint32 after) {
+Java_org_j3_mmtk_Memory_dumpMemory__Lorg_vmmagic_unboxed_Address_2II (MMTkObject* M, word_t address, sint32 before, sint32 after) {
UNIMPLEMENTED();
}
Modified: vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/ObjectModel.cpp Sun Oct 9 12:23:23 2011
@@ -14,20 +14,20 @@
namespace mmtk {
-extern "C" intptr_t Java_org_j3_mmtk_ObjectModel_getArrayBaseOffset__ (MMTkObject* OM) {
+extern "C" word_t Java_org_j3_mmtk_ObjectModel_getArrayBaseOffset__ (MMTkObject* OM) {
return sizeof(MMTkObject) + sizeof(ssize_t);
}
-extern "C" intptr_t Java_org_j3_mmtk_ObjectModel_GC_1HEADER_1OFFSET__ (MMTkObject* OM) {
+extern "C" word_t Java_org_j3_mmtk_ObjectModel_GC_1HEADER_1OFFSET__ (MMTkObject* OM) {
return sizeof(void*);
}
-extern "C" uintptr_t Java_org_j3_mmtk_ObjectModel_readAvailableBitsWord__Lorg_vmmagic_unboxed_ObjectReference_2 (MMTkObject* OM, gc* obj) {
+extern "C" word_t Java_org_j3_mmtk_ObjectModel_readAvailableBitsWord__Lorg_vmmagic_unboxed_ObjectReference_2 (MMTkObject* OM, gc* obj) {
return obj->header;
}
extern "C" void Java_org_j3_mmtk_ObjectModel_writeAvailableBitsWord__Lorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_Word_2 (
- MMTkObject* OM, gc* obj, uintptr_t val) {
+ MMTkObject* OM, gc* obj, word_t val) {
obj->header = val;
}
@@ -40,25 +40,25 @@
}
extern "C" uint8_t Java_org_j3_mmtk_ObjectModel_readAvailableByte__Lorg_vmmagic_unboxed_ObjectReference_2 (MMTkObject* OM, gc* obj) {
- return *mvm::System::GetLastBytePtr(reinterpret_cast<intptr_t>(obj));
+ return *mvm::System::GetLastBytePtr(reinterpret_cast<word_t>(obj));
}
extern "C" void Java_org_j3_mmtk_ObjectModel_writeAvailableByte__Lorg_vmmagic_unboxed_ObjectReference_2B (MMTkObject* OM, gc* obj, uint8_t val) {
- *mvm::System::GetLastBytePtr(reinterpret_cast<intptr_t>(obj)) = val;
+ *mvm::System::GetLastBytePtr(reinterpret_cast<word_t>(obj)) = val;
}
extern "C" gc* Java_org_j3_mmtk_ObjectModel_getObjectFromStartAddress__Lorg_vmmagic_unboxed_Address_2 (MMTkObject* OM, gc* obj) {
return obj;
}
-extern "C" uintptr_t Java_org_j3_mmtk_ObjectModel_prepareAvailableBits__Lorg_vmmagic_unboxed_ObjectReference_2 (MMTkObject* OM, gc* obj) {
+extern "C" word_t Java_org_j3_mmtk_ObjectModel_prepareAvailableBits__Lorg_vmmagic_unboxed_ObjectReference_2 (MMTkObject* OM, gc* obj) {
return obj->header;
}
extern "C" uint8_t
Java_org_j3_mmtk_ObjectModel_attemptAvailableBits__Lorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_Word_2Lorg_vmmagic_unboxed_Word_2(
- MMTkObject* OM, gc* obj, intptr_t oldValue, intptr_t newValue) {
- intptr_t val = __sync_val_compare_and_swap(&(obj->header), oldValue, newValue);
+ MMTkObject* OM, gc* obj, word_t oldValue, word_t newValue) {
+ word_t val = __sync_val_compare_and_swap(&(obj->header), oldValue, newValue);
return (val == oldValue);
}
@@ -70,49 +70,49 @@
memcpy(res, src, size);
}
-extern "C" uintptr_t JnJVM_org_j3_bindings_Bindings_copy__Lorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_ObjectReference_2II(
+extern "C" word_t JnJVM_org_j3_bindings_Bindings_copy__Lorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_ObjectReference_2II(
gc* obj, VirtualTable* VT, int size, int allocator);
-extern "C" uintptr_t Java_org_j3_mmtk_ObjectModel_copy__Lorg_vmmagic_unboxed_ObjectReference_2I (
+extern "C" word_t Java_org_j3_mmtk_ObjectModel_copy__Lorg_vmmagic_unboxed_ObjectReference_2I (
MMTkObject* OM, gc* src, int allocator) ALWAYS_INLINE;
-extern "C" uintptr_t Java_org_j3_mmtk_ObjectModel_copy__Lorg_vmmagic_unboxed_ObjectReference_2I (
+extern "C" word_t Java_org_j3_mmtk_ObjectModel_copy__Lorg_vmmagic_unboxed_ObjectReference_2I (
MMTkObject* OM, gc* src, int allocator) {
size_t size = mvm::Thread::get()->MyVM->getObjectSize(src);
size = llvm::RoundUpToAlignment(size, sizeof(void*));
- uintptr_t res = JnJVM_org_j3_bindings_Bindings_copy__Lorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_ObjectReference_2II(
+ word_t res = JnJVM_org_j3_bindings_Bindings_copy__Lorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_ObjectReference_2II(
src, src->getVirtualTable(), size, allocator);
- assert((((uintptr_t*)res)[1] & ~mvm::GCBitMask) == (((uintptr_t*)src)[1] & ~mvm::GCBitMask));
+ assert((((word_t*)res)[1] & ~mvm::GCBitMask) == (((word_t*)src)[1] & ~mvm::GCBitMask));
return res;
}
extern "C" void Java_org_j3_mmtk_ObjectModel_copyTo__Lorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_Address_2 (
- MMTkObject* OM, uintptr_t from, uintptr_t to, uintptr_t region) { UNIMPLEMENTED(); }
+ MMTkObject* OM, word_t from, word_t to, word_t region) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_ObjectModel_getReferenceWhenCopiedTo__Lorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_Address_2 (
- MMTkObject* OM, uintptr_t from, uintptr_t to) { UNIMPLEMENTED(); }
+ MMTkObject* OM, word_t from, word_t to) { UNIMPLEMENTED(); }
-extern "C" uintptr_t Java_org_j3_mmtk_ObjectModel_getObjectEndAddress__Lorg_vmmagic_unboxed_ObjectReference_2 (
+extern "C" word_t Java_org_j3_mmtk_ObjectModel_getObjectEndAddress__Lorg_vmmagic_unboxed_ObjectReference_2 (
MMTkObject* OM, gc* object) {
size_t size = mvm::Thread::get()->MyVM->getObjectSize(object);
size = llvm::RoundUpToAlignment(size, sizeof(void*));
- return reinterpret_cast<uintptr_t>(object) + size;
+ return reinterpret_cast<word_t>(object) + size;
}
extern "C" void Java_org_j3_mmtk_ObjectModel_getSizeWhenCopied__Lorg_vmmagic_unboxed_ObjectReference_2 (
- MMTkObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
+ MMTkObject* OM, word_t object) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_ObjectModel_getAlignWhenCopied__Lorg_vmmagic_unboxed_ObjectReference_2 (
- MMTkObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
+ MMTkObject* OM, word_t object) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_ObjectModel_getAlignOffsetWhenCopied__Lorg_vmmagic_unboxed_ObjectReference_2 (
- MMTkObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
+ MMTkObject* OM, word_t object) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_ObjectModel_getCurrentSize__Lorg_vmmagic_unboxed_ObjectReference_2 (
- MMTkObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
+ MMTkObject* OM, word_t object) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_ObjectModel_getNextObject__Lorg_vmmagic_unboxed_ObjectReference_2 (
- MMTkObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
+ MMTkObject* OM, word_t object) { UNIMPLEMENTED(); }
class FakeByteArray : public MMTkObject {
@@ -141,18 +141,18 @@
}
extern "C" void Java_org_j3_mmtk_ObjectModel_getArrayLength__Lorg_vmmagic_unboxed_ObjectReference_2 (
- MMTkObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
+ MMTkObject* OM, word_t object) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_ObjectModel_isArray__Lorg_vmmagic_unboxed_ObjectReference_2 (
- MMTkObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
+ MMTkObject* OM, word_t object) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_ObjectModel_isPrimitiveArray__Lorg_vmmagic_unboxed_ObjectReference_2 (
- MMTkObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
+ MMTkObject* OM, word_t object) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_ObjectModel_isAcyclic__Lorg_vmmagic_unboxed_ObjectReference_2 (
- MMTkObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
+ MMTkObject* OM, word_t object) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_ObjectModel_dumpObject__Lorg_vmmagic_unboxed_ObjectReference_2 (
- MMTkObject* OM, uintptr_t object) { UNIMPLEMENTED(); }
+ MMTkObject* OM, word_t object) { UNIMPLEMENTED(); }
}
Modified: vmkit/trunk/mmtk/mmtk-j3/ReferenceProcessor.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/ReferenceProcessor.cpp?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/ReferenceProcessor.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/ReferenceProcessor.cpp Sun Oct 9 12:23:23 2011
@@ -14,7 +14,7 @@
namespace mmtk {
-extern "C" void Java_org_j3_mmtk_ReferenceProcessor_scan__Lorg_mmtk_plan_TraceLocal_2Z (MMTkReferenceProcessor* RP, uintptr_t TL, uint8_t nursery) {
+extern "C" void Java_org_j3_mmtk_ReferenceProcessor_scan__Lorg_mmtk_plan_TraceLocal_2Z (MMTkReferenceProcessor* RP, word_t TL, uint8_t nursery) {
mvm::Thread* th = mvm::Thread::get();
uint32_t val = RP->ordinal;
@@ -28,7 +28,7 @@
}
}
-extern "C" void Java_org_j3_mmtk_ReferenceProcessor_forward__Lorg_mmtk_plan_TraceLocal_2Z (MMTkReferenceProcessor* RP, uintptr_t TL, uint8_t nursery) { UNIMPLEMENTED(); }
+extern "C" void Java_org_j3_mmtk_ReferenceProcessor_forward__Lorg_mmtk_plan_TraceLocal_2Z (MMTkReferenceProcessor* RP, word_t TL, uint8_t nursery) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_ReferenceProcessor_clear__ (MMTkReferenceProcessor* RP) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_ReferenceProcessor_countWaitingReferences__ (MMTkReferenceProcessor* RP) { UNIMPLEMENTED(); }
Modified: vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Scanning.cpp Sun Oct 9 12:23:23 2011
@@ -21,19 +21,19 @@
mvm::Thread* tcur = th;
do {
- tcur->scanStack(reinterpret_cast<uintptr_t>(TL));
+ tcur->scanStack(reinterpret_cast<word_t>(TL));
tcur = (mvm::Thread*)tcur->next();
} while (tcur != th);
}
extern "C" void Java_org_j3_mmtk_Scanning_computeGlobalRoots__Lorg_mmtk_plan_TraceLocal_2 (MMTkObject* Scanning, MMTkObject* TL) {
- mvm::Thread::get()->MyVM->tracer(reinterpret_cast<uintptr_t>(TL));
+ mvm::Thread::get()->MyVM->tracer(reinterpret_cast<word_t>(TL));
mvm::Thread* th = mvm::Thread::get();
mvm::Thread* tcur = th;
do {
- tcur->tracer(reinterpret_cast<uintptr_t>(TL));
+ tcur->tracer(reinterpret_cast<word_t>(TL));
tcur = (mvm::Thread*)tcur->next();
} while (tcur != th);
}
@@ -52,7 +52,7 @@
assert(obj && "No object to trace");
assert(obj->getVirtualTable() && "No virtual table");
assert(obj->getVirtualTable()->tracer && "No tracer in VT");
- obj->tracer(reinterpret_cast<uintptr_t>(TC));
+ obj->tracer(reinterpret_cast<word_t>(TC));
}
extern "C" void Java_org_j3_mmtk_Scanning_preCopyGCInstances__Lorg_mmtk_plan_TraceLocal_2 (MMTkObject* Scanning, MMTkObject* TL) {
@@ -60,7 +60,7 @@
}
extern "C" void Java_org_j3_mmtk_Scanning_scanObject__Lorg_mmtk_plan_TransitiveClosure_2Lorg_vmmagic_unboxed_ObjectReference_2 (
- MMTkObject* Scanning, uintptr_t TC, gc* obj) {
+ MMTkObject* Scanning, word_t TC, gc* obj) {
assert(obj && "No object to trace");
assert(obj->getVirtualTable() && "No virtual table");
assert(obj->getVirtualTable()->tracer && "No tracer in VT");
@@ -68,6 +68,6 @@
}
extern "C" void Java_org_j3_mmtk_Scanning_precopyChildren__Lorg_mmtk_plan_TraceLocal_2Lorg_vmmagic_unboxed_ObjectReference_2 (
- MMTkObject* Scanning, MMTkObject TL, uintptr_t ref) { UNIMPLEMENTED(); }
+ MMTkObject* Scanning, MMTkObject TL, word_t ref) { UNIMPLEMENTED(); }
}
Modified: vmkit/trunk/mmtk/mmtk-j3/TraceInterface.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/TraceInterface.cpp?rev=141509&r1=141508&r2=141509&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/TraceInterface.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/TraceInterface.cpp Sun Oct 9 12:23:23 2011
@@ -15,40 +15,40 @@
extern "C" bool Java_org_j3_mmtk_TraceInterface_gcEnabled__ (MMTkObject* TI) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_TraceInterface_adjustSlotOffset__ZLorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_Address_2 (
- MMTkObject* TI, bool scalar, uintptr_t src, uintptr_t slot) { UNIMPLEMENTED(); }
+ MMTkObject* TI, bool scalar, word_t src, word_t slot) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_TraceInterface_skipOwnFramesAndDump__Lorg_vmmagic_unboxed_ObjectReference_2 (
- MMTkObject* TI, uintptr_t typeRef) { UNIMPLEMENTED(); }
+ MMTkObject* TI, word_t typeRef) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_TraceInterface_updateDeathTime__Lorg_vmmagic_unboxed_ObjectReference_2 (
- MMTkObject* TI, uintptr_t obj) { UNIMPLEMENTED(); }
+ MMTkObject* TI, word_t obj) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_TraceInterface_setDeathTime__Lorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_Word_2 (
- MMTkObject* TI, uintptr_t ref, uintptr_t time) { UNIMPLEMENTED(); }
+ MMTkObject* TI, word_t ref, word_t time) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_TraceInterface_setLink__Lorg_vmmagic_unboxed_ObjectReference_2Lorg_vmmagic_unboxed_ObjectReference_2 (
- MMTkObject* TI, uintptr_t ref, uintptr_t link) { UNIMPLEMENTED(); }
+ MMTkObject* TI, word_t ref, word_t link) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_TraceInterface_updateTime__Lorg_vmmagic_unboxed_Word_2 (
- MMTkObject* TI, uintptr_t obj) { UNIMPLEMENTED(); }
+ MMTkObject* TI, word_t obj) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_TraceInterface_getOID__Lorg_vmmagic_unboxed_ObjectReference_2 (
- MMTkObject* TI, uintptr_t ref) { UNIMPLEMENTED(); }
+ MMTkObject* TI, word_t ref) { UNIMPLEMENTED(); }
-extern "C" uintptr_t Java_org_j3_mmtk_TraceInterface_getDeathTime__Lorg_vmmagic_unboxed_ObjectReference_2 (
- MMTkObject* TI, uintptr_t ref) { UNIMPLEMENTED(); }
+extern "C" word_t Java_org_j3_mmtk_TraceInterface_getDeathTime__Lorg_vmmagic_unboxed_ObjectReference_2 (
+ MMTkObject* TI, word_t ref) { UNIMPLEMENTED(); }
-extern "C" uintptr_t Java_org_j3_mmtk_TraceInterface_getLink__Lorg_vmmagic_unboxed_ObjectReference_2 (
- MMTkObject* TI, uintptr_t ref) { UNIMPLEMENTED(); }
+extern "C" word_t Java_org_j3_mmtk_TraceInterface_getLink__Lorg_vmmagic_unboxed_ObjectReference_2 (
+ MMTkObject* TI, word_t ref) { UNIMPLEMENTED(); }
-extern "C" uintptr_t Java_org_j3_mmtk_TraceInterface_getBootImageLink__ (
+extern "C" word_t Java_org_j3_mmtk_TraceInterface_getBootImageLink__ (
MMTkObject* TI) { UNIMPLEMENTED(); }
-extern "C" uintptr_t Java_org_j3_mmtk_TraceInterface_getOID__ (
+extern "C" word_t Java_org_j3_mmtk_TraceInterface_getOID__ (
MMTkObject* TI) { UNIMPLEMENTED(); }
extern "C" void Java_org_j3_mmtk_TraceInterface_setOID__Lorg_vmmagic_unboxed_Word_2 (
- MMTkObject* TI, uintptr_t oid) { UNIMPLEMENTED(); }
+ MMTkObject* TI, word_t oid) { UNIMPLEMENTED(); }
extern "C" sint32 Java_org_j3_mmtk_TraceInterface_getHeaderSize__ (MMTkObject* TI) { UNIMPLEMENTED(); }
extern "C" sint32 Java_org_j3_mmtk_TraceInterface_getHeaderEndOffset__ (MMTkObject* TI) { UNIMPLEMENTED(); }
More information about the vmkit-commits
mailing list