asm: Cleanup makefile.

[b43-tools.git] / assembler / main.c

diff --git a/assembler/main.c b/assembler/main.c
index 701721d6f202b2db71b34bee1bdfe4355b98989b..e90bac8118383f458426be1a8a9ed096220b97e4 100644 (file)
--- a/assembler/main.c
+++ b/assembler/main.c
@@ -289,7 +289,7 @@ static unsigned int generate_reg_operand(struct assembler_context *ctx,
        case SPR:
                /* format: 0b100. .... .... */
                val |= 0x800;
-               if (ctx->arch == 15) //FIXME is this ok?
+               if (ctx->arch == 15)
                        val <<= 1;
                if (reg->nr & ~0x1FF)
                        asm_error(ctx, "SPR-nr too big");
@@ -298,7 +298,7 @@ static unsigned int generate_reg_operand(struct assembler_context *ctx,
        case OFFR:
                /* format: 0b1000 0110 0rrr */
                val |= 0x860;
-               if (ctx->arch == 15) //FIXME is this ok?
+               if (ctx->arch == 15)
                        val <<= 1;
                if (reg->nr & ~0x7)
                        asm_error(ctx, "OFFR-nr too big");
@@ -1106,8 +1106,12 @@ int main(int argc, char **argv)
        int err, res = 1;
 
        err = parse_args(argc, argv);
-       if (err)
+       if (err < 0)
                goto out;
+       if (err > 0) {
+               res = 0;
+               goto out;
+       }
        err = open_input_file();
        if (err)
                goto out;