Changeset 44897 in webkit for trunk/JavaScriptCore


Ignore:
Timestamp:
Jun 20, 2009, 6:14:41 AM (16 years ago)
Author:
[email protected]
Message:

2009-06-20 Zoltan Herczeg <​[email protected]>

Bug 24986: ARM JIT port
<​https://bugs.webkit.org/show_bug.cgi?id=24986>

Reviewed by Oliver Hunt.

Move SegmentedVector to /wtf subdirectory
and change "namespace JSC" to "namespace WTF"

Additional build file updates by David Kilzer.

  • GNUmakefile.am: Updated path to SegmentedVector.h.
  • JavaScriptCore.order: Updated SegmentedVector namespace from JSC to WTF in mangled C++ method name.
  • JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj: Removed reference to bytecompiler\SegmentedVector.h.
  • JavaScriptCore.vcproj/WTF/WTF.vcproj: Added reference to wtf\SegmentedVector.h.
  • JavaScriptCore.xcodeproj/project.pbxproj: Moved SegmentedVector.h definition from bytecompiler subdirectory to wtf subdirectory.
  • bytecompiler/BytecodeGenerator.h: Updated #include path to
SegmentedVector.h and prepended WTF
namespace to its use.
  • parser/Lexer.h: Ditto.
  • wtf/SegmentedVector.h: Renamed from JavaScriptCore/bytecompiler/SegmentedVector.h. (WTF::SegmentedVector::SegmentedVector): (WTF::SegmentedVector::~SegmentedVector): (WTF::SegmentedVector::size): (WTF::SegmentedVector::at): (WTF::SegmentedVector::operator[]): (WTF::SegmentedVector::last): (WTF::SegmentedVector::append): (WTF::SegmentedVector::removeLast): (WTF::SegmentedVector::grow): (WTF::SegmentedVector::clear): (WTF::SegmentedVector::deleteAllSegments): (WTF::SegmentedVector::segmentExistsFor): (WTF::SegmentedVector::segmentFor): (WTF::SegmentedVector::subscriptFor): (WTF::SegmentedVector::ensureSegmentsFor): (WTF::SegmentedVector::ensureSegment):
Location:
trunk/JavaScriptCore
Files:
8 edited
1 moved

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/ChangeLog

    r44889 r44897  
     12009-06-20  Zoltan Herczeg  <[email protected]>
     2
     3        Bug 24986: ARM JIT port
     4        <https://bugs.webkit.org/show_bug.cgi?id=24986>
     5
     6        Reviewed by Oliver Hunt.
     7
     8        Move SegmentedVector to /wtf subdirectory
     9        and change "namespace JSC" to "namespace WTF"
     10
     11        Additional build file updates by David Kilzer.
     12
     13        * GNUmakefile.am: Updated path to SegmentedVector.h.
     14        * JavaScriptCore.order: Updated SegmentedVector namespace from
     15        JSC to WTF in mangled C++ method name.
     16        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
     17        Removed reference to bytecompiler\SegmentedVector.h.
     18        * JavaScriptCore.vcproj/WTF/WTF.vcproj: Added reference to
     19        wtf\SegmentedVector.h.
     20        * JavaScriptCore.xcodeproj/project.pbxproj: Moved
     21        SegmentedVector.h definition from bytecompiler subdirectory to
     22        wtf subdirectory.
     23        * bytecompiler/BytecodeGenerator.h: Updated #include path to
     24        SegmentedVector.h and prepended WTF:: namespace to its use.
     25        * parser/Lexer.h: Ditto.
     26        * wtf/SegmentedVector.h: Renamed from JavaScriptCore/bytecompiler/SegmentedVector.h.
     27        (WTF::SegmentedVector::SegmentedVector):
     28        (WTF::SegmentedVector::~SegmentedVector):
     29        (WTF::SegmentedVector::size):
     30        (WTF::SegmentedVector::at):
     31        (WTF::SegmentedVector::operator[]):
     32        (WTF::SegmentedVector::last):
     33        (WTF::SegmentedVector::append):
     34        (WTF::SegmentedVector::removeLast):
     35        (WTF::SegmentedVector::grow):
     36        (WTF::SegmentedVector::clear):
     37        (WTF::SegmentedVector::deleteAllSegments):
     38        (WTF::SegmentedVector::segmentExistsFor):
     39        (WTF::SegmentedVector::segmentFor):
     40        (WTF::SegmentedVector::subscriptFor):
     41        (WTF::SegmentedVector::ensureSegmentsFor):
     42        (WTF::SegmentedVector::ensureSegment):
     43
    1442009-06-19  Gavin Barraclough  <[email protected]>
    245

  • trunk/JavaScriptCore/GNUmakefile.am

    r44550 r44897  
    109109        JavaScriptCore/bytecode/SamplingTool.cpp \
    110110        JavaScriptCore/bytecode/SamplingTool.h \
    111         JavaScriptCore/bytecompiler/SegmentedVector.h \
    112111        JavaScriptCore/config.h \
    113112        JavaScriptCore/debugger/DebuggerActivation.cpp \
    … …  
    258257        JavaScriptCore/wtf/RefPtrHashMap.h \
    259258        JavaScriptCore/wtf/RetainPtr.h \
     259        JavaScriptCore/wtf/SegmentedVector.h \
    260260        JavaScriptCore/wtf/StdLibExtras.h \
    261261        JavaScriptCore/wtf/StringExtras.h \

  • trunk/JavaScriptCore/JavaScriptCore.order

    r43951 r44897  
    187187__ZN3JSC10Identifier3addEPNS_12JSGlobalDataEPKti
    188188__ZN3WTF7HashSetIPN3JSC7UString3RepENS_7StrHashIS4_EENS_10HashTraitsIS4_EEE3addINS1_11UCharBufferENS1_21UCharBufferTranslatorEE
    189 __ZN3JSC15SegmentedVectorINS_10IdentifierELm64EE6appendIS1_EEvRKT_
     189__ZN3WTF15SegmentedVectorINS_10IdentifierELm64EE6appendIS1_EEvRKT_
    190190__ZNK3JSC9HashTable11createTableEPNS_12JSGlobalDataE
    191191__ZN3JSC20ParserArenaDeletablenwEmPNS_12JSGlobalDataE

  • trunk/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj

    r44564 r44897  
    14721472                                >
    14731473                        </File>
    1474                         <File
    1475                                 RelativePath="..\..\bytecompiler\SegmentedVector.h"
    1476                                 >
    1477                         </File>
    14781474                </Filter>
    14791475                <Filter

  • trunk/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj

    r44508 r44897  
    410410                </File>
    411411                <File
     412                        RelativePath="..\..\wtf\SegmentedVector.h"
     413                        >
     414                </File>
     415                <File
    412416                        RelativePath="..\..\wtf\StdLibExtras.h"
    413417                        >

  • trunk/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

    r44711 r44897  
    12291229                                148A1ECD0D10C23B0069A47C /* RefPtrHashMap.h */,
    12301230                                51F648D60BB4E2CA0033D760 /* RetainPtr.h */,
     1231                                969A07290ED1CE6900F1F681 /* SegmentedVector.h */,
    12311232                                FE1B44790ECCD73B004F4DD1 /* StdLibExtras.h */,
    12321233                                E11D51750B2E798D0056C188 /* StringExtras.h */,
    … …  
    12781279                                960097A50EBABB58007A7297 /* LabelScope.h */,
    12791280                                969A07280ED1CE6900F1F681 /* RegisterID.h */,
    1280                                 969A07290ED1CE6900F1F681 /* SegmentedVector.h */,
    12811281                        );
    12821282                        path = bytecompiler;

  • trunk/JavaScriptCore/bytecompiler/BytecodeGenerator.h

    r44224 r44897  
    3838#include "Interpreter.h"
    3939#include "RegisterID.h"
    40 #include "SegmentedVector.h"
    4140#include "SymbolTable.h"
    4241#include "Debugger.h"
    4342#include "Nodes.h"
    4443#include <wtf/PassRefPtr.h>
     44#include <wtf/SegmentedVector.h>
    4545#include <wtf/Vector.h>
    4646
    … …  
    450450        RegisterID m_argumentsRegister;
    451451        int m_activationRegisterIndex;
    452         SegmentedVector<RegisterID, 32> m_calleeRegisters;
    453         SegmentedVector<RegisterID, 32> m_parameters;
    454         SegmentedVector<RegisterID, 32> m_globals;
    455         SegmentedVector<Label, 32> m_labels;
    456         SegmentedVector<LabelScope, 8> m_labelScopes;
     452        WTF::SegmentedVector<RegisterID, 32> m_calleeRegisters;
     453        WTF::SegmentedVector<RegisterID, 32> m_parameters;
     454        WTF::SegmentedVector<RegisterID, 32> m_globals;
     455        WTF::SegmentedVector<Label, 32> m_labels;
     456        WTF::SegmentedVector<LabelScope, 8> m_labelScopes;
    457457        RefPtr<RegisterID> m_lastConstant;
    458458        int m_finallyDepth;

  • trunk/JavaScriptCore/parser/Lexer.h

    r44224 r44897  
    2424
    2525#include "Lookup.h"
    26 #include "SegmentedVector.h"
    2726#include "SourceCode.h"
    2827#include <wtf/ASCIICType.h>
     28#include <wtf/SegmentedVector.h>
    2929#include <wtf/Vector.h>
    3030#include <wtf/unicode/Unicode.h>
    … …  
    109109        int m_next3;
    110110       
    111         SegmentedVector<JSC::Identifier, initialIdentifierTableCapacity> m_identifiers;
     111        WTF::SegmentedVector<JSC::Identifier, initialIdentifierTableCapacity> m_identifiers;
    112112
    113113        JSGlobalData* m_globalData;

  • trunk/JavaScriptCore/wtf/SegmentedVector.h

    r44895 r44897  
    3232#include <wtf/Vector.h>
    3333
    34 namespace JSC {
     34namespace WTF {
    3535
    3636    // SegmentedVector is just like Vector, but it doesn't move the values
    … …  
    109109    private:
    110110        typedef Vector<T, SegmentSize> Segment;
    111        
     111
    112112        void deleteAllSegments()
    113113        {
    … …  
    117117                delete m_segments[i];
    118118        }
    119        
     119
    120120        bool segmentExistsFor(size_t index)
    121121        {
    122122            return index / SegmentSize < m_segments.size();
    123123        }
    124        
     124
    125125        Segment* segmentFor(size_t index)
    126126        {
    127127            return m_segments[index / SegmentSize];
    128128        }
    129        
     129
    130130        size_t subscriptFor(size_t index)
    131131        {
    132132            return index % SegmentSize;
    133133        }
    134        
     134
    135135        void ensureSegmentsFor(size_t size)
    136136        {
    … …  
    148148            for (size_t i = segmentCount - 1; i < end; ++i)
    149149                ensureSegment(i, SegmentSize);
    150            
     150
    151151            // Grow segment N to accomodate the remainder.
    152152            ensureSegment(end, subscriptFor(size - 1) + 1);
Note: See TracChangeset for help on using the changeset viewer.