[vmkit-commits] [vmkit] r102266 - in /vmkit/trunk: include/mvm/Allocator.h include/mvm/Threads/Locks.h lib/J3/Classpath/ClasspathField.inc lib/J3/Compiler/JavaAOTCompiler.cpp lib/J3/VMCore/JavaConstantPool.cpp lib/J3/VMCore/JavaMetaJIT.cpp lib/J3/VMCore/JavaObject.cpp lib/J3/VMCore/Jnjvm.cpp lib/Mvm/Compiler/JIT.cpp
Nicolas Geoffray
nicolas.geoffray at lip6.fr
Sat Apr 24 13:36:11 PDT 2010
Author: geoffray
Date: Sat Apr 24 15:36:11 2010
New Revision: 102266
URL: http://llvm.org/viewvc/llvm-project?rev=102266&view=rev
Log:
Remove const warnings.
Modified:
vmkit/trunk/include/mvm/Allocator.h
vmkit/trunk/include/mvm/Threads/Locks.h
vmkit/trunk/lib/J3/Classpath/ClasspathField.inc
vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp
vmkit/trunk/lib/J3/VMCore/JavaConstantPool.cpp
vmkit/trunk/lib/J3/VMCore/JavaMetaJIT.cpp
vmkit/trunk/lib/J3/VMCore/JavaObject.cpp
vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp
vmkit/trunk/lib/Mvm/Compiler/JIT.cpp
Modified: vmkit/trunk/include/mvm/Allocator.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/Allocator.h?rev=102266&r1=102265&r2=102266&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/Allocator.h (original)
+++ vmkit/trunk/include/mvm/Allocator.h Sat Apr 24 15:36:11 2010
@@ -20,13 +20,6 @@
class VirtualTable;
-#ifdef WITH_LLVM_GCC
-extern "C" void __llvm_gcroot(const void**, void*) __attribute__((nothrow));
-#define llvm_gcroot(a, b) __llvm_gcroot((const void**)&a, b)
-#else
-#define llvm_gcroot(a, b)
-#endif
-
#define declare_gcroot(type, name) type name; llvm_gcroot(name, 0); name
namespace mvm {
Modified: vmkit/trunk/include/mvm/Threads/Locks.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/Threads/Locks.h?rev=102266&r1=102265&r2=102266&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/Threads/Locks.h (original)
+++ vmkit/trunk/include/mvm/Threads/Locks.h Sat Apr 24 15:36:11 2010
@@ -16,6 +16,13 @@
#include "mvm/Threads/Thread.h"
+#ifdef WITH_LLVM_GCC
+extern "C" void __llvm_gcroot(void**, void*) __attribute__((nothrow));
+#define llvm_gcroot(a, b) __llvm_gcroot((void**)&a, b)
+#else
+#define llvm_gcroot(a, b)
+#endif
+
namespace mvm {
extern "C" uint8 llvm_atomic_cmp_swap_i8(uint8* ptr, uint8 cmp,
@@ -193,15 +200,6 @@
// Mask for the GC bits.
static const uint64_t GCBitMask = 0x3;
-
-
-#ifdef WITH_LLVM_GCC
-extern "C" void __llvm_gcroot(const void**, void*) __attribute__((nothrow));
-#define llvm_gcroot(a, b) __llvm_gcroot((const void**)&a, b)
-#else
-#define llvm_gcroot(a, b)
-#endif
-
class FatLockNoGC {
public:
static void gcroot(void* val, void* unused)
Modified: vmkit/trunk/lib/J3/Classpath/ClasspathField.inc
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Classpath/ClasspathField.inc?rev=102266&r1=102265&r2=102266&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Classpath/ClasspathField.inc (original)
+++ vmkit/trunk/lib/J3/Classpath/ClasspathField.inc Sat Apr 24 15:36:11 2010
@@ -92,7 +92,7 @@
}
if (type->isPrimitive()) {
- const PrimitiveTypedef* prim = (PrimitiveTypedef*)type;
+ const PrimitiveTypedef* prim = (const PrimitiveTypedef*)type;
if (prim->isInt())
res = (sint32)field->getInt32Field(stat ? StatPtr : obj);
@@ -142,7 +142,7 @@
const Typedef* type = field->getSignature();
if (type->isPrimitive()) {
- const PrimitiveTypedef* prim = (PrimitiveTypedef*)type;
+ const PrimitiveTypedef* prim = (const PrimitiveTypedef*)type;
if (prim->isInt())
res = (sint64)field->getInt32Field(stat ? StatPtr : obj);
@@ -193,7 +193,7 @@
const Typedef* type = field->getSignature();
if (type->isPrimitive()) {
- const PrimitiveTypedef* prim = (PrimitiveTypedef*)type;
+ const PrimitiveTypedef* prim = (const PrimitiveTypedef*)type;
if (prim->isBool())
res = (uint8)field->getInt8Field(stat ? StatPtr : obj);
else
@@ -235,7 +235,7 @@
const Typedef* type = field->getSignature();
if (type->isPrimitive()) {
- const PrimitiveTypedef* prim = (PrimitiveTypedef*)type;
+ const PrimitiveTypedef* prim = (const PrimitiveTypedef*)type;
if (prim->isByte())
res = (jfloat)field->getInt8Field(stat ? StatPtr : obj);
else if (prim->isInt())
@@ -287,7 +287,7 @@
const Typedef* type = field->getSignature();
if (type->isPrimitive()) {
- const PrimitiveTypedef* prim = (PrimitiveTypedef*)type;
+ const PrimitiveTypedef* prim = (const PrimitiveTypedef*)type;
if (prim->isByte())
res = (sint8)field->getInt8Field(stat ? StatPtr : obj);
else
@@ -328,7 +328,7 @@
const Typedef* type = field->getSignature();
if (type->isPrimitive()) {
- const PrimitiveTypedef* prim = (PrimitiveTypedef*)type;
+ const PrimitiveTypedef* prim = (const PrimitiveTypedef*)type;
if (prim->isChar())
res = (uint16)field->getInt16Field(stat ? StatPtr : obj);
else
@@ -371,7 +371,7 @@
const Typedef* type = field->getSignature();
if (type->isPrimitive()) {
- const PrimitiveTypedef* prim = (PrimitiveTypedef*)type;
+ const PrimitiveTypedef* prim = (const PrimitiveTypedef*)type;
if (prim->isShort())
res = (sint16)field->getInt16Field(stat ? StatPtr : obj);
else if (prim->isByte())
@@ -414,7 +414,7 @@
const Typedef* type = field->getSignature();
if (type->isPrimitive()) {
- const PrimitiveTypedef* prim = (PrimitiveTypedef*)type;
+ const PrimitiveTypedef* prim = (const PrimitiveTypedef*)type;
if (prim->isByte())
res = (jdouble)(sint64)field->getInt8Field(stat ? StatPtr : obj);
else if (prim->isInt())
@@ -469,7 +469,7 @@
const Typedef* type = field->getSignature();
if (type->isPrimitive()) {
- const PrimitiveTypedef* prim = (PrimitiveTypedef*)type;
+ const PrimitiveTypedef* prim = (const PrimitiveTypedef*)type;
if (prim->isBool()) {
uint8 val = field->getInt8Field(stat ? StatPtr : obj);
res = vm->upcalls->boolClass->doNew(vm);
@@ -551,7 +551,7 @@
if (type->isPrimitive()) {
- const PrimitiveTypedef* prim = (PrimitiveTypedef*)type;
+ const PrimitiveTypedef* prim = (const PrimitiveTypedef*)type;
if (prim->isBool())
field->setInt8Field(stat ? StatPtr : obj, buf.z);
else if (prim->isByte())
@@ -601,7 +601,7 @@
const Typedef* type = field->getSignature();
if (type->isPrimitive()) {
- const PrimitiveTypedef* prim = (PrimitiveTypedef*)type;
+ const PrimitiveTypedef* prim = (const PrimitiveTypedef*)type;
if (prim->isBool())
field->setInt8Field(stat ? StatPtr : obj, (uint8)val);
else
@@ -640,7 +640,7 @@
const Typedef* type = field->getSignature();
if (type->isPrimitive()) {
- const PrimitiveTypedef* prim = (PrimitiveTypedef*)type;
+ const PrimitiveTypedef* prim = (const PrimitiveTypedef*)type;
if (prim->isByte())
field->setInt8Field(stat ? StatPtr : obj, (sint8)val);
else if (prim->isShort())
@@ -687,7 +687,7 @@
}
const Typedef* type = field->getSignature();
if (type->isPrimitive()) {
- const PrimitiveTypedef* prim = (PrimitiveTypedef*)type;
+ const PrimitiveTypedef* prim = (const PrimitiveTypedef*)type;
if (prim->isChar())
field->setInt16Field(stat ? StatPtr : obj, (uint16)val);
else if (prim->isInt())
@@ -733,7 +733,7 @@
const Typedef* type = field->getSignature();
if (type->isPrimitive()) {
- const PrimitiveTypedef* prim = (PrimitiveTypedef*)type;
+ const PrimitiveTypedef* prim = (const PrimitiveTypedef*)type;
if (prim->isShort())
field->setInt16Field(stat ? StatPtr : obj, (sint16)val);
else if (prim->isInt())
@@ -779,7 +779,7 @@
const Typedef* type = field->getSignature();
if (type->isPrimitive()) {
- const PrimitiveTypedef* prim = (PrimitiveTypedef*)type;
+ const PrimitiveTypedef* prim = (const PrimitiveTypedef*)type;
if (prim->isInt())
field->setInt32Field(stat ? StatPtr : obj, (sint32)val);
else if (prim->isLong())
@@ -823,7 +823,7 @@
const Typedef* type = field->getSignature();
if (type->isPrimitive()) {
- const PrimitiveTypedef* prim = (PrimitiveTypedef*)type;
+ const PrimitiveTypedef* prim = (const PrimitiveTypedef*)type;
if (prim->isLong())
field->setLongField(stat ? StatPtr : obj, (sint64)val);
else if (prim->isFloat())
@@ -865,7 +865,7 @@
const Typedef* type = field->getSignature();
if (type->isPrimitive()) {
- const PrimitiveTypedef* prim = (PrimitiveTypedef*)type;
+ const PrimitiveTypedef* prim = (const PrimitiveTypedef*)type;
if (prim->isFloat())
field->setFloatField(stat ? StatPtr : obj, (float)val);
else if (prim->isDouble())
@@ -905,7 +905,7 @@
const Typedef* type = field->getSignature();
if (type->isPrimitive()) {
- const PrimitiveTypedef* prim = (PrimitiveTypedef*)type;
+ const PrimitiveTypedef* prim = (const PrimitiveTypedef*)type;
if (prim->isDouble())
field->setDoubleField(stat ? StatPtr : obj, (double)val);
else
Modified: vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp?rev=102266&r1=102265&r2=102266&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp (original)
+++ vmkit/trunk/lib/J3/Compiler/JavaAOTCompiler.cpp Sat Apr 24 15:36:11 2010
@@ -394,7 +394,7 @@
void* obj = cl->getStaticInstance();
if (obj) {
if (type->isPrimitive()) {
- const PrimitiveTypedef* prim = (PrimitiveTypedef*)type;
+ const PrimitiveTypedef* prim = (const PrimitiveTypedef*)type;
if (prim->isBool() || prim->isByte()) {
ConstantInt* CI = ConstantInt::get(
Type::getInt8Ty(getLLVMContext()),
@@ -672,7 +672,7 @@
JavaField& field = curCl->virtualFields[i];
const Typedef* type = field.getSignature();
if (type->isPrimitive()) {
- const PrimitiveTypedef* prim = (PrimitiveTypedef*)type;
+ const PrimitiveTypedef* prim = (const PrimitiveTypedef*)type;
if (prim->isBool() || prim->isByte()) {
ConstantInt* CI = ConstantInt::get(Type::getInt8Ty(getLLVMContext()),
field.getInt8Field(obj));
Modified: vmkit/trunk/lib/J3/VMCore/JavaConstantPool.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaConstantPool.cpp?rev=102266&r1=102265&r2=102266&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaConstantPool.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaConstantPool.cpp Sat Apr 24 15:36:11 2010
@@ -219,7 +219,7 @@
JnjvmClassLoader* loader = classDef->classLoader;
const UTF8* utf8 = loader->hashUTF8->lookupOrCreateReader(buf, n);
- ctpRes[entry] = (UTF8*)utf8;
+ ctpRes[entry] = const_cast<UTF8*>(utf8);
PRINT_DEBUG(JNJVM_LOAD, 3, COLOR_NORMAL, "; [%5d] <utf8>\t\t\"%s\"\n",
entry, UTF8Buffer(utf8)->cString());
Modified: vmkit/trunk/lib/J3/VMCore/JavaMetaJIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaMetaJIT.cpp?rev=102266&r1=102265&r2=102266&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaMetaJIT.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaMetaJIT.cpp Sat Apr 24 15:36:11 2010
@@ -29,7 +29,7 @@
for (uint32 i = 0; i < signature->nbArguments; ++i) { \
const Typedef* type = arguments[i];\
if (type->isPrimitive()) {\
- const PrimitiveTypedef* prim = (PrimitiveTypedef*)type;\
+ const PrimitiveTypedef* prim = (const PrimitiveTypedef*)type;\
if (prim->isLong()) {\
buffer[i].j = va_arg(ap, sint64);\
} else if (prim->isInt()){ \
Modified: vmkit/trunk/lib/J3/VMCore/JavaObject.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/JavaObject.cpp?rev=102266&r1=102265&r2=102266&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/JavaObject.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/JavaObject.cpp Sat Apr 24 15:36:11 2010
@@ -225,7 +225,7 @@
} else {
UserCommonClass* cl = obj->getClass();
UserClassPrimitive* value = cl->toPrimitive(vm);
- PrimitiveTypedef* prim = (PrimitiveTypedef*)signature;
+ const PrimitiveTypedef* prim = (const PrimitiveTypedef*)signature;
if (value == 0) {
vm->illegalArgumentException("");
Modified: vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp?rev=102266&r1=102265&r2=102266&view=diff
==============================================================================
--- vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp (original)
+++ vmkit/trunk/lib/J3/VMCore/Jnjvm.cpp Sat Apr 24 15:36:11 2010
@@ -698,7 +698,7 @@
buf[i] = utf8->elements[i];
}
- return hashStr.lookupOrCreate((const ArrayUInt16*&)tmp, this,
+ return hashStr.lookupOrCreate(const_cast<const ArrayUInt16*&>(tmp), this,
JavaString::stringDup);
}
Modified: vmkit/trunk/lib/Mvm/Compiler/JIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Compiler/JIT.cpp?rev=102266&r1=102265&r2=102266&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/Compiler/JIT.cpp (original)
+++ vmkit/trunk/lib/Mvm/Compiler/JIT.cpp Sat Apr 24 15:36:11 2010
@@ -152,8 +152,8 @@
#endif
// Disable branch fold for accurate line numbers.
- char* commands[2] = { (char*)"vmkit", (char*)"-disable-branch-fold" };
- llvm::cl::ParseCommandLineOptions(2, commands);
+ const char* commands[2] = { "vmkit", "-disable-branch-fold" };
+ llvm::cl::ParseCommandLineOptions(2, const_cast<char**>(commands));
if (!M) {
globalModule = new Module("bootstrap module", *(new LLVMContext()));
More information about the vmkit-commits
mailing list