Make format strings correspond exactly to parameters

[p5sagit/p5-mst-13.2.git] / ext / Opcode / Opcode.xs

diff --git a/ext/Opcode/Opcode.xs b/ext/Opcode/Opcode.xs
index 928f680..28678ed 100644 (file)
--- a/ext/Opcode/Opcode.xs
+++ b/ext/Opcode/Opcode.xs
@@ -46,7 +46,7 @@ op_names_init()
     while(i-- > 0)
        bitmap[i] = 0xFF;
     /* Take care to set the right number of bits in the last byte */
-    bitmap[len-1] = ~(~0 << (maxo & 0x07));
+    bitmap[len-1] = (maxo & 0x07) ? ~(~0 << (maxo & 0x07)) : 0xFF;
     put_op_bitspec(":all",0, opset_all); /* don't mortalise */
 }
 
@@ -156,7 +156,7 @@ set_opset_bits(bitmap, bitspec, on, opname)
        if (myopcode >= maxo || myopcode < 0)
            croak("panic: opcode \"%s\" value %d is invalid", opname, myopcode);
        if (opcode_debug >= 2)
-           warn("set_opset_bits bit %2d (off=%d, bit=%d) %s on\n",
+           warn("set_opset_bits bit %2d (off=%d, bit=%d) %s %s\n",
                        myopcode, offset, bit, opname, (on)?"on":"off");
        if (on)
            bitmap[offset] |= 1 << bit;
@@ -175,8 +175,8 @@ set_opset_bits(bitmap, bitspec, on, opname)
            while(len-- > 0) bitmap[len] &= ~specbits[len];
     }
     else
-       croak("panic: invalid bitspec for \"%s\" (type %d)",
-               opname, SvTYPE(bitspec));
+       croak("panic: invalid bitspec for \"%s\" (type %lu)",
+               opname, (unsigned long)SvTYPE(bitspec));
 }
 
 
@@ -233,9 +233,9 @@ PROTOTYPES: ENABLE
 
 BOOT:
     assert(maxo < OP_MASK_BUF_SIZE);
-    opset_len = (maxo / 8) + 1;
+    opset_len = (maxo + 7) / 8;
     if (opcode_debug >= 1)
-       warn("opset_len %d\n", opset_len);
+       warn("opset_len %ld\n", (long)opset_len);
     op_names_init();
 
 
@@ -413,8 +413,8 @@ opdesc(...)
            }
        }
        else
-           croak("panic: invalid bitspec for \"%s\" (type %d)",
-               opname, SvTYPE(bitspec));
+           croak("panic: invalid bitspec for \"%s\" (type %lu)",
+               opname, (unsigned long)SvTYPE(bitspec));
     }