Modified: trunk/Source/_javascript_Core/ChangeLog (148941 => 148942)
--- trunk/Source/_javascript_Core/ChangeLog 2013-04-23 03:32:43 UTC (rev 148941)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-04-23 04:47:08 UTC (rev 148942)
@@ -1,3 +1,15 @@
+2013-04-22 Mark Lam <[email protected]>
+
+ Fix a typo in MacroAssemblerARMv7.h.
+ https://bugs.webkit.org/show_bug.cgi?id=115011.
+
+ Reviewed by Geoffrey Garen.
+
+ * assembler/ARMAssembler.h: Fix a comment.
+ * assembler/ARMv7Assembler.h: Added some comments.
+ * assembler/MacroAssemblerARMv7.h:
+ - ARMAssembler::PL should be ARMv7Assembler::ConditionPL.
+
2013-04-22 Julien Brianceau <[email protected]>
Add branchAdd32 missing implementation in SH4 base JIT.
Modified: trunk/Source/_javascript_Core/assembler/ARMAssembler.h (148941 => 148942)
--- trunk/Source/_javascript_Core/assembler/ARMAssembler.h 2013-04-23 03:32:43 UTC (rev 148941)
+++ trunk/Source/_javascript_Core/assembler/ARMAssembler.h 2013-04-23 04:47:08 UTC (rev 148942)
@@ -120,7 +120,7 @@
GE = 0xa0000000, // Signed greater than or equal.
LT = 0xb0000000, // Signed less than.
GT = 0xc0000000, // Signed greater than.
- LE = 0xd0000000, // Signed less than or euqal.
+ LE = 0xd0000000, // Signed less than or equal.
AL = 0xe0000000 // Unconditional / Always execute.
} Condition;
Modified: trunk/Source/_javascript_Core/assembler/ARMv7Assembler.h (148941 => 148942)
--- trunk/Source/_javascript_Core/assembler/ARMv7Assembler.h 2013-04-23 03:32:43 UTC (rev 148941)
+++ trunk/Source/_javascript_Core/assembler/ARMv7Assembler.h 2013-04-23 04:47:08 UTC (rev 148942)
@@ -422,21 +422,21 @@
// (HS, LO, HI, LS) -> (AE, B, A, BE)
// (VS, VC) -> (O, NO)
typedef enum {
- ConditionEQ,
- ConditionNE,
- ConditionHS, ConditionCS = ConditionHS,
- ConditionLO, ConditionCC = ConditionLO,
- ConditionMI,
- ConditionPL,
- ConditionVS,
- ConditionVC,
- ConditionHI,
- ConditionLS,
- ConditionGE,
- ConditionLT,
- ConditionGT,
- ConditionLE,
- ConditionAL,
+ ConditionEQ, // Zero / Equal.
+ ConditionNE, // Non-zero / Not equal.
+ ConditionHS, ConditionCS = ConditionHS, // Unsigned higher or same.
+ ConditionLO, ConditionCC = ConditionLO, // Unsigned lower.
+ ConditionMI, // Negative.
+ ConditionPL, // Positive or zero.
+ ConditionVS, // Overflowed.
+ ConditionVC, // Not overflowed.
+ ConditionHI, // Unsigned higher.
+ ConditionLS, // Unsigned lower or same.
+ ConditionGE, // Signed greater than or equal.
+ ConditionLT, // Signed less than.
+ ConditionGT, // Signed greater than.
+ ConditionLE, // Signed less than or equal.
+ ConditionAL, // Unconditional / Always execute.
ConditionInvalid
} Condition;
Modified: trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h (148941 => 148942)
--- trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h 2013-04-23 03:32:43 UTC (rev 148941)
+++ trunk/Source/_javascript_Core/assembler/MacroAssemblerARMv7.h 2013-04-23 04:47:08 UTC (rev 148942)
@@ -119,7 +119,7 @@
enum ResultCondition {
Overflow = ARMv7Assembler::ConditionVS,
Signed = ARMv7Assembler::ConditionMI,
- PositiveOrZero = ARMAssembler::PL,
+ PositiveOrZero = ARMv7Assembler::ConditionPL,
Zero = ARMv7Assembler::ConditionEQ,
NonZero = ARMv7Assembler::ConditionNE
};
