Merge branch 'queenp-master'

Merged queenp branch into master

Author: TobalJackson

CHANGELOG.md

@@ -0,0 +1 @@
+2017-05-01: forked by queenp, adding rudimentary python setuptools script to help install lexer in pygments cache. Also added some unrecognised mnemonics.

r2highlight/__init__.py

@@ -0,0 +1,3 @@
+__all__=['radare2']
+
+from r2highlight.radare2 import Radare2Lexer

radare2.py r2highlight/radare2.py

@@ -93,7 +93,7 @@ class Radare2Lexer(RegexLexer):
         ],
 
         'registers': [
-            (words(('rsp', 'esp', 'spl', 'rbp', 'ebp', 'bpl', 'rax', 'eax', 'ah', 'al', 'rbx', 'ebx', 'bh', 'bl', 'rcx', 'ecx', 'cx', 'ch', 'cl', 'rdx', 'edx', 'dx', 'dh', 'dl', 'rdi', 'edi', 'dil', 'rsi', 'esi', 'sil', 'r15', 'r14', 'r13', 'r12', 'r10', 'fs:', 'gs:')),
+            (words(('rsp', 'esp', 'spl', 'rbp', 'ebp', 'bpl', 'rax', 'eax', 'ah', 'al', 'rbx', 'ebx', 'bh', 'bl', 'rcx', 'ecx', 'cx', 'ch', 'cl', 'rdx', 'edx', 'dx', 'dh', 'dl', 'rdi', 'edi', 'dil', 'rsi', 'esi', 'sil', 'r15', 'r14', 'r13', 'r12', 'r10', 'r9', 'r9d', 'r8', 'fs:', 'gs:')),
             Keyword)
         ],
 
@@ -113,12 +113,12 @@ class Radare2Lexer(RegexLexer):
         ],
 
         'arithmeticops': [
-            (words(('leave', 'mov', 'lea', 'add', 'sub', 'imul', 'mul', 'shl', 'shr', 'sar', 'sal'), suffix=r'\b', prefix=r'\b'),
+            (words(('leave', 'mov', 'movzx', 'movsx', 'lea', 'add', 'sub', 'imul', 'mul', 'shl', 'shr', 'sar', 'sal'), suffix=r'\b', prefix=r'\b'),
             Operator)
         ],
 
         'ipops': [
-            (words(('jmp', 'jne', 'jae', 'jbe', 'call', 'ret'), suffix=r'\b', prefix=r'\b'),
+            (words(('je', 'jmp', 'jne', 'jae', 'jbe', 'call', 'ret'), suffix=r'\b', prefix=r'\b'),
             Name.Function)
         ]
     }

setup.py

@@ -0,0 +1,15 @@
+from setuptools import setup
+
+entry_points = """ 
+[pygments.lexers]
+r2highlight = r2highlight.radare2:Radare2Lexer
+"""
+
+setup(
+    name = "r2highlight",
+    version = "0.0.0",
+    description = __doc__,
+    author = "Tobal Jackson",
+    packages = ['r2highlight'],
+    entry_points = entry_points
+)