X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=assembler%2Fmain.c;h=0d995a4d6ffe0619ecf57e4cc092364d5b11d5ed;hb=a73ba526c3bd9f4e95cc95808d7487607c651cd0;hp=ab79f7eaaa74f13f51c32f33f41d3a8504b53983;hpb=ff7327cd416e9892b175af85c2641d425d256e70;p=b43-tools.git

diff --git a/assembler/main.c b/assembler/main.c
index ab79f7e..0d995a4 100644
--- a/assembler/main.c
+++ b/assembler/main.c
@@ -341,8 +341,14 @@ static unsigned int generate_mem_operand(struct assembler_context *ctx,
 			asm_warn(ctx, "INDIRECT memoffset 0x%X too long (> 6 bits)", off);
 			off &= 0x3F;
 		}
-		if (reg & ~0x7)
+		if (reg > 6) {
+			/* Assembler bug. The parser shouldn't pass this value. */
 			asm_error(ctx, "OFFR-nr too big");
+		}
+		if (reg == 6) {
+			asm_warn(ctx, "Using offset register 6. This register is broken "
+				 "on certain devices. Use off0 to off5 only.");
+		}
 		val |= off;
 		val |= (reg << 6);
 		break;
@@ -823,8 +829,8 @@ static void assemble_instruction(struct assembler_context *ctx,
 			/* Search the last insn. */
 			if (out->type == OUT_INSN) {
 				if (out->is_jump_insn) {
-					asm_error(ctx, "RET instruction directly after "
-						  "jump instruction. The hardware won't like this.");
+					asm_warn(ctx, "RET instruction directly after "
+						 "jump instruction. The hardware won't like this.");
 				}
 				break;
 			}
@@ -1124,7 +1130,8 @@ static void emit_code(struct assembler_context *ctx)
 
 	if (arg_print_sizes) {
 		printf("%s:  text = %u instructions (%u bytes)\n",
-		       fn, insn_count, insn_count * sizeof(uint64_t));
+		       fn, insn_count,
+		       (unsigned int)(insn_count * sizeof(uint64_t)));
 	}
 
 	fclose(fd);