Move arch config into function (#5902)

Author: wargio

librz/arch/analysis.c

@@ -252,6 +252,9 @@ RZ_API bool rz_analysis_use(RzAnalysis *analysis, const char *name) {
 		}
 		plugin_fini(analysis);
 		analysis->cur = h;
+
+		// always set the cpu as the name of the arch.
+		rz_analysis_set_cpu(analysis, name);
 		if (h->init && !h->init(&analysis->plugin_data)) {
 			RZ_LOG_ERROR("analysis plugin '%s' failed to initialize.\n", h->name);
 			rz_iterator_free(it);
@@ -312,12 +315,17 @@ RZ_API bool rz_analysis_set_reg_profile(RzAnalysis *analysis) {
 
 static bool analysis_set_os(RzAnalysis *analysis, const char *os) {
 	rz_return_val_if_fail(analysis, false);
-	if (!os || !*os) {
+	if (RZ_STR_ISEMPTY(os)) {
 		os = RZ_SYS_OS;
 	}
-	free(analysis->os);
+
+	if (analysis->os && RZ_STR_EQ(analysis->os, os)) {
+		return true;
+	}
+
+	RZ_FREE(analysis->os);
 	analysis->os = rz_str_dup(os);
-	rz_type_db_set_os(analysis->typedb, os);
+	rz_type_db_set_os(analysis->typedb, analysis->os);
 	rz_type_db_reload(analysis->typedb, analysis->sdb_types_path);
 	return true;
 }

librz/arch/asm.c

@@ -281,7 +281,7 @@ RZ_API RzAsm *rz_asm_new(void) {
 		return NULL;
 	}
 	a->dataalign = 1;
-	a->bits = RZ_SYS_BITS;
+	a->bits = RZ_SYS_BITS << 3;
 	a->bitshift = 0;
 	a->syntax = RZ_ASM_SYNTAX_INTEL;
 	a->sdb_opcodes_path = rz_path_new();
@@ -449,6 +449,24 @@ static void remove_plugin_config(RZ_BORROW RzCore *core, const char *plugin_name
 	ht_sp_delete(core->plugin_configs, plugin_name);
 }
 
+static ut32 asm_get_first_default_bits(RzAsmPlugin *h) {
+	if (!h) {
+		return RZ_SYS_BITS << 3;
+	}
+
+	if (h->bits & 32) {
+		return 32;
+	} else if (h->bits & 64) {
+		return 64;
+	} else if (h->bits & 16) {
+		return 16;
+	} else if (h->bits & 8) {
+		return 8;
+	}
+
+	return RZ_SYS_BITS << 3;
+}
+
 // TODO: this can be optimized using rz_str_hash()
 /**
  * \brief Puts an Asm plugin in use and disables the previous one.
@@ -488,6 +506,8 @@ RZ_API bool rz_asm_use(RzAsm *a, RZ_NULLABLE const char *name) {
 				}
 				free(opcodes_dir);
 			}
+
+			rz_asm_set_cpu(a, NULL);
 			if (h->init && !h->init(&a->plugin_data)) {
 				RZ_LOG_ERROR("asm plugin '%s' failed to initialize.\n", h->name);
 				rz_iterator_free(iter);
@@ -502,6 +522,9 @@ RZ_API bool rz_asm_use(RzAsm *a, RZ_NULLABLE const char *name) {
 			}
 			a->cur = h;
 			rz_iterator_free(iter);
+			RZ_FREE(a->features);
+			RZ_FREE(a->platforms);
+			a->bits = asm_get_first_default_bits(h);
 			return true;
 		}
 	}

librz/arch/platform_profile.c

@@ -170,43 +170,6 @@ RZ_API bool rz_platform_load_profile_sdb(RZ_NONNULL RzPlatformTarget *t, RZ_NONN
 	return sdb_load_arch_profile_by_path(t, path);
 }
 
-static bool is_cpu_valid(const char *cpu_dir, const char *cpu) {
-	RzList *files = rz_sys_dir(cpu_dir);
-	if (!files) {
-		return false;
-	}
-	RzListIter *it;
-	char *filename = NULL;
-	char *arch_cpu = NULL;
-
-	rz_list_foreach (files, it, filename) {
-		char *cpu_name = NULL;
-		if (!strcmp(filename, "..") || !strcmp(filename, "..")) {
-			continue;
-		}
-		arch_cpu = rz_str_ndup(filename, strlen(filename) - 4);
-		if (!arch_cpu) {
-			continue;
-		}
-		cpu_name = strchr(arch_cpu, '-');
-		if (!cpu_name) {
-			free(arch_cpu);
-			continue;
-		}
-		cpu_name[0] = '\0';
-		if (!strcmp(cpu_name + 1, cpu)) {
-			rz_list_free(files);
-			free(arch_cpu);
-			return true;
-		}
-
-		free(arch_cpu);
-	}
-
-	rz_list_free(files);
-	return false;
-}
-
 /**
  * \brief Initializes RzPlatformProfile by loading the path to the SDB file
  * 		  of the CPU profile
@@ -223,17 +186,23 @@ RZ_API bool rz_platform_profiles_init(RZ_NULLABLE RzPlatformTarget *t, RZ_NULLAB
 	if (!cpu_reload_needed(t, cpu, arch)) {
 		return false;
 	}
+
+	if (cpu && RZ_STR_EQ(cpu, "avr")) {
+		cpu = "ATmega8";
+	}
+
+	if (t->arch && RZ_STR_EQ(t->arch, arch) &&
+		t->cpu && RZ_STR_EQ(t->cpu, cpu)) {
+		// already loaded.
+		return true;
+	}
+
 	char buf[50];
 	char *path = rz_file_path_join(cpus_dir, rz_strf(buf, "%s-%s.sdb", arch, cpu));
 	if (!path) {
 		return false;
 	}
-	if (!is_cpu_valid(cpus_dir, cpu)) {
-		if (!strcmp(arch, "avr")) {
-			free(path);
-			path = rz_file_path_join(cpus_dir, "avr-ATmega8.sdb");
-		}
-	}
+
 	free(t->cpu);
 	free(t->arch);
 	t->cpu = rz_str_dup(cpu);

librz/arch/platform_target_index.c

@@ -128,8 +128,7 @@ RZ_API bool rz_platform_target_index_load_sdb(RZ_NONNULL RzPlatformTargetIndex *
  * \param platform reference to the selected platform (value of `asm.platform`)
  * \param platforms_dir reference to the directory containing platform files
  */
-RZ_API bool rz_platform_target_index_init(RzPlatformTargetIndex *t, RZ_NONNULL const char *arch, RZ_NONNULL const char *cpu,
-	const char *platform, RZ_NONNULL const char *platforms_dir) {
+RZ_API bool rz_platform_target_index_init(RzPlatformTargetIndex *t, RZ_NONNULL const char *arch, RZ_NONNULL const char *cpu, const char *platform, RZ_NONNULL const char *platforms_dir) {
 	if (RZ_STR_ISEMPTY(platform)) {
 		return true;
 	}

librz/bin/format/elf/elf_info.c

@@ -884,42 +884,46 @@ static int get_bits_mips(ELFOBJ *bin) {
 	return get_bits_mips_common(mips_type);
 }
 
+static inline bool arch_is(ELFOBJ *bin, ut64 machine_id) {
+	return bin->ehdr.e_machine == machine_id;
+}
+
 static inline bool arch_is_nanomips(ELFOBJ *bin) {
-	return bin->ehdr.e_machine == EM_IMG1;
+	return arch_is(bin, EM_IMG1);
 }
 
-static bool arch_is_mips(ELFOBJ *bin) {
+static inline bool arch_is_mips(ELFOBJ *bin) {
 	return bin->ehdr.e_machine == EM_MIPS ||
 		bin->ehdr.e_machine == EM_MIPS_RS3_LE ||
 		bin->ehdr.e_machine == EM_MIPS_X ||
 		arch_is_nanomips(bin);
 }
 
-static bool arch_is_h8xx(ELFOBJ *bin) {
+static inline bool arch_is_h8xx(ELFOBJ *bin) {
 	return bin->ehdr.e_machine == EM_H8_300 ||
 		bin->ehdr.e_machine == EM_H8_300H ||
 		bin->ehdr.e_machine == EM_H8S ||
 		bin->ehdr.e_machine == EM_H8_500;
 }
 
-static bool arch_is_sparc(ELFOBJ *bin) {
+static inline bool arch_is_sparc(ELFOBJ *bin) {
 	return bin->ehdr.e_machine == EM_SPARC ||
 		bin->ehdr.e_machine == EM_SPARC32PLUS ||
 		bin->ehdr.e_machine == EM_SPARCV9;
 }
 
-static bool arch_is_arm(ELFOBJ *bin) {
+static inline bool arch_is_arm(ELFOBJ *bin) {
 	return bin->ehdr.e_machine == EM_ARM || bin->ehdr.e_machine == EM_AARCH64;
 }
 
-static bool arch_is_arcompact(ELFOBJ *bin) {
+static inline bool arch_is_arcompact(ELFOBJ *bin) {
 	return bin->ehdr.e_machine == EM_ARC_A5 ||
 		bin->ehdr.e_machine == EM_ARC_COMPACT3_64 ||
 		bin->ehdr.e_machine == EM_ARC_COMPACT3;
 }
 
-static bool arch_is_parisc(ELFOBJ *bin) {
-	return bin->ehdr.e_machine == EM_PARISC;
+static inline bool arch_is_parisc(ELFOBJ *bin) {
+	return arch_is(bin, EM_PARISC);
 }
 
 static bool arch_is_riscv(ELFOBJ *bin) {
@@ -2389,8 +2393,9 @@ bool Elf_(rz_bin_elf_is_static)(RZ_NONNULL ELFOBJ *bin) {
 int Elf_(rz_bin_elf_get_bits)(RZ_NONNULL ELFOBJ *bin) {
 	rz_return_val_if_fail(bin, 0);
 
-	/* Hack for ARCompact */
-	if (arch_is_arcompact(bin)) {
+	if (arch_is_arcompact(bin) ||
+		arch_is_h8xx(bin) ||
+		arch_is(bin, EM_MSP430)) {
 		return 16;
 	}
 
@@ -2399,10 +2404,6 @@ int Elf_(rz_bin_elf_get_bits)(RZ_NONNULL ELFOBJ *bin) {
 		return get_bits_mips(bin);
 	}
 
-	if (arch_is_h8xx(bin)) {
-		return 16;
-	}
-
 	/* Hack for Thumb */
 	if (Elf_(rz_bin_elf_is_arm_binary_supporting_thumb)(bin)) {
 		if (!Elf_(rz_bin_elf_is_static)(bin) && has_thumb_symbol(bin)) {

librz/bin/p/bin_avr.c

@@ -734,12 +734,21 @@ static RzBinInfo *avr_info(RzBinFile *bf) {
 		return NULL;
 	}
 
+	const char *board = "ATmel (unknown)";
+	const char *cpu = "ATmega8";
+
+	if (rom->board) {
+		board = rom->board->name;
+		cpu = rom->board->cpu;
+	}
+
 	bi->file = rz_str_dup(bf->file);
 	bi->type = rz_str_dup("ROM");
-	bi->machine = rz_str_dup(rom->board ? rom->board->name : "ATmel (unknown)");
+	bi->machine = rz_str_dup(board);
 	bi->os = rz_str_dup("avr usermode");
 	bi->has_va = false;
 	bi->arch = rz_str_dup("avr");
+	bi->cpu = rz_str_dup(cpu);
 	bi->bits = 8;
 	return bi;
 }

librz/bin/p/bin_mach0.inc

@@ -475,7 +475,7 @@ static RzBinInfo *mach0_info(RzBinFile *bf) {
 	ret->machine = MACH0_(get_cpusubtype)(bf->o->bin_obj);
 	ret->type = MACH0_(get_filetype)(bf->o->bin_obj);
 	ret->big_endian = MACH0_(is_big_endian)(bf->buf);
-	ret->bits = 32;
+	ret->bits = MACH0_(get_bits)(bf->o->bin_obj);
 	if (bf && bf->o && bf->o->bin_obj) {
 		ret->has_crypto = ((struct MACH0_(obj_t) *)
 					   bf->o->bin_obj)

librz/bin/p/bin_qnx.c

@@ -240,6 +240,7 @@ static RzBinInfo *qnx_info(RzBinFile *bf) {
 	ret->os = rz_str_dup("any");
 	ret->subsystem = rz_str_dup("any");
 	ret->lang = "C/C++";
+	ret->bits = 32;
 	ret->signature = true;
 	return ret;
 }

librz/config/config.c

@@ -170,8 +170,8 @@ RZ_API const char *rz_config_node_type(RzConfigNode *node) {
 RZ_API RZ_BORROW RzConfigNode *rz_config_set_cb(RZ_BORROW RzConfig *cfg, const char *name, const char *value, RzConfigCallback cb) {
 	RzConfigNode *node = rz_config_set(cfg, name, value);
 	if (node && (node->setter = cb)) {
-		if (!cb(cfg->user, node)) {
-			return NULL;
+		if (!node->setter(cfg->user, node)) {
+			return node;
 		}
 	}
 	return node;
@@ -181,7 +181,7 @@ RZ_API RZ_BORROW RzConfigNode *rz_config_set_i_cb(RZ_BORROW RzConfig *cfg, const
 	RzConfigNode *node = rz_config_set_i(cfg, name, ivalue);
 	if (node && (node->setter = cb)) {
 		if (!node->setter(cfg->user, node)) {
-			return NULL;
+			return node;
 		}
 	}
 	return node;