From a7ce9bf2d1b70c4b7d35688aa1cd102baf5998b9 Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Sat, 1 Dec 2001 03:07:23 +0000 Subject: [PATCH] Delete dbg optimizer (won't be useful) and add "basic" (equiv. to NASM 2-pass) optimizer. svn path=/trunk/yasm/; revision=364 --- configure.ac | 2 +- configure.in | 2 +- libyasm/optimizer.h | 2 +- modules/optimizers/Makefile.am | 2 +- modules/optimizers/basic/basic-optimizer.c | 8 +++--- modules/optimizers/basic/optimizer.c | 8 +++--- modules/optimizers/dbg/Makefile.am | 12 -------- modules/optimizers/dbg/optimizer.c | 32 ---------------------- src/optimizer.h | 2 +- src/optimizers/Makefile.am | 2 +- src/optimizers/basic/basic-optimizer.c | 8 +++--- src/optimizers/basic/optimizer.c | 8 +++--- src/optimizers/dbg/Makefile.am | 12 -------- src/optimizers/dbg/optimizer.c | 32 ---------------------- 14 files changed, 22 insertions(+), 110 deletions(-) delete mode 100644 modules/optimizers/dbg/Makefile.am delete mode 100644 modules/optimizers/dbg/optimizer.c delete mode 100644 src/optimizers/dbg/Makefile.am delete mode 100644 src/optimizers/dbg/optimizer.c diff --git a/configure.ac b/configure.ac index 1d9d8fa8..38e2b1a9 100644 --- a/configure.ac +++ b/configure.ac @@ -210,7 +210,7 @@ AC_OUTPUT(Makefile src/preprocs/Makefile src/preprocs/raw/Makefile src/optimizers/Makefile - src/optimizers/dbg/Makefile + src/optimizers/basic/Makefile src/objfmts/Makefile src/objfmts/dbg/Makefile src/tests/Makefile diff --git a/configure.in b/configure.in index 1d9d8fa8..38e2b1a9 100644 --- a/configure.in +++ b/configure.in @@ -210,7 +210,7 @@ AC_OUTPUT(Makefile src/preprocs/Makefile src/preprocs/raw/Makefile src/optimizers/Makefile - src/optimizers/dbg/Makefile + src/optimizers/basic/Makefile src/objfmts/Makefile src/objfmts/dbg/Makefile src/tests/Makefile diff --git a/libyasm/optimizer.h b/libyasm/optimizer.h index 0f52e087..cb4aae10 100644 --- a/libyasm/optimizer.h +++ b/libyasm/optimizer.h @@ -38,6 +38,6 @@ struct optimizer { }; /* Available optimizers */ -extern optimizer dbg_optimizer; +extern optimizer basic_optimizer; #endif diff --git a/modules/optimizers/Makefile.am b/modules/optimizers/Makefile.am index bfa60745..794ebe23 100644 --- a/modules/optimizers/Makefile.am +++ b/modules/optimizers/Makefile.am @@ -1,3 +1,3 @@ # $IdPath$ -SUBDIRS = dbg +SUBDIRS = basic diff --git a/modules/optimizers/basic/basic-optimizer.c b/modules/optimizers/basic/basic-optimizer.c index 763f3864..d22e6af4 100644 --- a/modules/optimizers/basic/basic-optimizer.c +++ b/modules/optimizers/basic/basic-optimizer.c @@ -1,5 +1,5 @@ /* - * Debugging optimizer (used to debug optimizer module interface) + * Basic optimizer (equivalent to the NASM 2-pass 'no optimizer' design) * * Copyright (C) 2001 Peter Johnson * @@ -26,7 +26,7 @@ RCSID("$IdPath$"); /* Define optimizer structure -- see optimizer.h for details */ -optimizer dbg_optimizer = { - "Trace of all info passed to optimizer module", - "dbg" +optimizer basic_optimizer = { + "Only the most basic optimizations", + "basic" }; diff --git a/modules/optimizers/basic/optimizer.c b/modules/optimizers/basic/optimizer.c index 763f3864..d22e6af4 100644 --- a/modules/optimizers/basic/optimizer.c +++ b/modules/optimizers/basic/optimizer.c @@ -1,5 +1,5 @@ /* - * Debugging optimizer (used to debug optimizer module interface) + * Basic optimizer (equivalent to the NASM 2-pass 'no optimizer' design) * * Copyright (C) 2001 Peter Johnson * @@ -26,7 +26,7 @@ RCSID("$IdPath$"); /* Define optimizer structure -- see optimizer.h for details */ -optimizer dbg_optimizer = { - "Trace of all info passed to optimizer module", - "dbg" +optimizer basic_optimizer = { + "Only the most basic optimizations", + "basic" }; diff --git a/modules/optimizers/dbg/Makefile.am b/modules/optimizers/dbg/Makefile.am deleted file mode 100644 index 31ea1c2a..00000000 --- a/modules/optimizers/dbg/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -# $IdPath$ - -noinst_LIBRARIES = liboptimizer.a - -liboptimizer_a_SOURCES = \ - optimizer.c - -INCLUDES = \ - -I$(top_srcdir)/src \ - -I$(top_builddir)/intl - -CFLAGS = @ANSI_CFLAGS@ diff --git a/modules/optimizers/dbg/optimizer.c b/modules/optimizers/dbg/optimizer.c deleted file mode 100644 index 763f3864..00000000 --- a/modules/optimizers/dbg/optimizer.c +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Debugging optimizer (used to debug optimizer module interface) - * - * Copyright (C) 2001 Peter Johnson - * - * This file is part of YASM. - * - * YASM is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * YASM is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#include "util.h" -RCSID("$IdPath$"); - -#include "optimizer.h" - - -/* Define optimizer structure -- see optimizer.h for details */ -optimizer dbg_optimizer = { - "Trace of all info passed to optimizer module", - "dbg" -}; diff --git a/src/optimizer.h b/src/optimizer.h index 0f52e087..cb4aae10 100644 --- a/src/optimizer.h +++ b/src/optimizer.h @@ -38,6 +38,6 @@ struct optimizer { }; /* Available optimizers */ -extern optimizer dbg_optimizer; +extern optimizer basic_optimizer; #endif diff --git a/src/optimizers/Makefile.am b/src/optimizers/Makefile.am index bfa60745..794ebe23 100644 --- a/src/optimizers/Makefile.am +++ b/src/optimizers/Makefile.am @@ -1,3 +1,3 @@ # $IdPath$ -SUBDIRS = dbg +SUBDIRS = basic diff --git a/src/optimizers/basic/basic-optimizer.c b/src/optimizers/basic/basic-optimizer.c index 763f3864..d22e6af4 100644 --- a/src/optimizers/basic/basic-optimizer.c +++ b/src/optimizers/basic/basic-optimizer.c @@ -1,5 +1,5 @@ /* - * Debugging optimizer (used to debug optimizer module interface) + * Basic optimizer (equivalent to the NASM 2-pass 'no optimizer' design) * * Copyright (C) 2001 Peter Johnson * @@ -26,7 +26,7 @@ RCSID("$IdPath$"); /* Define optimizer structure -- see optimizer.h for details */ -optimizer dbg_optimizer = { - "Trace of all info passed to optimizer module", - "dbg" +optimizer basic_optimizer = { + "Only the most basic optimizations", + "basic" }; diff --git a/src/optimizers/basic/optimizer.c b/src/optimizers/basic/optimizer.c index 763f3864..d22e6af4 100644 --- a/src/optimizers/basic/optimizer.c +++ b/src/optimizers/basic/optimizer.c @@ -1,5 +1,5 @@ /* - * Debugging optimizer (used to debug optimizer module interface) + * Basic optimizer (equivalent to the NASM 2-pass 'no optimizer' design) * * Copyright (C) 2001 Peter Johnson * @@ -26,7 +26,7 @@ RCSID("$IdPath$"); /* Define optimizer structure -- see optimizer.h for details */ -optimizer dbg_optimizer = { - "Trace of all info passed to optimizer module", - "dbg" +optimizer basic_optimizer = { + "Only the most basic optimizations", + "basic" }; diff --git a/src/optimizers/dbg/Makefile.am b/src/optimizers/dbg/Makefile.am deleted file mode 100644 index 31ea1c2a..00000000 --- a/src/optimizers/dbg/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -# $IdPath$ - -noinst_LIBRARIES = liboptimizer.a - -liboptimizer_a_SOURCES = \ - optimizer.c - -INCLUDES = \ - -I$(top_srcdir)/src \ - -I$(top_builddir)/intl - -CFLAGS = @ANSI_CFLAGS@ diff --git a/src/optimizers/dbg/optimizer.c b/src/optimizers/dbg/optimizer.c deleted file mode 100644 index 763f3864..00000000 --- a/src/optimizers/dbg/optimizer.c +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Debugging optimizer (used to debug optimizer module interface) - * - * Copyright (C) 2001 Peter Johnson - * - * This file is part of YASM. - * - * YASM is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * YASM is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#include "util.h" -RCSID("$IdPath$"); - -#include "optimizer.h" - - -/* Define optimizer structure -- see optimizer.h for details */ -optimizer dbg_optimizer = { - "Trace of all info passed to optimizer module", - "dbg" -};