Ignore:
Timestamp:
Jun 27, 2008, 3:35:33 PM (17 years ago)
Author:
[email protected]
Message:

JavaScriptCore:

2008-06-27 Geoffrey Garen <​[email protected]>

Reviewed by Oliver Hunt.


One RegisterFile to rule them all!


SunSpider reports a 0.2% speedup.

This patch removes the RegisterFileStack abstraction and replaces it with
a single register file that


(a) allocates a fixed storage area, including a fixed area for global
vars, so that no operation may cause the register file to reallocate


and

(b) swaps between global storage areas when executing code in different
global objects.


This patch also changes the layout of the register file so that all call
frames, including call frames for global code, get a header. This is
required to support re-entrant global code. It also just makes things simpler.


  • VM/CodeGenerator.cpp: (KJS::CodeGenerator::addGlobalVar): New function. Differs from addVar in that


(a) global vars don't contribute to a CodeBlock's numLocals count, since
global storage is fixed and allocated at startup


and


(b) references to global vars get shifted to elide intermediate stack
between "r" and the global storage area.


  • VM/Machine.cpp: (KJS::Machine::dumpRegisters): Updated this function to match the new register file layout, and added the ability to dump exact identifiers for the different parts of a call frame.


(KJS::Machine::unwindCallFrame): Updated this function to match the new
register file layout.


(KJS::Machine::execute): Updated this function to initialize a call frame
header for global code, and to swap global storage areas when switching
to execution in a new global object.


(KJS::Machine::privateExecute): Got rid of "safeForReentry" and re-reading
of registerBase because the register file is always safe for reentry now,
and registerBase never changes.


  • VM/Machine.h: Moved the call frame header enum from Machine to RegisterFile, to resolve a header dependency problem (a good sign that the enum belonged in RegisterFile all along!)
  • VM/RegisterFile.cpp:
  • VM/RegisterFile.h: Changed RegisterFile to mmap a fixed size register area. This allows us to avoid re-allocting the register file later on. Instead, we rely on the OS to allocate physical pages to the register file as necessary.
  • VM/RegisterFileStack.cpp: Removed. Tada!
  • VM/RegisterFileStack.h: Removed. Tada!
  • kjs/DebuggerCallFrame.cpp: Updated this class to match the new register file layout, greatly simplifying it in the process.
  • kjs/JSActivation.h:
  • kjs/JSActivation.cpp: Moved some of this logic up to JSVariableObject, since the global object now needs to be able to tear off its registers just like the activation object.
  • kjs/JSFunction.cpp: No need to fiddle with the register file anymore.
  • kjs/JSGlobalObject.h:
  • kjs/JSGlobalObject.cpp: Updated JSGlobalObject to support moving its global storage area into and out of the register file.
  • kjs/PropertySlot.cpp: No need to fiddle with the register file anymore.
  • kjs/collector.cpp: Renamed markStackObjectConservatively to markConservatively, since we don't just mark stack objects this way.


Also, added code to mark the machine's register file.

  • kjs/config.h: Moved some platforms #defines from here...
  • wtf/Platform.h: ...to here, to support mmap/VirtualAlloc detection in RegisterFile.h.

LayoutTests:

2008-06-26 Geoffrey Garen <​[email protected]>

Reviewed by Oliver Hunt.


Added a test for what happens when a script exceeds the limit on declared
global variables.

  • fast/js/global-var-limit-expected.txt: Added.
  • fast/js/global-var-limit.html: Added.
  • fast/js/global-recursion-on-full-stack-expected.txt: Updated for new (slightly more correct) behavior. Since the stack overflow happens in the middle of a try/catch block, it should be caught, instead of logged to the console.
File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r34727 r34838  
    100100                14BD5A320A3E91F600BAF59C /* JSValueRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14BD5A2B0A3E91F600BAF59C /* JSValueRef.cpp */; };
    101101                14D792660DAA03FB001A9F05 /* RegisterFile.h in Headers */ = {isa = PBXBuildFile; fileRef = 14D792640DAA03FB001A9F05 /* RegisterFile.h */; settings = {ATTRIBUTES = (Private, ); }; };
    102                 14D797800DAC3307001A9F05 /* RegisterFileStack.h in Headers */ = {isa = PBXBuildFile; fileRef = 14D7977E0DAC3307001A9F05 /* RegisterFileStack.h */; settings = {ATTRIBUTES = (Private, ); }; };
    103                 14D797810DAC3307001A9F05 /* RegisterFileStack.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14D7977F0DAC3307001A9F05 /* RegisterFileStack.cpp */; };
    104102                14DA81900D99FD2000B0A4FB /* JSActivation.h in Headers */ = {isa = PBXBuildFile; fileRef = 14DA818E0D99FD2000B0A4FB /* JSActivation.h */; };
    105103                14E0FF120DBAAED00007C0AB /* Machine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 149B15E70D81F986009CB8C7 /* Machine.cpp */; settings = {COMPILER_FLAGS = "-fno-tree-pre"; }; };
    … …  
    460458                14D792640DAA03FB001A9F05 /* RegisterFile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegisterFile.h; path = VM/RegisterFile.h; sourceTree = "<group>"; };
    461459                14D792650DAA03FB001A9F05 /* RegisterFile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RegisterFile.cpp; path = VM/RegisterFile.cpp; sourceTree = "<group>"; };
    462                 14D7977E0DAC3307001A9F05 /* RegisterFileStack.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RegisterFileStack.h; path = VM/RegisterFileStack.h; sourceTree = "<group>"; };
    463                 14D7977F0DAC3307001A9F05 /* RegisterFileStack.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RegisterFileStack.cpp; path = VM/RegisterFileStack.cpp; sourceTree = "<group>"; };
    464460                14D857740A4696C80032146C /* testapi.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = testapi.js; path = API/testapi.js; sourceTree = "<group>"; };
    465461                14DA818E0D99FD2000B0A4FB /* JSActivation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSActivation.h; sourceTree = "<group>"; };
    … …  
    881877                                14D792650DAA03FB001A9F05 /* RegisterFile.cpp */,
    882878                                14D792640DAA03FB001A9F05 /* RegisterFile.h */,
    883                                 14D7977F0DAC3307001A9F05 /* RegisterFileStack.cpp */,
    884                                 14D7977E0DAC3307001A9F05 /* RegisterFileStack.h */,
    885879                                A72701B30DADE94900E548D7 /* ExceptionHelpers.h */,
    886880                                A72701B40DADE94900E548D7 /* ExceptionHelpers.cpp */,
    … …  
    10531047                                F692A8700255597D01FF60F7 /* NumberObject.cpp */,
    10541048                                F692A8710255597D01FF60F7 /* NumberObject.h */,
     1049                                F692A8760255597D01FF60F7 /* JSObject.h */,
    10551050                                F692A8750255597D01FF60F7 /* JSObject.cpp */,
    1056                                 F692A8760255597D01FF60F7 /* JSObject.h */,
    10571051                                F692A8730255597D01FF60F7 /* object_object.cpp */,
    10581052                                F692A8740255597D01FF60F7 /* object_object.h */,
    … …  
    13091303                                145C50800D9DF63B0088F6B9 /* CallData.h in Headers */,
    13101304                                14D792660DAA03FB001A9F05 /* RegisterFile.h in Headers */,
    1311                                 14D797800DAC3307001A9F05 /* RegisterFileStack.h in Headers */,
    13121305                                BC8F3CED0DAF1A8000577A80 /* ConstructData.h in Headers */,
    13131306                                A72701B50DADE94900E548D7 /* ExceptionHelpers.h in Headers */,
    … …  
    16001593                                A727FF6B0DA3092200E548D7 /* JSPropertyNameIterator.cpp in Sources */,
    16011594                                A72700900DAC6BBC00E548D7 /* JSNotAnObject.cpp in Sources */,
    1602                                 14D797810DAC3307001A9F05 /* RegisterFileStack.cpp in Sources */,
    16031595                                A72701B60DADE94900E548D7 /* ExceptionHelpers.cpp in Sources */,
    16041596                                149559EE0DDCDDF700648087 /* DebuggerCallFrame.cpp in Sources */,
Note: See TracChangeset for help on using the changeset viewer.