<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[193633] trunk/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/193633">193633</a></dd>
<dt>Author</dt> <dd>mark.lam@apple.com</dd>
<dt>Date</dt> <dd>2015-12-07 09:31:52 -0800 (Mon, 07 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename JITBitwiseBinaryOpGenerator to JITBitBinaryOpGenerator.
https://bugs.webkit.org/show_bug.cgi?id=151945
Reviewed by Saam Barati.
The lshift operator also need to inherit from JITBitBinaryOpGenerator. Calling
it "BitBinaryOp" makes more sense than "BitwiseBinaryOp" in that case, and still
makes sense for the bitand, bitor, and bitxor operators.
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
* JavaScriptCore.xcodeproj/project.pbxproj:
* jit/JIT.h:
* jit/JITArithmetic.cpp:
(JSC::JIT::emitBitBinaryOpFastPath):
(JSC::JIT::emit_op_bitand):
(JSC::JIT::emitSlow_op_bitand):
(JSC::JIT::emit_op_bitor):
(JSC::JIT::emitSlow_op_bitor):
(JSC::JIT::emit_op_bitxor):
(JSC::JIT::emitSlow_op_bitxor):
(JSC::JIT::emitBitwiseBinaryOpFastPath): Deleted.
* jit/JITBitAndGenerator.h:
(JSC::JITBitAndGenerator::JITBitAndGenerator):
* jit/JITBitBinaryOpGenerator.h: Copied from Source/JavaScriptCore/jit/JITBitwiseBinaryOpGenerator.h.
(JSC::JITBitBinaryOpGenerator::JITBitBinaryOpGenerator):
(JSC::JITBitwiseBinaryOpGenerator::JITBitwiseBinaryOpGenerator): Deleted.
* jit/JITBitOrGenerator.h:
(JSC::JITBitOrGenerator::JITBitOrGenerator):
* jit/JITBitXorGenerator.h:
(JSC::JITBitXorGenerator::JITBitXorGenerator):
* jit/JITBitwiseBinaryOpGenerator.h: Removed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITh">trunk/Source/JavaScriptCore/jit/JIT.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITArithmeticcpp">trunk/Source/JavaScriptCore/jit/JITArithmetic.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITBitAndGeneratorh">trunk/Source/JavaScriptCore/jit/JITBitAndGenerator.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITBitOrGeneratorh">trunk/Source/JavaScriptCore/jit/JITBitOrGenerator.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejitJITBitXorGeneratorh">trunk/Source/JavaScriptCore/jit/JITBitXorGenerator.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCorejitJITBitBinaryOpGeneratorh">trunk/Source/JavaScriptCore/jit/JITBitBinaryOpGenerator.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCorejitJITBitwiseBinaryOpGeneratorh">trunk/Source/JavaScriptCore/jit/JITBitwiseBinaryOpGenerator.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (193632 => 193633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-12-07 17:30:25 UTC (rev 193632)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-12-07 17:31:52 UTC (rev 193633)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2015-12-07 Mark Lam <mark.lam@apple.com>
+
+ Rename JITBitwiseBinaryOpGenerator to JITBitBinaryOpGenerator.
+ https://bugs.webkit.org/show_bug.cgi?id=151945
+
+ Reviewed by Saam Barati.
+
+ The lshift operator also need to inherit from JITBitBinaryOpGenerator. Calling
+ it "BitBinaryOp" makes more sense than "BitwiseBinaryOp" in that case, and still
+ makes sense for the bitand, bitor, and bitxor operators.
+
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * jit/JIT.h:
+ * jit/JITArithmetic.cpp:
+ (JSC::JIT::emitBitBinaryOpFastPath):
+ (JSC::JIT::emit_op_bitand):
+ (JSC::JIT::emitSlow_op_bitand):
+ (JSC::JIT::emit_op_bitor):
+ (JSC::JIT::emitSlow_op_bitor):
+ (JSC::JIT::emit_op_bitxor):
+ (JSC::JIT::emitSlow_op_bitxor):
+ (JSC::JIT::emitBitwiseBinaryOpFastPath): Deleted.
+ * jit/JITBitAndGenerator.h:
+ (JSC::JITBitAndGenerator::JITBitAndGenerator):
+ * jit/JITBitBinaryOpGenerator.h: Copied from Source/JavaScriptCore/jit/JITBitwiseBinaryOpGenerator.h.
+ (JSC::JITBitBinaryOpGenerator::JITBitBinaryOpGenerator):
+ (JSC::JITBitwiseBinaryOpGenerator::JITBitwiseBinaryOpGenerator): Deleted.
+ * jit/JITBitOrGenerator.h:
+ (JSC::JITBitOrGenerator::JITBitOrGenerator):
+ * jit/JITBitXorGenerator.h:
+ (JSC::JITBitXorGenerator::JITBitXorGenerator):
+ * jit/JITBitwiseBinaryOpGenerator.h: Removed.
+
</ins><span class="cx"> 2015-12-07 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> [B3] Typo fix after r193386 to fix the build
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (193632 => 193633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2015-12-07 17:30:25 UTC (rev 193632)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2015-12-07 17:31:52 UTC (rev 193633)
</span><span class="lines">@@ -1476,9 +1476,9 @@
</span><span class="cx"> <ClInclude Include="..\jit\JIT.h" />
</span><span class="cx"> <ClInclude Include="..\jit\JITAddGenerator.h" />
</span><span class="cx"> <ClInclude Include="..\jit\JITBitAndGenerator.h" />
</span><ins>+ <ClInclude Include="..\jit\JITBitBinaryOpGenerator.h" />
</ins><span class="cx"> <ClInclude Include="..\jit\JITBitOrGenerator.h" />
</span><span class="cx"> <ClInclude Include="..\jit\JITBitXorGenerator.h" />
</span><del>- <ClInclude Include="..\jit\JITBitwiseBinaryOpGenerator.h" />
</del><span class="cx"> <ClInclude Include="..\jit\JITCode.h" />
</span><span class="cx"> <ClInclude Include="..\jit\JITCompilationEffort.h" />
</span><span class="cx"> <ClInclude Include="..\jit\JITDisassembler.h" />
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters (193632 => 193633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2015-12-07 17:30:25 UTC (rev 193632)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2015-12-07 17:31:52 UTC (rev 193633)
</span><span class="lines">@@ -2540,15 +2540,15 @@
</span><span class="cx"> <ClInclude Include="..\jit\JITBitAndGenerator.h">
</span><span class="cx"> <Filter>jit</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="..\jit\JITBitBinaryOpGenerator.h">
+ <Filter>jit</Filter>
+ </ClInclude>
</ins><span class="cx"> <ClInclude Include="..\jit\JITBitOrGenerator.h">
</span><span class="cx"> <Filter>jit</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="cx"> <ClInclude Include="..\jit\JITBitXorGenerator.h">
</span><span class="cx"> <Filter>jit</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\jit\JITBitwiseBinaryOpGenerator.h">
- <Filter>jit</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\jit\JITCode.h">
</span><span class="cx"> <Filter>jit</Filter>
</span><span class="cx"> </ClInclude>
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (193632 => 193633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-12-07 17:30:25 UTC (rev 193632)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-12-07 17:31:52 UTC (rev 193633)
</span><span class="lines">@@ -2008,7 +2008,7 @@
</span><span class="cx"> FE3913551B794F8A00EDAF71 /* LiveObjectData.h in Headers */ = {isa = PBXBuildFile; fileRef = FE3913511B794AC900EDAF71 /* LiveObjectData.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> FE3913561B794F8F00EDAF71 /* LiveObjectList.h in Headers */ = {isa = PBXBuildFile; fileRef = FE3913531B794AC900EDAF71 /* LiveObjectList.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> FE3A06A61C10B72D00390FDD /* JITBitOrGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = FE3A06A41C10B70800390FDD /* JITBitOrGenerator.h */; settings = {ASSET_TAGS = (); }; };
</span><del>- FE3A06A81C10BC8100390FDD /* JITBitwiseBinaryOpGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = FE3A06A71C10BC7400390FDD /* JITBitwiseBinaryOpGenerator.h */; settings = {ASSET_TAGS = (); }; };
</del><ins>+ FE3A06A81C10BC8100390FDD /* JITBitBinaryOpGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = FE3A06A71C10BC7400390FDD /* JITBitBinaryOpGenerator.h */; settings = {ASSET_TAGS = (); }; };
</ins><span class="cx"> FE3A06AC1C10C39E00390FDD /* JITBitOrGenerator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE3A06A31C10B70800390FDD /* JITBitOrGenerator.cpp */; settings = {ASSET_TAGS = (); }; };
</span><span class="cx"> FE3A06B11C10CB8400390FDD /* JITBitAndGenerator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = FE3A06AD1C10CB6F00390FDD /* JITBitAndGenerator.cpp */; settings = {ASSET_TAGS = (); }; };
</span><span class="cx"> FE3A06B21C10CB8900390FDD /* JITBitAndGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = FE3A06AE1C10CB6F00390FDD /* JITBitAndGenerator.h */; settings = {ASSET_TAGS = (); }; };
</span><span class="lines">@@ -4182,7 +4182,7 @@
</span><span class="cx"> FE3913531B794AC900EDAF71 /* LiveObjectList.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LiveObjectList.h; sourceTree = "<group>"; };
</span><span class="cx"> FE3A06A31C10B70800390FDD /* JITBitOrGenerator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JITBitOrGenerator.cpp; sourceTree = "<group>"; };
</span><span class="cx"> FE3A06A41C10B70800390FDD /* JITBitOrGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JITBitOrGenerator.h; sourceTree = "<group>"; };
</span><del>- FE3A06A71C10BC7400390FDD /* JITBitwiseBinaryOpGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JITBitwiseBinaryOpGenerator.h; sourceTree = "<group>"; };
</del><ins>+ FE3A06A71C10BC7400390FDD /* JITBitBinaryOpGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JITBitBinaryOpGenerator.h; sourceTree = "<group>"; };
</ins><span class="cx"> FE3A06AD1C10CB6F00390FDD /* JITBitAndGenerator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JITBitAndGenerator.cpp; sourceTree = "<group>"; };
</span><span class="cx"> FE3A06AE1C10CB6F00390FDD /* JITBitAndGenerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JITBitAndGenerator.h; sourceTree = "<group>"; };
</span><span class="cx"> FE3A06AF1C10CB6F00390FDD /* JITBitXorGenerator.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JITBitXorGenerator.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -4863,7 +4863,7 @@
</span><span class="cx"> FE3A06A41C10B70800390FDD /* JITBitOrGenerator.h */,
</span><span class="cx"> FE3A06AF1C10CB6F00390FDD /* JITBitXorGenerator.cpp */,
</span><span class="cx"> FE3A06B01C10CB6F00390FDD /* JITBitXorGenerator.h */,
</span><del>- FE3A06A71C10BC7400390FDD /* JITBitwiseBinaryOpGenerator.h */,
</del><ins>+ FE3A06A71C10BC7400390FDD /* JITBitBinaryOpGenerator.h */,
</ins><span class="cx"> 86CC85A20EE79B7400288682 /* JITCall.cpp */,
</span><span class="cx"> 146FE51111A710430087AE66 /* JITCall32_64.cpp */,
</span><span class="cx"> 0F8F94431667635200D61971 /* JITCode.cpp */,
</span><span class="lines">@@ -7390,7 +7390,7 @@
</span><span class="cx"> 86CCEFDE0F413F8900FD7F9E /* JITCode.h in Headers */,
</span><span class="cx"> 0F0776BF14FF002B00102332 /* JITCompilationEffort.h in Headers */,
</span><span class="cx"> 0FAF7EFE165BA91F000C8455 /* JITDisassembler.h in Headers */,
</span><del>- FE3A06A81C10BC8100390FDD /* JITBitwiseBinaryOpGenerator.h in Headers */,
</del><ins>+ FE3A06A81C10BC8100390FDD /* JITBitBinaryOpGenerator.h in Headers */,
</ins><span class="cx"> 0F46808214BA572D00BFE272 /* JITExceptions.h in Headers */,
</span><span class="cx"> 0FB14E1F18124ACE009B6B4D /* JITInlineCacheGenerator.h in Headers */,
</span><span class="cx"> 86CC85A10EE79A4700288682 /* JITInlines.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JIT.h (193632 => 193633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JIT.h 2015-12-07 17:30:25 UTC (rev 193632)
+++ trunk/Source/JavaScriptCore/jit/JIT.h 2015-12-07 17:31:52 UTC (rev 193633)
</span><span class="lines">@@ -827,7 +827,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> template<typename SnippetGenerator>
</span><del>- void emitBitwiseBinaryOpFastPath(Instruction* currentInstruction);
</del><ins>+ void emitBitBinaryOpFastPath(Instruction* currentInstruction);
</ins><span class="cx">
</span><span class="cx"> Jump checkStructure(RegisterID reg, Structure* structure);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITArithmeticcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITArithmetic.cpp (193632 => 193633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITArithmetic.cpp 2015-12-07 17:30:25 UTC (rev 193632)
+++ trunk/Source/JavaScriptCore/jit/JITArithmetic.cpp 2015-12-07 17:31:52 UTC (rev 193633)
</span><span class="lines">@@ -632,7 +632,7 @@
</span><span class="cx"> #endif // USE(JSVALUE64)
</span><span class="cx">
</span><span class="cx"> template<typename SnippetGenerator>
</span><del>-void JIT::emitBitwiseBinaryOpFastPath(Instruction* currentInstruction)
</del><ins>+void JIT::emitBitBinaryOpFastPath(Instruction* currentInstruction)
</ins><span class="cx"> {
</span><span class="cx"> int result = currentInstruction[1].u.operand;
</span><span class="cx"> int op1 = currentInstruction[2].u.operand;
</span><span class="lines">@@ -688,7 +688,7 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emit_op_bitand(Instruction* currentInstruction)
</span><span class="cx"> {
</span><del>- emitBitwiseBinaryOpFastPath<JITBitAndGenerator>(currentInstruction);
</del><ins>+ emitBitBinaryOpFastPath<JITBitAndGenerator>(currentInstruction);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_bitand(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="lines">@@ -701,7 +701,7 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emit_op_bitor(Instruction* currentInstruction)
</span><span class="cx"> {
</span><del>- emitBitwiseBinaryOpFastPath<JITBitOrGenerator>(currentInstruction);
</del><ins>+ emitBitBinaryOpFastPath<JITBitOrGenerator>(currentInstruction);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_bitor(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span><span class="lines">@@ -714,7 +714,7 @@
</span><span class="cx">
</span><span class="cx"> void JIT::emit_op_bitxor(Instruction* currentInstruction)
</span><span class="cx"> {
</span><del>- emitBitwiseBinaryOpFastPath<JITBitXorGenerator>(currentInstruction);
</del><ins>+ emitBitBinaryOpFastPath<JITBitXorGenerator>(currentInstruction);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JIT::emitSlow_op_bitxor(Instruction* currentInstruction, Vector<SlowCaseEntry>::iterator& iter)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITBitAndGeneratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITBitAndGenerator.h (193632 => 193633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITBitAndGenerator.h 2015-12-07 17:30:25 UTC (rev 193632)
+++ trunk/Source/JavaScriptCore/jit/JITBitAndGenerator.h 2015-12-07 17:31:52 UTC (rev 193633)
</span><span class="lines">@@ -28,15 +28,15 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(JIT)
</span><span class="cx">
</span><del>-#include "JITBitwiseBinaryOpGenerator.h"
</del><ins>+#include "JITBitBinaryOpGenerator.h"
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-class JITBitAndGenerator : public JITBitwiseBinaryOpGenerator {
</del><ins>+class JITBitAndGenerator : public JITBitBinaryOpGenerator {
</ins><span class="cx"> public:
</span><span class="cx"> JITBitAndGenerator(const SnippetOperand& leftOperand, const SnippetOperand& rightOperand,
</span><span class="cx"> JSValueRegs result, JSValueRegs left, JSValueRegs right, GPRReg scratchGPR)
</span><del>- : JITBitwiseBinaryOpGenerator(leftOperand, rightOperand, result, left, right, scratchGPR)
</del><ins>+ : JITBitBinaryOpGenerator(leftOperand, rightOperand, result, left, right, scratchGPR)
</ins><span class="cx"> { }
</span><span class="cx">
</span><span class="cx"> void generateFastPath(CCallHelpers&);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITBitBinaryOpGeneratorhfromrev193628trunkSourceJavaScriptCorejitJITBitwiseBinaryOpGeneratorh"></a>
<div class="copfile"><h4>Copied: trunk/Source/JavaScriptCore/jit/JITBitBinaryOpGenerator.h (from rev 193628, trunk/Source/JavaScriptCore/jit/JITBitwiseBinaryOpGenerator.h) (0 => 193633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITBitBinaryOpGenerator.h (rev 0)
+++ trunk/Source/JavaScriptCore/jit/JITBitBinaryOpGenerator.h 2015-12-07 17:31:52 UTC (rev 193633)
</span><span class="lines">@@ -0,0 +1,71 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef JITBitBinaryOpGenerator_h
+#define JITBitBinaryOpGenerator_h
+
+#if ENABLE(JIT)
+
+#include "CCallHelpers.h"
+#include "SnippetOperand.h"
+
+namespace JSC {
+
+class JITBitBinaryOpGenerator {
+public:
+ JITBitBinaryOpGenerator(const SnippetOperand& leftOperand, const SnippetOperand& rightOperand,
+ JSValueRegs result, JSValueRegs left, JSValueRegs right, GPRReg scratchGPR)
+ : m_leftOperand(leftOperand)
+ , m_rightOperand(rightOperand)
+ , m_result(result)
+ , m_left(left)
+ , m_right(right)
+ , m_scratchGPR(scratchGPR)
+ {
+ ASSERT(!m_leftOperand.isConstInt32() || !m_rightOperand.isConstInt32());
+ }
+
+ bool didEmitFastPath() const { return m_didEmitFastPath; }
+ CCallHelpers::JumpList& endJumpList() { return m_endJumpList; }
+ CCallHelpers::JumpList& slowPathJumpList() { return m_slowPathJumpList; }
+
+protected:
+ SnippetOperand m_leftOperand;
+ SnippetOperand m_rightOperand;
+ JSValueRegs m_result;
+ JSValueRegs m_left;
+ JSValueRegs m_right;
+ GPRReg m_scratchGPR;
+ bool m_didEmitFastPath { false };
+
+ CCallHelpers::JumpList m_endJumpList;
+ CCallHelpers::JumpList m_slowPathJumpList;
+};
+
+} // namespace JSC
+
+#endif // ENABLE(JIT)
+
+#endif // JITBitBinaryOpGenerator_h
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITBitOrGeneratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITBitOrGenerator.h (193632 => 193633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITBitOrGenerator.h 2015-12-07 17:30:25 UTC (rev 193632)
+++ trunk/Source/JavaScriptCore/jit/JITBitOrGenerator.h 2015-12-07 17:31:52 UTC (rev 193633)
</span><span class="lines">@@ -28,15 +28,15 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(JIT)
</span><span class="cx">
</span><del>-#include "JITBitwiseBinaryOpGenerator.h"
</del><ins>+#include "JITBitBinaryOpGenerator.h"
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-class JITBitOrGenerator : public JITBitwiseBinaryOpGenerator {
</del><ins>+class JITBitOrGenerator : public JITBitBinaryOpGenerator {
</ins><span class="cx"> public:
</span><span class="cx"> JITBitOrGenerator(const SnippetOperand& leftOperand, const SnippetOperand& rightOperand,
</span><span class="cx"> JSValueRegs result, JSValueRegs left, JSValueRegs right, GPRReg unused = InvalidGPRReg)
</span><del>- : JITBitwiseBinaryOpGenerator(leftOperand, rightOperand, result, left, right, unused)
</del><ins>+ : JITBitBinaryOpGenerator(leftOperand, rightOperand, result, left, right, unused)
</ins><span class="cx"> { }
</span><span class="cx">
</span><span class="cx"> void generateFastPath(CCallHelpers&);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITBitXorGeneratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/JITBitXorGenerator.h (193632 => 193633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITBitXorGenerator.h 2015-12-07 17:30:25 UTC (rev 193632)
+++ trunk/Source/JavaScriptCore/jit/JITBitXorGenerator.h 2015-12-07 17:31:52 UTC (rev 193633)
</span><span class="lines">@@ -28,15 +28,15 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(JIT)
</span><span class="cx">
</span><del>-#include "JITBitwiseBinaryOpGenerator.h"
</del><ins>+#include "JITBitBinaryOpGenerator.h"
</ins><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-class JITBitXorGenerator : public JITBitwiseBinaryOpGenerator {
</del><ins>+class JITBitXorGenerator : public JITBitBinaryOpGenerator {
</ins><span class="cx"> public:
</span><span class="cx"> JITBitXorGenerator(const SnippetOperand& leftOperand, const SnippetOperand& rightOperand,
</span><span class="cx"> JSValueRegs result, JSValueRegs left, JSValueRegs right, GPRReg unused = InvalidGPRReg)
</span><del>- : JITBitwiseBinaryOpGenerator(leftOperand, rightOperand, result, left, right, unused)
</del><ins>+ : JITBitBinaryOpGenerator(leftOperand, rightOperand, result, left, right, unused)
</ins><span class="cx"> { }
</span><span class="cx">
</span><span class="cx"> void generateFastPath(CCallHelpers&);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejitJITBitwiseBinaryOpGeneratorh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/jit/JITBitwiseBinaryOpGenerator.h (193632 => 193633)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jit/JITBitwiseBinaryOpGenerator.h 2015-12-07 17:30:25 UTC (rev 193632)
+++ trunk/Source/JavaScriptCore/jit/JITBitwiseBinaryOpGenerator.h 2015-12-07 17:31:52 UTC (rev 193633)
</span><span class="lines">@@ -1,71 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef JITBitwiseBinaryOpGenerator_h
-#define JITBitwiseBinaryOpGenerator_h
-
-#if ENABLE(JIT)
-
-#include "CCallHelpers.h"
-#include "SnippetOperand.h"
-
-namespace JSC {
-
-class JITBitwiseBinaryOpGenerator {
-public:
- JITBitwiseBinaryOpGenerator(const SnippetOperand& leftOperand, const SnippetOperand& rightOperand,
- JSValueRegs result, JSValueRegs left, JSValueRegs right, GPRReg scratchGPR)
- : m_leftOperand(leftOperand)
- , m_rightOperand(rightOperand)
- , m_result(result)
- , m_left(left)
- , m_right(right)
- , m_scratchGPR(scratchGPR)
- {
- ASSERT(!m_leftOperand.isConstInt32() || !m_rightOperand.isConstInt32());
- }
-
- bool didEmitFastPath() const { return m_didEmitFastPath; }
- CCallHelpers::JumpList& endJumpList() { return m_endJumpList; }
- CCallHelpers::JumpList& slowPathJumpList() { return m_slowPathJumpList; }
-
-protected:
- SnippetOperand m_leftOperand;
- SnippetOperand m_rightOperand;
- JSValueRegs m_result;
- JSValueRegs m_left;
- JSValueRegs m_right;
- GPRReg m_scratchGPR;
- bool m_didEmitFastPath { false };
-
- CCallHelpers::JumpList m_endJumpList;
- CCallHelpers::JumpList m_slowPathJumpList;
-};
-
-} // namespace JSC
-
-#endif // ENABLE(JIT)
-
-#endif // JITBitwiseBinaryOpGenerator_h
</del></span></pre>
</div>
</div>
</body>
</html>