Tokenize and colorize asm strings

librz/asm/arch/hexagon/hexagon.h

@@ -16,6 +16,7 @@
 #include <rz_config.h>
 #include <rz_list.h>
 #include <rz_types.h>
+#include <rz_util/rz_print.h>
 
 #define HEX_MAX_OPERANDS    6
 #define HEX_PARSE_BITS_MASK 0xc000
@@ -135,6 +136,7 @@ typedef struct {
 	RzList *const_ext_l; // Constant extender values.
 	RzAsm rz_asm; // Copy of RzAsm struct. Holds certain flags of interesed for disassembly formatting.
 	RzConfig *cfg;
+	RzPVector /* RzAsmTokenPattern* */ *token_patterns; ///< PVector with token patterns. Priority ordered.
 } HexState;
 
 typedef enum {

librz/asm/arch/hexagon/hexagon_arch.c

@@ -785,10 +785,14 @@ RZ_API void hexagon_reverse_opcode(const RzAsm *rz_asm, HexReversedOpcode *rz_re
 			memcpy(rz_reverse->asm_op, &(hi->asm_op), sizeof(RzAsmOp));
 			memcpy(rz_reverse->ana_op, &(hi->ana_op), sizeof(RzAnalysisOp));
 			rz_strbuf_set(&rz_reverse->asm_op->buf_asm, hi->mnem);
+			rz_reverse->asm_op->asm_toks = rz_asm_tokenize_asm_regex(&rz_reverse->asm_op->buf_asm, state->token_patterns);
+			rz_reverse->asm_op->asm_toks->op_type = hi->ana_op.type;
 			return;
 		case HEXAGON_DISAS:
 			memcpy(rz_reverse->asm_op, &(hi->asm_op), sizeof(RzAsmOp));
 			rz_strbuf_set(&rz_reverse->asm_op->buf_asm, hi->mnem);
+			rz_reverse->asm_op->asm_toks = rz_asm_tokenize_asm_regex(&rz_reverse->asm_op->buf_asm, state->token_patterns);
+			rz_reverse->asm_op->asm_toks->op_type = hi->ana_op.type;
 			return;
 		case HEXAGON_ANALYSIS:
 			memcpy(rz_reverse->ana_op, &(hi->ana_op), sizeof(RzAnalysisOp));
@@ -815,10 +819,14 @@ RZ_API void hexagon_reverse_opcode(const RzAsm *rz_asm, HexReversedOpcode *rz_re
 		memcpy(rz_reverse->asm_op, &hi->asm_op, sizeof(RzAsmOp));
 		memcpy(rz_reverse->ana_op, &hi->ana_op, sizeof(RzAnalysisOp));
 		rz_strbuf_set(&rz_reverse->asm_op->buf_asm, hi->mnem);
+		rz_reverse->asm_op->asm_toks = rz_asm_tokenize_asm_regex(&rz_reverse->asm_op->buf_asm, state->token_patterns);
+		rz_reverse->asm_op->asm_toks->op_type = hi->ana_op.type;
 		break;
 	case HEXAGON_DISAS:
 		memcpy(rz_reverse->asm_op, &hi->asm_op, sizeof(RzAsmOp));
 		rz_strbuf_set(&rz_reverse->asm_op->buf_asm, hi->mnem);
+		rz_reverse->asm_op->asm_toks = rz_asm_tokenize_asm_regex(&rz_reverse->asm_op->buf_asm, state->token_patterns);
+		rz_reverse->asm_op->asm_toks->op_type = hi->ana_op.type;
 		break;
 	case HEXAGON_ANALYSIS:
 		memcpy(rz_reverse->ana_op, &hi->ana_op, sizeof(RzAnalysisOp));

librz/asm/arch/hexagon/hexagon_arch.h

@@ -42,12 +42,12 @@ typedef struct {
 
 #define HEX_PKT_UNK           "?   "
 #define HEX_PKT_SINGLE        "[   "
-#define HEX_PKT_SINGLE_UTF8   "[     "
+#define HEX_PKT_SINGLE_UTF8   "[   "
 #define HEX_PKT_FIRST_UTF8    "┌   "
 #define HEX_PKT_MID_UTF8      "│   "
 #define HEX_PKT_LAST_UTF8     "└   "
 #define HEX_PKT_FIRST_SDK     "{   "
-#define HEX_PKT_SDK_PADDING   "   "
+#define HEX_PKT_SDK_PADDING   "    "
 #define HEX_PKT_LAST_SDK      " }"
 #define HEX_PKT_FIRST         "/   "
 #define HEX_PKT_MID           "|   "

librz/asm/arch/hexagon/hexagon_disas.c

@@ -14,6 +14,7 @@
 #include <rz_types.h>
 #include <rz_util.h>
 #include <rz_util/rz_hex.h>
+#include <rz_util/rz_strbuf.h>
 #include <rz_analysis.h>
 #include "hexagon.h"
 #include "hexagon_insn.h"
@@ -53661,5 +53662,6 @@ int hexagon_disasm_instruction(HexState *state, const ut32 hi_u32, RZ_INOUT HexI
 		sprintf(hi->mnem_infix, "invalid");
 		sprintf(hi->mnem, "%s%s%s", hi->pkt_info.mnem_prefix, hi->mnem_infix, hi->pkt_info.mnem_postfix);
 	}
+
 	return 4;
 }