Changeset 38523 in webkit for trunk/JavaScriptCore


Ignore:
Timestamp:
Nov 17, 2008, 1:44:26 PM (17 years ago)
Author:
[email protected]
Message:

2008-11-17 Geoffrey Garen <​[email protected]>

Reviewed by Sam Weinig.


Moved VM/SamplingTool.* => bytecode/SamplingTool.*.

  • GNUmakefile.am:
  • JavaScriptCore.pri:
  • JavaScriptCore.scons:
  • JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
  • JavaScriptCore.xcodeproj/project.pbxproj:
  • JavaScriptCoreSources.bkl:
  • VM/SamplingTool.cpp: Removed.
  • VM/SamplingTool.h: Removed.
  • bytecode/SamplingTool.cpp: Copied from VM/SamplingTool.cpp.
  • bytecode/SamplingTool.h: Copied from VM/SamplingTool.h.
  • jsc.cpp: (runWithScripts):
Location:
trunk/JavaScriptCore
Files:
8 edited
2 moved

Legend:

Unmodified
Added
Removed

  • trunk/JavaScriptCore/ChangeLog

    r38522 r38523  
     12008-11-17  Geoffrey Garen  <[email protected]>
     2
     3        Reviewed by Sam Weinig.
     4       
     5        Moved VM/SamplingTool.* => bytecode/SamplingTool.*.
     6
     7        * GNUmakefile.am:
     8        * JavaScriptCore.pri:
     9        * JavaScriptCore.scons:
     10        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
     11        * JavaScriptCore.xcodeproj/project.pbxproj:
     12        * JavaScriptCoreSources.bkl:
     13        * VM/SamplingTool.cpp: Removed.
     14        * VM/SamplingTool.h: Removed.
     15        * bytecode/SamplingTool.cpp: Copied from VM/SamplingTool.cpp.
     16        * bytecode/SamplingTool.h: Copied from VM/SamplingTool.h.
     17        * jsc.cpp:
     18        (runWithScripts):
     19
    1202008-11-17  Geoffrey Garen  <[email protected]>
    221

  • trunk/JavaScriptCore/GNUmakefile.am

    r38521 r38523  
    8888        JavaScriptCore/interpreter/Register.h \
    8989        JavaScriptCore/bytecompiler/RegisterID.h \
    90         JavaScriptCore/VM/SamplingTool.cpp \
    91         JavaScriptCore/VM/SamplingTool.h \
     90        JavaScriptCore/bytecode/SamplingTool.cpp \
     91        JavaScriptCore/bytecode/SamplingTool.h \
    9292        JavaScriptCore/bytecompiler/SegmentedVector.h \
    9393        JavaScriptCore/config.h \

  • trunk/JavaScriptCore/JavaScriptCore.pri

    r38521 r38523  
    6262    interpreter/Interpreter.cpp \
    6363    bytecode/Opcode.cpp \
    64     VM/SamplingTool.cpp \
     64    bytecode/SamplingTool.cpp \
    6565    interpreter/RegisterFile.cpp
    6666

  • trunk/JavaScriptCore/JavaScriptCore.scons

    r38521 r38523  
    123123    'bytecode/CodeBlock.cpp',
    124124    'bytecode/Opcode.cpp',
     125    'bytecode/SamplingTool.cpp',
    125126]
    126127sources['interpreter'] = [
    … …  
    130131sources['VM'] = [
    131132    'VM/CTI.cpp',
    132     'VM/SamplingTool.cpp',
    133133]
    134134sources['wrec'] = [

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

    r38521 r38523  
    13111311                        </File>
    13121312                        <File
    1313                                 RelativePath="..\..\VM\SamplingTool.cpp"
    1314                                 >
    1315                         </File>
    1316                         <File
    1317                                 RelativePath="..\..\VM\SamplingTool.h"
     1313                                RelativePath="..\..\bytecode\SamplingTool.cpp"
     1314                                >
     1315                        </File>
     1316                        <File
     1317                                RelativePath="..\..\bytecode\SamplingTool.h"
    13181318                                >
    13191319                        </File>

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

    r38521 r38523  
    4545                1429D7D40ED2128200B89619 /* Interpreter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1429D7D30ED2128200B89619 /* Interpreter.cpp */; };
    4646                1429D8780ED21ACD00B89619 /* ExceptionHelpers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1429D8770ED21ACD00B89619 /* ExceptionHelpers.cpp */; };
     47                1429D8850ED21C3D00B89619 /* SamplingTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1429D8830ED21C3D00B89619 /* SamplingTool.cpp */; };
     48                1429D8860ED21C3D00B89619 /* SamplingTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 1429D8840ED21C3D00B89619 /* SamplingTool.h */; };
    4749                143A97E60A4A06E200456B66 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6560A4CF04B3B3E7008AE952 /* CoreFoundation.framework */; };
    4850                1440057F0A5335640005F061 /* JSNode.c in Sources */ = {isa = PBXBuildFile; fileRef = 1440F6420A4F8B6A0005F061 /* JSNode.c */; };
    … …  
    8688                7E4EE70F0EBB7A5B005934AA /* StructureChain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7E4EE70E0EBB7A5B005934AA /* StructureChain.cpp */; };
    8789                7EFF00640EC05A9A00AA7C93 /* NodeInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 7EFF00630EC05A9A00AA7C93 /* NodeInfo.h */; };
    88                 8613F45A0E3A433E00C948FD /* SamplingTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8613F4580E3A433E00C948FD /* SamplingTool.cpp */; };
    89                 8613F45B0E3A433E00C948FD /* SamplingTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 8613F4590E3A433E00C948FD /* SamplingTool.h */; };
    9090                8683B02E0E636482004C19EE /* CTI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8683B02B0E636482004C19EE /* CTI.cpp */; };
    9191                8683B02F0E636482004C19EE /* CTI.h in Headers */ = {isa = PBXBuildFile; fileRef = 8683B02C0E636482004C19EE /* CTI.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    398398                1429D85B0ED218E900B89619 /* RegisterFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RegisterFile.cpp; sourceTree = "<group>"; };
    399399                1429D8770ED21ACD00B89619 /* ExceptionHelpers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ExceptionHelpers.cpp; sourceTree = "<group>"; };
     400                1429D8830ED21C3D00B89619 /* SamplingTool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SamplingTool.cpp; sourceTree = "<group>"; };
     401                1429D8840ED21C3D00B89619 /* SamplingTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SamplingTool.h; sourceTree = "<group>"; };
    400402                1440051F0A531D3B0005F061 /* Node.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Node.h; path = tests/Node.h; sourceTree = "<group>"; };
    401403                144005200A531D3B0005F061 /* Node.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Node.c; path = tests/Node.c; sourceTree = "<group>"; };
    … …  
    521523                7E4EE70E0EBB7A5B005934AA /* StructureChain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StructureChain.cpp; sourceTree = "<group>"; };
    522524                7EFF00630EC05A9A00AA7C93 /* NodeInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NodeInfo.h; sourceTree = "<group>"; };
    523                 8613F4580E3A433E00C948FD /* SamplingTool.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SamplingTool.cpp; path = VM/SamplingTool.cpp; sourceTree = "<group>"; };
    524                 8613F4590E3A433E00C948FD /* SamplingTool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SamplingTool.h; path = VM/SamplingTool.h; sourceTree = "<group>"; };
    525525                8683B02B0E636482004C19EE /* CTI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CTI.cpp; path = VM/CTI.cpp; sourceTree = "<group>"; };
    526526                8683B02C0E636482004C19EE /* CTI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CTI.h; path = VM/CTI.h; sourceTree = "<group>"; };
    … …  
    960960                                8683B02B0E636482004C19EE /* CTI.cpp */,
    961961                                8683B02C0E636482004C19EE /* CTI.h */,
    962                                 8613F4580E3A433E00C948FD /* SamplingTool.cpp */,
    963                                 8613F4590E3A433E00C948FD /* SamplingTool.h */,
    964962                        );
    965963                        name = vm;
    … …  
    13431341                                969A07940ED1D3AE00F1F681 /* Opcode.cpp */,
    13441342                                969A07950ED1D3AE00F1F681 /* Opcode.h */,
     1343                                1429D8830ED21C3D00B89619 /* SamplingTool.cpp */,
     1344                                1429D8840ED21C3D00B89619 /* SamplingTool.h */,
    13451345                        );
    13461346                        path = bytecode;
    … …  
    15531553                                BCF605140E203EF800B9A64D /* ArgList.h in Headers */,
    15541554                                95FDFA160E2299980006FB00 /* HeavyProfile.h in Headers */,
    1555                                 8613F45B0E3A433E00C948FD /* SamplingTool.h in Headers */,
    15561555                                C0A272630E50A06300E96E15 /* NotFound.h in Headers */,
    15571556                                E124A8F70E555775003091F1 /* OpaqueJSString.h in Headers */,
    … …  
    15851584                                969A079B0ED1D3AE00F1F681 /* Opcode.h in Headers */,
    15861585                                1429D77C0ED20D7300B89619 /* Interpreter.h in Headers */,
     1586                                1429D8860ED21C3D00B89619 /* SamplingTool.h in Headers */,
    15871587                        );
    15881588                        runOnlyForDeploymentPostprocessing = 0;
    … …  
    19061906                                95FDFA140E22998F0006FB00 /* HeavyProfile.cpp in Sources */,
    19071907                                905B02AE0E28640F006DF882 /* RefCountedLeakCounter.cpp in Sources */,
    1908                                 8613F45A0E3A433E00C948FD /* SamplingTool.cpp in Sources */,
    19091908                                E124A8F80E555775003091F1 /* OpaqueJSString.cpp in Sources */,
    19101909                                95F6E6950E5B5F970091E860 /* JSProfilerPrivate.cpp in Sources */,
    … …  
    19201919                                1429D7D40ED2128200B89619 /* Interpreter.cpp in Sources */,
    19211920                                1429D8780ED21ACD00B89619 /* ExceptionHelpers.cpp in Sources */,
     1921                                1429D8850ED21C3D00B89619 /* SamplingTool.cpp in Sources */,
    19221922                        );
    19231923                        runOnlyForDeploymentPostprocessing = 0;

  • trunk/JavaScriptCore/JavaScriptCoreSources.bkl

    r38521 r38523  
    151151        interpreter/Interpreter.cpp
    152152        bytecode/Opcode.cpp
    153         VM/SamplingTool.cpp
     153        bytecode/SamplingTool.cpp
    154154        interpreter/RegisterFile.cpp
    155155    </set>

  • trunk/JavaScriptCore/jsc.cpp

    r38509 r38523  
    321321#if ENABLE(OPCODE_SAMPLING)
    322322    Interpreter* interpreter = globalObject->globalData()->interpreter;
    323     interpreter->setSampler(new SamplingTool(machine));
     323    interpreter->setSampler(new SamplingTool(interpreter));
    324324#endif
    325325
Note: See TracChangeset for help on using the changeset viewer.