snprintf(str, 5, "0x%02X", (bin->opcode & 0x0FF));
stmt->u.insn.operands[0] = str;
- disasm_std_operand(stmt, 0, 1, 0);
- disasm_std_operand(stmt, 1, 2, 0);
- stmt->u.insn.is_labelref = 3;
+ /* We don't disassemble the first and second operand, as
+ * that always is a dummy r0 operand.
+ * disasm_std_operand(stmt, 0, 1, 0);
+ * disasm_std_operand(stmt, 1, 2, 0);
+ * stmt->u.insn.is_labelref = 3;
+ */
+ stmt->u.insn.is_labelref = 1;
stmt->u.insn.labeladdr = stmt->u.insn.bin->operands[2];
break;
case 0x700:
snprintf(str, 5, "0x%02X", (bin->opcode & 0x0FF));
stmt->u.insn.operands[0] = str;
- disasm_std_operand(stmt, 0, 1, 0);
- disasm_std_operand(stmt, 1, 2, 0);
- stmt->u.insn.is_labelref = 3;
+ /* We don't disassemble the first and second operand, as
+ * that always is a dummy r0 operand.
+ * disasm_std_operand(stmt, 0, 1, 0);
+ * disasm_std_operand(stmt, 1, 2, 0);
+ * stmt->u.insn.is_labelref = 3;
+ */
+ stmt->u.insn.is_labelref = 1;
stmt->u.insn.labeladdr = stmt->u.insn.bin->operands[2];
break;
default:
struct statement *stmt;
int first, i;
int err;
+ unsigned int addr = 0;
err = open_output_file();
if (err)
list_for_each_entry(stmt, &ctx->stmt_list, list) {
switch (stmt->type) {
case STMT_INSN:
+ if (cmdargs.print_addresses)
+ fprintf(outfile, "/* %03X */", 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.is_labelref == i) {
- fprintf(outfile, ",%s",
+ fprintf(outfile, ", %s",
stmt->u.insn.labelref->u.label.name);
}
if (!stmt->u.insn.operands[i])
if (first)
fprintf(outfile, "\t");
if (!first)
- fprintf(outfile, ",");
+ fprintf(outfile, ", ");
first = 0;
fprintf(outfile, "%s",
stmt->u.insn.operands[i]);
}
fprintf(outfile, "\n");
+ addr++;
break;
case STMT_LABEL:
fprintf(outfile, "%s:\n", stmt->u.label.name);
if (err)
goto error;
- ret = fread(&hdr, 1, sizeof(hdr), infile);
- if (ret != sizeof(hdr)) {
- fprintf(stderr, "Corrupt input file (not fwcutter output)\n");
- goto err_close;
- }
- if (hdr.type != FW_TYPE_UCODE) {
- fprintf(stderr, "Corrupt input file. Not a microcode image.\n");
- goto err_close;
- }
- if (hdr.ver != FW_HDR_VER) {
- fprintf(stderr, "Invalid input file header version.\n");
- goto err_close;
+ if (!cmdargs.no_header) {
+ ret = fread(&hdr, 1, sizeof(hdr), infile);
+ if (ret != sizeof(hdr)) {
+ fprintf(stderr, "Corrupt input file (not fwcutter output)\n");
+ goto err_close;
+ }
+ if (hdr.type != FW_TYPE_UCODE) {
+ fprintf(stderr, "Corrupt input file. Not a microcode image.\n");
+ goto err_close;
+ }
+ if (hdr.ver != FW_HDR_VER) {
+ fprintf(stderr, "Invalid input file header version.\n");
+ goto err_close;
+ }
}
while (1) {