Title: [158981] trunk/Source/_javascript_Core
- Revision
- 158981
- Author
- [email protected]
- Date
- 2013-11-08 17:29:30 -0800 (Fri, 08 Nov 2013)
Log Message
Get rid of the bizarre Darwin/x86-only MacroAssembler::shouldBlindForSpecificArch(uintptr_t) overload
https://bugs.webkit.org/show_bug.cgi?id=124087
Reviewed by Michael Saboff.
* assembler/MacroAssembler.h:
(JSC::MacroAssembler::shouldBlindPointerForSpecificArch):
(JSC::MacroAssembler::shouldBlind):
* assembler/MacroAssemblerX86Common.h:
(JSC::MacroAssemblerX86Common::shouldBlindForSpecificArch):
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (158980 => 158981)
--- trunk/Source/_javascript_Core/ChangeLog 2013-11-09 01:16:26 UTC (rev 158980)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-11-09 01:29:30 UTC (rev 158981)
@@ -1,5 +1,18 @@
2013-11-08 Filip Pizlo <[email protected]>
+ Get rid of the bizarre Darwin/x86-only MacroAssembler::shouldBlindForSpecificArch(uintptr_t) overload
+ https://bugs.webkit.org/show_bug.cgi?id=124087
+
+ Reviewed by Michael Saboff.
+
+ * assembler/MacroAssembler.h:
+ (JSC::MacroAssembler::shouldBlindPointerForSpecificArch):
+ (JSC::MacroAssembler::shouldBlind):
+ * assembler/MacroAssemblerX86Common.h:
+ (JSC::MacroAssemblerX86Common::shouldBlindForSpecificArch):
+
+2013-11-08 Filip Pizlo <[email protected]>
+
FTL should support NewArrayBuffer
https://bugs.webkit.org/show_bug.cgi?id=124067
Modified: trunk/Source/_javascript_Core/assembler/MacroAssembler.h (158980 => 158981)
--- trunk/Source/_javascript_Core/assembler/MacroAssembler.h 2013-11-09 01:16:26 UTC (rev 158980)
+++ trunk/Source/_javascript_Core/assembler/MacroAssembler.h 2013-11-09 01:29:30 UTC (rev 158981)
@@ -985,6 +985,13 @@
return value > 0xff;
}
+ bool shouldBlindPointerForSpecificArch(uintptr_t value)
+ {
+ if (sizeof(void*) == 4)
+ return shouldBlindForSpecificArch(static_cast<uint32_t>(value));
+ return shouldBlindForSpecificArch(static_cast<uint64_t>(value));
+ }
+
bool shouldBlind(ImmPtr imm)
{
if (!canBlind())
@@ -1020,7 +1027,7 @@
if (!shouldConsiderBlinding())
return false;
- return shouldBlindForSpecificArch(value);
+ return shouldBlindPointerForSpecificArch(value);
}
struct RotatedImmPtr {
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.h (158980 => 158981)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.h 2013-11-09 01:16:26 UTC (rev 158980)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.h 2013-11-09 01:29:30 UTC (rev 158981)
@@ -97,12 +97,7 @@
static bool canBlind() { return true; }
static bool shouldBlindForSpecificArch(uint32_t value) { return value >= 0x00ffffff; }
-#if CPU(X86_64)
static bool shouldBlindForSpecificArch(uint64_t value) { return value >= 0x00ffffff; }
-#if OS(DARWIN) // On 64-bit systems other than DARWIN uint64_t and uintptr_t are the same type so overload is prohibited.
- static bool shouldBlindForSpecificArch(uintptr_t value) { return value >= 0x00ffffff; }
-#endif
-#endif
// Integer arithmetic operations:
//
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes