Merge rz_asm and rz_analysis into one library but keep deprecated apis.

The tms320c64x has been merged into tms320.

binrz/rizin/meson.build

@@ -9,13 +9,12 @@ rizin_exe = executable('rizin', 'rizin.c',
     rz_bin_dep,
     rz_flag_dep,
     rz_cons_dep,
-    rz_asm_dep,
+    rz_arch_dep,
     rz_debug_dep,
     rz_config_dep,
     rz_bp_dep,
     rz_reg_dep,
     rz_syscall_dep,
-    rz_analysis_dep,
     rz_parse_dep,
     rz_egg_dep,
     rz_search_dep,

binrz/rz-diff/meson.build

@@ -8,8 +8,7 @@ executable('rz-diff', 'rz-diff.c',
     rz_cons_dep,
     rz_core_dep,
     rz_bin_dep,
-    rz_analysis_dep,
-    rz_asm_dep,
+    rz_arch_dep,
     rz_hash_dep,
     rz_config_dep
   ],

librz/arch/analysis.c

@@ -6,12 +6,8 @@
 #include <rz_util.h>
 #include <rz_list.h>
 #include <rz_util/rz_path.h>
+#include <rz_arch.h>
 #include <rz_lib.h>
-#include <config.h>
-
-RZ_LIB_VERSION(rz_analysis);
-
-static RzAnalysisPlugin *analysis_static_plugins[] = { RZ_ANALYSIS_STATIC_PLUGINS };
 
 /**
  * \brief Returns the default size byte width of memory access operations.
@@ -76,7 +72,6 @@ static void global_kv_free(HtPPKv *kv) {
 }
 
 RZ_API RzAnalysis *rz_analysis_new(void) {
-	int i;
 	RzAnalysis *analysis = RZ_NEW0(RzAnalysis);
 	if (!analysis) {
 		return NULL;
@@ -129,8 +124,13 @@ RZ_API RzAnalysis *rz_analysis_new(void) {
 	rz_analysis_set_bits(analysis, 32);
 	analysis->plugins = rz_list_new();
 	if (analysis->plugins) {
-		for (i = 0; i < RZ_ARRAY_SIZE(analysis_static_plugins); i++) {
-			rz_analysis_plugin_add(analysis, analysis_static_plugins[i]);
+		const size_t n_plugins = rz_arch_get_n_plugins();
+		for (size_t i = 0; i < n_plugins; i++) {
+			RzAnalysisPlugin *plugin = rz_arch_get_analysis_plugin(i);
+			if (!plugin) {
+				continue;
+			}
+			rz_analysis_plugin_add(analysis, plugin);
 		}
 	}
 	analysis->ht_global_var = ht_pp_new(NULL, global_kv_free, NULL);