JavaScriptCore-7600.1.4.13.1.tar.gz

[apple/javascriptcore.git] / disassembler / ARMv7 / ARMv7DOpcode.cpp

diff --git a/disassembler/ARMv7/ARMv7DOpcode.cpp b/disassembler/ARMv7/ARMv7DOpcode.cpp
index fb6e0db83da1eb6a4e2d8439c81c4ed8e16e6bfc..43ed442348ddd5ddfef3b0f63a871d2463202b95 100644 (file)
--- a/disassembler/ARMv7/ARMv7DOpcode.cpp
+++ b/disassembler/ARMv7/ARMv7DOpcode.cpp
@@ -32,6 +32,7 @@
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
+#include <string.h>
 
 namespace JSC { namespace ARMv7Disassembler {
 
@@ -48,7 +49,7 @@ const char* const ARMv7DOpcode::s_optionName[8] = {
 };
 
 const char* const ARMv7DOpcode::s_shiftNames[4] = {
-    "lsl", "lsr", "asl", "ror"
+    "lsl", "lsr", "asr", "ror"
 };
 
 const char* const ARMv7DOpcode::s_specialRegisterNames[3] = { "sp", "lr", "pc" };
@@ -269,7 +270,7 @@ void ARMv7DOpcode::appendRegisterList(unsigned registers)
     appendCharacter('{');
 
     for (unsigned i = 0; i < 16; i++) {
-        if (registers & i) {
+        if (registers & (1 << i)) {
             if (numberPrinted++)
                 appendSeparator();
             appendRegisterName(i);