* GNU General Public License for more details.
*/
+#include "main.h"
#include "list.h"
#include "util.h"
#include "args.h"
#include <stdlib.h>
#include <string.h>
-#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
-
-/* The header that fwcutter puts in to every .fw file */
-struct fw_header {
- /* Type of the firmware data */
- uint8_t type;
- /* Version number of the firmware data format */
- uint8_t ver;
- uint8_t __padding[2];
- /* Size of the data. For ucode and PCM this is in bytes.
- * For IV this is in number-of-ivs. */
- uint32_t size;
-} __attribute__ ((__packed__));
-
struct bin_instruction {
unsigned int opcode;
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:
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(stderr, "Corrupt input file (not fwcutter output)\n");
goto err_close;
}
- if (hdr.type != 'u') {
+ if (hdr.type != FW_TYPE_UCODE) {
fprintf(stderr, "Corrupt input file. Not a microcode image.\n");
goto err_close;
}
- if (hdr.ver != 1) {
+ if (hdr.ver != FW_HDR_VER) {
fprintf(stderr, "Invalid input file header version.\n");
goto err_close;
}