merge

--HG--
branch : pmacs2

mode/tal.py

@@ -134,7 +134,7 @@ class Taldoc(Method):
         'AND': ['And', [['a', 'b'], ['a&b']], None, 'bitwise-and (a & b)'],
         'ORA': ['Or', [['a', 'b'], ['a|b']], None, 'bitwise-or (a | b)'],
         'EOR': ['Exclusive Or', [['a', 'b'], ['a^b']], None, 'bitwise-xor (a ^ b)'],
-        'SFT': ['Shift', [['a', 'b^'], ['c']], None, 'bitshift left (b >> 4) then right (b & 0xf)'],
+        'SFT': ['Shift', [['a', 'b^'], ['c']], None, 'bitshift right (b & 0x0f) then left (b >> 4)'],
     }
     inst_re = re.compile(r'^([A-Z]{3})(2?k?r?)$')
     addr_dict = {