From 9d784e9d6540696dda776f129c04ab476d11333b Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Fri, 5 Sep 2003 04:20:46 +0000 Subject: [PATCH] Merge updates for 0.3.0 into the trunk (except for version bump). svn path=/trunk/yasm/; revision=1055 --- Makefile.am | 4 +- Mkfiles/Makefile.dj | 17 +- Mkfiles/Makefile.flat | 15 +- Mkfiles/dj/config.h | 28 ++- Mkfiles/dj/libyasm/config.h | 336 ------------------------------ Mkfiles/vc/{libyasm => }/config.h | 28 ++- Mkfiles/vc/modules/modules.dsp | 32 ++- Mkfiles/vc/modules/modules.mak | 50 +++++ Mkfiles/vc/yasm-module.c | 4 + 9 files changed, 153 insertions(+), 361 deletions(-) delete mode 100644 Mkfiles/dj/libyasm/config.h rename Mkfiles/vc/{libyasm => }/config.h (90%) diff --git a/Makefile.am b/Makefile.am index ffe17aec..24a82212 100644 --- a/Makefile.am +++ b/Makefile.am @@ -47,13 +47,13 @@ EXTRA_DIST += GNU_LGPL-2.0 EXTRA_DIST += splint.sh EXTRA_DIST += Mkfiles/Makefile.flat EXTRA_DIST += Mkfiles/Makefile.dj -EXTRA_DIST += Mkfiles/dj/libyasm/config.h +EXTRA_DIST += Mkfiles/dj/config.h EXTRA_DIST += Mkfiles/vc/yasm-module.c EXTRA_DIST += Mkfiles/vc/yasm.dep EXTRA_DIST += Mkfiles/vc/yasm.dsp EXTRA_DIST += Mkfiles/vc/yasm.dsw EXTRA_DIST += Mkfiles/vc/yasm.mak -EXTRA_DIST += Mkfiles/vc/libyasm/config.h +EXTRA_DIST += Mkfiles/vc/config.h EXTRA_DIST += Mkfiles/vc/libyasm/libyasm.dep EXTRA_DIST += Mkfiles/vc/libyasm/libyasm.dsp EXTRA_DIST += Mkfiles/vc/libyasm/libyasm.mak diff --git a/Mkfiles/Makefile.dj b/Mkfiles/Makefile.dj index a16e7a98..0738a41c 100644 --- a/Mkfiles/Makefile.dj +++ b/Mkfiles/Makefile.dj @@ -9,7 +9,7 @@ # How to compile: # make -fMkfiles/Makefile.dj -CFLAGS=-DHAVE_CONFIG_H -DWIN32 -IMkfiles/dj -I. -Ifrontends/yasm +CFLAGS=-DHAVE_CONFIG_H -DWIN32 -IMkfiles/dj -O2 -I. -Ifrontends/yasm CC=gcc all: yasm @@ -34,19 +34,30 @@ LIBYASM_OBJS= \ libyasm/xmalloc.o \ libyasm/xstrdup.o -MODULES_ARCH_OBJS= \ +MODULES_ARCH_X86_OBJS= \ modules/arch/x86/x86arch.o \ modules/arch/x86/x86bc.o \ modules/arch/x86/x86expr.o \ x86id.o +MODULES_ARCH_LC3B_OBJS= \ + modules/arch/lc3b/lc3barch.o \ + modules/arch/lc3b/lc3bbc.o \ + lc3bid.o + +MODULES_ARCH_OBJS= \ + $(MODULES_ARCH_X86_OBJS) \ + $(MODULES_ARCH_LC3B_OBJS) + MODULES_DBGFMTS_OBJS= \ modules/dbgfmts/null/null-dbgfmt.o MODULES_OBJFMTS_OBJS= \ modules/objfmts/dbg/dbg-objfmt.o \ modules/objfmts/bin/bin-objfmt.o \ - modules/objfmts/coff/coff-objfmt.o + modules/objfmts/coff/coff-objfmt.o \ + modules/objfmts/elf/elf.o \ + modules/objfmts/elf/elf-objfmt.o MODULES_OPTIMIZERS_OBJS= \ modules/optimizers/basic/basic-optimizer.o diff --git a/Mkfiles/Makefile.flat b/Mkfiles/Makefile.flat index 57d332cc..a90054b3 100644 --- a/Mkfiles/Makefile.flat +++ b/Mkfiles/Makefile.flat @@ -37,19 +37,30 @@ LIBYASM_OBJS= \ libyasm/xmalloc.o \ libyasm/xstrdup.o -MODULES_ARCH_OBJS= \ +MODULES_ARCH_X86_OBJS= \ modules/arch/x86/x86arch.o \ modules/arch/x86/x86bc.o \ modules/arch/x86/x86expr.o \ x86id.o +MODULES_ARCH_LC3B_OBJS= \ + modules/arch/lc3b/lc3barch.o \ + modules/arch/lc3b/lc3bbc.o \ + lc3bid.o + +MODULES_ARCH_OBJS= \ + $(MODULES_ARCH_X86_OBJS) \ + $(MODULES_ARCH_LC3B_OBJS) + MODULES_DBGFMTS_OBJS= \ modules/dbgfmts/null/null-dbgfmt.o MODULES_OBJFMTS_OBJS= \ modules/objfmts/dbg/dbg-objfmt.o \ modules/objfmts/bin/bin-objfmt.o \ - modules/objfmts/coff/coff-objfmt.o + modules/objfmts/coff/coff-objfmt.o \ + modules/objfmts/elf/elf.o \ + modules/objfmts/elf/elf-objfmt.o MODULES_OPTIMIZERS_OBJS= \ modules/optimizers/basic/basic-optimizer.o diff --git a/Mkfiles/dj/config.h b/Mkfiles/dj/config.h index 8ac0485f..5a29c4b6 100644 --- a/Mkfiles/dj/config.h +++ b/Mkfiles/dj/config.h @@ -30,12 +30,18 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_ASSERT_H */ +/* Define to 1 if you have the `basename' function. */ +#define HAVE_BASENAME 1 + /* Define to 1 if you have the `bcopy' function. */ /* #undef HAVE_BCOPY */ /* */ /* #undef HAVE_CATGETS */ +/* Define to 1 if you have the `closedir' function. */ +/* #undef HAVE_CLOSEDIR */ + /* Define to 1 if you have the header file. */ #define HAVE_CTYPE_H 1 @@ -98,7 +104,8 @@ /* Define if you have the header file. */ #define HAVE_LIMITS_H 1 -/* Define if your system has a working `malloc' function. */ +/* Define to 1 if your system has a GNU libc compatible `malloc' function, and + to 0 otherwise. */ #define HAVE_MALLOC 1 /* Define if you have the header file. */ @@ -131,9 +138,15 @@ /* Define to 1 if you have the header file, and it defines `DIR'. */ /* #undef HAVE_NDIR_H */ +/* Define to 1 if you have the `opendir' function. */ +/* #undef HAVE_OPENDIR */ + /* Define if libtool can extract symbol lists from object files. */ /* #undef HAVE_PRELOADED_SYMBOLS */ +/* Define to 1 if you have the `readdir' function. */ +/* #undefine HAVE_READDIR */ + /* Define to 1 if you have the `rindex' function. */ /* #undef HAVE_RINDEX */ @@ -280,13 +293,13 @@ #define PACKAGE_NAME "yasm" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "yasm `date "+%Y%m%d"`" +#define PACKAGE_STRING "yasm CVS" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "yasm" /* Define to the version of this package. */ -#define PACKAGE_VERSION "`date "+%Y%m%d"`" +#define PACKAGE_VERSION "CVS" /* Define if the C compiler supports function prototypes. */ #define PROTOTYPES 1 @@ -298,15 +311,11 @@ /* #undef USE_FORKWAITMSG */ /* Version number of package */ -#define VERSION "0.1.0" +#define VERSION "CVS" /* Define if using the dmalloc debugging malloc package */ /* #undef WITH_DMALLOC */ -/* Define if `lex' declares `yytext' as a `char *' by default, not a `char[]'. - */ -#define YYTEXT_POINTER 1 - /* Make sure we see all GNU extensions. */ /* #undef _GNU_SOURCE */ @@ -326,6 +335,9 @@ if it is not supported. */ /* #undef inline */ +/* Define to rpl_malloc if the replacement function should be used. */ +/* #undef malloc */ + /* Define to `int' if doesn't define. */ /* #undef pid_t */ diff --git a/Mkfiles/dj/libyasm/config.h b/Mkfiles/dj/libyasm/config.h deleted file mode 100644 index 8ac0485f..00000000 --- a/Mkfiles/dj/libyasm/config.h +++ /dev/null @@ -1,336 +0,0 @@ -/* $IdPath$ */ - -/* */ -/* #undef ENABLE_NLS */ - -/* Define if you have the `abort' function. */ -#define HAVE_ABORT 1 - -/* Define if you have and it should be used (not on Ultrix). */ -/* #undef HAVE_ALLOCA_H */ - -/* Define to 1 if you have the `argz_append' function. */ -/* #undef HAVE_ARGZ_APPEND */ - -/* Define to 1 if you have the `argz_create_sep' function. */ -/* #undef HAVE_ARGZ_CREATE_SEP */ - -/* Define if you have the header file. */ -/* #undef HAVE_ARGZ_H */ - -/* Define to 1 if you have the `argz_insert' function. */ -/* #undef HAVE_ARGZ_INSERT */ - -/* Define to 1 if you have the `argz_next' function. */ -/* #undef HAVE_ARGZ_NEXT */ - -/* Define to 1 if you have the `argz_stringify' function. */ -/* #undef HAVE_ARGZ_STRINGIFY */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_ASSERT_H */ - -/* Define to 1 if you have the `bcopy' function. */ -/* #undef HAVE_BCOPY */ - -/* */ -/* #undef HAVE_CATGETS */ - -/* Define to 1 if you have the header file. */ -#define HAVE_CTYPE_H 1 - -/* Define if the GNU dcgettext() function is already present or preinstalled. - */ -/* #undef HAVE_DCGETTEXT */ - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -/* #undef HAVE_DIRENT_H */ - -/* Define if you have the GNU dld library. */ -/* #undef HAVE_DLD */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_DLD_H */ - -/* Define to 1 if you have the `dlerror' function. */ -/* #undef HAVE_DLERROR */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_DLFCN_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_DL_H */ - -/* Define if you don't have `vprintf' but do have `_doprnt'. */ -/* #undef HAVE_DOPRNT */ - -/* Define to 1 if you have the header file. */ -#define HAVE_ERRNO_H 1 - -/* Define to 1 if the system has the type `error_t'. */ -/* #undef HAVE_ERROR_T */ - -/* Define if you have the `fork' function. */ -/* #undef HAVE_FORK */ - -/* */ -/* #undef HAVE_GETTEXT */ - -/* Define if you have the GNU C Library */ -/* #undef HAVE_GNU_C_LIBRARY */ - -/* Define if you have the iconv() function. */ -/* #undef HAVE_ICONV */ - -/* Define to 1 if you have the `index' function. */ -/* #undef HAVE_INDEX */ - -/* Define if you have the header file. */ -/* #undef HAVE_INTTYPES_H */ - -/* */ -/* #undef HAVE_LC_MESSAGES */ - -/* Define if you have the libdl library or equivalent. */ -/* #undef HAVE_LIBDL */ - -/* Define if you have the header file. */ -#define HAVE_LIMITS_H 1 - -/* Define if your system has a working `malloc' function. */ -#define HAVE_MALLOC 1 - -/* Define if you have the header file. */ -#define HAVE_MALLOC_H 1 - -/* Define if you have the `memcpy' function. */ -#define HAVE_MEMCPY 1 - -/* Define if you have the `memmove' function. */ -#define HAVE_MEMMOVE 1 - -/* Define if you have the header file. */ -#define HAVE_MEMORY_H 1 - -/* Define if you have the `mergesort function. */ -/* #undef HAVE_MERGESORT */ - -/* Define if you have the `msgctl' function. */ -/* #undef HAVE_MSGCTL */ - -/* Define if you have the `msgget' function. */ -/* #undef HAVE_MSGGET */ - -/* Define if you have the `msgrcv' function. */ -/* #undef HAVE_MSGRCV */ - -/* Define if you have the `msgsnd' function. */ -/* #undef HAVE_MSGSND */ - -/* Define to 1 if you have the header file, and it defines `DIR'. */ -/* #undef HAVE_NDIR_H */ - -/* Define if libtool can extract symbol lists from object files. */ -/* #undef HAVE_PRELOADED_SYMBOLS */ - -/* Define to 1 if you have the `rindex' function. */ -/* #undef HAVE_RINDEX */ - -/* Define if you have the shl_load function. */ -/* #undef HAVE_SHL_LOAD */ - -/* Define if you have the `snprintf' function. */ -/* #undef HAVE_SNPRINTF */ - -/* Define if you have the header file. */ -#define HAVE_STDINT_H 1 - -/* Define to 1 if you have the header file. */ -#define HAVE_STDIO_H 1 - -/* Define if you have the header file. */ -#define HAVE_STDLIB_H 1 - -/* */ -#define HAVE_STPCPY 1 - -/* Define if you have the `strcasecmp' function. */ -#define HAVE_STRCASECMP 1 - -/* Define if you have the `strchr' function. */ -#define HAVE_STRCHR 1 - -/* Define to 1 if you have the `strcmp' function. */ -#define HAVE_STRCMP 1 - -/* Define if you have the `strcmpi' function. */ -/* #undef HAVE_STRCMPI */ - -/* Define if you have the `strerror' function. */ -#define HAVE_STRERROR 1 - -/* Define if you have the `stricmp' function. */ -/* #undef HAVE_STRICMP */ - -/* Define if you have the header file. */ -#define HAVE_STRINGS_H 1 - -/* Define if you have the header file. */ -#define HAVE_STRING_H 1 - -/* Define if you have the `strncasecmp' function. */ -#define HAVE_STRNCASECMP 1 - -/* Define if you have the `strrchr' function. */ -#define HAVE_STRRCHR 1 - -/* Define if you have the `strsep' function. */ -#define HAVE_STRSEP 1 - -/* Define if you have the header file. */ -#define HAVE_SYS_CDEFS_H 1 - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -/* #undef HAVE_SYS_DIR_H */ - -/* Define to 1 if you have the header file. */ -/* #undef HAVE_SYS_DL_H */ - -/* Define if you have the header file. */ -/* #undef HAVE_SYS_IPC_H */ - -/* Define if you have the header file. */ -/* #undef HAVE_SYS_MSG_H */ - -/* Define to 1 if you have the header file, and it defines `DIR'. - */ -/* #undef HAVE_SYS_NDIR_H */ - -/* Define if you have the header file. */ -#define HAVE_SYS_PARAM_H 1 - -/* Define if you have the header file. */ -/* #undef HAVE_SYS_QUEUE_H */ - -/* Define if you have the header file. */ -#define HAVE_SYS_STAT_H 1 - -/* Define if you have the header file. */ -#define HAVE_SYS_TYPES_H 1 - -/* Define if you have that is POSIX.1 compatible. */ -#define HAVE_SYS_WAIT_H 1 - -/* Define if you have the `toascii' function. */ -#define HAVE_TOASCII 1 - -/* Define if you have the header file. */ -#define HAVE_UNISTD_H 1 - -/* Define if you have the `vfork' function. */ -/* #undef HAVE_VFORK */ - -/* Define if you have the header file. */ -/* #undef HAVE_VFORK_H */ - -/* Define if you have the vprintf function. */ -#define HAVE_VPRINTF 1 - -/* Define to 1 if you have the `vsnprintf' function. */ -/* #undef HAVE_VSNPRINTF */ - -/* Define if you have the `wait' function. */ -#define HAVE_WAIT 1 - -/* Define if `fork' works. */ -/* #undef HAVE_WORKING_FORK */ - -/* Define if `vfork' works. */ -/* #undef HAVE_WORKING_VFORK */ - -/* Define if the OS needs help to load dependent libraries for dlopen(). */ -#define LTDL_DLOPEN_DEPLIBS 1 - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#define LTDL_OBJDIR ".libs/" - -/* Define to the name of the environment variable that determines the dynamic - library search path. */ -#define LTDL_SHLIBPATH_VAR "PATH" - -/* Define to the extension used for shared libraries, say, ".so". */ -#define LTDL_SHLIB_EXT ".dll" - -/* Define to the system default library search path. */ -#define LTDL_SYSSEARCHPATH "/lib:/usr/lib" - -/* Define if dlsym() requires a leading underscode in symbol names. */ -/* #undef NEED_USCORE */ - -/* Name of package */ -#define PACKAGE "yasm" - -/* Define to the address where bug reports for this package should be sent. */ -#define PACKAGE_BUGREPORT "bug-yasm@tortall.net" - -/* Define to the full name of this package. */ -#define PACKAGE_NAME "yasm" - -/* Define to the full name and version of this package. */ -#define PACKAGE_STRING "yasm `date "+%Y%m%d"`" - -/* Define to the one symbol short name of this package. */ -#define PACKAGE_TARNAME "yasm" - -/* Define to the version of this package. */ -#define PACKAGE_VERSION "`date "+%Y%m%d"`" - -/* Define if the C compiler supports function prototypes. */ -#define PROTOTYPES 1 - -/* Define if you have the ANSI C header files. */ -#define STDC_HEADERS 1 - -/* Combined test for fork/wait/msg* */ -/* #undef USE_FORKWAITMSG */ - -/* Version number of package */ -#define VERSION "0.1.0" - -/* Define if using the dmalloc debugging malloc package */ -/* #undef WITH_DMALLOC */ - -/* Define if `lex' declares `yytext' as a `char *' by default, not a `char[]'. - */ -#define YYTEXT_POINTER 1 - -/* Make sure we see all GNU extensions. */ -/* #undef _GNU_SOURCE */ - -/* Make sure we see all SVID extensions. */ -/* #undef _SVID_SOURCE */ - -/* Define like PROTOTYPES; this can be used by system headers. */ -#define __PROTOTYPES 1 - -/* Define to empty if `const' does not conform to ANSI C. */ -/* #undef const */ - -/* Define to a type to use for `error_t' if it is not otherwise available. */ -#define error_t int - -/* Define as `__inline' if that's what the C compiler calls it, or to nothing - if it is not supported. */ -/* #undef inline */ - -/* Define to `int' if doesn't define. */ -/* #undef pid_t */ - -/* Define to `unsigned' if doesn't define. */ -/* #undef size_t */ - -/* Define as `fork' if `vfork' does not work. */ -/* #undef vfork */ diff --git a/Mkfiles/vc/libyasm/config.h b/Mkfiles/vc/config.h similarity index 90% rename from Mkfiles/vc/libyasm/config.h rename to Mkfiles/vc/config.h index 756be2a7..c406ccc9 100644 --- a/Mkfiles/vc/libyasm/config.h +++ b/Mkfiles/vc/config.h @@ -30,12 +30,18 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_ASSERT_H */ +/* Define to 1 if you have the `basename' function. */ +#define HAVE_BASENAME 1 + /* Define to 1 if you have the `bcopy' function. */ /* #undef HAVE_BCOPY */ /* */ /* #undef HAVE_CATGETS */ +/* Define to 1 if you have the `closedir' function. */ +/* #undef HAVE_CLOSEDIR */ + /* Define to 1 if you have the header file. */ #define HAVE_CTYPE_H 1 @@ -98,7 +104,8 @@ /* Define if you have the header file. */ #define HAVE_LIMITS_H 1 -/* Define if your system has a working `malloc' function. */ +/* Define to 1 if your system has a GNU libc compatible `malloc' function, and + to 0 otherwise. */ #define HAVE_MALLOC 1 /* Define if you have the header file. */ @@ -131,9 +138,15 @@ /* Define to 1 if you have the header file, and it defines `DIR'. */ /* #undef HAVE_NDIR_H */ +/* Define to 1 if you have the `opendir' function. */ +/* #undef HAVE_OPENDIR */ + /* Define if libtool can extract symbol lists from object files. */ /* #undef HAVE_PRELOADED_SYMBOLS */ +/* Define to 1 if you have the `readdir' function. */ +/* #undefine HAVE_READDIR */ + /* Define to 1 if you have the `rindex' function. */ /* #undef HAVE_RINDEX */ @@ -284,13 +297,13 @@ #define PACKAGE_NAME "yasm" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "yasm `date "+%Y%m%d"`" +#define PACKAGE_STRING "yasm CVS" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "yasm" /* Define to the version of this package. */ -#define PACKAGE_VERSION "`date "+%Y%m%d"`" +#define PACKAGE_VERSION "CVS" /* Define if the C compiler supports function prototypes. */ #define PROTOTYPES 1 @@ -302,15 +315,11 @@ /* #undef USE_FORKWAITMSG */ /* Version number of package */ -#define VERSION "0.1.0" +#define VERSION "CVS" /* Define if using the dmalloc debugging malloc package */ /* #undef WITH_DMALLOC */ -/* Define if `lex' declares `yytext' as a `char *' by default, not a `char[]'. - */ -#define YYTEXT_POINTER 1 - /* Make sure we see all GNU extensions. */ /* #undef _GNU_SOURCE */ @@ -330,6 +339,9 @@ if it is not supported. */ /* #undef inline */ +/* Define to rpl_malloc if the replacement function should be used. */ +/* #undef malloc */ + /* Define to `int' if doesn't define. */ #define pid_t int diff --git a/Mkfiles/vc/modules/modules.dsp b/Mkfiles/vc/modules/modules.dsp index 5913f470..fe2c5526 100644 --- a/Mkfiles/vc/modules/modules.dsp +++ b/Mkfiles/vc/modules/modules.dsp @@ -63,8 +63,8 @@ LIB32=link.exe -lib # PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I ".." /I "../../.." /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /GZ /c +# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I ".." /I "../../.." /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "HAVE_CONFIG_H" /YX /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe @@ -88,6 +88,22 @@ LIB32=link.exe -lib # PROP Default_Filter "" # Begin Source File +SOURCE=..\..\..\modules\arch\lc3b\lc3barch.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\modules\arch\lc3b\lc3barch.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\modules\arch\lc3b\lc3bbc.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\lc3bid.c +# End Source File +# Begin Source File + SOURCE=..\..\..\modules\arch\x86\x86arch.c # End Source File # Begin Source File @@ -130,6 +146,18 @@ SOURCE="..\..\..\modules\objfmts\coff\coff-objfmt.c" SOURCE="..\..\..\modules\objfmts\dbg\dbg-objfmt.c" # End Source File +# Begin Source File + +SOURCE="..\..\..\modules\objfmts\elf\elf-objfmt.c" +# End Source File +# Begin Source File + +SOURCE=..\..\..\modules\objfmts\elf\elf.c +# End Source File +# Begin Source File + +SOURCE=..\..\..\modules\objfmts\elf\elf.h +# End Source File # End Group # Begin Group "optimizers" diff --git a/Mkfiles/vc/modules/modules.mak b/Mkfiles/vc/modules/modules.mak index c4585876..0684a8bd 100644 --- a/Mkfiles/vc/modules/modules.mak +++ b/Mkfiles/vc/modules/modules.mak @@ -52,6 +52,11 @@ CLEAN : -@erase "$(INTDIR)\bin-objfmt.obj" -@erase "$(INTDIR)\coff-objfmt.obj" -@erase "$(INTDIR)\dbg-objfmt.obj" + -@erase "$(INTDIR)\elf-objfmt.obj" + -@erase "$(INTDIR)\elf.obj" + -@erase "$(INTDIR)\lc3barch.obj" + -@erase "$(INTDIR)\lc3bbc.obj" + -@erase "$(INTDIR)\lc3bid.obj" -@erase "$(INTDIR)\nasm-bison.obj" -@erase "$(INTDIR)\nasm-eval.obj" -@erase "$(INTDIR)\nasm-macros.obj" @@ -131,6 +136,11 @@ LIB32_OBJS= \ "$(INTDIR)\nasm-preproc.obj" \ "$(INTDIR)\nasmlib.obj" \ "$(INTDIR)\raw-preproc.obj" \ + "$(INTDIR)\lc3bbc.obj" \ + "$(INTDIR)\lc3barch.obj" \ + "$(INTDIR)\lc3bid.obj" \ + "$(INTDIR)\elf-objfmt.obj" \ + "$(INTDIR)\elf.obj" \ "..\libyasm\Release\libyasm.lib" "$(OUTDIR)\modules.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) @@ -165,6 +175,11 @@ CLEAN : -@erase "$(INTDIR)\bin-objfmt.obj" -@erase "$(INTDIR)\coff-objfmt.obj" -@erase "$(INTDIR)\dbg-objfmt.obj" + -@erase "$(INTDIR)\elf-objfmt.obj" + -@erase "$(INTDIR)\elf.obj" + -@erase "$(INTDIR)\lc3barch.obj" + -@erase "$(INTDIR)\lc3bbc.obj" + -@erase "$(INTDIR)\lc3bid.obj" -@erase "$(INTDIR)\nasm-bison.obj" -@erase "$(INTDIR)\nasm-eval.obj" -@erase "$(INTDIR)\nasm-macros.obj" @@ -245,6 +260,11 @@ LIB32_OBJS= \ "$(INTDIR)\nasm-preproc.obj" \ "$(INTDIR)\nasmlib.obj" \ "$(INTDIR)\raw-preproc.obj" \ + "$(INTDIR)\lc3bbc.obj" \ + "$(INTDIR)\lc3barch.obj" \ + "$(INTDIR)\lc3bid.obj" \ + "$(INTDIR)\elf-objfmt.obj" \ + "$(INTDIR)\elf.obj" \ "..\libyasm\Debug\libyasm.lib" "$(OUTDIR)\modules.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS) @@ -265,6 +285,24 @@ LIB32_OBJS= \ !IF "$(CFG)" == "modules - Win32 Release" || "$(CFG)" == "modules - Win32 Debug" +SOURCE=..\..\..\modules\arch\lc3b\lc3barch.c + +"$(INTDIR)\lc3barch.obj" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=..\..\..\modules\arch\lc3b\lc3bbc.c + +"$(INTDIR)\lc3bbc.obj" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=..\..\..\lc3bid.c + +"$(INTDIR)\lc3bid.obj" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + SOURCE=..\..\..\modules\arch\x86\x86arch.c "$(INTDIR)\x86arch.obj" : $(SOURCE) "$(INTDIR)" @@ -313,6 +351,18 @@ SOURCE="..\..\..\modules\objfmts\dbg\dbg-objfmt.c" $(CPP) $(CPP_PROJ) $(SOURCE) +SOURCE="..\..\..\modules\objfmts\elf\elf-objfmt.c" + +"$(INTDIR)\elf-objfmt.obj" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + +SOURCE=..\..\..\modules\objfmts\elf\elf.c + +"$(INTDIR)\elf.obj" : $(SOURCE) "$(INTDIR)" + $(CPP) $(CPP_PROJ) $(SOURCE) + + SOURCE="..\..\..\modules\optimizers\basic\basic-optimizer.c" "$(INTDIR)\basic-optimizer.obj" : $(SOURCE) "$(INTDIR)" diff --git a/Mkfiles/vc/yasm-module.c b/Mkfiles/vc/yasm-module.c index b9a50c72..fdf8c816 100644 --- a/Mkfiles/vc/yasm-module.c +++ b/Mkfiles/vc/yasm-module.c @@ -41,11 +41,13 @@ typedef struct module { extern yasm_arch yasm_x86_LTX_arch; extern int yasm_x86_LTX_mode_bits; +extern yasm_arch yasm_lc3b_LTX_arch; extern yasm_dbgfmt yasm_null_LTX_dbgfmt; extern yasm_objfmt yasm_bin_LTX_objfmt; extern yasm_objfmt yasm_coff_LTX_objfmt; extern yasm_objfmt yasm_win32_LTX_objfmt; extern yasm_objfmt yasm_dbg_LTX_objfmt; +extern yasm_objfmt yasm_elf_LTX_objfmt; extern yasm_optimizer yasm_basic_LTX_optimizer; extern yasm_parser yasm_nasm_LTX_parser; extern yasm_preproc yasm_nasm_LTX_preproc; @@ -55,11 +57,13 @@ extern yasm_preproc yasm_yapp_LTX_preproc; static module modules[] = { {MODULE_ARCH, "x86", "arch", &yasm_x86_LTX_arch}, {MODULE_ARCH, "x86", "mode_bits", &yasm_x86_LTX_mode_bits}, + {MODULE_ARCH, "lc3b", "arch", &yasm_lc3b_LTX_arch}, {MODULE_DBGFMT, "null", "dbgfmt", &yasm_null_LTX_dbgfmt}, {MODULE_OBJFMT, "bin", "objfmt", &yasm_bin_LTX_objfmt}, {MODULE_OBJFMT, "coff", "objfmt", &yasm_coff_LTX_objfmt}, {MODULE_OBJFMT, "dbg", "objfmt", &yasm_dbg_LTX_objfmt}, {MODULE_OBJFMT, "win32", "objfmt", &yasm_win32_LTX_objfmt}, + {MODULE_OBJFMT, "elf", "objfmt", &yasm_elf_LTX_objfmt}, {MODULE_OPTIMIZER, "basic", "optimizer", &yasm_basic_LTX_optimizer}, {MODULE_PARSER, "nasm", "parser", &yasm_nasm_LTX_parser}, {MODULE_PREPROC, "nasm", "preproc", &yasm_nasm_LTX_preproc}, -- 2.40.0