luke
/
iverilog
mirror of https://github.com/steveicarus/iverilog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update the mingw build to not require cygwin files.

This commit is contained in:
steve 2001-05-22 02:14:47 +00:00
parent 53772db66d
commit 660fd7c1d4
10 changed files with 64 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tgt-null/null.c
View File

@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/ */
#if !defined(WINNT) && !defined(macintosh) #if !defined(WINNT) && !defined(macintosh)
#ident "$Id: null.c,v 1.3 2001/05/20 15:09:40 steve Exp $" #ident "$Id: null.c,v 1.4 2001/05/22 02:14:47 steve Exp $"
#endif #endif
/* /*
@ -32,13 +32,16 @@ int target_design(ivl_design_t des)
return 0; return 0;
} }
#if defined(__MINGW32__) || defined (__CYGWIN32__) #if defined (__CYGWIN32__)
#include <cygwin/cygwin_dll.h> #include <cygwin/cygwin_dll.h>
DECLARE_CYGWIN_DLL(DllMain); DECLARE_CYGWIN_DLL(DllMain);
#endif #endif
/* /*
* $Log: null.c,v $ * $Log: null.c,v $
* Revision 1.4 2001/05/22 02:14:47 steve
* Update the mingw build to not require cygwin files.
*
* Revision 1.3 2001/05/20 15:09:40 steve * Revision 1.3 2001/05/20 15:09:40 steve
* Mingw32 support (Venkat Iyer) * Mingw32 support (Venkat Iyer)
* *

7
tgt-stub/stub.c
View File

@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/ */
#if !defined(WINNT) && !defined(macintosh) #if !defined(WINNT) && !defined(macintosh)
#ident "$Id: stub.c,v 1.41 2001/05/20 15:09:40 steve Exp $" #ident "$Id: stub.c,v 1.42 2001/05/22 02:14:47 steve Exp $"
#endif #endif
/* /*
@ -543,13 +543,16 @@ int target_design(ivl_design_t des)
return 0; return 0;
} }
#if defined(__MINGW32__) || defined (__CYGWIN32__) #if defined (__CYGWIN32__)
#include <cygwin/cygwin_dll.h> #include <cygwin/cygwin_dll.h>
DECLARE_CYGWIN_DLL(DllMain); DECLARE_CYGWIN_DLL(DllMain);
#endif #endif
/* /*
* $Log: stub.c,v $ * $Log: stub.c,v $
* Revision 1.42 2001/05/22 02:14:47 steve
* Update the mingw build to not require cygwin files.
*
* Revision 1.41 2001/05/20 15:09:40 steve * Revision 1.41 2001/05/20 15:09:40 steve
* Mingw32 support (Venkat Iyer) * Mingw32 support (Venkat Iyer)
* *

7
tgt-verilog/verilog.c
View File

@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/ */
#if !defined(WINNT) && !defined(macintosh) #if !defined(WINNT) && !defined(macintosh)
#ident "$Id: verilog.c,v 1.22 2001/05/20 15:09:40 steve Exp $" #ident "$Id: verilog.c,v 1.23 2001/05/22 02:14:47 steve Exp $"
#endif #endif
/* /*
@ -434,13 +434,16 @@ int target_design(ivl_design_t des)
} }
#if defined(__MINGW32__) || defined (__CYGWIN32__) #if defined (__CYGWIN32__)
#include <cygwin/cygwin_dll.h> #include <cygwin/cygwin_dll.h>
DECLARE_CYGWIN_DLL(DllMain); DECLARE_CYGWIN_DLL(DllMain);
#endif #endif
/* /*
* $Log: verilog.c,v $ * $Log: verilog.c,v $
* Revision 1.23 2001/05/22 02:14:47 steve
* Update the mingw build to not require cygwin files.
*
* Revision 1.22 2001/05/20 15:09:40 steve * Revision 1.22 2001/05/20 15:09:40 steve
* Mingw32 support (Venkat Iyer) * Mingw32 support (Venkat Iyer)
* *

4
tgt-vvp/vvp.c
View File

@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/ */
#if !defined(WINNT) && !defined(macintosh) #if !defined(WINNT) && !defined(macintosh)
#ident "$Id: vvp.c,v 1.7 2001/05/20 15:09:40 steve Exp $" #ident "$Id: vvp.c,v 1.8 2001/05/22 02:14:47 steve Exp $"
#endif #endif
/* /*
@ -83,7 +83,7 @@ int target_design(ivl_design_t des)
return rc; return rc;
} }
#if defined(__MINGW32__) || defined (__CYGWIN32__) #if defined (__CYGWIN32__)
#include <cygwin/cygwin_dll.h> #include <cygwin/cygwin_dll.h>
DECLARE_CYGWIN_DLL(DllMain); DECLARE_CYGWIN_DLL(DllMain);
#endif #endif

7
vpi/sys_table.c
View File

@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/ */
#if !defined(WINNT) && !defined(macintosh) #if !defined(WINNT) && !defined(macintosh)
#ident "$Id: sys_table.c,v 1.10 2001/05/20 15:09:40 steve Exp $" #ident "$Id: sys_table.c,v 1.11 2001/05/22 02:14:47 steve Exp $"
#endif #endif
#include "vpi_user.h" #include "vpi_user.h"
@ -40,13 +40,16 @@ void (*vlog_startup_routines[])() = {
0 0
}; };
#if defined(__MINGW32__) || defined (__CYGWIN32__) #if defined (__CYGWIN32__)
#include <cygwin/cygwin_dll.h> #include <cygwin/cygwin_dll.h>
DECLARE_CYGWIN_DLL(DllMain); DECLARE_CYGWIN_DLL(DllMain);
#endif #endif
/* /*
* $Log: sys_table.c,v $ * $Log: sys_table.c,v $
* Revision 1.11 2001/05/22 02:14:47 steve
* Update the mingw build to not require cygwin files.
*
* Revision 1.10 2001/05/20 15:09:40 steve * Revision 1.10 2001/05/20 15:09:40 steve
* Mingw32 support (Venkat Iyer) * Mingw32 support (Venkat Iyer)
* *

7
vpip/vpi_systask.c
View File

@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/ */
#if !defined(WINNT) && !defined(macintosh) #if !defined(WINNT) && !defined(macintosh)
#ident "$Id: vpi_systask.c,v 1.2 2001/05/20 15:09:40 steve Exp $" #ident "$Id: vpi_systask.c,v 1.3 2001/05/22 02:14:47 steve Exp $"
#endif #endif
# include "vpi_priv.h" # include "vpi_priv.h"
@ -118,13 +118,16 @@ const struct __vpirt *vpip_get_sysfunc_rt(void)
return &vpip_sysfunc_rt; return &vpip_sysfunc_rt;
} }
#if defined(__MINGW32__) || defined (__CYGWIN32__) #if defined (__CYGWIN32__)
#include <cygwin/cygwin_dll.h> #include <cygwin/cygwin_dll.h>
DECLARE_CYGWIN_DLL(DllMain); DECLARE_CYGWIN_DLL(DllMain);
#endif #endif
/* /*
* $Log: vpi_systask.c,v $ * $Log: vpi_systask.c,v $
* Revision 1.3 2001/05/22 02:14:47 steve
* Update the mingw build to not require cygwin files.
*
* Revision 1.2 2001/05/20 15:09:40 steve * Revision 1.2 2001/05/20 15:09:40 steve
* Mingw32 support (Venkat Iyer) * Mingw32 support (Venkat Iyer)
* *

7
vvm/ivl_dlfcn.h
View File

@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/ */
#if !defined(WINNT) && !defined(macintosh) #if !defined(WINNT) && !defined(macintosh)
#ident "$Id: ivl_dlfcn.h,v 1.2 2001/05/20 15:09:40 steve Exp $" #ident "$Id: ivl_dlfcn.h,v 1.3 2001/05/22 02:14:47 steve Exp $"
#endif #endif
#if defined(__MINGW32__) #if defined(__MINGW32__)
@ -45,7 +45,7 @@ inline void ivl_dlclose(ivl_dll_t dll)
{ (void)FreeLibrary((HINSTANCE)dll);} { (void)FreeLibrary((HINSTANCE)dll);}
inline const char *dlerror(void) inline const char *dlerror(void)
{ static char s[30]; sprintf(s,"DLError:%l", GetLastError()); return s;} { static char s[30]; sprintf(s,"DLError:%ld", GetLastError()); return s;}
#elif defined(HAVE_DLFCN_H) #elif defined(HAVE_DLFCN_H)
inline ivl_dll_t ivl_dlopen(const char*name) inline ivl_dll_t ivl_dlopen(const char*name)
@ -77,6 +77,9 @@ inline const char*dlerror(void)
/* /*
* $Log: ivl_dlfcn.h,v $ * $Log: ivl_dlfcn.h,v $
* Revision 1.3 2001/05/22 02:14:47 steve
* Update the mingw build to not require cygwin files.
*
* Revision 1.2 2001/05/20 15:09:40 steve * Revision 1.2 2001/05/20 15:09:40 steve
* Mingw32 support (Venkat Iyer) * Mingw32 support (Venkat Iyer)
* *

18
vvp/compile.cc
View File

@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/ */
#if !defined(WINNT) #if !defined(WINNT)
#ident "$Id: compile.cc,v 1.65 2001/05/20 00:46:12 steve Exp $" #ident "$Id: compile.cc,v 1.66 2001/05/22 02:14:47 steve Exp $"
#endif #endif
# include "compile.h" # include "compile.h"
@ -36,6 +36,10 @@
# include <string.h> # include <string.h>
# include <assert.h> # include <assert.h>
#ifdef __MINGW32__
#include <windows.h>
#endif
unsigned compile_errors = 0; unsigned compile_errors = 0;
/* /*
@ -215,6 +219,15 @@ void compile_init(void)
void compile_load_vpi_module(char*name) void compile_load_vpi_module(char*name)
{ {
#ifdef __MINGW32__
char module_path[4096], *s;
GetModuleFileName(NULL,module_path,1024);
/* Get to the end. Search back twice for backslashes */
s = module_path + strlen(module_path);
while (*s != '\\') s--; s--;
while (*s != '\\') s--;
strcpy(s,"\\lib\\ivl");
#endif
vpip_load_module(name, module_path); vpip_load_module(name, module_path);
free(name); free(name);
} }
@ -1193,6 +1206,9 @@ vvp_ipoint_t debug_lookup_functor(const char*name)
/* /*
* $Log: compile.cc,v $ * $Log: compile.cc,v $
* Revision 1.66 2001/05/22 02:14:47 steve
* Update the mingw build to not require cygwin files.
*
* Revision 1.65 2001/05/20 00:46:12 steve * Revision 1.65 2001/05/20 00:46:12 steve
* Add support for system function calls. * Add support for system function calls.
* *

7
vvp/ivl_dlfcn.h
View File

@ -19,7 +19,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/ */
#if !defined(WINNT) && !defined(macintosh) #if !defined(WINNT) && !defined(macintosh)
#ident "$Id: ivl_dlfcn.h,v 1.2 2001/05/20 15:09:40 steve Exp $" #ident "$Id: ivl_dlfcn.h,v 1.3 2001/05/22 02:14:47 steve Exp $"
#endif #endif
#if defined(__MINGW32__) #if defined(__MINGW32__)
@ -45,7 +45,7 @@ inline void ivl_dlclose(ivl_dll_t dll)
{ (void)FreeLibrary((HINSTANCE)dll);} { (void)FreeLibrary((HINSTANCE)dll);}
inline const char *dlerror(void) inline const char *dlerror(void)
{ static char s[30]; sprintf(s,"DLError:%l", GetLastError()); return s;} { static char s[30]; sprintf(s,"DLError:%ld", GetLastError()); return s;}
#elif defined(HAVE_DLFCN_H) #elif defined(HAVE_DLFCN_H)
inline ivl_dll_t ivl_dlopen(const char*name) inline ivl_dll_t ivl_dlopen(const char*name)
@ -77,6 +77,9 @@ inline const char*dlerror(void)
/* /*
* $Log: ivl_dlfcn.h,v $ * $Log: ivl_dlfcn.h,v $
* Revision 1.3 2001/05/22 02:14:47 steve
* Update the mingw build to not require cygwin files.
*
* Revision 1.2 2001/05/20 15:09:40 steve * Revision 1.2 2001/05/20 15:09:40 steve
* Mingw32 support (Venkat Iyer) * Mingw32 support (Venkat Iyer)
* *

12
vvp/vpi_modules.cc
View File

@ -17,7 +17,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*/ */
#if !defined(WINNT) #if !defined(WINNT)
#ident "$Id: vpi_modules.cc,v 1.3 2001/03/23 02:40:22 steve Exp $" #ident "$Id: vpi_modules.cc,v 1.4 2001/05/22 02:14:47 steve Exp $"
#endif #endif
# include "config.h" # include "config.h"
@ -30,7 +30,12 @@ typedef void (*vlog_startup_routines_t)(void);
void vpip_load_module(const char*name, const char*path) void vpip_load_module(const char*name, const char*path)
{ {
char buf[4096]; char buf[4096];
sprintf(buf, "%s/%s.vpi", path, name); #ifdef __MINGW32__
char sep = '\\';
#else
char sep = '/';
#endif
sprintf(buf, "%s%c%s.vpi", path, sep, name);
//printf("Load %s...\n", buf); //printf("Load %s...\n", buf);
ivl_dll_t dll = ivl_dlopen(buf); ivl_dll_t dll = ivl_dlopen(buf);
@ -54,6 +59,9 @@ void vpip_load_module(const char*name, const char*path)
/* /*
* $Log: vpi_modules.cc,v $ * $Log: vpi_modules.cc,v $
* Revision 1.4 2001/05/22 02:14:47 steve
* Update the mingw build to not require cygwin files.
*
* Revision 1.3 2001/03/23 02:40:22 steve * Revision 1.3 2001/03/23 02:40:22 steve
* Add the :module header statement. * Add the :module header statement.
* *