[vmkit-commits] [vmkit] r143957 - in /vmkit/trunk: ./ lib/J3/ClassLib/ lib/J3/ClassLib/GNUClasspath/ lib/J3/VMCore/JavaClass.cpp lib/J3/VMCore/JavaObject.cpp lib/Mvm/CommonThread/ObjectLocks.cpp lib/Mvm/CommonThread/ctlock.cpp lib/Mvm/Compiler/JIT.cpp lib/Mvm/MMTk/ mmtk/inline/ mmtk/java/ mmtk/mmtk-alloc/ mmtk/mmtk-j3/Statistics.cpp tools/
Gael Thomas
gael.thomas at lip6.fr
Mon Nov 7 03:16:04 PST 2011
Author: gthomas
Date: Mon Nov 7 05:16:04 2011
New Revision: 143957
URL: http://llvm.org/viewvc/llvm-project?rev=143957&view=rev
Log:
avoid warnings, LLVM_HOSTTRIPLE is now LLVM_DEFAULT_TARGET_TRIPLE
Modified:
vmkit/trunk/ (props changed)
vmkit/trunk/lib/J3/ClassLib/ (props changed)
vmkit/trunk/lib/J3/ClassLib/GNUClasspath/ (props changed)
vmkit/trunk/lib/J3/VMCore/JavaClass.cpp
vmkit/trunk/lib/J3/VMCore/JavaObject.cpp
vmkit/trunk/lib/Mvm/CommonThread/ObjectLocks.cpp
vmkit/trunk/lib/Mvm/CommonThread/ctlock.cpp
vmkit/trunk/lib/Mvm/Compiler/JIT.cpp
vmkit/trunk/lib/Mvm/MMTk/ (props changed)
vmkit/trunk/mmtk/inline/ (props changed)
vmkit/trunk/mmtk/java/ (props changed)
vmkit/trunk/mmtk/mmtk-alloc/ (props changed)
vmkit/trunk/mmtk/mmtk-j3/Statistics.cpp
vmkit/trunk/tools/ (props changed)
Propchange: vmkit/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Nov 7 05:16:04 2011
@@ -1,5 +1,6 @@
do-find
Makefile.config
+Makefile.llvmbuild
replace.sh
config.log
*.tmp
Propchange: vmkit/trunk/lib/J3/ClassLib/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Nov 7 05:16:04 2011
@@ -0,0 +1 @@
+Classpath.h
Propchange: vmkit/trunk/lib/J3/ClassLib/GNUClasspath/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Nov 7 05:16:04 2011
@@ -0,0 +1 @@
+Release
Modified: vmkit/trunk/lib/J3/VMCore/JavaClass.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaClass.cpp?rev=143957&r1=143956&r2=143957&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaClass.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaClass.cpp Mon Nov 7 05:16:04 2011
@@ -877,7 +877,8 @@
PRINT_DEBUG(JNJVM_LOAD, 0, COLOR_NORMAL, "%s\n", mvm::PrintBuffer(this).cString());
Reader reader(bytes);
- uint32 magic = reader.readU4();
+ uint32 magic;
+ magic = reader.readU4();
assert(magic == Jnjvm::Magic && "I've created a class but magic is no good!");
/* uint16 minor = */ reader.readU2();
Modified: vmkit/trunk/lib/J3/VMCore/JavaObject.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaObject.cpp?rev=143957&r1=143956&r2=143957&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaObject.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaObject.cpp Mon Nov 7 05:16:04 2011
@@ -34,7 +34,8 @@
assert(mvm::HashBits != 0);
word_t header = self->header;
- word_t GCBits = header & mvm::GCBitMask;
+ word_t GCBits;
+ GCBits = header & mvm::GCBitMask;
word_t val = header & HashMask;
if (val != 0) {
return val ^ (word_t)getClass(self);
Modified: vmkit/trunk/lib/Mvm/CommonThread/ObjectLocks.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/CommonThread/ObjectLocks.cpp?rev=143957&r1=143956&r2=143957&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/CommonThread/ObjectLocks.cpp (original)
+++ vmkit/trunk/lib/Mvm/CommonThread/ObjectLocks.cpp Mon Nov 7 05:16:04 2011
@@ -45,10 +45,12 @@
void ThinLock::removeFatLock(FatLock* fatLock, LockSystem& table) {
gc* object = fatLock->associatedObject;
llvm_gcroot(object, 0);
- word_t ID = fatLock->getID();
+ word_t ID;
word_t oldValue = 0;
word_t newValue = 0;
word_t yieldedValue = 0;
+
+ ID = fatLock->getID();
do {
oldValue = object->header;
newValue = oldValue & NonLockBitsMask;
Modified: vmkit/trunk/lib/Mvm/CommonThread/ctlock.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/CommonThread/ctlock.cpp?rev=143957&r1=143956&r2=143957&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/CommonThread/ctlock.cpp (original)
+++ vmkit/trunk/lib/Mvm/CommonThread/ctlock.cpp Mon Nov 7 05:16:04 2011
@@ -130,7 +130,8 @@
}
Cond::Cond() {
- int errorcode = pthread_cond_init((pthread_cond_t*)&internalCond, NULL);
+ int errorcode;
+ errorcode = pthread_cond_init((pthread_cond_t*)&internalCond, NULL);
assert(errorcode == 0);
}
@@ -145,11 +146,11 @@
void Cond::wait(Lock* l) {
assert(l->selfOwner());
int n = l->unsafeUnlock();
-
+ int res;
Thread* th = Thread::get();
th->enterUncooperativeCode();
- int res = pthread_cond_wait((pthread_cond_t*)&internalCond,
- (pthread_mutex_t*)&(l->internalLock));
+ res = pthread_cond_wait((pthread_cond_t*)&internalCond,
+ (pthread_mutex_t*)&(l->internalLock));
th->leaveUncooperativeCode();
assert(!res && "Error on wait");
Modified: vmkit/trunk/lib/Mvm/Compiler/JIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Compiler/JIT.cpp?rev=143957&r1=143956&r2=143957&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/Compiler/JIT.cpp (original)
+++ vmkit/trunk/lib/Mvm/Compiler/JIT.cpp Mon Nov 7 05:16:04 2011
@@ -60,7 +60,11 @@
}
const char* MvmModule::getHostTriple() {
- return LLVM_HOSTTRIPLE;
+#ifdef LLVM_HOSTTRIPLE
+ return LLVM_HOSTTRIPLE
+#else
+ return LLVM_DEFAULT_TARGET_TRIPLE;
+#endif
}
cl::opt<bool>
@@ -416,7 +420,8 @@
FrameIterator iterator(*frames);
while (iterator.hasNext()) {
FrameInfo* frame = iterator.next();
- FrameInfo* other = VM->IPToFrameInfo(frame->ReturnAddress);
+ FrameInfo* other;
+ other = VM->IPToFrameInfo(frame->ReturnAddress);
assert(frame->ReturnAddress == other->ReturnAddress);
}
}
Propchange: vmkit/trunk/lib/Mvm/MMTk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Nov 7 05:16:04 2011
@@ -1 +1,3 @@
Release+Asserts
+Release
+
Propchange: vmkit/trunk/mmtk/inline/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Nov 7 05:16:04 2011
@@ -1,2 +1,3 @@
Release+Asserts
+Release
*.inc
Propchange: vmkit/trunk/mmtk/java/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Nov 7 05:16:04 2011
@@ -1,5 +1,6 @@
build.xml
Release+Asserts
+Release
mmtk-vmkit.bc
mmtk-vmkit-optimized.bc
mmtk-vmkit.jar
Propchange: vmkit/trunk/mmtk/mmtk-alloc/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Nov 7 05:16:04 2011
@@ -1 +1,3 @@
Release+Asserts
+Release
+
Modified: vmkit/trunk/mmtk/mmtk-j3/Statistics.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Statistics.cpp?rev=143957&r1=143956&r2=143957&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Statistics.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Statistics.cpp Mon Nov 7 05:16:04 2011
@@ -22,7 +22,8 @@
int64_t result;
struct timeval tp;
- int res = gettimeofday (&tp, NULL);
+ int res;
+ res = gettimeofday (&tp, NULL);
assert(res != -1 && "failed gettimeofday.");
result = (int64_t) tp.tv_sec;
Propchange: vmkit/trunk/tools/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Nov 7 05:16:04 2011
@@ -0,0 +1 @@
+llvm-config-2
More information about the vmkit-commits
mailing list