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

diff --git a/assembler/main.c b/assembler/main.c
index b262276..ad180b2 100644
--- a/assembler/main.c
+++ b/assembler/main.c
@@ -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;
@@ -1017,7 +1017,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 +1104,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 +1116,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 +1152,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 +1179,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 +1215,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)));