Changeset 170839 in webkit for trunk/Source/JavaScriptCore/disassembler

Timestamp:

Jul 6, 2014, 11:24:54 PM (11 years ago)

Author:

[email protected]

Message:

[ARMv7] Use 16 bits instructions for push/pop when possible
​https://bugs.webkit.org/show_bug.cgi?id=134656

Reviewed by Andreas Kling.

• assembler/ARMv7Assembler.h:

(JSC::ARMv7Assembler::pop):
(JSC::ARMv7Assembler::push):
(JSC::ARMv7Assembler::ARMInstructionFormatter::oneWordOp7Imm9):
Add the 16 bits version of push and pop.

• assembler/MacroAssemblerARMv7.h:

(JSC::MacroAssemblerARMv7::pop):
(JSC::MacroAssemblerARMv7::push):
Use the new push/pop instead of a regular load/store.

• disassembler/ARMv7/ARMv7DOpcode.cpp:

(JSC::ARMv7Disassembler::ARMv7DOpcode::appendRegisterList):

• disassembler/ARMv7/ARMv7DOpcode.h:

(JSC::ARMv7Disassembler::ARMv7DOpcodeMiscPushPop::registerMask):
Fix the disassembler for push/pop:
-The register mask was on 7 bits for some reason.
-The code printing the registers was comparing a register ID with a register

mask.

Location:

trunk/Source/JavaScriptCore/disassembler/ARMv7

Files:

• ARMv7DOpcode.cpp (modified) (1 diff)
• ARMv7DOpcode.h (modified) (1 diff)

trunk/Source/JavaScriptCore/disassembler/ARMv7/ARMv7DOpcode.cpp

@@ -270 +270 @@
 
     for (unsigned i = 0; i < 16; i++) {
-        if (registers & i) {
+        if (registers & (1 << i)) {
             if (numberPrinted++)
                 appendSeparator();

trunk/Source/JavaScriptCore/disassembler/ARMv7/ARMv7DOpcode.h

@@ -622 +622 @@
     const char* opName() { return op() ? "pop" : "push"; }
     unsigned op() { return (m_opcode >> 11) & 0x1; }
-    unsigned registerMask() { return ((m_opcode << 6) & 0x4000) | (m_opcode & 0x7f); }
+    unsigned registerMask() { return ((m_opcode << 6) & 0x4000) | (m_opcode & 0xff); }
 };