bc_calc_len() family should return unsigned long, not int.

svn path=/trunk/yasm/; revision=436

libyasm/arch.h

@@ -40,9 +40,9 @@ struct arch {
 	void (*bc_print) (FILE *f, const bytecode *bc);
 
 	/* See bytecode.h comments on bc_calc_len() */
-	int (*bc_calc_len) (bytecode *bc, /*@only@*/ /*@null@*/
-			    intnum *(*resolve_label) (section *sect, /*@null@*/
-						      bytecode *bc));
+	unsigned long (*bc_calc_len) (bytecode *bc, /*@only@*/ /*@null@*/
+				      intnum *(*resolve_label) (section *sect,
+					  /*@null@*/ bytecode *bc));
     } bc;
 };
 

libyasm/bytecode.c

@@ -307,7 +307,7 @@ bc_print(FILE *f, const bytecode *bc)
     fprintf(f, "%*sOffset=%lx\n", indent_level, "", bc->offset);
 }
 
-int
+unsigned long
 bc_calc_len(bytecode *bc,
 	    intnum *(*resolve_label) (section *sect, /*@null@*/ bytecode *bc))
 {

libyasm/bytecode.h

@@ -63,7 +63,7 @@ void bc_print(FILE *f, const bytecode *bc);
  * resolve_label is the function used to determine the value (offset) of a
  *  in-file label (eg, not an EXTERN variable, which is indeterminate).
  */
-int bc_calc_len(bytecode *bc, /*@only@*/ /*@null@*/
+unsigned long bc_calc_len(bytecode *bc, /*@only@*/ /*@null@*/
 			  intnum *(*resolve_label) (section *sect,
 						    /*@null@*/ bytecode *bc));
 

modules/arch/x86/x86-int.h

@@ -96,7 +96,7 @@ typedef struct x86_jmprel {
 
 void x86_bc_delete(bytecode *bc);
 void x86_bc_print(FILE *f, const bytecode *bc);
-int x86_bc_calc_len(bytecode *bc, /*@only@*/ /*@null@*/
+unsigned long x86_bc_calc_len(bytecode *bc, /*@only@*/ /*@null@*/
 			      intnum *(*resolve_label) (section *sect,
 				  /*@null@*/ bytecode *bc));
 

modules/arch/x86/x86bc.c

@@ -460,7 +460,7 @@ x86_bc_print(FILE *f, const bytecode *bc)
     }
 }
 
-static int
+static unsigned long
 x86_bc_calc_len_insn(x86_insn *insn, /*@only@*/ /*@null@*/
 		     intnum *(*resolve_label) (section *sect,
 					       /*@null@*/ bytecode *bc))
@@ -518,7 +518,7 @@ x86_bc_calc_len_insn(x86_insn *insn, /*@only@*/ /*@null@*/
     return 0;
 }
 
-int
+unsigned long
 x86_bc_calc_len(bytecode *bc,
 		intnum *(*resolve_label) (section *sect,
 					  /*@null@*/ bytecode *bc))

src/arch.h

@@ -40,9 +40,9 @@ struct arch {
 	void (*bc_print) (FILE *f, const bytecode *bc);
 
 	/* See bytecode.h comments on bc_calc_len() */
-	int (*bc_calc_len) (bytecode *bc, /*@only@*/ /*@null@*/
-			    intnum *(*resolve_label) (section *sect, /*@null@*/
-						      bytecode *bc));
+	unsigned long (*bc_calc_len) (bytecode *bc, /*@only@*/ /*@null@*/
+				      intnum *(*resolve_label) (section *sect,
+					  /*@null@*/ bytecode *bc));
     } bc;
 };
 

src/arch/x86/x86-int.h

@@ -96,7 +96,7 @@ typedef struct x86_jmprel {
 
 void x86_bc_delete(bytecode *bc);
 void x86_bc_print(FILE *f, const bytecode *bc);
-int x86_bc_calc_len(bytecode *bc, /*@only@*/ /*@null@*/
+unsigned long x86_bc_calc_len(bytecode *bc, /*@only@*/ /*@null@*/
 			      intnum *(*resolve_label) (section *sect,
 				  /*@null@*/ bytecode *bc));
 

src/arch/x86/x86bc.c

@@ -460,7 +460,7 @@ x86_bc_print(FILE *f, const bytecode *bc)
     }
 }
 
-static int
+static unsigned long
 x86_bc_calc_len_insn(x86_insn *insn, /*@only@*/ /*@null@*/
 		     intnum *(*resolve_label) (section *sect,
 					       /*@null@*/ bytecode *bc))
@@ -518,7 +518,7 @@ x86_bc_calc_len_insn(x86_insn *insn, /*@only@*/ /*@null@*/
     return 0;
 }
 
-int
+unsigned long
 x86_bc_calc_len(bytecode *bc,
 		intnum *(*resolve_label) (section *sect,
 					  /*@null@*/ bytecode *bc))

src/bytecode.c

@@ -307,7 +307,7 @@ bc_print(FILE *f, const bytecode *bc)
     fprintf(f, "%*sOffset=%lx\n", indent_level, "", bc->offset);
 }
 
-int
+unsigned long
 bc_calc_len(bytecode *bc,
 	    intnum *(*resolve_label) (section *sect, /*@null@*/ bytecode *bc))
 {

src/bytecode.h

@@ -63,7 +63,7 @@ void bc_print(FILE *f, const bytecode *bc);
  * resolve_label is the function used to determine the value (offset) of a
  *  in-file label (eg, not an EXTERN variable, which is indeterminate).
  */
-int bc_calc_len(bytecode *bc, /*@only@*/ /*@null@*/
+unsigned long bc_calc_len(bytecode *bc, /*@only@*/ /*@null@*/
 			  intnum *(*resolve_label) (section *sect,
 						    /*@null@*/ bytecode *bc));