De-constify yasm_bytecode parameter to yasm_output_expr_func.

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

diff --git a/libyasm/bytecode.c b/libyasm/bytecode.c
index 71801ae1b179502e457145b36ab1380564b5b453..0f102b5260afa457f30d4e66301bd9120feac13d 100644 (file)
--- a/libyasm/bytecode.c
+++ b/libyasm/bytecode.c
@@ -676,7 +676,7 @@ yasm_bc_resolve(yasm_bytecode *bc, int save, const yasm_section *sect,
 
 static int
 bc_tobytes_data(bytecode_data *bc_data, unsigned char **bufp,
-               const yasm_section *sect, const yasm_bytecode *bc, void *d,
+               const yasm_section *sect, yasm_bytecode *bc, void *d,
                yasm_output_expr_func output_expr)
     /*@sets **bufp@*/
 {

diff --git a/libyasm/coretype.h b/libyasm/coretype.h
index 75d9f88da55c49e998251d439522991b3a1f5e4d..3cd2b5bc9a053a02961c1a23e42b6b6789190f3d 100644 (file)
--- a/libyasm/coretype.h
+++ b/libyasm/coretype.h
@@ -119,7 +119,7 @@ typedef /*@null@*/ yasm_intnum * (*yasm_calc_bc_dist_func)
 typedef int (*yasm_output_expr_func)
     (yasm_expr **ep, unsigned char **bufp, unsigned long valsize,
      unsigned long offset, /*@observer@*/ const yasm_section *sect,
-     /*@observer@*/ const yasm_bytecode *bc, int rel, /*@null@*/ void *d)
+     yasm_bytecode *bc, int rel, /*@null@*/ void *d)
     /*@uses *ep@*/ /*@sets **bufp@*/;
 
 /* Converts a objfmt data bytecode into its byte representation.  Usually

diff --git a/modules/arch/x86/x86bc.c b/modules/arch/x86/x86bc.c
index d7cb4cbf2ad9c2dd3994bdb96343741f207457d2..e812459cc3cf118c251c8c32e332bd8497b36199 100644 (file)
--- a/modules/arch/x86/x86bc.c
+++ b/modules/arch/x86/x86bc.c
@@ -831,7 +831,7 @@ yasm_x86__bc_resolve(yasm_bytecode *bc, int save, const yasm_section *sect,
 
 static int
 x86_bc_tobytes_insn(x86_insn *insn, unsigned char **bufp,
-                   const yasm_section *sect, const yasm_bytecode *bc, void *d,
+                   const yasm_section *sect, yasm_bytecode *bc, void *d,
                    yasm_output_expr_func output_expr)
 {
     /*@null@*/ x86_effaddr *x86_ea = insn->ea;
@@ -925,7 +925,7 @@ x86_bc_tobytes_insn(x86_insn *insn, unsigned char **bufp,
 
 static int
 x86_bc_tobytes_jmprel(x86_jmprel *jmprel, unsigned char **bufp,
-                     const yasm_section *sect, const yasm_bytecode *bc,
+                     const yasm_section *sect, yasm_bytecode *bc,
                      void *d, yasm_output_expr_func output_expr)
 {
     unsigned char opersize;

diff --git a/modules/objfmts/bin/bin-objfmt.c b/modules/objfmts/bin/bin-objfmt.c
index 4007a363be2c89968c2cef324b010c756036a6f3..7afadbcb2cbbc44b13959e984be312acdc10bd1c 100644 (file)
--- a/modules/objfmts/bin/bin-objfmt.c
+++ b/modules/objfmts/bin/bin-objfmt.c
@@ -129,7 +129,7 @@ bin_objfmt_output_expr(yasm_expr **ep, unsigned char **bufp,
                       unsigned long valsize,
                       /*@unused@*/ unsigned long offset,
                       /*@observer@*/ const yasm_section *sect,
-                      /*@observer@*/ const yasm_bytecode *bc, int rel,
+                      yasm_bytecode *bc, int rel,
                       /*@unused@*/ /*@null@*/ void *d)
 {
     /*@dependent@*/ /*@null@*/ const yasm_intnum *intn;

diff --git a/modules/objfmts/coff/coff-objfmt.c b/modules/objfmts/coff/coff-objfmt.c
index e09ade9d8c09d09a898fc5cad55d7c8726e71837..95d884895dcc298507ef075dbefc5ca7ea895e51 100644 (file)
--- a/modules/objfmts/coff/coff-objfmt.c
+++ b/modules/objfmts/coff/coff-objfmt.c
@@ -247,8 +247,7 @@ static int
 coff_objfmt_output_expr(yasm_expr **ep, unsigned char **bufp,
                        unsigned long valsize, unsigned long offset,
                        /*@observer@*/ const yasm_section *sect,
-                       /*@observer@*/ const yasm_bytecode *bc, int rel,
-                       /*@unused@*/ /*@null@*/ void *d)
+                       yasm_bytecode *bc, int rel, /*@null@*/ void *d)
 {
     /*@null@*/ coff_objfmt_output_info *info = (coff_objfmt_output_info *)d;
     /*@dependent@*/ /*@null@*/ const yasm_intnum *intn;