Only compile Perl_hv_assert with DEBUGGING.

[p5sagit/p5-mst-13.2.git] / wince / perllib.c

diff --git a/wince/perllib.c b/wince/perllib.c
index 931a362..0b00246 100644 (file)
--- a/wince/perllib.c
+++ b/wince/perllib.c
@@ -1,12 +1,8 @@
-// Time-stamp: <01/08/01 20:58:55 keuchel@w2k>
+/* Time-stamp: <01/08/01 20:58:55 keuchel@w2k> */
 
 #include "EXTERN.h"
 #include "perl.h"
 
-#ifdef PERL_OBJECT
-#define NO_XSLOCKS
-#endif
-
 #include "XSUB.h"
 
 #ifdef PERL_IMPLICIT_SYS
@@ -21,10 +17,10 @@ char *staticlinkmodules[] = {
     NULL,
 };
 
-EXTERN_C void boot_DynaLoader (pTHXo_ CV* cv);
+EXTERN_C void boot_DynaLoader (pTHX_ CV* cv);
 
 static void
-xs_init(pTHXo)
+xs_init(pTHX)
 {
     char *file = __FILE__;
     dXSUB_SYS;
@@ -33,6 +29,49 @@ xs_init(pTHXo)
 
 #ifdef PERL_IMPLICIT_SYS
 
+extern "C" void win32_checkTLS(PerlInterpreter *host_perl);
+void
+win32_checkTLS(PerlInterpreter *host_perl)
+{
+    dTHX;
+    if (host_perl != my_perl) {
+        printf(" ... bad in win32_checkTLS\n");
+        printf("  %08X ne %08X\n",host_perl,my_perl);
+       int *nowhere = NULL;
+        *nowhere = 0; 
+       abort();
+    }
+}
+
+#ifdef UNDER_CE
+int GetLogicalDrives() {
+    return 0; /* no logical drives on CE */
+}
+int GetLogicalDriveStrings(int size, char addr[]) {
+    return 0; /* no logical drives on CE */
+}
+/* TBD */
+DWORD GetFullPathNameA(LPCSTR fn, DWORD blen, LPTSTR buf,  LPSTR *pfile) {
+    return 0;
+}
+/* TBD */
+DWORD GetFullPathNameW(CONST WCHAR *fn, DWORD blen, WCHAR * buf,  WCHAR **pfile) {
+    return 0;
+}
+/* TBD */
+DWORD SetCurrentDirectoryA(LPSTR pPath) {
+    return 0;
+}
+/* TBD */
+DWORD SetCurrentDirectoryW(CONST WCHAR *pPath) {
+    return 0;
+}
+int xcesetuid(uid_t id){return 0;}
+int xceseteuid(uid_t id){  return 0;}
+int xcegetuid() {return 0;}
+int xcegeteuid(){ return 0;}
+#endif
+
 #include "perlhost.h"
 
 EXTERN_C void
@@ -106,9 +145,6 @@ perl_alloc_override(struct IPerlMem** ppMem, struct IPerlMem** ppMemShared,
                                   pHost->m_pHostperlSock,
                                   pHost->m_pHostperlProc);
        if (my_perl) {
-#ifdef PERL_OBJECT
-           CPerlObj* pPerl = (CPerlObj*)my_perl;
-#endif
            w32_internal_host = pHost;
        }
     }
@@ -131,12 +167,10 @@ perl_alloc(void)
                                   pHost->m_pHostperlSock,
                                   pHost->m_pHostperlProc);
        if (my_perl) {
-#ifdef PERL_OBJECT
-           CPerlObj* pPerl = (CPerlObj*)my_perl;
-#endif
            w32_internal_host = pHost;
        }
     }
+    pHost->host_perl = my_perl; /* FIXME this statement shouldn't be here */
     return my_perl;
 }
 
@@ -147,108 +181,6 @@ win32_delete_internal_host(void *h)
     delete host;
 }
 
-#ifdef PERL_OBJECT
-
-EXTERN_C void
-perl_construct(PerlInterpreter* my_perl)
-{
-    CPerlObj* pPerl = (CPerlObj*)my_perl;
-    try
-    {
-       Perl_construct();
-    }
-    catch(...)
-    {
-       win32_fprintf(stderr, "%s\n",
-                     "Error: Unable to construct data structures");
-       perl_free(my_perl);
-    }
-}
-
-EXTERN_C void
-perl_destruct(PerlInterpreter* my_perl)
-{
-    CPerlObj* pPerl = (CPerlObj*)my_perl;
-#ifdef DEBUGGING
-    Perl_destruct();
-#else
-    try
-    {
-       Perl_destruct();
-    }
-    catch(...)
-    {
-    }
-#endif
-}
-
-EXTERN_C void
-perl_free(PerlInterpreter* my_perl)
-{
-    CPerlObj* pPerl = (CPerlObj*)my_perl;
-    void *host = w32_internal_host;
-#ifdef DEBUGGING
-    Perl_free();
-#else
-    try
-    {
-       Perl_free();
-    }
-    catch(...)
-    {
-    }
-#endif
-    win32_delete_internal_host(host);
-    PERL_SET_THX(NULL);
-}
-
-EXTERN_C int
-perl_run(PerlInterpreter* my_perl)
-{
-    CPerlObj* pPerl = (CPerlObj*)my_perl;
-    int retVal;
-#ifdef DEBUGGING
-    retVal = Perl_run();
-#else
-    try
-    {
-       retVal = Perl_run();
-    }
-    catch(...)
-    {
-       win32_fprintf(stderr, "Error: Runtime exception\n");
-       retVal = -1;
-    }
-#endif
-    return retVal;
-}
-
-EXTERN_C int
-perl_parse(PerlInterpreter* my_perl, void (*xsinit)(CPerlObj*), int argc, char** argv, char** env)
-{
-    int retVal;
-    CPerlObj* pPerl = (CPerlObj*)my_perl;
-#ifdef DEBUGGING
-    retVal = Perl_parse(xsinit, argc, argv, env);
-#else
-    try
-    {
-       retVal = Perl_parse(xsinit, argc, argv, env);
-    }
-    catch(...)
-    {
-       win32_fprintf(stderr, "Error: Parse exception\n");
-       retVal = -1;
-    }
-#endif
-    *win32_errno() = 0;
-    return retVal;
-}
-
-#undef PL_perl_destruct_level
-#define PL_perl_destruct_level int dummy
-
-#endif /* PERL_OBJECT */
 #endif /* PERL_IMPLICIT_SYS */
 
 EXTERN_C HANDLE w32_perldll_handle;
@@ -293,23 +225,7 @@ RunPerl(int argc, char **argv, char **env)
     exitstatus = perl_parse(my_perl, xs_init, argc, argv, env);
     if (!exitstatus) {
 #if defined(TOP_CLONE) && defined(USE_ITHREADS)                /* XXXXXX testing */
-#  ifdef PERL_OBJECT
-       CPerlHost *h = new CPerlHost();
-       new_perl = perl_clone_using(my_perl, 1,
-                                   h->m_pHostperlMem,
-                                   h->m_pHostperlMemShared,
-                                   h->m_pHostperlMemParse,
-                                   h->m_pHostperlEnv,
-                                   h->m_pHostperlStdIO,
-                                   h->m_pHostperlLIO,
-                                   h->m_pHostperlDir,
-                                   h->m_pHostperlSock,
-                                   h->m_pHostperlProc
-                                   );
-       CPerlObj *pPerl = (CPerlObj*)new_perl;
-#  else
        new_perl = perl_clone(my_perl, 1);
-#  endif
        exitstatus = perl_run(new_perl);
        PERL_SET_THX(my_perl);
 #else
@@ -384,3 +300,27 @@ DllMain(HANDLE hModule,            /* DLL module handle */
     return TRUE;
 }
 
+
+#if defined(USE_ITHREADS) && defined(PERL_IMPLICIT_SYS)
+EXTERN_C PerlInterpreter *
+perl_clone_host(PerlInterpreter* proto_perl, UV flags) {
+    dTHX;
+    CPerlHost *h;
+    h = new CPerlHost(*(CPerlHost*)PL_sys_intern.internal_host);
+    proto_perl = perl_clone_using(proto_perl, flags,
+                        h->m_pHostperlMem,
+                        h->m_pHostperlMemShared,
+                        h->m_pHostperlMemParse,
+                        h->m_pHostperlEnv,
+                        h->m_pHostperlStdIO,
+                        h->m_pHostperlLIO,
+                        h->m_pHostperlDir,
+                        h->m_pHostperlSock,
+                        h->m_pHostperlProc
+    );
+    proto_perl->Isys_intern.internal_host = h;
+    h->host_perl  = proto_perl;
+    return proto_perl;
+       
+}
+#endif