[vmkit-commits] [vmkit] r200848 - Remove the useless j3thread::get(void*) function
Gael Thomas
gael.thomas at lip6.fr
Wed Feb 5 08:05:55 PST 2014
Author: gthomas
Date: Wed Feb 5 10:05:54 2014
New Revision: 200848
URL: http://llvm.org/viewvc/llvm-project?rev=200848&view=rev
Log:
Remove the useless j3thread::get(void*) function
Modified:
vmkit/branches/mcjit/include/j3/j3codegen.h
vmkit/branches/mcjit/include/j3/j3meta.def
vmkit/branches/mcjit/include/j3/j3monitor.h
vmkit/branches/mcjit/include/j3/j3thread.h
vmkit/branches/mcjit/lib/j3/vm/j3codegen.cc
vmkit/branches/mcjit/lib/j3/vm/j3monitor.cc
vmkit/branches/mcjit/lib/j3/vm/j3object.cc
vmkit/branches/mcjit/lib/j3/vm/j3thread.cc
Modified: vmkit/branches/mcjit/include/j3/j3codegen.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/include/j3/j3codegen.h?rev=200848&r1=200847&r2=200848&view=diff
==============================================================================
--- vmkit/branches/mcjit/include/j3/j3codegen.h (original)
+++ vmkit/branches/mcjit/include/j3/j3codegen.h Wed Feb 5 10:05:54 2014
@@ -108,7 +108,6 @@ namespace j3 {
llvm::Function* buildFunction(J3Method* method, bool isStub=1);
llvm::Value* typeDescriptor(J3ObjectType* objectType, llvm::Type* type);
- llvm::Value* spToCurrentThread(llvm::Value* sp);
llvm::Value* currentThread();
llvm::Value* nullCheck(llvm::Value* obj);
Modified: vmkit/branches/mcjit/include/j3/j3meta.def
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/include/j3/j3meta.def?rev=200848&r1=200847&r2=200848&view=diff
==============================================================================
--- vmkit/branches/mcjit/include/j3/j3meta.def (original)
+++ vmkit/branches/mcjit/include/j3/j3meta.def Wed Feb 5 10:05:54 2014
@@ -25,7 +25,6 @@ _x(funcCXAEndCatch, "__c
_x(funcFake, "j3::J3::forceSymbolDefinition()", 0)
_x(funcJ3ThreadGet, "j3::J3Thread::get()", 0)
-_x(funcJ3ThreadGetP, "j3::J3Thread::get(void*)", 0)
_x(funcVMKitThreadGet, "vmkit::Thread::get()", 0)
_x(funcVMKitThreadGetP, "vmkit::Thread::get(void*)", 0)
_x(funcJ3ThreadJniEnv, "j3::J3Thread::jniEnv()", 0)
Modified: vmkit/branches/mcjit/include/j3/j3monitor.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/include/j3/j3monitor.h?rev=200848&r1=200847&r2=200848&view=diff
==============================================================================
--- vmkit/branches/mcjit/include/j3/j3monitor.h (original)
+++ vmkit/branches/mcjit/include/j3/j3monitor.h Wed Feb 5 10:05:54 2014
@@ -6,10 +6,10 @@
namespace vmkit {
class BumpAllocator;
+ class Thread;
}
namespace j3 {
- class J3Thread;
class J3Object;
class J3LockRecord;
@@ -19,7 +19,7 @@ namespace j3 {
J3Monitor* _next;
- J3Thread* owner;
+ vmkit::Thread* owner;
uint32_t lockCount;
pthread_mutex_t mutex;
pthread_cond_t cond;
@@ -35,7 +35,7 @@ namespace j3 {
J3Monitor* prepare(J3Object* _object, uintptr_t header, J3LockRecord* _record);
J3Monitor* prepare();
- bool isOwner(J3Thread* thread);
+ bool isOwner(vmkit::Thread* thread);
void lock();
void unlock();
Modified: vmkit/branches/mcjit/include/j3/j3thread.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/include/j3/j3thread.h?rev=200848&r1=200847&r2=200848&view=diff
==============================================================================
--- vmkit/branches/mcjit/include/j3/j3thread.h (original)
+++ vmkit/branches/mcjit/include/j3/j3thread.h Wed Feb 5 10:05:54 2014
@@ -68,7 +68,6 @@ namespace j3 {
JavaVM* javaVM() { return &_javaVM; }
static J3Thread* get();
- static J3Thread* get(void* ptr);
static void start(J3ObjectHandle* handle);
};
Modified: vmkit/branches/mcjit/lib/j3/vm/j3codegen.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/vm/j3codegen.cc?rev=200848&r1=200847&r2=200848&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3codegen.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3codegen.cc Wed Feb 5 10:05:54 2014
@@ -227,12 +227,6 @@ llvm::Value* J3CodeGen::typeDescriptor(J
return type == vm->typeJ3ObjectTypePtr ? v : builder.CreateBitCast(v, type);
}
-llvm::Value* J3CodeGen::spToCurrentThread(llvm::Value* sp) {
- if(sp->getType()->isIntegerTy())
- sp = builder.CreateIntToPtr(sp, funcJ3ThreadGetP->getFunctionType()->getParamType(0));
- return builder.CreateCall(funcJ3ThreadGetP, sp);
-}
-
llvm::Value* J3CodeGen::currentThread() {
return builder.CreateCall(funcJ3ThreadGet);
}
Modified: vmkit/branches/mcjit/lib/j3/vm/j3monitor.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/vm/j3monitor.cc?rev=200848&r1=200847&r2=200848&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3monitor.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3monitor.cc Wed Feb 5 10:05:54 2014
@@ -20,7 +20,7 @@ J3Monitor* J3Monitor::prepare(J3Object*
object = _object;
record = _record;
header = _header;
- owner = _record ? J3Thread::get(_record) : 0;
+ owner = _record ? vmkit::Thread::get(_record) : 0;
return this;
}
@@ -35,7 +35,7 @@ void J3Monitor::checkRecord() {
}
}
-bool J3Monitor::isOwner(J3Thread* thread) {
+bool J3Monitor::isOwner(vmkit::Thread* thread) {
return owner == thread;
}
Modified: vmkit/branches/mcjit/lib/j3/vm/j3object.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/vm/j3object.cc?rev=200848&r1=200847&r2=200848&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3object.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3object.cc Wed Feb 5 10:05:54 2014
@@ -388,13 +388,13 @@ J3Monitor* J3Object::inflate() {
}
bool J3Object::isLockOwner() {
- J3Thread* self = J3Thread::get();
+ vmkit::Thread* self = vmkit::Thread::get();
uintptr_t header = _header;
if(isInflated(header)) /* inflated */
return asMonitor(header)->isOwner(self);
else
- return !isUnlocked(header) && (J3Thread*)J3Thread::get((void*)header) == self;
+ return !isUnlocked(header) && vmkit::Thread::get((void*)header) == self;
}
/*
Modified: vmkit/branches/mcjit/lib/j3/vm/j3thread.cc
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/mcjit/lib/j3/vm/j3thread.cc?rev=200848&r1=200847&r2=200848&view=diff
==============================================================================
--- vmkit/branches/mcjit/lib/j3/vm/j3thread.cc (original)
+++ vmkit/branches/mcjit/lib/j3/vm/j3thread.cc Wed Feb 5 10:05:54 2014
@@ -95,10 +95,6 @@ void J3Thread::restore(J3ObjectHandle* p
_localReferences.restore(ptr);
}
-J3Thread* J3Thread::get(void* ptr) {
- return (J3Thread*)Thread::get(ptr);
-}
-
J3Thread* J3Thread::get() {
return (J3Thread*)Thread::get();
}
More information about the vmkit-commits
mailing list