Support non-arm bflt executables ##bin

Author: trufae

libr/bin/format/bflt/bflt.c

@@ -42,6 +42,11 @@ static int bflt_init_hdr(struct r_bin_bflt_obj *bin) {
 	p_hdr->reloc_count = READ (bhdr, i);
 	p_hdr->flags = READ (bhdr, i);
 	p_hdr->build_date = READ (bhdr, i);
+	/* cpu_type may be stored in filler[5] by some toolchains, read it separately */
+	bin->cpu_type = r_read_be32 (bhdr + 60);	/* offset 60 = filler[5] */
+	if (bin->cpu_type == 0 || bin->cpu_type > 0x100) {
+		bin->cpu_type = BFLT_CPU_ARM;	/* default to ARM if invalid */
+	}
 
 	if (p_hdr->rev != FLAT_VERSION) {
 		R_LOG_WARN ("only v4 is supported!");

libr/bin/format/bflt/bflt.h

@@ -15,6 +15,15 @@
 #define FLAT_FLAG_GZDATA	0x8	/* only data/relocs are compressed (for XIP) */
 #define FLAT_FLAG_KTRACE	0x10	/* output useful kernel trace for debugging */
 
+/* CPU architecture constants */
+#define BFLT_CPU_68K		0x0001	/* Motorola 68000 */
+#define BFLT_CPU_386		0x0002	/* Intel x86 */
+#define BFLT_CPU_ARM		0x0004	/* ARM */
+#define BFLT_CPU_MIPS		0x0008	/* MIPS */
+#define BFLT_CPU_PPC		0x0010	/* PowerPC */
+#define BFLT_CPU_SH		0x0020	/* SuperH */
+#define BFLT_CPU_COLDFIRE	0x0040	/* ColdFire */
+
 typedef struct bflt_hdr {
 	ut8 magic[4];
 	ut32 rev;
@@ -44,6 +53,7 @@ typedef struct r_bin_bflt_obj {
 	ut8 endian;
 	size_t size;
 	ut32 n_got;
+	ut32 cpu_type;
 } RBinBfltObj;
 
 #define BFLT_HDR_SIZE sizeof (RBinBfltHeader)

libr/bin/p/bin_bflt.c

@@ -208,12 +208,11 @@ static RList *relocs(RBinFile *bf) {
 				reloc_table[i].data_offset = reloc_data_offset;
 
 				RBinReloc *reloc = R_NEW0 (RBinReloc);
-				if (reloc) {
-					reloc->type = R_BIN_RELOC_32;
-					reloc->paddr = reloc_table[i].addr_to_patch;
-					reloc->vaddr = reloc->paddr;
-					r_list_append (list, reloc);
-				}
+				reloc->type = R_BIN_RELOC_32;
+				// reloc->ntype = R_BIN_RELOC_32;
+				reloc->paddr = reloc_table[i].addr_to_patch;
+				reloc->vaddr = reloc->paddr;
+				r_list_append (list, reloc);
 			}
 		}
 		free (reloc_pointer_table);
@@ -226,6 +225,27 @@ static RList *relocs(RBinFile *bf) {
 	return NULL;
 }
 
+static const char *bflt_cpu_to_arch(ut32 cpu_type) {
+	switch (cpu_type) {
+	case BFLT_CPU_68K:
+		return "m68k";
+	case BFLT_CPU_386:
+		return "x86";
+	case BFLT_CPU_ARM:
+		return "arm";
+	case BFLT_CPU_MIPS:
+		return "mips";
+	case BFLT_CPU_PPC:
+		return "ppc";
+	case BFLT_CPU_SH:
+		return "sh";
+	case BFLT_CPU_COLDFIRE:
+		return "m68k";	/* ColdFire is 68k variant */
+	default:
+		return "arm";	/* default to ARM */
+	}
+}
+
 static RBinInfo *info(RBinFile *bf) {
 	RBinInfo *info = R_NEW0 (RBinInfo);
 	struct r_bin_bflt_obj *obj = R_UNWRAP3 (bf, bo, bin_obj);
@@ -235,7 +255,8 @@ static RBinInfo *info(RBinFile *bf) {
 	info->type = strdup ("bFLT (Executable file)");
 	info->os = strdup ("Linux");
 	info->subsystem = strdup ("Linux");
-	info->arch = strdup ("arm");
+	const char *arch = obj? bflt_cpu_to_arch (obj->cpu_type): "arm";
+	info->arch = strdup (arch);
 	info->big_endian = obj? obj->endian: R_SYS_ENDIAN_LITTLE;
 	info->bits = 32;
 	info->has_va = false;