diff --git a/ediv/src/dlls/dlls.suo b/ediv/src/dlls/dlls.suo index 25637aa..fdc3e77 100644 Binary files a/ediv/src/dlls/dlls.suo and b/ediv/src/dlls/dlls.suo differ diff --git a/ediv/src/stub/fatal.c b/ediv/src/stub/fatal.c index 2c3ea80..82351cb 100644 --- a/ediv/src/stub/fatal.c +++ b/ediv/src/stub/fatal.c @@ -103,23 +103,23 @@ static void eDIV_Parachute(int sig) } print_msg(" (eDIV Parachute Deployed)\n"); #ifndef DISABLE_STDIO - printf("dbg: ignore_errors:%d",ignore_errors); + fprintf(stderr,"dbg: ignore_errors:%d",ignore_errors); #ifdef DBG - printf(", debug:%d",debug); + fprintf(stderr,", debug:%d",debug); #endif - printf("\ndbg: num_procesos:%d, proceso actual:%d\n",num_proc_orden,proceso_actual); - printf("dbg: imem:%d, imem_max:%d, mem:0x%X\n",imem,imem_max,mem); - printf("dbg: sp:%d, pila:0x%X, pila_max:%d\n",sp,pila,pila_max); + fprintf(stderr,"\ndbg: num_procesos:%d, proceso actual:%d\n",num_proc_orden,proceso_actual); + fprintf(stderr,"dbg: imem:%d, imem_max:%d, mem:0x%X\n",imem,imem_max,mem); + fprintf(stderr,"dbg: sp:%d, pila:0x%X, pila_max:%d\n",sp,pila,pila_max); if(pila) { int s,e,i; s=sp-10; if(s<0) s=0; e=sp+10; if(e>pila_max) e=pila_max; - printf("dbg: Volcado de pila (%d-%d):\ndbg: ",s,e); + fprintf(stderr,"dbg: Volcado de pila (%d-%d):\ndbg: ",s,e); for(i=s;i<=e;i++) { - printf("%d",pila[i]); - if(i!=e) printf(", "); + fprintf(stderr,"%d",pila[i]); + if(i!=e) fprintf(stderr,", "); } - printf("\n"); + fprintf(stderr,"\n"); } #endif SDL_Quit(); diff --git a/ediv/src/stub/inte.c b/ediv/src/stub/inte.c index 1937ecc..c9e9b1c 100644 --- a/ediv/src/stub/inte.c +++ b/ediv/src/stub/inte.c @@ -100,7 +100,7 @@ int busca_proc_libre() int lista_mete( int num ) { - // Esto esta mal, habra que buscar su posicion segun priority + // Esto esta mal, habra que buscar su posicion segun priority procs_s[num].orden = num_proc_orden ; proc_orden[ num_proc_orden++ ] = num ; @@ -268,6 +268,7 @@ int proceso( int num ) case lfun://25 NO USADO break ; case lcal://26 + assert(num_proc_orden<153); devolver++ ; v1 = busca_proc_libre() ; procs_s[v1].imem = mem[imem++] ; diff --git a/ediv/src/stub/stub.c b/ediv/src/stub/stub.c index b50b338..53145f7 100644 --- a/ediv/src/stub/stub.c +++ b/ediv/src/stub/stub.c @@ -76,7 +76,6 @@ int main(int argc, char* argv[]) file_tiempo = fopen( "time.txt" , "w+" ) ; - #ifdef _WIN32 f=strlen(argv[0]); if(argv[0][f-4]!='.' || (argv[0][f-3]!='e' && argv[0][f-3]!='E') diff --git a/ediv/src/visual c/ediv_ws.suo b/ediv/src/visual c/ediv_ws.suo index 921cdc8..90251f4 100644 Binary files a/ediv/src/visual c/ediv_ws.suo and b/ediv/src/visual c/ediv_ws.suo differ diff --git a/ediv/src/visual c/stub/resource.h b/ediv/src/visual c/stub/resource.h new file mode 100644 index 0000000..d32a16e --- /dev/null +++ b/ediv/src/visual c/stub/resource.h @@ -0,0 +1,16 @@ +//{{NO_DEPENDENCIES}} +// Microsoft Visual C++ generated include file. +// Used by stub.rc +// +#define IDI_ICON1 101 + +// Next default values for new objects +// +#ifdef APSTUDIO_INVOKED +#ifndef APSTUDIO_READONLY_SYMBOLS +#define _APS_NEXT_RESOURCE_VALUE 102 +#define _APS_NEXT_COMMAND_VALUE 40001 +#define _APS_NEXT_CONTROL_VALUE 1001 +#define _APS_NEXT_SYMED_VALUE 101 +#endif +#endif diff --git a/ediv/src/visual c/stub/stub.aps b/ediv/src/visual c/stub/stub.aps new file mode 100644 index 0000000..19ba8cd Binary files /dev/null and b/ediv/src/visual c/stub/stub.aps differ diff --git a/ediv/src/visual c/stub/stub.ico b/ediv/src/visual c/stub/stub.ico new file mode 100644 index 0000000..807987b Binary files /dev/null and b/ediv/src/visual c/stub/stub.ico differ diff --git a/ediv/src/visual c/stub/stub.rc b/ediv/src/visual c/stub/stub.rc new file mode 100644 index 0000000..0e68f85 --- /dev/null +++ b/ediv/src/visual c/stub/stub.rc @@ -0,0 +1,84 @@ +// Microsoft Visual C++ generated resource script. +// +#include "resource.h" + +#define APSTUDIO_READONLY_SYMBOLS +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 2 resource. +// +#include "afxres.h" + +///////////////////////////////////////////////////////////////////////////// +#undef APSTUDIO_READONLY_SYMBOLS + +///////////////////////////////////////////////////////////////////////////// +// English (U.S.) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) +#ifdef _WIN32 +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) +#endif //_WIN32 + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE +BEGIN + "#include ""afxres.h""\r\n" + "\0" +END + +3 TEXTINCLUDE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + +#endif // English (U.S.) resources +///////////////////////////////////////////////////////////////////////////// + + +///////////////////////////////////////////////////////////////////////////// +// Spanish (Castilian) resources + +#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESP) +#ifdef _WIN32 +LANGUAGE LANG_SPANISH, SUBLANG_SPANISH +#pragma code_page(1252) +#endif //_WIN32 + +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_ICON1 ICON "stub.ico" +#endif // Spanish (Castilian) resources +///////////////////////////////////////////////////////////////////////////// + + + +#ifndef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// Generated from the TEXTINCLUDE 3 resource. +// + + +///////////////////////////////////////////////////////////////////////////// +#endif // not APSTUDIO_INVOKED + diff --git a/ediv/src/visual c/stub/stub.vcproj b/ediv/src/visual c/stub/stub.vcproj index 7edd89b..79dbc73 100644 --- a/ediv/src/visual c/stub/stub.vcproj +++ b/ediv/src/visual c/stub/stub.vcproj @@ -47,7 +47,7 @@ Name="VCMIDLTool"/> + + @@ -247,6 +250,9 @@ makelib.bat win32.dbg + + @@ -262,6 +268,9 @@ makelib.bat win32.dbg + + @@ -269,6 +278,12 @@ makelib.bat win32.dbg + + + +