added license and added compressed decoding files, still didn't fix stringfication (printer_t)

Author: moste00

CMakeLists.txt

@@ -577,6 +577,7 @@ if(CAPSTONE_RISCV_SUPPORT)
         arch/RISCV/RISCVDisassembler.c
         arch/RISCV/RISCVDetails.c
         arch/RISCV/RISCVModule.c
+        arch/RISCV/RISCVPrinter.c
     )
     set(HEADERS_RISCV
         arch/RISCV/riscv_ast.gen.inc
@@ -591,6 +592,7 @@ if(CAPSTONE_RISCV_SUPPORT)
         arch/RISCV/riscv_helpers_ast2str.h
         arch/RISCV/riscv_helpers_rvconf.h
         arch/RISCV/RISCVModule.h
+        arch/RISCV/RISCVPrinter.h
     )
 endif()
 

arch/RISCV/RISCVDisassembler.c

@@ -3,7 +3,6 @@
 
 #include "riscv_decode.gen.inc"
 #include "riscv_insn_mapping.gen.inc"
-#include "riscv_ast2str.gen.inc"
 
 bool riscv_get_instruction(csh handle, 
                     const uint8_t *code, size_t code_len, MCInst *instr, 
@@ -24,27 +23,6 @@ bool riscv_get_instruction(csh handle,
         insn->address = address;
         *size = insn->size;
         memcpy(insn->bytes, code, insn->size);
-
-        char instruction_as_str[RISCV_MAX_INSTRUCTION_STR_LEN];
-        riscv_conf conf;
-        conf.sys_enable_fdext = NULL;
-        conf.sys_enable_zfinx = NULL;
-
-        ast2str(&instruction, instruction_as_str, &conf);
-
-        char *curr = instruction_as_str;
-        uint16_t mnemonic_len = 0;
-        while (*curr != ' ') {
-            mnemonic_len++;
-            curr++;
-        }
-        uint16_t operand_len = 0;
-        while (*curr) {
-            operand_len++;
-            curr++;
-        }
-        memcpy(insn->mnemonic, instruction_as_str, mnemonic_len);
-        memcpy(insn->op_str, instruction_as_str + mnemonic_len + 1, operand_len);
         return true;
     } else {
 

arch/RISCV/RISCVModule.c

@@ -6,14 +6,6 @@
 
 #include "RISCVModule.h"
 
-void noop_printer(MCInst *MI, SStream *OS, void *info) {
-
-}
-
-void noop_postprinter(csh handle, cs_insn *, SStream *mnem, MCInst *mci) {
-
-}
-
 const char *noop_getname(csh handle, unsigned int id) { 
 	return ""; 
 }
@@ -24,11 +16,11 @@ void noop_getid(cs_struct *h, cs_insn *insn, unsigned int id) {
 
 cs_err RISCV_global_init(cs_struct * ud)
 {
-	ud->printer = noop_printer;
+	ud->printer = riscv_printer;
 	ud->printer_info = NULL;
 	ud->getinsn_info = NULL;
 	ud->disasm = riscv_get_instruction;
-	ud->post_printer = noop_postprinter;
+	ud->post_printer = NULL;
 
 	ud->reg_name = noop_getname;
 	ud->insn_id = noop_getid;

arch/RISCV/RISCVModule.h

@@ -6,6 +6,7 @@
 
 #include "../../utils.h"
 #include "RISCVDisassembler.h"
+#include "RISCVPrinter.h"
 
 cs_err RISCV_global_init(cs_struct * ud);
 cs_err RISCV_option(cs_struct * handle, cs_opt_type type, size_t value);

arch/RISCV/RISCVPrinter.c

@@ -0,0 +1,12 @@
+#include "RISCVPrinter.h"
+
+void riscv_printer(MCInst *MI, SStream *OS, void *info) {
+    // FIXME: add the ast struct as a member in the riscv_details
+    //( stringification can't happen unless ast is available)
+
+    // char instruction_as_str[RISCV_MAX_INSTRUCTION_STR_LEN];
+    // riscv_conf conf;
+    // conf.sys_enable_fdext = NULL;
+    // conf.sys_enable_zfinx = NULL;
+    // ast2str(&instruction, instruction_as_str, &conf);
+}

arch/RISCV/RISCVPrinter.h

@@ -0,0 +1,10 @@
+#ifndef __RISCV_PRINTER__H_
+#define __RISCV_PRINTER__H_
+
+#include "../../cs_priv.h"
+
+//#include "riscv_ast2str.gen.inc" FIXME: uncomment when printer is implemented
+
+void riscv_printer(MCInst *MI, SStream *OS, void *info);
+
+#endif

arch/RISCV/riscv_ast.gen.inc

@@ -1,3 +1,13 @@
+/*=======================================================================*/
+/*This code was generated by the tool riscv_disasm_from_sail (see
+ * https://github.com/moste00/riscv_disasm_from_sail)*/
+/*from the sail model of RISC-V (see https://github.com/riscv/sail-riscv) @
+ * version 0b9c639f19da48734cbf14b61f6ad200b7c70de9.*/
+/*DO NOT MODIFY THIS CODE MANUALLY.*/
+/* */
+/*SPDX-License-Identifier: BSD-3-Clause*/
+/*=======================================================================*/
+
 #ifndef __Riscv_ast_gen_inc__
 #define __Riscv_ast_gen_inc__
 #include <stdint.h>

arch/RISCV/riscv_ast2str.gen.inc

@@ -1,3 +1,13 @@
+/*=======================================================================*/
+/*This code was generated by the tool riscv_disasm_from_sail (see
+ * https://github.com/moste00/riscv_disasm_from_sail)*/
+/*from the sail model of RISC-V (see https://github.com/riscv/sail-riscv) @
+ * version 0b9c639f19da48734cbf14b61f6ad200b7c70de9.*/
+/*DO NOT MODIFY THIS CODE MANUALLY.*/
+/* */
+/*SPDX-License-Identifier: BSD-3-Clause*/
+/*=======================================================================*/
+
 #ifndef __Riscv_ast2str_gen_inc__
 #define __Riscv_ast2str_gen_inc__
 #include <stdint.h>
@@ -67,7 +77,7 @@
              s7_len + s8_len + s9_len + s10_len + s11_len + s12_len,           \
          s13, s13_len)
 
-static void ast2str(struct ast *tree, char *buff, riscv_conf *conf) {
+void ast2str(struct ast *tree, char *buff, riscv_conf *conf) {
   memset(buff, 0, RISCV_MAX_INSTRUCTION_STR_LEN);
   switch (tree->ast_node_type) {
   case RISCV_UTYPE: {

arch/RISCV/riscv_ast2str_tbls.gen.inc

@@ -1,3 +1,13 @@
+/*=======================================================================*/
+/*This code was generated by the tool riscv_disasm_from_sail (see
+ * https://github.com/moste00/riscv_disasm_from_sail)*/
+/*from the sail model of RISC-V (see https://github.com/riscv/sail-riscv) @
+ * version 0b9c639f19da48734cbf14b61f6ad200b7c70de9.*/
+/*DO NOT MODIFY THIS CODE MANUALLY.*/
+/* */
+/*SPDX-License-Identifier: BSD-3-Clause*/
+/*=======================================================================*/
+
 #ifndef __Riscv_ast2str_tbls_gen_inc__
 #define __Riscv_ast2str_tbls_gen_inc__
 #include <stdint.h>

arch/RISCV/riscv_decode.gen.inc

@@ -1,3 +1,13 @@
+/*=======================================================================*/
+/*This code was generated by the tool riscv_disasm_from_sail (see
+ * https://github.com/moste00/riscv_disasm_from_sail)*/
+/*from the sail model of RISC-V (see https://github.com/riscv/sail-riscv) @
+ * version 0b9c639f19da48734cbf14b61f6ad200b7c70de9.*/
+/*DO NOT MODIFY THIS CODE MANUALLY.*/
+/* */
+/*SPDX-License-Identifier: BSD-3-Clause*/
+/*=======================================================================*/
+
 #ifndef __Riscv_decode_gen_inc__
 #define __Riscv_decode_gen_inc__
 #include <stdint.h>