[webkit-changes] [160351] branches/jsCStack/Source/JavaScriptCore

Mon, 09 Dec 2013 23:17:01 -0800

Title: [160351] branches/jsCStack/Source/_javascript_Core
Revision
160351
Author
msab...@apple.com
Date
2013-12-09 23:19:00 -0800 (Mon, 09 Dec 2013)

Log Message

CStack Branch: ctiNativeCallFallback and friends should renamed ...NativeTailCall
https://bugs.webkit.org/show_bug.cgi?id=125485

Not yet reviewed.

Changed ctiNativeCallFallback to ctiNativeTailCall and nativeCallFallbackGenerator
to nativeTailCallGenerator to be more descriptive of what is happening.

* jit/JITThunks.cpp:
(JSC::JITThunks::ctiNativeTailCall):
* jit/JITThunks.h:
* jit/ThunkGenerators.cpp:
(JSC::nativeTailCallGenerator):
(JSC::charCodeAtThunkGenerator):
(JSC::charAtThunkGenerator):
(JSC::fromCharCodeThunkGenerator):
(JSC::sqrtThunkGenerator):
(JSC::floorThunkGenerator):
(JSC::ceilThunkGenerator):
(JSC::roundThunkGenerator):
(JSC::expThunkGenerator):
(JSC::logThunkGenerator):
(JSC::absThunkGenerator):
(JSC::powThunkGenerator):
(JSC::imulThunkGenerator):
(JSC::arrayIteratorNextThunkGenerator):
* jit/ThunkGenerators.h:

Modified Paths

Diff

Modified: branches/jsCStack/Source/_javascript_Core/ChangeLog (160350 => 160351)


--- branches/jsCStack/Source/_javascript_Core/ChangeLog	2013-12-10 06:54:32 UTC (rev 160350)
+++ branches/jsCStack/Source/_javascript_Core/ChangeLog	2013-12-10 07:19:00 UTC (rev 160351)
@@ -1,5 +1,35 @@
 2013-12-09  Michael Saboff  <msab...@apple.com>
 
+        CStack Branch: ctiNativeCallFallback and friends should renamed ...NativeTailCall
+        https://bugs.webkit.org/show_bug.cgi?id=125485
+
+        Not yet reviewed.
+
+        Changed ctiNativeCallFallback to ctiNativeTailCall and nativeCallFallbackGenerator
+        to nativeTailCallGenerator to be more descriptive of what is happening.
+
+        * jit/JITThunks.cpp:
+        (JSC::JITThunks::ctiNativeTailCall):
+        * jit/JITThunks.h:
+        * jit/ThunkGenerators.cpp:
+        (JSC::nativeTailCallGenerator):
+        (JSC::charCodeAtThunkGenerator):
+        (JSC::charAtThunkGenerator):
+        (JSC::fromCharCodeThunkGenerator):
+        (JSC::sqrtThunkGenerator):
+        (JSC::floorThunkGenerator):
+        (JSC::ceilThunkGenerator):
+        (JSC::roundThunkGenerator):
+        (JSC::expThunkGenerator):
+        (JSC::logThunkGenerator):
+        (JSC::absThunkGenerator):
+        (JSC::powThunkGenerator):
+        (JSC::imulThunkGenerator):
+        (JSC::arrayIteratorNextThunkGenerator):
+        * jit/ThunkGenerators.h:
+
+2013-12-09  Michael Saboff  <msab...@apple.com>
+
         CStack Branch: Change nativeForGenerator fallBack bool to an enum
         https://bugs.webkit.org/show_bug.cgi?id=125473

Modified: branches/jsCStack/Source/_javascript_Core/jit/JITThunks.cpp (160350 => 160351)


--- branches/jsCStack/Source/_javascript_Core/jit/JITThunks.cpp	2013-12-10 06:54:32 UTC (rev 160350)
+++ branches/jsCStack/Source/_javascript_Core/jit/JITThunks.cpp	2013-12-10 07:19:00 UTC (rev 160351)
@@ -62,10 +62,10 @@
     return ctiStub(vm, nativeConstructGenerator).code();
 }
 
-MacroAssemblerCodePtr JITThunks::ctiNativeCallFallback(VM* vm)
+MacroAssemblerCodePtr JITThunks::ctiNativeTailCall(VM* vm)
 {
     ASSERT(vm->canUseJIT());
-    return ctiStub(vm, nativeCallFallbackGenerator).code();
+    return ctiStub(vm, nativeTailCallGenerator).code();
 }
 
 MacroAssemblerCodeRef JITThunks::ctiStub(VM* vm, ThunkGenerator generator)

Modified: branches/jsCStack/Source/_javascript_Core/jit/JITThunks.h (160350 => 160351)


--- branches/jsCStack/Source/_javascript_Core/jit/JITThunks.h	2013-12-10 06:54:32 UTC (rev 160350)
+++ branches/jsCStack/Source/_javascript_Core/jit/JITThunks.h	2013-12-10 07:19:00 UTC (rev 160351)
@@ -54,7 +54,7 @@
 
     MacroAssemblerCodePtr ctiNativeCall(VM*);
     MacroAssemblerCodePtr ctiNativeConstruct(VM*);
-    MacroAssemblerCodePtr ctiNativeCallFallback(VM*);    
+    MacroAssemblerCodePtr ctiNativeTailCall(VM*);    
 
     MacroAssemblerCodeRef ctiStub(VM*, ThunkGenerator);

Modified: branches/jsCStack/Source/_javascript_Core/jit/ThunkGenerators.cpp (160350 => 160351)


--- branches/jsCStack/Source/_javascript_Core/jit/ThunkGenerators.cpp	2013-12-10 06:54:32 UTC (rev 160350)
+++ branches/jsCStack/Source/_javascript_Core/jit/ThunkGenerators.cpp	2013-12-10 07:19:00 UTC (rev 160351)
@@ -408,7 +408,7 @@
     jit.jumpToExceptionHandler();
 
     LinkBuffer patchBuffer(*vm, &jit, GLOBAL_THUNK_ID);
-    return FINALIZE_CODE(patchBuffer, ("native %s %strampoline", toCString(kind).data(), entryType == EnterViaJump ? "Fallback " : ""));
+    return FINALIZE_CODE(patchBuffer, ("native %s%s trampoline", entryType == EnterViaJump ? "Tail " : "", toCString(kind).data()));
 }
 
 MacroAssemblerCodeRef nativeCallGenerator(VM* vm)
@@ -416,7 +416,7 @@
     return nativeForGenerator(vm, CodeForCall);
 }
 
-MacroAssemblerCodeRef nativeCallFallbackGenerator(VM* vm)
+MacroAssemblerCodeRef nativeTailCallGenerator(VM* vm)
 {
     return nativeForGenerator(vm, CodeForCall, EnterViaJump);
 }
@@ -550,7 +550,7 @@
     SpecializedThunkJIT jit(vm, 1);
     stringCharLoad(jit, vm);
     jit.returnInt32(SpecializedThunkJIT::regT0);
-    return jit.finalize(vm->jitStubs->ctiNativeCallFallback(vm), "charCodeAt");
+    return jit.finalize(vm->jitStubs->ctiNativeTailCall(vm), "charCodeAt");
 }
 
 MacroAssemblerCodeRef charAtThunkGenerator(VM* vm)
@@ -559,7 +559,7 @@
     stringCharLoad(jit, vm);
     charToString(jit, vm, SpecializedThunkJIT::regT0, SpecializedThunkJIT::regT0, SpecializedThunkJIT::regT1);
     jit.returnJSCell(SpecializedThunkJIT::regT0);
-    return jit.finalize(vm->jitStubs->ctiNativeCallFallback(vm), "charAt");
+    return jit.finalize(vm->jitStubs->ctiNativeTailCall(vm), "charAt");
 }
 
 MacroAssemblerCodeRef fromCharCodeThunkGenerator(VM* vm)
@@ -569,7 +569,7 @@
     jit.loadInt32Argument(0, SpecializedThunkJIT::regT0);
     charToString(jit, vm, SpecializedThunkJIT::regT0, SpecializedThunkJIT::regT0, SpecializedThunkJIT::regT1);
     jit.returnJSCell(SpecializedThunkJIT::regT0);
-    return jit.finalize(vm->jitStubs->ctiNativeCallFallback(vm), "fromCharCode");
+    return jit.finalize(vm->jitStubs->ctiNativeTailCall(vm), "fromCharCode");
 }
 
 MacroAssemblerCodeRef sqrtThunkGenerator(VM* vm)
@@ -581,7 +581,7 @@
     jit.loadDoubleArgument(0, SpecializedThunkJIT::fpRegT0, SpecializedThunkJIT::regT0);
     jit.sqrtDouble(SpecializedThunkJIT::fpRegT0, SpecializedThunkJIT::fpRegT0);
     jit.returnDouble(SpecializedThunkJIT::fpRegT0);
-    return jit.finalize(vm->jitStubs->ctiNativeCallFallback(vm), "sqrt");
+    return jit.finalize(vm->jitStubs->ctiNativeTailCall(vm), "sqrt");
 }
 
 
@@ -729,7 +729,7 @@
     doubleResult.link(&jit);
     jit.returnDouble(SpecializedThunkJIT::fpRegT0);
 #endif // CPU(ARM64)
-    return jit.finalize(vm->jitStubs->ctiNativeCallFallback(vm), "floor");
+    return jit.finalize(vm->jitStubs->ctiNativeTailCall(vm), "floor");
 }
 
 MacroAssemblerCodeRef ceilThunkGenerator(VM* vm)
@@ -752,7 +752,7 @@
     jit.returnInt32(SpecializedThunkJIT::regT0);
     doubleResult.link(&jit);
     jit.returnDouble(SpecializedThunkJIT::fpRegT0);
-    return jit.finalize(vm->jitStubs->ctiNativeCallFallback(vm), "ceil");
+    return jit.finalize(vm->jitStubs->ctiNativeTailCall(vm), "ceil");
 }
 
 MacroAssemblerCodeRef roundThunkGenerator(VM* vm)
@@ -786,7 +786,7 @@
     jit.returnInt32(SpecializedThunkJIT::regT0);
     doubleResult.link(&jit);
     jit.returnDouble(SpecializedThunkJIT::fpRegT0);
-    return jit.finalize(vm->jitStubs->ctiNativeCallFallback(vm), "round");
+    return jit.finalize(vm->jitStubs->ctiNativeTailCall(vm), "round");
 }
 
 MacroAssemblerCodeRef expThunkGenerator(VM* vm)
@@ -799,7 +799,7 @@
     jit.loadDoubleArgument(0, SpecializedThunkJIT::fpRegT0, SpecializedThunkJIT::regT0);
     jit.callDoubleToDoublePreservingReturn(UnaryDoubleOpWrapper(exp));
     jit.returnDouble(SpecializedThunkJIT::fpRegT0);
-    return jit.finalize(vm->jitStubs->ctiNativeCallFallback(vm), "exp");
+    return jit.finalize(vm->jitStubs->ctiNativeTailCall(vm), "exp");
 }
 
 MacroAssemblerCodeRef logThunkGenerator(VM* vm)
@@ -812,7 +812,7 @@
     jit.loadDoubleArgument(0, SpecializedThunkJIT::fpRegT0, SpecializedThunkJIT::regT0);
     jit.callDoubleToDoublePreservingReturn(UnaryDoubleOpWrapper(log));
     jit.returnDouble(SpecializedThunkJIT::fpRegT0);
-    return jit.finalize(vm->jitStubs->ctiNativeCallFallback(vm), "log");
+    return jit.finalize(vm->jitStubs->ctiNativeTailCall(vm), "log");
 }
 
 MacroAssemblerCodeRef absThunkGenerator(VM* vm)
@@ -832,7 +832,7 @@
     jit.loadDoubleArgument(0, SpecializedThunkJIT::fpRegT0, SpecializedThunkJIT::regT0);
     jit.absDouble(SpecializedThunkJIT::fpRegT0, SpecializedThunkJIT::fpRegT1);
     jit.returnDouble(SpecializedThunkJIT::fpRegT1);
-    return jit.finalize(vm->jitStubs->ctiNativeCallFallback(vm), "abs");
+    return jit.finalize(vm->jitStubs->ctiNativeTailCall(vm), "abs");
 }
 
 MacroAssemblerCodeRef powThunkGenerator(VM* vm)
@@ -884,7 +884,7 @@
     } else
         jit.appendFailure(nonIntExponent);
 
-    return jit.finalize(vm->jitStubs->ctiNativeCallFallback(vm), "pow");
+    return jit.finalize(vm->jitStubs->ctiNativeTailCall(vm), "pow");
 }
 
 MacroAssemblerCodeRef imulThunkGenerator(VM* vm)
@@ -917,7 +917,7 @@
     } else
         jit.appendFailure(nonIntArg1Jump);
 
-    return jit.finalize(vm->jitStubs->ctiNativeCallFallback(vm), "imul");
+    return jit.finalize(vm->jitStubs->ctiNativeTailCall(vm), "imul");
 }
 
 static MacroAssemblerCodeRef arrayIteratorNextThunkGenerator(VM* vm, ArrayIterationKind kind)
@@ -957,7 +957,7 @@
     if (kind == ArrayIterateKey) {
         jit.add32(TrustedImm32(1), Address(SpecializedThunkJIT::regT4, JSArrayIterator::offsetOfNextIndex()));
         jit.returnInt32(SpecializedThunkJIT::regT1);
-        return jit.finalize(vm->jitStubs->ctiNativeCallFallback(vm), "array-iterator-next-key");
+        return jit.finalize(vm->jitStubs->ctiNativeTailCall(vm), "array-iterator-next-key");
         
     }
     ASSERT(kind == ArrayIterateValue);
@@ -1008,7 +1008,7 @@
     jit.add32(TrustedImm32(1), Address(SpecializedThunkJIT::regT4, JSArrayIterator::offsetOfNextIndex()));
     jit.returnDouble(SpecializedThunkJIT::fpRegT0);
     
-    return jit.finalize(vm->jitStubs->ctiNativeCallFallback(vm), "array-iterator-next-value");
+    return jit.finalize(vm->jitStubs->ctiNativeTailCall(vm), "array-iterator-next-value");
 }
 
 MacroAssemblerCodeRef arrayIteratorNextKeyThunkGenerator(VM* vm)

Modified: branches/jsCStack/Source/_javascript_Core/jit/ThunkGenerators.h (160350 => 160351)


--- branches/jsCStack/Source/_javascript_Core/jit/ThunkGenerators.h	2013-12-10 06:54:32 UTC (rev 160350)
+++ branches/jsCStack/Source/_javascript_Core/jit/ThunkGenerators.h	2013-12-10 07:19:00 UTC (rev 160351)
@@ -43,7 +43,7 @@
 
 MacroAssemblerCodeRef nativeCallGenerator(VM*);
 MacroAssemblerCodeRef nativeConstructGenerator(VM*);
-MacroAssemblerCodeRef nativeCallFallbackGenerator(VM*);
+MacroAssemblerCodeRef nativeTailCallGenerator(VM*);
 MacroAssemblerCodeRef arityFixup(VM*);
 
 MacroAssemblerCodeRef charCodeAtThunkGenerator(VM*);

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to