Changeset 29508 in webkit for trunk/JavaScriptCore/kjs/math_object.cpp

Timestamp:

Jan 15, 2008, 10:43:15 PM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

Reviewed by Geoffrey Garen.

Fix <rdar://problem/5595552> r27608 introduced a 20% increase in JS binary size, 4% increase in WebCore binary size

• This changes the way JS functions that use Lookup tables are handled. Instead using one class per function, which allowed specialization of the virtual callAsFunction method, we now use on class, PrototypeFunction, which takes a pointer to a static function to use as the implementation. This significantly decreases the binary size of JavaScriptCore (about 145k on an Intel only build) while still keeping some of the speedup r27608 garnered (SunSpider says this is 1.005x as slow, which should leave some wiggle room from the original 1% speedup) and keeps the functions implementations in separate functions to help with optimizations.

• JavaScriptCore.exp:
• JavaScriptCore.xcodeproj/project.pbxproj:
• kjs/array_object.cpp: (KJS::arrayProtoFuncToString): (KJS::arrayProtoFuncToLocaleString): (KJS::arrayProtoFuncJoin): (KJS::arrayProtoFuncConcat): (KJS::arrayProtoFuncPop): (KJS::arrayProtoFuncPush): (KJS::arrayProtoFuncReverse): (KJS::arrayProtoFuncShift): (KJS::arrayProtoFuncSlice): (KJS::arrayProtoFuncSort): (KJS::arrayProtoFuncSplice): (KJS::arrayProtoFuncUnShift): (KJS::arrayProtoFuncFilter): (KJS::arrayProtoFuncMap): (KJS::arrayProtoFuncEvery): (KJS::arrayProtoFuncForEach): (KJS::arrayProtoFuncSome): (KJS::arrayProtoFuncIndexOf): (KJS::arrayProtoFuncLastIndexOf):
• kjs/array_object.h:
• kjs/date_object.cpp: (KJS::DatePrototype::getOwnPropertySlot): (KJS::dateProtoFuncToString): (KJS::dateProtoFuncToUTCString): (KJS::dateProtoFuncToDateString): (KJS::dateProtoFuncToTimeString): (KJS::dateProtoFuncToLocaleString): (KJS::dateProtoFuncToLocaleDateString): (KJS::dateProtoFuncToLocaleTimeString): (KJS::dateProtoFuncValueOf): (KJS::dateProtoFuncGetTime): (KJS::dateProtoFuncGetFullYear): (KJS::dateProtoFuncGetUTCFullYear): (KJS::dateProtoFuncToGMTString): (KJS::dateProtoFuncGetMonth): (KJS::dateProtoFuncGetUTCMonth): (KJS::dateProtoFuncGetDate): (KJS::dateProtoFuncGetUTCDate): (KJS::dateProtoFuncGetDay): (KJS::dateProtoFuncGetUTCDay): (KJS::dateProtoFuncGetHours): (KJS::dateProtoFuncGetUTCHours): (KJS::dateProtoFuncGetMinutes): (KJS::dateProtoFuncGetUTCMinutes): (KJS::dateProtoFuncGetSeconds): (KJS::dateProtoFuncGetUTCSeconds): (KJS::dateProtoFuncGetMilliSeconds): (KJS::dateProtoFuncGetUTCMilliseconds): (KJS::dateProtoFuncGetTimezoneOffset): (KJS::dateProtoFuncSetTime): (KJS::dateProtoFuncSetMilliSeconds): (KJS::dateProtoFuncSetUTCMilliseconds): (KJS::dateProtoFuncSetSeconds): (KJS::dateProtoFuncSetUTCSeconds): (KJS::dateProtoFuncSetMinutes): (KJS::dateProtoFuncSetUTCMinutes): (KJS::dateProtoFuncSetHours): (KJS::dateProtoFuncSetUTCHours): (KJS::dateProtoFuncSetDate): (KJS::dateProtoFuncSetUTCDate): (KJS::dateProtoFuncSetMonth): (KJS::dateProtoFuncSetUTCMonth): (KJS::dateProtoFuncSetFullYear): (KJS::dateProtoFuncSetUTCFullYear): (KJS::dateProtoFuncSetYear): (KJS::dateProtoFuncGetYear):
• kjs/date_object.h:
• kjs/function.cpp: (KJS::PrototypeFunction::PrototypeFunction): (KJS::PrototypeFunction::callAsFunction):
• kjs/function.h:
• kjs/lookup.h: (KJS::HashEntry::): (KJS::staticFunctionGetter):
• kjs/math_object.cpp: (KJS::mathProtoFuncAbs): (KJS::mathProtoFuncACos): (KJS::mathProtoFuncASin): (KJS::mathProtoFuncATan): (KJS::mathProtoFuncATan2): (KJS::mathProtoFuncCeil): (KJS::mathProtoFuncCos): (KJS::mathProtoFuncExp): (KJS::mathProtoFuncFloor): (KJS::mathProtoFuncLog): (KJS::mathProtoFuncMax): (KJS::mathProtoFuncMin): (KJS::mathProtoFuncPow): (KJS::mathProtoFuncRandom): (KJS::mathProtoFuncRound): (KJS::mathProtoFuncSin): (KJS::mathProtoFuncSqrt): (KJS::mathProtoFuncTan):
• kjs/math_object.h:
• kjs/string_object.cpp: (KJS::stringProtoFuncToString): (KJS::stringProtoFuncValueOf): (KJS::stringProtoFuncCharAt): (KJS::stringProtoFuncCharCodeAt): (KJS::stringProtoFuncConcat): (KJS::stringProtoFuncIndexOf): (KJS::stringProtoFuncLastIndexOf): (KJS::stringProtoFuncMatch): (KJS::stringProtoFuncSearch): (KJS::stringProtoFuncReplace): (KJS::stringProtoFuncSlice): (KJS::stringProtoFuncSplit): (KJS::stringProtoFuncSubstr): (KJS::stringProtoFuncSubstring): (KJS::stringProtoFuncToLowerCase): (KJS::stringProtoFuncToUpperCase): (KJS::stringProtoFuncToLocaleLowerCase): (KJS::stringProtoFuncToLocaleUpperCase): (KJS::stringProtoFuncLocaleCompare): (KJS::stringProtoFuncBig): (KJS::stringProtoFuncSmall): (KJS::stringProtoFuncBlink): (KJS::stringProtoFuncBold): (KJS::stringProtoFuncFixed): (KJS::stringProtoFuncItalics): (KJS::stringProtoFuncStrike): (KJS::stringProtoFuncSub): (KJS::stringProtoFuncSup): (KJS::stringProtoFuncFontcolor): (KJS::stringProtoFuncFontsize): (KJS::stringProtoFuncAnchor): (KJS::stringProtoFuncLink):
• kjs/string_object.h:

WebCore:

Reviewed by Geoffrey Garen.

Fix <rdar://problem/5595552> r27608 introduced a 20% increase in JS binary size, 4% increase in WebCore binary size

• Update JS Function implementations to use a static function based method. This decreases the binary size of an Intel only build by 1013.5K.

• WebCore.xcodeproj/project.pbxproj:
• bindings/js/JSDOMWindowCustom.cpp: (WebCore::JSDOMWindow::customGetOwnPropertySlot):
• bindings/js/JSEventTargetBase.cpp: (WebCore::jsEventTargetAddEventListener): (WebCore::jsEventTargetRemoveEventListener): (WebCore::jsEventTargetDispatchEvent): (WebCore::retrieveEventTargetAndCorrespondingNode):
• bindings/js/JSEventTargetBase.h:
• bindings/js/JSHTMLInputElementBase.cpp: (WebCore::jsHTMLInputElementBaseFunctionSetSelectionRange): (WebCore::JSHTMLInputElementBase::getOwnPropertySlot):
• bindings/js/JSHTMLInputElementBase.h:
• bindings/js/JSLocation.cpp: (WebCore::JSLocation::getOwnPropertySlot): (WebCore::jsLocationProtoFuncReplace): (WebCore::jsLocationProtoFuncReload): (WebCore::jsLocationProtoFuncAssign): (WebCore::jsLocationProtoFuncToString):
• bindings/js/JSLocation.h:
• bindings/js/JSXMLHttpRequest.cpp: (KJS::jsXMLHttpRequestPrototypeFunctionAbort): (KJS::jsXMLHttpRequestPrototypeFunctionGetAllResponseHeaders): (KJS::jsXMLHttpRequestPrototypeFunctionGetResponseHeader): (KJS::jsXMLHttpRequestPrototypeFunctionOpen): (KJS::jsXMLHttpRequestPrototypeFunctionSend): (KJS::jsXMLHttpRequestPrototypeFunctionSetRequestHeader): (KJS::jsXMLHttpRequestPrototypeFunctionOverrideMIMEType): (KJS::jsXMLHttpRequestPrototypeFunctionAddEventListener): (KJS::jsXMLHttpRequestPrototypeFunctionRemoveEventListener): (KJS::jsXMLHttpRequestPrototypeFunctionDispatchEvent):
• bindings/js/JSXMLHttpRequest.h:
• bindings/js/JSXSLTProcessor.cpp: (KJS::jsXSLTProcessorPrototypeFunctionImportStylesheet): (KJS::jsXSLTProcessorPrototypeFunctionTransformToFragment): (KJS::jsXSLTProcessorPrototypeFunctionTransformToDocument): (KJS::jsXSLTProcessorPrototypeFunctionSetParameter): (KJS::jsXSLTProcessorPrototypeFunctionGetParameter): (KJS::jsXSLTProcessorPrototypeFunctionRemoveParameter): (KJS::jsXSLTProcessorPrototypeFunctionClearParameters): (KJS::jsXSLTProcessorPrototypeFunctionReset):
• bindings/js/JSXSLTProcessor.h:
• bindings/js/kjs_events.cpp: (WebCore::jsClipboardPrototypeFunctionClearData): (WebCore::jsClipboardPrototypeFunctionGetData): (WebCore::jsClipboardPrototypeFunctionSetData): (WebCore::jsClipboardPrototypeFunctionSetDragImage):
• bindings/js/kjs_events.h:
• bindings/js/kjs_navigator.cpp: (KJS::pluginsFunctionRefresh): (KJS::navigatorProtoFuncJavaEnabled):
• bindings/js/kjs_navigator.h:
• bindings/js/kjs_window.cpp: (KJS::Window::getOwnPropertySlot): (KJS::windowProtoFuncAToB): (KJS::windowProtoFuncBToA): (KJS::windowProtoFuncOpen): (KJS::windowProtoFuncSetTimeout): (KJS::windowProtoFuncClearTimeout): (KJS::windowProtoFuncSetInterval): (KJS::windowProtoFuncAddEventListener): (KJS::windowProtoFuncRemoveEventListener): (KJS::windowProtoFuncShowModalDialog): (KJS::windowProtoFuncNotImplemented):
• bindings/js/kjs_window.h:
• bindings/scripts/CodeGenerator.pm:
• bindings/scripts/CodeGeneratorJS.pm:

File:

• trunk/JavaScriptCore/kjs/math_object.cpp (modified) (19 diffs)

trunk/JavaScriptCore/kjs/math_object.cpp

@@ -45 +45 @@
   SQRT1_2       MathObjectImp::Sqrt1_2         DontEnum|DontDelete|ReadOnly
   SQRT2         MathObjectImp::Sqrt2           DontEnum|DontDelete|ReadOnly
-  abs           &MathProtoFuncAbs::create      DontEnum|Function 1
-  acos          &MathProtoFuncACos::create     DontEnum|Function 1
-  asin          &MathProtoFuncASin::create     DontEnum|Function 1
-  atan          &MathProtoFuncATan::create     DontEnum|Function 1
-  atan2         &MathProtoFuncATan2::create    DontEnum|Function 2
-  ceil          &MathProtoFuncCeil::create     DontEnum|Function 1
-  cos           &MathProtoFuncCos::create      DontEnum|Function 1
-  exp           &MathProtoFuncExp::create      DontEnum|Function 1
-  floor         &MathProtoFuncFloor::create    DontEnum|Function 1
-  log           &MathProtoFuncLog::create      DontEnum|Function 1
-  max           &MathProtoFuncMax::create      DontEnum|Function 2
-  min           &MathProtoFuncMin::create      DontEnum|Function 2
-  pow           &MathProtoFuncPow::create      DontEnum|Function 2
-  random        &MathProtoFuncRandom::create   DontEnum|Function 0 
-  round         &MathProtoFuncRound::create    DontEnum|Function 1
-  sin           &MathProtoFuncSin::create      DontEnum|Function 1
-  sqrt          &MathProtoFuncSqrt::create     DontEnum|Function 1
-  tan           &MathProtoFuncTan::create      DontEnum|Function 1
+  abs           mathProtoFuncAbs               DontEnum|Function 1
+  acos          mathProtoFuncACos              DontEnum|Function 1
+  asin          mathProtoFuncASin              DontEnum|Function 1
+  atan          mathProtoFuncATan              DontEnum|Function 1
+  atan2         mathProtoFuncATan2             DontEnum|Function 2
+  ceil          mathProtoFuncCeil              DontEnum|Function 1
+  cos           mathProtoFuncCos               DontEnum|Function 1
+  exp           mathProtoFuncExp               DontEnum|Function 1
+  floor         mathProtoFuncFloor             DontEnum|Function 1
+  log           mathProtoFuncLog               DontEnum|Function 1
+  max           mathProtoFuncMax               DontEnum|Function 2
+  min           mathProtoFuncMin               DontEnum|Function 2
+  pow           mathProtoFuncPow               DontEnum|Function 2
+  random        mathProtoFuncRandom            DontEnum|Function 0 
+  round         mathProtoFuncRound             DontEnum|Function 1
+  sin           mathProtoFuncSin               DontEnum|Function 1
+  sqrt          mathProtoFuncSqrt              DontEnum|Function 1
+  tan           mathProtoFuncTan               DontEnum|Function 1
 @end
 */
@@ -116 +116 @@
 // ------------------------------ Functions --------------------------------
 
-JSValue* MathProtoFuncAbs::callAsFunction(ExecState* exec, JSObject*, const List& args)
+JSValue* mathProtoFuncAbs(ExecState* exec, JSObject*, const List& args)
 {
     double arg = args[0]->toNumber(exec);
@@ -122 +122 @@
 }
 
-JSValue* MathProtoFuncACos::callAsFunction(ExecState* exec, JSObject*, const List& args)
+JSValue* mathProtoFuncACos(ExecState* exec, JSObject*, const List& args)
 {
     double arg = args[0]->toNumber(exec);
@@ -128 +128 @@
 }
 
-JSValue* MathProtoFuncASin::callAsFunction(ExecState* exec, JSObject*, const List& args)
+JSValue* mathProtoFuncASin(ExecState* exec, JSObject*, const List& args)
 {
     double arg = args[0]->toNumber(exec);
@@ -134 +134 @@
 }
 
-JSValue* MathProtoFuncATan::callAsFunction(ExecState* exec, JSObject*, const List& args)
+JSValue* mathProtoFuncATan(ExecState* exec, JSObject*, const List& args)
 {
     double arg = args[0]->toNumber(exec);
@@ -140 +140 @@
 }
 
-JSValue* MathProtoFuncATan2::callAsFunction(ExecState* exec, JSObject*, const List& args)
+JSValue* mathProtoFuncATan2(ExecState* exec, JSObject*, const List& args)
 {
     double arg = args[0]->toNumber(exec);
@@ -147 +147 @@
 }
 
-JSValue* MathProtoFuncCeil::callAsFunction(ExecState* exec, JSObject*, const List& args)
+JSValue* mathProtoFuncCeil(ExecState* exec, JSObject*, const List& args)
 {
     double arg = args[0]->toNumber(exec);
@@ -155 +155 @@
 }
 
-JSValue* MathProtoFuncCos::callAsFunction(ExecState* exec, JSObject*, const List& args)
+JSValue* mathProtoFuncCos(ExecState* exec, JSObject*, const List& args)
 {
     double arg = args[0]->toNumber(exec);
@@ -161 +161 @@
 }
 
-JSValue* MathProtoFuncExp::callAsFunction(ExecState* exec, JSObject*, const List& args)
+JSValue* mathProtoFuncExp(ExecState* exec, JSObject*, const List& args)
 {
     double arg = args[0]->toNumber(exec);
@@ -167 +167 @@
 }
 
-JSValue* MathProtoFuncFloor::callAsFunction(ExecState* exec, JSObject*, const List& args)
+JSValue* mathProtoFuncFloor(ExecState* exec, JSObject*, const List& args)
 {
     double arg = args[0]->toNumber(exec);
@@ -175 +175 @@
 }
 
-JSValue* MathProtoFuncLog::callAsFunction(ExecState* exec, JSObject*, const List& args)
+JSValue* mathProtoFuncLog(ExecState* exec, JSObject*, const List& args)
 {
     double arg = args[0]->toNumber(exec);
@@ -181 +181 @@
 }
 
-JSValue* MathProtoFuncMax::callAsFunction(ExecState* exec, JSObject*, const List& args)
+JSValue* mathProtoFuncMax(ExecState* exec, JSObject*, const List& args)
 {
     unsigned argsCount = args.size();
@@ -197 +197 @@
 }
 
-JSValue* MathProtoFuncMin::callAsFunction(ExecState* exec, JSObject*, const List& args)
+JSValue* mathProtoFuncMin(ExecState* exec, JSObject*, const List& args)
 {
     unsigned argsCount = args.size();
@@ -213 +213 @@
 }
 
-JSValue* MathProtoFuncPow::callAsFunction(ExecState* exec, JSObject*, const List& args)
+JSValue* mathProtoFuncPow(ExecState* exec, JSObject*, const List& args)
 {
     // ECMA 15.8.2.1.13
@@ -229 +229 @@
 static bool didInitRandom;
 
-JSValue* MathProtoFuncRandom::callAsFunction(ExecState*, JSObject*, const List&)
+JSValue* mathProtoFuncRandom(ExecState*, JSObject*, const List&)
 {
     if (!didInitRandom) {
@@ -238 +238 @@
 }
 
-JSValue* MathProtoFuncRound::callAsFunction(ExecState* exec, JSObject*, const List& args)
+JSValue* mathProtoFuncRound(ExecState* exec, JSObject*, const List& args)
 {
     double arg = args[0]->toNumber(exec);
@@ -246 +246 @@
 }
 
-JSValue* MathProtoFuncSin::callAsFunction(ExecState* exec, JSObject*, const List& args)
+JSValue* mathProtoFuncSin(ExecState* exec, JSObject*, const List& args)
 {
     double arg = args[0]->toNumber(exec);
@@ -252 +252 @@
 }
 
-JSValue* MathProtoFuncSqrt::callAsFunction(ExecState* exec, JSObject*, const List& args)
+JSValue* mathProtoFuncSqrt(ExecState* exec, JSObject*, const List& args)
 {
     double arg = args[0]->toNumber(exec);
@@ -258 +258 @@
 }
 
-JSValue* MathProtoFuncTan::callAsFunction(ExecState* exec, JSObject*, const List& args)
+JSValue* mathProtoFuncTan(ExecState* exec, JSObject*, const List& args)
 {
     double arg = args[0]->toNumber(exec);