Title: [110208] trunk/Source/_javascript_Core
- Revision
- 110208
- Author
- [email protected]
- Date
- 2012-03-08 14:53:01 -0800 (Thu, 08 Mar 2012)
Log Message
Build fix. That day is not today.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (110207 => 110208)
--- trunk/Source/_javascript_Core/ChangeLog 2012-03-08 22:47:44 UTC (rev 110207)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-03-08 22:53:01 UTC (rev 110208)
@@ -1,5 +1,15 @@
2012-03-08 Oliver Hunt <[email protected]>
+ Build fix. That day is not today.
+
+ * assembler/MacroAssembler.h:
+ (JSC::MacroAssembler::shouldBlind):
+ * assembler/MacroAssemblerX86Common.h:
+ (MacroAssemblerX86Common):
+ (JSC::MacroAssemblerX86Common::shouldBlindForSpecificArch):
+
+2012-03-08 Oliver Hunt <[email protected]>
+
Build fix. One of these days I'll manage to commit something that works everywhere.
* assembler/AbstractMacroAssembler.h:
Modified: trunk/Source/_javascript_Core/assembler/MacroAssembler.h (110207 => 110208)
--- trunk/Source/_javascript_Core/assembler/MacroAssembler.h 2012-03-08 22:47:44 UTC (rev 110207)
+++ trunk/Source/_javascript_Core/assembler/MacroAssembler.h 2012-03-08 22:53:01 UTC (rev 110208)
@@ -534,9 +534,9 @@
UNUSED_PARAM(imm);
// Debug always blind all constants, if only so we know
// if we've broken blinding during patch development.
- return true;
-#else
-
+ return true;
+#endif
+
// First off we'll special case common, "safe" values to avoid hurting
// performance too much
uintptr_t value = imm.asTrustedImmPtr().asIntptr();
@@ -565,7 +565,6 @@
}
}
return shouldBlindForSpecificArch(value);
-#endif
}
struct RotatedImmPtr {
@@ -643,7 +642,7 @@
// Debug always blind all constants, if only so we know
// if we've broken blinding during patch development.
return true;
-#else
+#endif
// First off we'll special case common, "safe" values to avoid hurting
// performance too much
@@ -658,7 +657,6 @@
return false;
}
return shouldBlindForSpecificArch(value);
-#endif
}
struct BlindedImm32 {
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.h (110207 => 110208)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.h 2012-03-08 22:47:44 UTC (rev 110207)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.h 2012-03-08 22:53:01 UTC (rev 110208)
@@ -93,8 +93,10 @@
#if ENABLE(JIT_CONSTANT_BLINDING)
static bool shouldBlindForSpecificArch(uint32_t value) { return value >= 0x00ffffff; }
- static bool shouldBlindForSpecificArch(uint64_t value) { return value >= 0x00ffffff; }
+#if CPU(X86_64)
+ static bool shouldBlindForSpecificArch(uintptr_t value) { return value >= 0x00ffffff; }
#endif
+#endif
// Integer arithmetic operations:
//
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
