Title: [160666] branches/jsCStack/Source
- Revision
- 160666
- Author
- [email protected]
- Date
- 2013-12-16 14:59:59 -0800 (Mon, 16 Dec 2013)
Log Message
Merged r160665 from trunk.
2013-12-16 Mark Lam <[email protected]>
Change slow path result to take a void* instead of a ExecState*.
https://bugs.webkit.org/show_bug.cgi?id=125802.
Reviewed by Filip Pizlo.
This is in preparation for C Stack OSR entry work that is coming soon.
In the OSR entry case, we'll be returning a topOfFrame pointer value
instead of the ExecState*.
* offlineasm/cloop.rb:
* runtime/CommonSlowPaths.h:
(JSC::encodeResult):
(JSC::decodeResult):
Modified Paths
Property Changed
Diff
Property changes: branches/jsCStack/Source
Added: svn:mergeinfo
Modified: branches/jsCStack/Source/_javascript_Core/ChangeLog (160665 => 160666)
--- branches/jsCStack/Source/_javascript_Core/ChangeLog 2013-12-16 22:52:36 UTC (rev 160665)
+++ branches/jsCStack/Source/_javascript_Core/ChangeLog 2013-12-16 22:59:59 UTC (rev 160666)
@@ -1,3 +1,23 @@
+2013-12-16 Mark Lam <[email protected]>
+
+ Merged r160665 from trunk.
+
+ 2013-12-16 Mark Lam <[email protected]>
+
+ Change slow path result to take a void* instead of a ExecState*.
+ https://bugs.webkit.org/show_bug.cgi?id=125802.
+
+ Reviewed by Filip Pizlo.
+
+ This is in preparation for C Stack OSR entry work that is coming soon.
+ In the OSR entry case, we'll be returning a topOfFrame pointer value
+ instead of the ExecState*.
+
+ * offlineasm/cloop.rb:
+ * runtime/CommonSlowPaths.h:
+ (JSC::encodeResult):
+ (JSC::decodeResult):
+
2013-12-16 Michael Saboff <[email protected]>
CStack Branch: Eliminate topOfStack parameter from callToJavaScript() and callToNativeFunction()
Modified: branches/jsCStack/Source/_javascript_Core/offlineasm/cloop.rb (160665 => 160666)
--- branches/jsCStack/Source/_javascript_Core/offlineasm/cloop.rb 2013-12-16 22:52:36 UTC (rev 160665)
+++ branches/jsCStack/Source/_javascript_Core/offlineasm/cloop.rb 2013-12-16 22:59:59 UTC (rev 160666)
@@ -560,7 +560,7 @@
$asm.putc " ExecState* exec = CAST<ExecState*>(#{operands[1].clValue(:voidPtr)});"
$asm.putc " Instruction* pc = CAST<Instruction*>(#{operands[2].clValue(:voidPtr)});"
$asm.putc " SlowPathReturnType result = #{operands[0].cLabel}(exec, pc);"
- $asm.putc " decodeResult(result, t0.instruction, t1.execState);"
+ $asm.putc " decodeResult(result, t0.instruction, t1.vp);"
$asm.putc "}"
end
Modified: branches/jsCStack/Source/_javascript_Core/runtime/CommonSlowPaths.h (160665 => 160666)
--- branches/jsCStack/Source/_javascript_Core/runtime/CommonSlowPaths.h 2013-12-16 22:52:36 UTC (rev 160665)
+++ branches/jsCStack/Source/_javascript_Core/runtime/CommonSlowPaths.h 2013-12-16 22:59:59 UTC (rev 160666)
@@ -105,10 +105,10 @@
// warnings, or worse, a change in the ABI used to return these types.
struct SlowPathReturnType {
void* a;
- ExecState* b;
+ void* b;
};
-inline SlowPathReturnType encodeResult(void* a, ExecState* b)
+inline SlowPathReturnType encodeResult(void* a, void* b)
{
SlowPathReturnType result;
result.a = a;
@@ -116,7 +116,7 @@
return result;
}
-inline void decodeResult(SlowPathReturnType result, void*& a, ExecState*& b)
+inline void decodeResult(SlowPathReturnType result, void*& a, void*& b)
{
a = result.a;
b = result.b;
@@ -128,12 +128,12 @@
typedef union {
struct {
void* a;
- ExecState* b;
+ void* b;
} pair;
int64_t i;
} SlowPathReturnTypeEncoding;
-inline SlowPathReturnType encodeResult(void* a, ExecState* b)
+inline SlowPathReturnType encodeResult(void* a, void* b)
{
SlowPathReturnTypeEncoding u;
u.pair.a = a;
@@ -141,7 +141,7 @@
return u.i;
}
-inline void decodeResult(SlowPathReturnType result, void*& a, ExecState*& b)
+inline void decodeResult(SlowPathReturnType result, void*& a, void*& b)
{
SlowPathReturnTypeEncoding u;
u.i = result;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
