X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=disassembler%2Fmain.c;h=eecea39d70d2f1e33eb68a489303b5a7a75211ab;hb=1907804cab2799ae52ee09adffb64ec37fef7372;hp=ba990ab007e3d0ea5b89913aae7605181e265b08;hpb=818c430fb65cc84d9fa2b1ef3808fa57ac5692f6;p=b43-tools.git

diff --git a/disassembler/main.c b/disassembler/main.c
index ba990ab..eecea39 100644
--- a/disassembler/main.c
+++ b/disassembler/main.c
@@ -1,5 +1,5 @@
 /*
- *   Copyright (C) 2006-2010  Michael Buesch <mb@bu3sch.de>
+ *   Copyright (C) 2006-2010  Michael Buesch <m@bues.ch>
  *
  *   This program is free software; you can redistribute it and/or modify
  *   it under the terms of the GNU General Public License version 2
@@ -39,7 +39,7 @@ struct statement {
 			const char *name;
 			const char *operands[5];
 
-			int is_labelref;
+			int labelref_operand;
 			unsigned int labeladdr;
 			struct statement *labelref;
 		} insn;
@@ -284,6 +284,12 @@ static void disasm_constant_opcodes(struct disassembler_context *ctx,
 	struct bin_instruction *bin = stmt->u.insn.bin;
 
 	switch (bin->opcode) {
+	case 0x101:
+		stmt->u.insn.name = "mul";
+		disasm_std_operand(stmt, 0, 0);
+		disasm_std_operand(stmt, 1, 1);
+		disasm_std_operand(stmt, 2, 2);
+		break;
 	case 0x1C0:
 		stmt->u.insn.name = "add";
 		disasm_std_operand(stmt, 0, 0);
@@ -388,98 +394,126 @@ static void disasm_constant_opcodes(struct disassembler_context *ctx,
 		break;
 	case 0x040:
 		stmt->u.insn.name = "jand";
-		stmt->u.insn.is_labelref = 2;
+		stmt->u.insn.labelref_operand = 2;
 		stmt->u.insn.labeladdr = stmt->u.insn.bin->operands[2];
 		disasm_std_operand(stmt, 0, 0);
 		disasm_std_operand(stmt, 1, 1);
 		break;
 	case (0x040 | 0x1):
 		stmt->u.insn.name = "jnand";
-		stmt->u.insn.is_labelref = 2;
+		stmt->u.insn.labelref_operand = 2;
 		stmt->u.insn.labeladdr = stmt->u.insn.bin->operands[2];
 		disasm_std_operand(stmt, 0, 0);
 		disasm_std_operand(stmt, 1, 1);
 		break;
 	case 0x050:
 		stmt->u.insn.name = "js";
-		stmt->u.insn.is_labelref = 2;
+		stmt->u.insn.labelref_operand = 2;
 		stmt->u.insn.labeladdr = stmt->u.insn.bin->operands[2];
 		disasm_std_operand(stmt, 0, 0);
 		disasm_std_operand(stmt, 1, 1);
 		break;
 	case (0x050 | 0x1):
 		stmt->u.insn.name = "jns";
-		stmt->u.insn.is_labelref = 2;
+		stmt->u.insn.labelref_operand = 2;
 		stmt->u.insn.labeladdr = stmt->u.insn.bin->operands[2];
 		disasm_std_operand(stmt, 0, 0);
 		disasm_std_operand(stmt, 1, 1);
 		break;
 	case 0x0D0:
 		stmt->u.insn.name = "je";
-		stmt->u.insn.is_labelref = 2;
+		stmt->u.insn.labelref_operand = 2;
 		stmt->u.insn.labeladdr = stmt->u.insn.bin->operands[2];
 		disasm_std_operand(stmt, 0, 0);
 		disasm_std_operand(stmt, 1, 1);
 		break;
 	case (0x0D0 | 0x1):
 		stmt->u.insn.name = "jne";
-		stmt->u.insn.is_labelref = 2;
+		stmt->u.insn.labelref_operand = 2;
 		stmt->u.insn.labeladdr = stmt->u.insn.bin->operands[2];
 		disasm_std_operand(stmt, 0, 0);
 		disasm_std_operand(stmt, 1, 1);
 		break;
 	case 0x0D2:
 		stmt->u.insn.name = "jls";
-		stmt->u.insn.is_labelref = 2;
+		stmt->u.insn.labelref_operand = 2;
 		stmt->u.insn.labeladdr = stmt->u.insn.bin->operands[2];
 		disasm_std_operand(stmt, 0, 0);
 		disasm_std_operand(stmt, 1, 1);
 		break;
 	case (0x0D2 | 0x1):
 		stmt->u.insn.name = "jges";
-		stmt->u.insn.is_labelref = 2;
+		stmt->u.insn.labelref_operand = 2;
 		stmt->u.insn.labeladdr = stmt->u.insn.bin->operands[2];
 		disasm_std_operand(stmt, 0, 0);
 		disasm_std_operand(stmt, 1, 1);
 		break;
 	case 0x0D4:
 		stmt->u.insn.name = "jgs";
-		stmt->u.insn.is_labelref = 2;
+		stmt->u.insn.labelref_operand = 2;
 		stmt->u.insn.labeladdr = stmt->u.insn.bin->operands[2];
 		disasm_std_operand(stmt, 0, 0);
 		disasm_std_operand(stmt, 1, 1);
 		break;
 	case (0x0D4 | 0x1):
 		stmt->u.insn.name = "jles";
-		stmt->u.insn.is_labelref = 2;
+		stmt->u.insn.labelref_operand = 2;
+		stmt->u.insn.labeladdr = stmt->u.insn.bin->operands[2];
+		disasm_std_operand(stmt, 0, 0);
+		disasm_std_operand(stmt, 1, 1);
+		break;
+	case 0x0D6:
+		stmt->u.insn.name = "jdn";
+		stmt->u.insn.labelref_operand = 2;
+		stmt->u.insn.labeladdr = stmt->u.insn.bin->operands[2];
+		disasm_std_operand(stmt, 0, 0);
+		disasm_std_operand(stmt, 1, 1);
+		break;
+	case (0x0D6 | 0x1):
+		stmt->u.insn.name = "jdpz";
+		stmt->u.insn.labelref_operand = 2;
+		stmt->u.insn.labeladdr = stmt->u.insn.bin->operands[2];
+		disasm_std_operand(stmt, 0, 0);
+		disasm_std_operand(stmt, 1, 1);
+		break;
+	case 0x0D8:
+		stmt->u.insn.name = "jdp";
+		stmt->u.insn.labelref_operand = 2;
+		stmt->u.insn.labeladdr = stmt->u.insn.bin->operands[2];
+		disasm_std_operand(stmt, 0, 0);
+		disasm_std_operand(stmt, 1, 1);
+		break;
+	case (0x0D8 | 0x1):
+		stmt->u.insn.name = "jdnz";
+		stmt->u.insn.labelref_operand = 2;
 		stmt->u.insn.labeladdr = stmt->u.insn.bin->operands[2];
 		disasm_std_operand(stmt, 0, 0);
 		disasm_std_operand(stmt, 1, 1);
 		break;
 	case 0x0DA:
 		stmt->u.insn.name = "jl";
-		stmt->u.insn.is_labelref = 2;
+		stmt->u.insn.labelref_operand = 2;
 		stmt->u.insn.labeladdr = stmt->u.insn.bin->operands[2];
 		disasm_std_operand(stmt, 0, 0);
 		disasm_std_operand(stmt, 1, 1);
 		break;
 	case (0x0DA | 0x1):
 		stmt->u.insn.name = "jge";
-		stmt->u.insn.is_labelref = 2;
+		stmt->u.insn.labelref_operand = 2;
 		stmt->u.insn.labeladdr = stmt->u.insn.bin->operands[2];
 		disasm_std_operand(stmt, 0, 0);
 		disasm_std_operand(stmt, 1, 1);
 		break;
 	case 0x0DC:
 		stmt->u.insn.name = "jg";
-		stmt->u.insn.is_labelref = 2;
+		stmt->u.insn.labelref_operand = 2;
 		stmt->u.insn.labeladdr = stmt->u.insn.bin->operands[2];
 		disasm_std_operand(stmt, 0, 0);
 		disasm_std_operand(stmt, 1, 1);
 		break;
 	case (0x0DC | 0x1):
 		stmt->u.insn.name = "jle";
-		stmt->u.insn.is_labelref = 2;
+		stmt->u.insn.labelref_operand = 2;
 		stmt->u.insn.labeladdr = stmt->u.insn.bin->operands[2];
 		disasm_std_operand(stmt, 0, 0);
 		disasm_std_operand(stmt, 1, 1);
@@ -490,7 +524,7 @@ static void disasm_constant_opcodes(struct disassembler_context *ctx,
 		switch (cmdargs.arch) {
 		case 5:
 			stmt->u.insn.name = "call";
-			stmt->u.insn.is_labelref = 1;
+			stmt->u.insn.labelref_operand = 1;
 			stmt->u.insn.labeladdr = stmt->u.insn.bin->operands[2];
 			str = xmalloc(4);
 			snprintf(str, 4, "lr%u", stmt->u.insn.bin->operands[0]);
@@ -515,30 +549,31 @@ static void disasm_constant_opcodes(struct disassembler_context *ctx,
 		stmt->u.insn.operands[2] = str;
 		break;
 	}
-//TODO also implement it in the assembler
-#if 0
 	case 0x004: {
 		if (cmdargs.arch != 15) {
-			dasm_error("arch 15 call instruction found in arch %d binary",
+			dasm_error("arch 15 'calls' instruction found in arch %d binary",
 				   cmdargs.arch);
 		}
-		stmt->u.insn.name = "call";
-		stmt->u.insn.is_labelref = 0;
+		stmt->u.insn.name = "calls";
+		stmt->u.insn.labelref_operand = 0;
 		stmt->u.insn.labeladdr = stmt->u.insn.bin->operands[2];
 		if (stmt->u.insn.bin->operands[0] != 0x1780 ||
 		    stmt->u.insn.bin->operands[1] != 0x1780)
-			dasm_warn("r15 call: Invalid first or second argument");
+			dasm_warn("r15 calls: Invalid first or second argument");
 		break;
 	}
 	case 0x005: {
 		if (cmdargs.arch != 15) {
-			dasm_error("arch 15 ret instruction found in arch %d binary",
+			dasm_error("arch 15 'rets' instruction found in arch %d binary",
 				   cmdargs.arch);
 		}
-		stmt->u.insn.name = "ret";
+		stmt->u.insn.name = "rets";
+		if (stmt->u.insn.bin->operands[0] != 0x1780 ||
+		    stmt->u.insn.bin->operands[1] != 0x1780 ||
+		    stmt->u.insn.bin->operands[2] != 0)
+			dasm_warn("r15 rets: Invalid argument(s)");
 		break;
 	}
-#endif
 	case 0x1E0: {
 		unsigned int flags, mask;
 
@@ -602,6 +637,9 @@ static void disasm_constant_opcodes(struct disassembler_context *ctx,
 		}
 		break;
 	}
+	case 0x000:
+		disasm_opcode_raw(ctx, stmt, 1);
+		break;
 	default:
 		disasm_opcode_raw(ctx, stmt, (cmdargs.unknown_decode == 0));
 		break;
@@ -622,7 +660,7 @@ static void disasm_opcodes(struct disassembler_context *ctx)
 		stmt->type = STMT_INSN;
 		INIT_LIST_HEAD(&stmt->list);
 		stmt->u.insn.bin = bin;
-		stmt->u.insn.is_labelref = -1;
+		stmt->u.insn.labelref_operand = -1; /* none */
 
 		switch (bin->opcode & 0xF00) {
 		case 0x200:
@@ -665,7 +703,7 @@ static void disasm_opcodes(struct disassembler_context *ctx)
 
 			disasm_std_operand(stmt, 0, 2);
 			disasm_std_operand(stmt, 1, 3);
-			stmt->u.insn.is_labelref = 4;
+			stmt->u.insn.labelref_operand = 4;
 			stmt->u.insn.labeladdr = stmt->u.insn.bin->operands[2];
 			break;
 		case 0x500:
@@ -680,7 +718,7 @@ static void disasm_opcodes(struct disassembler_context *ctx)
 
 			disasm_std_operand(stmt, 0, 2);
 			disasm_std_operand(stmt, 1, 3);
-			stmt->u.insn.is_labelref = 4;
+			stmt->u.insn.labelref_operand = 4;
 			stmt->u.insn.labeladdr = stmt->u.insn.bin->operands[2];
 			break;
 		case 0x600:
@@ -694,9 +732,9 @@ static void disasm_opcodes(struct disassembler_context *ctx)
 			 * that always is a dummy r0 operand.
 			 * disasm_std_operand(stmt, 0, 1);
 			 * disasm_std_operand(stmt, 1, 2);
-			 * stmt->u.insn.is_labelref = 3;
+			 * stmt->u.insn.labelref_operand = 3;
 			 */
-			stmt->u.insn.is_labelref = 1;
+			stmt->u.insn.labelref_operand = 1;
 			stmt->u.insn.labeladdr = stmt->u.insn.bin->operands[2];
 			break;
 		case 0x700:
@@ -710,9 +748,9 @@ static void disasm_opcodes(struct disassembler_context *ctx)
 			 * that always is a dummy r0 operand.
 			 * disasm_std_operand(stmt, 0, 1);
 			 * disasm_std_operand(stmt, 1, 2);
-			 * stmt->u.insn.is_labelref = 3;
+			 * stmt->u.insn.labelref_operand = 3;
 			 */
-			stmt->u.insn.is_labelref = 1;
+			stmt->u.insn.labelref_operand = 1;
 			stmt->u.insn.labeladdr = stmt->u.insn.bin->operands[2];
 			break;
 		default:
@@ -762,8 +800,8 @@ static void resolve_labels(struct disassembler_context *ctx)
 	list_for_each_entry_safe(stmt, n, &ctx->stmt_list, list) {
 		if (stmt->type != STMT_INSN)
 			continue;
-		if (stmt->u.insn.is_labelref == -1)
-			continue;
+		if (stmt->u.insn.labelref_operand < 0)
+			continue; /* Doesn't have label reference operand. */
 		labeladdr = stmt->u.insn.labeladdr;
 		label = get_label_at(ctx, labeladdr);
 		if (!label)
@@ -784,9 +822,9 @@ static void resolve_labels(struct disassembler_context *ctx)
 static void emit_asm(struct disassembler_context *ctx)
 {
 	struct statement *stmt;
-	int first, i;
+	int first;
 	int err;
-	unsigned int addr = 0;
+	unsigned int i, addr = 0;
 
 	err = open_output_file();
 	if (err)
@@ -799,19 +837,21 @@ static void emit_asm(struct disassembler_context *ctx)
 		switch (stmt->type) {
 		case STMT_INSN:
 			if (cmdargs.print_addresses)
-				fprintf(outfile, "/* %03X */", addr);
+				fprintf(outfile, "/* %04X */", addr);
 			fprintf(outfile, "\t%s", stmt->u.insn.name);
 			first = 1;
 			for (i = 0; i < ARRAY_SIZE(stmt->u.insn.operands); i++) {
 				if (!stmt->u.insn.operands[i] &&
-				    stmt->u.insn.is_labelref != i)
+				    (stmt->u.insn.labelref_operand < 0 ||
+				     (unsigned int)stmt->u.insn.labelref_operand != i))
 					continue;
 				if (first)
 					fprintf(outfile, "\t");
 				if (!first)
 					fprintf(outfile, ", ");
 				first = 0;
-				if (stmt->u.insn.is_labelref == i) {
+				if (stmt->u.insn.labelref_operand >= 0 &&
+				    (unsigned int)stmt->u.insn.labelref_operand == i) {
 					fprintf(outfile, "%s",
 						stmt->u.insn.labelref->u.label.name);
 				} else {
@@ -837,7 +877,7 @@ static int read_input(struct disassembler_context *ctx)
 	size_t ret;
 	struct bin_instruction *code = NULL;
 	unsigned char tmp[sizeof(uint64_t)];
-	uint64_t codeword;
+	uint64_t codeword = 0;
 	struct fw_header hdr;
 	int err;
 
@@ -853,11 +893,11 @@ static int read_input(struct disassembler_context *ctx)
 	case FMT_B43:
 		ret = fread(&hdr, 1, sizeof(hdr), infile);
 		if (ret != sizeof(hdr)) {
-			fprintf(stderr, "Corrupt input file (not fwcutter output)\n");
+			fprintf(stderr, "Corrupt input file (no b43 header found)\n");
 			goto err_close;
 		}
 		if (hdr.type != FW_TYPE_UCODE) {
-			fprintf(stderr, "Corrupt input file. Not a microcode image.\n");
+			fprintf(stderr, "Corrupt input file. Not a b43 microcode image.\n");
 			goto err_close;
 		}
 		if (hdr.ver != FW_HDR_VER) {