- Use new symrec_get_label().

- Change optimize() function to return void.
- Pass LCLint.

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

diff --git a/libyasm/optimizer.h b/libyasm/optimizer.h
index 23a465e2029ed0b83ef4f1837c2c6f76107a96ec..c39e6648e3156cf0891eb422bf3afd3092ebabec 100644 (file)
--- 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 65ec69124fb9fa48a497a9ed748c00a48941dd37..c53d8ce0ee0033c9f6c0beaafc12fbbb292f5f12 100644 (file)
--- 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, &sect, &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 23a465e2029ed0b83ef4f1837c2c6f76107a96ec..c39e6648e3156cf0891eb422bf3afd3092ebabec 100644 (file)
--- 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 65ec69124fb9fa48a497a9ed748c00a48941dd37..c53d8ce0ee0033c9f6c0beaafc12fbbb292f5f12 100644 (file)
--- 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, &sect, &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 */