[vmkit-commits] [vmkit] r133398 - in /vmkit/trunk: include/mvm/GC/GC.h include/mvm/UTF8.h lib/Mvm/Allocator/gcalloc.h lib/Mvm/MMTk/MvmGC.cpp lib/Mvm/MMTk/MvmGC.h mmtk/mmtk-j3/MMTkObject.h mmtk/mmtk-j3/Strings.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Sun Jun 19 12:00:27 2011
New Revision: 133398

URL: http://llvm.org/viewvc/llvm-project?rev=133398&view=rev
Log:
Remove warnings from clang++.

Modified:
    vmkit/trunk/include/mvm/GC/GC.h
    vmkit/trunk/include/mvm/UTF8.h
    vmkit/trunk/lib/Mvm/Allocator/gcalloc.h
    vmkit/trunk/lib/Mvm/MMTk/MvmGC.cpp
    vmkit/trunk/lib/Mvm/MMTk/MvmGC.h
    vmkit/trunk/mmtk/mmtk-j3/MMTkObject.h
    vmkit/trunk/mmtk/mmtk-j3/Strings.cpp

Modified: vmkit/trunk/include/mvm/GC/GC.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/GC/GC.h?rev=133398&r1=133397&r2=133398&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/GC/GC.h (original)
+++ vmkit/trunk/include/mvm/GC/GC.h Sun Jun 19 12:00:27 2011
@@ -13,7 +13,7 @@
 
 #include <stdint.h>
 
-struct VirtualTable;
+class VirtualTable;
 
 class gcRoot {
 public:

Modified: vmkit/trunk/include/mvm/UTF8.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/include/mvm/UTF8.h?rev=133398&r1=133397&r2=133398&view=diff
==============================================================================
--- vmkit/trunk/include/mvm/UTF8.h (original)
+++ vmkit/trunk/include/mvm/UTF8.h Sun Jun 19 12:00:27 2011
@@ -111,8 +111,8 @@
 		this->size = size;
 	}
 
-	UTF8Builder *append(const UTF8 *utf8, uint32 start=0, uint32 length=0xffffffff) {
-		length = length == 0xffffffff ? utf8->size : length;
+	UTF8Builder *append(const UTF8 *utf8, uint32 start=0, ssize_t length=-1) {
+		length = length == -1 ? utf8->size : length;
 		uint32 req = cur + length;
 
 		if(req > size) {

Modified: vmkit/trunk/lib/Mvm/Allocator/gcalloc.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Allocator/gcalloc.h?rev=133398&r1=133397&r2=133398&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/Allocator/gcalloc.h (original)
+++ vmkit/trunk/lib/Mvm/Allocator/gcalloc.h Sun Jun 19 12:00:27 2011
@@ -120,7 +120,7 @@
 		
  		if(fl->chunk_nbb()) {
 			//			printf("0 Filled %p with %d bytes\n", header->chunk(), header->nbb());
-			memset(header->chunk(), 0, header->nbb());
+			memset((void*)header->chunk(), 0, header->nbb());
 			header->free();
  			fl->reject(header);
 		} else {
@@ -138,7 +138,7 @@
  		GCChunkNode *new_header = alloc_chunk(new_nbb, old_header->isCollectable(), old_header->mark());
  		uintptr_t old = old_header->nbb();
  		uintptr_t nbb = old < new_nbb ? old : new_nbb;
- 		memcpy(new_header->chunk(), old_header->chunk(), nbb);
+ 		memcpy((void*)new_header->chunk(), (void*)old_header->chunk(), nbb);
  		return new_header;
  	}
 	

Modified: vmkit/trunk/lib/Mvm/MMTk/MvmGC.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/MMTk/MvmGC.cpp?rev=133398&r1=133397&r2=133398&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/MMTk/MvmGC.cpp (original)
+++ vmkit/trunk/lib/Mvm/MMTk/MvmGC.cpp Sun Jun 19 12:00:27 2011
@@ -24,7 +24,7 @@
   VirtualTable* VT = (VirtualTable*)_VT;
   sz = llvm::RoundUpToAlignment(sz, sizeof(void*));
   res = (gc*)malloc(sz);
-  memset(res, 0, sz);
+  memset((void*)res, 0, sz);
   
   lock.acquire();
   __InternalSet__.insert(res);
@@ -47,7 +47,7 @@
 
 extern "C" void* AllocateMagicArray(int32_t sz, void* length) {
   gc* res = (gc*)malloc(sz);
-  memset(res, 0, sz);
+  memset((void*)res, 0, sz);
   ((void**)res)[0] = length;
   return res;
 }

Modified: vmkit/trunk/lib/Mvm/MMTk/MvmGC.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/MMTk/MvmGC.h?rev=133398&r1=133397&r2=133398&view=diff
==============================================================================
--- vmkit/trunk/lib/Mvm/MMTk/MvmGC.h (original)
+++ vmkit/trunk/lib/Mvm/MMTk/MvmGC.h Sun Jun 19 12:00:27 2011
@@ -16,7 +16,8 @@
 
 #define gc_allocator std::allocator
 
-struct VirtualTable {
+class VirtualTable {
+ public:
   uintptr_t destructor;
   uintptr_t operatorDelete;
   uintptr_t tracer;

Modified: vmkit/trunk/mmtk/mmtk-j3/MMTkObject.h
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/MMTkObject.h?rev=133398&r1=133397&r2=133398&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/MMTkObject.h (original)
+++ vmkit/trunk/mmtk/mmtk-j3/MMTkObject.h Sun Jun 19 12:00:27 2011
@@ -16,7 +16,7 @@
 
 namespace mmtk {
 
-class MMTkObject;
+struct MMTkObject;
 
 struct MMTkClass {
   MMTkObject* delegatee;

Modified: vmkit/trunk/mmtk/mmtk-j3/Strings.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/mmtk/mmtk-j3/Strings.cpp?rev=133398&r1=133397&r2=133398&view=diff
==============================================================================
--- vmkit/trunk/mmtk/mmtk-j3/Strings.cpp (original)
+++ vmkit/trunk/mmtk/mmtk-j3/Strings.cpp Sun Jun 19 12:00:27 2011
@@ -34,8 +34,8 @@
 
 extern "C" sint32
 Java_org_j3_mmtk_Strings_copyStringToChars__Ljava_lang_String_2_3CII(
-    MMTkObject* obj, MMTkString* str, MMTkArray* dst, uint32 dstBegin,
-    uint32 dstEnd) {
+    MMTkObject* obj, MMTkString* str, MMTkArray* dst, sint32 dstBegin,
+    sint32 dstEnd) {
 
   sint32 len = str->count;
   sint32 n = (dstBegin + len <= dstEnd) ? len : (dstEnd - dstBegin);