Title: [157621] trunk/Source/_javascript_Core
- Revision
- 157621
- Author
- fpi...@apple.com
- Date
- 2013-10-17 21:32:26 -0700 (Thu, 17 Oct 2013)
Log Message
Unreviewed, another ARM64 build fix.
Get rid of andPtr(TrustedImmPtr, blah), since it would take Effort to get it to work
on ARM64 and none of its uses are legit - they should all be using
andPtr(TrustedImm32, blah) anyway.
* assembler/MacroAssembler.h:
* assembler/MacroAssemblerARM64.h:
* dfg/DFGJITCompiler.cpp:
(JSC::DFG::JITCompiler::compileExceptionHandlers):
* jit/JIT.cpp:
(JSC::JIT::privateCompileExceptionHandlers):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (157620 => 157621)
--- trunk/Source/_javascript_Core/ChangeLog 2013-10-18 03:59:52 UTC (rev 157620)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-10-18 04:32:26 UTC (rev 157621)
@@ -1,5 +1,20 @@
2013-10-17 Filip Pizlo <fpi...@apple.com>
+ Unreviewed, another ARM64 build fix.
+
+ Get rid of andPtr(TrustedImmPtr, blah), since it would take Effort to get it to work
+ on ARM64 and none of its uses are legit - they should all be using
+ andPtr(TrustedImm32, blah) anyway.
+
+ * assembler/MacroAssembler.h:
+ * assembler/MacroAssemblerARM64.h:
+ * dfg/DFGJITCompiler.cpp:
+ (JSC::DFG::JITCompiler::compileExceptionHandlers):
+ * jit/JIT.cpp:
+ (JSC::JIT::privateCompileExceptionHandlers):
+
+2013-10-17 Filip Pizlo <fpi...@apple.com>
+
Unreviewed, speculative ARM64 build fix.
move(ImmPtr, blah) is only available in MacroAssembler since that's where blinding is
Modified: trunk/Source/_javascript_Core/assembler/MacroAssembler.h (157620 => 157621)
--- trunk/Source/_javascript_Core/assembler/MacroAssembler.h 2013-10-18 03:59:52 UTC (rev 157620)
+++ trunk/Source/_javascript_Core/assembler/MacroAssembler.h 2013-10-18 04:32:26 UTC (rev 157621)
@@ -697,11 +697,6 @@
and64(imm, srcDest);
}
- void andPtr(TrustedImmPtr imm, RegisterID srcDest)
- {
- and64(imm, srcDest);
- }
-
void lshiftPtr(Imm32 imm, RegisterID srcDest)
{
lshift64(trustedImm32ForShift(imm), srcDest);
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h (157620 => 157621)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h 2013-10-18 03:59:52 UTC (rev 157620)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARM64.h 2013-10-18 04:32:26 UTC (rev 157621)
@@ -347,7 +347,7 @@
signExtend32ToPtr(imm, getCachedDataTempRegisterIDAndInvalidate());
m_assembler.and_<64>(dest, dest, dataTempRegister);
}
-
+
void countLeadingZeros32(RegisterID src, RegisterID dest)
{
m_assembler.clz<32>(dest, src);
Modified: trunk/Source/_javascript_Core/dfg/DFGJITCompiler.cpp (157620 => 157621)
--- trunk/Source/_javascript_Core/dfg/DFGJITCompiler.cpp 2013-10-18 03:59:52 UTC (rev 157620)
+++ trunk/Source/_javascript_Core/dfg/DFGJITCompiler.cpp 2013-10-18 04:32:26 UTC (rev 157621)
@@ -128,7 +128,7 @@
// Remove hostCallFrameFlag from caller.
m_exceptionChecksWithCallFrameRollback.link(this);
emitGetFromCallFrameHeaderPtr(JSStack::CallerFrame, GPRInfo::argumentGPR0);
- andPtr(TrustedImmPtr(reinterpret_cast<void*>(~CallFrame::hostCallFrameFlag())), GPRInfo::argumentGPR0);
+ andPtr(TrustedImm32(safeCast<int32_t>(~CallFrame::hostCallFrameFlag())), GPRInfo::argumentGPR0);
doLookup = jump();
}
Modified: trunk/Source/_javascript_Core/jit/JIT.cpp (157620 => 157621)
--- trunk/Source/_javascript_Core/jit/JIT.cpp 2013-10-18 03:59:52 UTC (rev 157620)
+++ trunk/Source/_javascript_Core/jit/JIT.cpp 2013-10-18 04:32:26 UTC (rev 157621)
@@ -850,7 +850,7 @@
// Remove hostCallFlag from caller
m_exceptionChecksWithCallFrameRollback.link(this);
emitGetFromCallFrameHeaderPtr(JSStack::CallerFrame, GPRInfo::argumentGPR0);
- andPtr(TrustedImmPtr(reinterpret_cast<void *>(~CallFrame::hostCallFrameFlag())), GPRInfo::argumentGPR0);
+ andPtr(TrustedImm32(safeCast<int32_t>(~CallFrame::hostCallFrameFlag())), GPRInfo::argumentGPR0);
doLookup = jump();
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
