Changeset 36251 in webkit for trunk/JavaScriptCore/kjs/collector.cpp

Timestamp:

Sep 7, 2008, 1:39:38 AM (17 years ago)

Author:

[email protected]

Message:

2008-09-07 Cameron Zwarich <​[email protected]>

Reviewed by Sam Weinig.

Remove C-style casts from kjs/collector.cpp.

• kjs/collector.cpp: (KJS::Heap::heapAllocate): (KJS::currentThreadStackBase): (KJS::Heap::markConservatively): (KJS::otherThreadStackPointer): (KJS::Heap::markOtherThreadConservatively): (KJS::Heap::sweep):

File:

• trunk/JavaScriptCore/kjs/collector.cpp (modified) (14 diffs)

trunk/JavaScriptCore/kjs/collector.cpp

@@ -317 +317 @@
     size_t targetBlockUsedCells;
     if (i != usedBlocks) {
-        targetBlock = (Block*)heap.blocks[i];
+        targetBlock = reinterpret_cast<Block*>(heap.blocks[i]);
         targetBlockUsedCells = targetBlock->usedCells;
         ASSERT(targetBlockUsedCells <= HeapConstants<heapType>::cellsPerBlock);
@@ -323 +323 @@
             if (++i == usedBlocks)
                 goto collect;
-            targetBlock = (Block*)heap.blocks[i];
+            targetBlock = reinterpret_cast<Block*>(heap.blocks[i]);
             targetBlockUsedCells = targetBlock->usedCells;
             ASSERT(targetBlockUsedCells <= HeapConstants<heapType>::cellsPerBlock);
@@ -359 +359 @@
         }
 
-        targetBlock = (Block*)allocateBlock<heapType>();
+        targetBlock = reinterpret_cast<Block*>(allocateBlock<heapType>());
         targetBlock->freeList = targetBlock->cells;
         targetBlock->heap = this;
         targetBlockUsedCells = 0;
-        heap.blocks[usedBlocks] = (CollectorBlock*)targetBlock;
+        heap.blocks[usedBlocks] = reinterpret_cast<CollectorBlock*>(targetBlock);
         heap.usedBlocks = usedBlocks + 1;
         heap.firstBlockWithPossibleSpace = usedBlocks;
@@ -408 +408 @@
         MOV pTib, EAX
     }
-    return (void*)pTib->StackBase;
+    return static_cast<void*>(pTib->StackBase);
 #elif PLATFORM(WIN_OS) && PLATFORM(X86_64) && COMPILER(MSVC)
     PNT_TIB64 pTib = reinterpret_cast<PNT_TIB64>(NtCurrentTeb());
-    return (void*)pTib->StackBase;
+    return static_cast<void*>(pTib->StackBase);
 #elif PLATFORM(WIN_OS) && PLATFORM(X86) && COMPILER(GCC)
     // offset 0x18 from the FS segment register gives a pointer to
@@ -419 +419 @@
           : "=r" (pTib)
         );
-    return (void*)pTib->StackBase;
+    return static_cast<void*>(pTib->StackBase);
 #elif PLATFORM(SOLARIS)
     stack_t s;
@@ -534 +534 @@
     }
 
-    ASSERT(((char*)end - (char*)start) < 0x1000000);
+    ASSERT((static_cast<char*>(end) - static_cast<char*>(start)) < 0x1000000);
     ASSERT(IS_POINTER_ALIGNED(start));
     ASSERT(IS_POINTER_ALIGNED(end));
 
-    char** p = (char**)start;
-    char** e = (char**)end;
+    char** p = static_cast<char**>(start);
+    char** e = static_cast<char**>(end);
 
     size_t usedPrimaryBlocks = primaryHeap.usedBlocks;
@@ -566 +566 @@
             for (size_t block = 0; block < usedPrimaryBlocks; block++) {
                 if ((primaryBlocks[block] == blockAddr) & (offset <= lastCellOffset)) {
-                    if (((CollectorCell*)xAsBits)->u.freeCell.zeroIfFree != 0) {
+                    if (reinterpret_cast<CollectorCell*>(xAsBits)->u.freeCell.zeroIfFree != 0) {
                         JSCell* imp = reinterpret_cast<JSCell*>(xAsBits);
                         if (!imp->marked())
@@ -700 +700 @@
 
 #if PLATFORM(X86)
-    return (void*)regs.__esp;
+    return reinterpret_cast<void*>(regs.__esp);
 #elif PLATFORM(X86_64)
-    return (void*)regs.__rsp;
+    return reinterpret_cast<void*>(regs.__rsp);
 #elif PLATFORM(PPC) || PLATFORM(PPC64)
-    return (void*)regs.__r1;
+    return reinterpret_cast<void*>(regs.__r1);
 #elif PLATFORM(ARM)
-    return (void*)regs.__sp;
+    return reinterpret_cast<void*>(regs.__sp);
 #else
 #error Unknown Architecture
@@ -714 +714 @@
 
 #if PLATFORM(X86)
-    return (void*)regs.esp;
+    return reinterpret_cast<void*>(regs.esp);
 #elif PLATFORM(X86_64)
-    return (void*)regs.rsp;
+    return reinterpret_cast<void*>(regs.rsp);
 #elif (PLATFORM(PPC) || PLATFORM(PPC64))
-    return (void*)regs.r1;
+    return reinterpret_cast<void*>(regs.r1);
 #else
 #error Unknown Architecture
@@ -727 +727 @@
 // end PLATFORM(DARWIN)
 #elif PLATFORM(X86) && PLATFORM(WIN_OS)
-    return (void*)(uintptr_t)regs.Esp;
+    return reinterpret_cast<void*>(reinterpret_cast<uintptr_t>(regs.Esp));
 #else
 #error Need a way to get the stack pointer for another thread on this platform
@@ -741 +741 @@
 
     // mark the thread's registers
-    markConservatively((void*)&regs, (void*)((char*)&regs + regSize));
+    markConservatively(static_cast<void*>(&regs), static_cast<void*>(reinterpret_cast<char*>(&regs) + regSize));
 
     void* stackPointer = otherThreadStackPointer(regs);
@@ -859 +859 @@
     
     for (size_t block = 0; block < heap.usedBlocks; block++) {
-        Block* curBlock = (Block*)heap.blocks[block];
+        Block* curBlock = reinterpret_cast<Block*>(heap.blocks[block]);
         
         size_t usedCells = curBlock->usedCells;
@@ -922 +922 @@
             if (emptyBlocks > SPARE_EMPTY_BLOCKS) {
 #if !DEBUG_COLLECTOR
-                freeBlock((CollectorBlock*)curBlock);
+                freeBlock(reinterpret_cast<CollectorBlock*>(curBlock));
 #endif
                 // swap with the last block so we compact as we go
@@ -931 +931 @@
                 if (heap.numBlocks > MIN_ARRAY_SIZE && heap.usedBlocks < heap.numBlocks / LOW_WATER_FACTOR) {
                     heap.numBlocks = heap.numBlocks / GROWTH_FACTOR; 
-                    heap.blocks = (CollectorBlock**)fastRealloc(heap.blocks, heap.numBlocks * sizeof(CollectorBlock*));
+                    heap.blocks = static_cast<CollectorBlock**>(fastRealloc(heap.blocks, heap.numBlocks * sizeof(CollectorBlock*)));
                 }
             }