Change return type of calc_len() family back to int from unsigned long.

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

diff --git a/libyasm/arch.h b/libyasm/arch.h
index aae614cdc9c97f8689a0b2b70adf34401d4c11e3..b89967956b3d9b11ad79ed3500c25e7e6f8b6150 100644 (file)
--- a/libyasm/arch.h
+++ b/libyasm/arch.h
@@ -40,8 +40,8 @@ struct arch {
        void (*bc_print) (FILE *f, const bytecode *bc);
 
        /* See bytecode.h comments on bc_calc_len() */
-       unsigned long (*bc_calc_len) (bytecode *bc,
-                                     intnum *(*resolve_label) (symrec *sym));
+       int (*bc_calc_len) (bytecode *bc,
+                           intnum *(*resolve_label) (symrec *sym));
     } bc;
 };
 

diff --git a/libyasm/bytecode.c b/libyasm/bytecode.c
index bed8f7d9668d3d7bf27cc730cb270583d6c9b0f0..86ee2859814dc9834fe5abf4bda4b7b85c056e11 100644 (file)
--- a/libyasm/bytecode.c
+++ b/libyasm/bytecode.c
@@ -307,7 +307,7 @@ bc_print(FILE *f, const bytecode *bc)
     fprintf(f, "%*sOffset=%lx\n", indent_level, "", bc->offset);
 }
 
-unsigned long
+int
 bc_calc_len(bytecode *bc, intnum *(*resolve_label) (symrec *sym))
 {
     switch (bc->type) {

diff --git a/libyasm/bytecode.h b/libyasm/bytecode.h
index cbe3d0d083d5d84d989a4ed6d734280cff17a1d8..c295f15c811051144c3eb8d2fd31bff00fa43c93 100644 (file)
--- a/libyasm/bytecode.h
+++ b/libyasm/bytecode.h
@@ -63,8 +63,8 @@ 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).
  */
-unsigned long bc_calc_len(bytecode *bc,
-                         intnum *(*resolve_label) (symrec *sym));
+int bc_calc_len(bytecode *bc,
+               intnum *(*resolve_label) (symrec *sym));
 
 /* void bcs_initialize(bytecodehead *headp); */
 #define        bcs_initialize(headp)   STAILQ_INIT(headp)

diff --git a/modules/arch/x86/x86-int.h b/modules/arch/x86/x86-int.h
index a491c312fa97ecee2396a243d506b41d8da3f0d7..d07a43bd1054406a56c29d89478f4fffad4edc77 100644 (file)
--- a/modules/arch/x86/x86-int.h
+++ b/modules/arch/x86/x86-int.h
@@ -96,8 +96,7 @@ typedef struct x86_jmprel {
 
 void x86_bc_delete(bytecode *bc);
 void x86_bc_print(FILE *f, const bytecode *bc);
-unsigned long x86_bc_calc_len(bytecode *bc,
-                             intnum *(*resolve_label) (symrec *sym));
+int x86_bc_calc_len(bytecode *bc, intnum *(*resolve_label) (symrec *sym));
 
 int x86_expr_checkea(expr **ep, unsigned char *addrsize, unsigned char bits,
                     unsigned char nosplit, unsigned char *displen,

diff --git a/modules/arch/x86/x86bc.c b/modules/arch/x86/x86bc.c
index 46a259c76808df213e4ce7d90644599455752a57..70e59ff9a2f733b28983bc033e348540d3e61086 100644 (file)
--- a/modules/arch/x86/x86bc.c
+++ b/modules/arch/x86/x86bc.c
@@ -463,7 +463,7 @@ x86_bc_print(FILE *f, const bytecode *bc)
     }
 }
 
-static unsigned long
+static int
 x86_bc_calc_len_insn(x86_insn *insn, intnum *(*resolve_label) (symrec *sym))
 {
     effaddr *ea = insn->ea;
@@ -519,7 +519,7 @@ x86_bc_calc_len_insn(x86_insn *insn, intnum *(*resolve_label) (symrec *sym))
     return 0;
 }
 
-unsigned long
+int
 x86_bc_calc_len(bytecode *bc,
                intnum *(*resolve_label) (symrec *sym))
 {

diff --git a/src/arch.h b/src/arch.h
index aae614cdc9c97f8689a0b2b70adf34401d4c11e3..b89967956b3d9b11ad79ed3500c25e7e6f8b6150 100644 (file)
--- a/src/arch.h
+++ b/src/arch.h
@@ -40,8 +40,8 @@ struct arch {
        void (*bc_print) (FILE *f, const bytecode *bc);
 
        /* See bytecode.h comments on bc_calc_len() */
-       unsigned long (*bc_calc_len) (bytecode *bc,
-                                     intnum *(*resolve_label) (symrec *sym));
+       int (*bc_calc_len) (bytecode *bc,
+                           intnum *(*resolve_label) (symrec *sym));
     } bc;
 };
 

diff --git a/src/arch/x86/x86-int.h b/src/arch/x86/x86-int.h
index a491c312fa97ecee2396a243d506b41d8da3f0d7..d07a43bd1054406a56c29d89478f4fffad4edc77 100644 (file)
--- a/src/arch/x86/x86-int.h
+++ b/src/arch/x86/x86-int.h
@@ -96,8 +96,7 @@ typedef struct x86_jmprel {
 
 void x86_bc_delete(bytecode *bc);
 void x86_bc_print(FILE *f, const bytecode *bc);
-unsigned long x86_bc_calc_len(bytecode *bc,
-                             intnum *(*resolve_label) (symrec *sym));
+int x86_bc_calc_len(bytecode *bc, intnum *(*resolve_label) (symrec *sym));
 
 int x86_expr_checkea(expr **ep, unsigned char *addrsize, unsigned char bits,
                     unsigned char nosplit, unsigned char *displen,

diff --git a/src/arch/x86/x86bc.c b/src/arch/x86/x86bc.c
index 46a259c76808df213e4ce7d90644599455752a57..70e59ff9a2f733b28983bc033e348540d3e61086 100644 (file)
--- a/src/arch/x86/x86bc.c
+++ b/src/arch/x86/x86bc.c
@@ -463,7 +463,7 @@ x86_bc_print(FILE *f, const bytecode *bc)
     }
 }
 
-static unsigned long
+static int
 x86_bc_calc_len_insn(x86_insn *insn, intnum *(*resolve_label) (symrec *sym))
 {
     effaddr *ea = insn->ea;
@@ -519,7 +519,7 @@ x86_bc_calc_len_insn(x86_insn *insn, intnum *(*resolve_label) (symrec *sym))
     return 0;
 }
 
-unsigned long
+int
 x86_bc_calc_len(bytecode *bc,
                intnum *(*resolve_label) (symrec *sym))
 {

diff --git a/src/bytecode.c b/src/bytecode.c
index bed8f7d9668d3d7bf27cc730cb270583d6c9b0f0..86ee2859814dc9834fe5abf4bda4b7b85c056e11 100644 (file)
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -307,7 +307,7 @@ bc_print(FILE *f, const bytecode *bc)
     fprintf(f, "%*sOffset=%lx\n", indent_level, "", bc->offset);
 }
 
-unsigned long
+int
 bc_calc_len(bytecode *bc, intnum *(*resolve_label) (symrec *sym))
 {
     switch (bc->type) {

diff --git a/src/bytecode.h b/src/bytecode.h
index cbe3d0d083d5d84d989a4ed6d734280cff17a1d8..c295f15c811051144c3eb8d2fd31bff00fa43c93 100644 (file)
--- a/src/bytecode.h
+++ b/src/bytecode.h
@@ -63,8 +63,8 @@ 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).
  */
-unsigned long bc_calc_len(bytecode *bc,
-                         intnum *(*resolve_label) (symrec *sym));
+int bc_calc_len(bytecode *bc,
+               intnum *(*resolve_label) (symrec *sym));
 
 /* void bcs_initialize(bytecodehead *headp); */
 #define        bcs_initialize(headp)   STAILQ_INIT(headp)