X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=assembler%2Fmain.c;h=afca996a1269160e7b9b92ae6a295d2e1822934b;hb=a392db777966d9e35be7c95590cdb24aa7f41ec1;hp=b262276d2ee800305d6a192b42fd1e73b80cfdb3;hpb=b3fbfb385c00f16d9e9ecae3b4298087c5587597;p=b43-tools.git

diff --git a/assembler/main.c b/assembler/main.c
index b262276..afca996 100644
--- a/assembler/main.c
+++ b/assembler/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
@@ -429,7 +429,7 @@ static struct code_output * do_assemble_insn(struct assembler_context *ctx,
 					     struct instruction *insn,
 					     unsigned int opcode)
 {
-	int i;
+	unsigned int i;
 	struct operlist *ol;
 	int nr_oper = 0;
 	uint64_t code = 0;
@@ -737,6 +737,9 @@ static void assemble_instruction(struct assembler_context *ctx,
 	unsigned int opcode;
 
 	switch (insn->op) {
+	case OP_MUL:
+		do_assemble_insn(ctx, insn, 0x101);
+		break;
 	case OP_ADD:
 		do_assemble_insn(ctx, insn, 0x1C0);
 		break;
@@ -855,6 +858,22 @@ static void assemble_instruction(struct assembler_context *ctx,
 		out = do_assemble_insn(ctx, insn, 0x0DC | 0x1);
 		out->is_jump_insn = 1;
 		break;
+	case OP_JDN:
+		out = do_assemble_insn(ctx, insn, 0x0D6);
+		out->is_jump_insn = 1;
+		break;
+	case OP_JDPZ:
+		out = do_assemble_insn(ctx, insn, 0x0D6 | 0x1);
+		out->is_jump_insn = 1;
+		break;
+	case OP_JDP:
+		out = do_assemble_insn(ctx, insn, 0x0D8);
+		out->is_jump_insn = 1;
+		break;
+	case OP_JDNZ:
+		out = do_assemble_insn(ctx, insn, 0x0D8 | 0x1);
+		out->is_jump_insn = 1;
+		break;
 	case OP_JZX:
 		opcode = merge_ext_into_opcode(ctx, 0x400, insn);
 		out = do_assemble_insn(ctx, insn, opcode);
@@ -1017,7 +1036,7 @@ static void resolve_labels(struct assembler_context *ctx)
 {
 	struct code_output *c;
 	int addr;
-	int i;
+	unsigned int i;
 	unsigned int current_address;
 
 	/* Calculate the absolute addresses for each instruction. */
@@ -1104,7 +1123,7 @@ static void emit_code(struct assembler_context *ctx)
 		exit(1);
 	}
 	if (IS_VERBOSE_DEBUG)
-		fprintf(stderr, "\nCode:\n");
+		printf("\nCode:\n");
 
 	list_for_each_entry(c, &ctx->output, list) {
 		switch (c->type) {
@@ -1116,7 +1135,7 @@ static void emit_code(struct assembler_context *ctx)
 		}
 	}
 
-	switch (output_format) {
+	switch (cmdargs.outformat) {
 	case FMT_RAW_LE32:
 	case FMT_RAW_BE32:
 		/* Nothing */
@@ -1152,7 +1171,7 @@ static void emit_code(struct assembler_context *ctx)
 		switch (c->type) {
 		case OUT_INSN:
 			if (IS_VERBOSE_DEBUG) {
-				fprintf(stderr, "%03X %03X,%03X,%03X\n",
+				printf("%03X %04X,%04X,%04X\n",
 					c->opcode,
 					c->operands[0].u.operand,
 					c->operands[1].u.operand,
@@ -1179,7 +1198,7 @@ static void emit_code(struct assembler_context *ctx)
 					  ctx->arch);
 			}
 
-			switch (output_format) {
+			switch (cmdargs.outformat) {
 			case FMT_B43:
 			case FMT_RAW_BE32:
 				code = ((code & (uint64_t)0xFFFFFFFF00000000ULL) >> 32) |
@@ -1215,7 +1234,7 @@ static void emit_code(struct assembler_context *ctx)
 		}
 	}
 
-	if (arg_print_sizes) {
+	if (cmdargs.print_sizes) {
 		printf("%s:  text = %u instructions (%u bytes)\n",
 		       fn, insn_count,
 		       (unsigned int)(insn_count * sizeof(uint64_t)));