Added flat assembly support...

xighlight.c

@@ -237,9 +237,7 @@ static void highlight_common_assembly (void) {
 
 	syntax_define_separators (separators);
 
-	syntax_define_range ("#", "\n", '\0', COLOUR_GREY, EFFECT_BOLD);
-	syntax_define_range ("[", "]",  '\0', COLOUR_RED,  EFFECT_NORMAL);
-	syntax_define_range ("<", ">",  '\0', COLOUR_PINK, EFFECT_NORMAL);
+	syntax_define_range ("[", "]", '\0', COLOUR_RED, EFFECT_NORMAL);
 
 	syntax_define_operators (".,+-", COLOUR_BLUE, EFFECT_BOLD);
 
@@ -251,20 +249,81 @@ static void highlight_common_assembly (void) {
 	highlighted = 1;
 }
 
+static void highlight_flat_assembly (void) {
+	char * separators = ".,+-=:;{}[]$ \t\r\n";
+
+	char * instructions [] = {
+		"mov",              "movabs",           "movapd",           "movaps",           "movebe",           "movsd",            "movsx",            "movzx",
+		"movsxd",           "movd",             "movq",             "movs",             "movsb",            "movsw",            "movsd",            "movsq",
+		"cmovmp",           "cmovrcxz",         "cmovc",            "cmovnc",           "cmove",            "cmovne",           "cmovz",            "cmovnz",
+		"cmovg",            "cmovng",           "cmovge",           "cmovnge",          "cmovl",            "cmovnl",           "cmovle",           "cmovnle",
+		"cmova",            "cmovna",           "cmovae",           "cmovnae",          "cmovb",            "cmovnb",           "cmovbe",           "cmovnbe",
+		"cmovs",            "cmovns",           "cmovo",            "cmovno",           "cmovp",            "cmovnp",           "cmovpo",           "cmovpe",
+		"cmp",              "cmps",             "cmpsb",            "cmpsw",            "cmpsd",            "cmpsq",            "cmpxchg",          "lea",
+		"monitor",          "cpuid",            "in",               "out",              "syscall",          "sysenter",         "sysret",           "sysexit",
+		"swap",             "bswap",            "pop",              "push",             "call",             "ret",              "enter",            "leave",
+		"and",              "or",               "not",              "neg",              "sal",              "sar",              "shl",              "shr",
+		"inc",              "dec",              "add",              "sub",              "mul",              "div",              "imul",             "idiv",
+		"nop",              "fnop",             "adc",              "sbb",              "aaa",              "aas",              "aam",              "aad",
+		"jmp",              "jrcxz",            "jc",               "jnc",              "je",               "jne",              "jz",               "jnz",
+		"jg",               "jng",              "jge",              "jnge",             "jl",               "jnl",              "jle",              "jnle",
+		"ja",               "jna",              "jae",              "jnae",             "jb",               "jnb",              "jbe",              "jnbe",
+		"js",               "jns",              "jo",               "jno",              "jp",               "jnp",              "jpo",              "jpe",
+		"rep",              "repe",             "repz",             "repne",            "repnz",            "loop",             "loope",            "loopne"
+	};
+
+	char * registers [] = {
+		"rax",              "rcx",              "rdx",              "rbx",              "rsp",              "rbp",              "rsi",              "rdi",
+		"r8",               "r9",               "r10",              "r11",              "r12",              "r13",              "r14",              "r15",
+		"eax",              "ecx",              "edx",              "ebx",              "esp",              "ebp",              "esi",              "edi",
+		"r8d",              "r9d",              "r10d",             "r11d",             "r12d",             "r13d",             "r14d",             "r15d",
+		"ax",               "cx",               "dx",               "bx",               "sp",               "bp",               "si",               "di",
+		"r8w",              "r9w",              "r10w",             "r11w",             "r12w",             "r13w",             "r14w",             "r15w",
+		"al",               "cl",               "dl",               "bl",               "spl",              "bpl",              "sil",              "dil",
+		"r8b",              "r9b",              "r10b",             "r11b",             "r12b",             "r13b",             "r14b",             "r15b",
+		"ah",               "ch",               "dh",               "bh"
+	};
+
+	char * keywords [] = {
+		"format",           "executable",       "readable",         "writable",         "segment",          "sector",           "entry",            "macro",
+		"db",               "dw",               "dd",               "dq",               "rb",               "rw",               "rd",               "rq"
+	};
+
+	if (highlighted != 0) {
+		syntax_delete ();
+	}
+
+	syntax_define_separators (separators);
+
+	syntax_define_range (";", "\n", '\0', COLOUR_GREY, EFFECT_BOLD);
+	syntax_define_range ("[", "]",  '\0', COLOUR_RED,  EFFECT_NORMAL);
+
+	syntax_define_operators (".,+-=:{}$", COLOUR_BLUE, EFFECT_BOLD);
+
+	syntax_define_words (instructions, sizeof (instructions) / sizeof (instructions [0]), COLOUR_BLUE, EFFECT_NORMAL);
+	syntax_define_words (registers,    sizeof (registers)    / sizeof (registers [0]),    COLOUR_CYAN, EFFECT_NORMAL);
+	syntax_define_words (keywords,     sizeof (keywords)     / sizeof (keywords [0]),     COLOUR_PINK, EFFECT_NORMAL);
+
+	syntax_define_default (1, COLOUR_RED, EFFECT_NORMAL, COLOUR_CYAN, EFFECT_NORMAL);
+
+	highlighted = 1;
+}
+
 int main (int argc, char * * argv) {
 	int    offset = 0;
 	int    select = 0;
 	int    length = 0;
 	char * buffer = NULL;
 
-	argument_define ("-v", "--version",  echo_version);
-	argument_define ("-l", "--license",  echo_license);
-	argument_define ("-c", "--c",        highlight_c);
-	argument_define ("-a", "--ada",      highlight_ada);
-	argument_define ("-C", "--c++",      highlight_cpp);
-	/*argument_define ("-p", "--python",      highlight_python);*/
-	argument_define ("-V", "--valgrind", highlight_valgrind);
-	argument_define ("-A", "--assembly", highlight_common_assembly);
+	argument_define ("-v", "--version",       echo_version);
+	argument_define ("-l", "--license",       echo_license);
+	argument_define ("-c", "--c",             highlight_c);
+	argument_define ("-a", "--ada",           highlight_ada);
+	argument_define ("-C", "--c++",           highlight_cpp);
+	/*argument_define ("-p", "--python",           highlight_python);*/
+	argument_define ("-V", "--valgrind",      highlight_valgrind);
+	argument_define ("-A", "--assembly",      highlight_common_assembly);
+	argument_define ("-F", "--flat-assembly", highlight_flat_assembly);
 
 	if (argc != 1) {
 		argument_select (argc, argv);
@@ -288,6 +347,8 @@ int main (int argc, char * * argv) {
 			highlight_cpp ();
 		} else if (select == FILE_TYPE_COMMON_ASSEMBLY) {
 			highlight_common_assembly ();
+		} else if (select == FILE_TYPE_FLAT_ASSEMBLY) {
+			highlight_flat_assembly ();
 		} else {
 			highlight_common ();
 		}