From 0276a2db379291d363f05828460641d45099a3e8 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Wed, 9 Jan 2002 09:04:41 +0000 Subject: [PATCH] - Use new symrec_get_label(). - Change optimize() function to return void. - Pass LCLint. svn path=/trunk/yasm/; revision=447 --- libyasm/optimizer.h | 2 +- modules/optimizers/basic/basic-optimizer.c | 22 +++++++++++++--------- src/optimizer.h | 2 +- src/optimizers/basic/basic-optimizer.c | 22 +++++++++++++--------- 4 files changed, 28 insertions(+), 20 deletions(-) diff --git a/libyasm/optimizer.h b/libyasm/optimizer.h index 23a465e2..c39e6648 100644 --- a/libyasm/optimizer.h +++ b/libyasm/optimizer.h @@ -35,7 +35,7 @@ struct optimizer { * This function takes the unoptimized linked list of sections and returns * an optimized linked list of sections ready for output to an object file. */ - sectionhead *(*optimize) (sectionhead *sections); + void (*optimize) (sectionhead *sections); }; /* Available optimizers */ diff --git a/modules/optimizers/basic/basic-optimizer.c b/modules/optimizers/basic/basic-optimizer.c index 65ec6912..c53d8ce0 100644 --- a/modules/optimizers/basic/basic-optimizer.c +++ b/modules/optimizers/basic/basic-optimizer.c @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "util.h" -RCSID("$IdPath$"); +/*@unused@*/ RCSID("$IdPath$"); #include "symrec.h" @@ -32,18 +32,23 @@ RCSID("$IdPath$"); #include "optimizer.h" -#define SECTFLAG_NONE 0 -#define SECTFLAG_INPROGRESS (1<<0) -#define SECTFLAG_DONE (1<<1) +#define SECTFLAG_NONE 0UL +#define SECTFLAG_INPROGRESS (1UL<<0) +#define SECTFLAG_DONE (1UL<<1) -#define BCFLAG_NONE 0 -#define BCFLAG_INPROGRESS (1<<0) -#define BCFLAG_DONE (1<<1) +#define BCFLAG_NONE 0UL +#define BCFLAG_INPROGRESS (1UL<<0) +#define BCFLAG_DONE (1UL<<1) static /*@only@*/ /*@null@*/ intnum * basic_optimize_resolve_label(symrec *sym) { unsigned long flags; + /*@dependent@*/ section *sect; + /*@dependent@*/ /*@null@*/ bytecode *bc; + + if (!symrec_get_label(sym, §, &bc)) + return NULL; flags = symrec_get_opt_flags(sym); @@ -74,7 +79,7 @@ basic_optimize_section(section *sect, /*@unused@*/ /*@null@*/ void *d) return 1; } -static sectionhead * +static void basic_optimize(sectionhead *sections) { /* Optimization process: (essentially NASM's pass 1) @@ -90,7 +95,6 @@ basic_optimize(sectionhead *sections) sections_traverse(sections, NULL, basic_optimize_section); /* NASM's pass 2 is output, so we just return. */ - return sections; } /* Define optimizer structure -- see optimizer.h for details */ diff --git a/src/optimizer.h b/src/optimizer.h index 23a465e2..c39e6648 100644 --- a/src/optimizer.h +++ b/src/optimizer.h @@ -35,7 +35,7 @@ struct optimizer { * This function takes the unoptimized linked list of sections and returns * an optimized linked list of sections ready for output to an object file. */ - sectionhead *(*optimize) (sectionhead *sections); + void (*optimize) (sectionhead *sections); }; /* Available optimizers */ diff --git a/src/optimizers/basic/basic-optimizer.c b/src/optimizers/basic/basic-optimizer.c index 65ec6912..c53d8ce0 100644 --- a/src/optimizers/basic/basic-optimizer.c +++ b/src/optimizers/basic/basic-optimizer.c @@ -20,7 +20,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "util.h" -RCSID("$IdPath$"); +/*@unused@*/ RCSID("$IdPath$"); #include "symrec.h" @@ -32,18 +32,23 @@ RCSID("$IdPath$"); #include "optimizer.h" -#define SECTFLAG_NONE 0 -#define SECTFLAG_INPROGRESS (1<<0) -#define SECTFLAG_DONE (1<<1) +#define SECTFLAG_NONE 0UL +#define SECTFLAG_INPROGRESS (1UL<<0) +#define SECTFLAG_DONE (1UL<<1) -#define BCFLAG_NONE 0 -#define BCFLAG_INPROGRESS (1<<0) -#define BCFLAG_DONE (1<<1) +#define BCFLAG_NONE 0UL +#define BCFLAG_INPROGRESS (1UL<<0) +#define BCFLAG_DONE (1UL<<1) static /*@only@*/ /*@null@*/ intnum * basic_optimize_resolve_label(symrec *sym) { unsigned long flags; + /*@dependent@*/ section *sect; + /*@dependent@*/ /*@null@*/ bytecode *bc; + + if (!symrec_get_label(sym, §, &bc)) + return NULL; flags = symrec_get_opt_flags(sym); @@ -74,7 +79,7 @@ basic_optimize_section(section *sect, /*@unused@*/ /*@null@*/ void *d) return 1; } -static sectionhead * +static void basic_optimize(sectionhead *sections) { /* Optimization process: (essentially NASM's pass 1) @@ -90,7 +95,6 @@ basic_optimize(sectionhead *sections) sections_traverse(sections, NULL, basic_optimize_section); /* NASM's pass 2 is output, so we just return. */ - return sections; } /* Define optimizer structure -- see optimizer.h for details */ -- 2.40.0