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

diff --git a/disassembler/main.c b/disassembler/main.c
index ba990ab..b73c3bf 100644
--- a/disassembler/main.c
+++ b/disassembler/main.c
@@ -515,30 +515,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.name = "calls";
 		stmt->u.insn.is_labelref = 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 +603,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;
@@ -784,9 +788,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 +803,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.is_labelref < 0 ||
+				     (unsigned int)stmt->u.insn.is_labelref != i))
 					continue;
 				if (first)
 					fprintf(outfile, "\t");
 				if (!first)
 					fprintf(outfile, ", ");
 				first = 0;
-				if (stmt->u.insn.is_labelref == i) {
+				if (stmt->u.insn.is_labelref >= 0 &&
+				    (unsigned int)stmt->u.insn.is_labelref == i) {
 					fprintf(outfile, "%s",
 						stmt->u.insn.labelref->u.label.name);
 				} else {
@@ -853,11 +859,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) {