Title: [110206] trunk/Source/_javascript_Core
- Revision
- 110206
- Author
- [email protected]
- Date
- 2012-03-08 14:29:09 -0800 (Thu, 08 Mar 2012)
Log Message
Build fix. One of these days I'll manage to commit something that works everywhere.
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (110205 => 110206)
--- trunk/Source/_javascript_Core/ChangeLog 2012-03-08 22:09:53 UTC (rev 110205)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-03-08 22:29:09 UTC (rev 110206)
@@ -1,3 +1,15 @@
+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:
+ (AbstractMacroAssembler):
+ * assembler/MacroAssemblerARMv7.h:
+ (MacroAssemblerARMv7):
+ * assembler/MacroAssemblerX86Common.h:
+ (JSC::MacroAssemblerX86Common::shouldBlindForSpecificArch):
+ (MacroAssemblerX86Common):
+
2012-03-08 Chao-ying Fu <[email protected]>
Update MIPS patchOffsetGetByIdSlowCaseCall
Modified: trunk/Source/_javascript_Core/assembler/AbstractMacroAssembler.h (110205 => 110206)
--- trunk/Source/_javascript_Core/assembler/AbstractMacroAssembler.h 2012-03-08 22:09:53 UTC (rev 110205)
+++ trunk/Source/_javascript_Core/assembler/AbstractMacroAssembler.h 2012-03-08 22:29:09 UTC (rev 110206)
@@ -589,10 +589,12 @@
}
WeakRandom m_randomSource;
-
+
+#if ENABLE(JIT_CONSTANT_BLINDING)
static bool scratchRegisterForBlinding() { return false; }
static bool shouldBlindForSpecificArch(uint32_t) { return true; }
static bool shouldBlindForSpecificArch(uint64_t) { return true; }
+#endif
friend class LinkBuffer;
friend class RepatchBuffer;
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h (110205 => 110206)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h 2012-03-08 22:09:53 UTC (rev 110205)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h 2012-03-08 22:29:09 UTC (rev 110206)
@@ -721,6 +721,7 @@
store16(src, setupArmAddress(address));
}
+#if ENABLE(JIT_CONSTANT_BLINDING)
static RegisterID scratchRegisterForBlinding() { return dataTempRegister; }
static bool shouldBlindForSpecificArch(uint32_t value)
{
@@ -739,6 +740,7 @@
// be controlled by an attacker.
return !immediate.isUInt12();
}
+#endif
// Floating-point operations:
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.h (110205 => 110206)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.h 2012-03-08 22:09:53 UTC (rev 110205)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerX86Common.h 2012-03-08 22:29:09 UTC (rev 110206)
@@ -90,9 +90,11 @@
DoubleConditionBits_should_not_interfere_with_X86Assembler_Condition_codes);
static const RegisterID stackPointerRegister = X86Registers::esp;
-
+
+#if ENABLE(JIT_CONSTANT_BLINDING)
static bool shouldBlindForSpecificArch(uint32_t value) { return value >= 0x00ffffff; }
- static bool shouldBlindForSpecificArch(uintptr_t value) { return value >= 0x00ffffff; }
+ static bool shouldBlindForSpecificArch(uint64_t value) { return value >= 0x00ffffff; }
+#endif
// Integer arithmetic operations:
//
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
