harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ge...@apache.org
Subject svn commit: r428641 - /incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/win/ia32/nt_exception_filter.cpp
Date Fri, 04 Aug 2006 06:26:39 GMT
Author: geirm
Date: Thu Aug  3 23:26:38 2006
New Revision: 428641

URL: http://svn.apache.org/viewvc?rev=428641&view=rev
Log:
Temporary modification to remove dbghelp inclusion so
that it runs on stock Win2k.  I filed a JIRA in DRLVM
so we can remember to fix this

build and smoke tested


Modified:
    incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/win/ia32/nt_exception_filter.cpp

Modified: incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/win/ia32/nt_exception_filter.cpp
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/win/ia32/nt_exception_filter.cpp?rev=428641&r1=428640&r2=428641&view=diff
==============================================================================
--- incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/win/ia32/nt_exception_filter.cpp
(original)
+++ incubator/harmony/enhanced/drlvm/trunk/vm/vmcore/src/util/win/ia32/nt_exception_filter.cpp
Thu Aug  3 23:26:38 2006
@@ -29,9 +29,13 @@
 // Windows specific
 #include <string>
 #include <excpt.h>
-#include <dbghelp.h>
-#include <windows.h> 
-#pragma comment(linker, "/defaultlib:dbghelp.lib")
+
+// TODO - fix temporarily comment to solve win2k's lack of dbghelp.lib problem
+//    search for $$WIN2k for other related mods for this to undo
+//
+// #include <dbghelp.h>
+// #include <windows.h>
+// #pragma comment(linker, "/defaultlib:dbghelp.lib")
 
 static inline void nt_to_vm_context(PCONTEXT context, Registers* regs)
 {
@@ -85,6 +89,8 @@
     fprintf(stderr, "    EIP: 0x%08x\n", nt_exception->ContextRecord->Eip);
 }
 
+/*  todo - resolve problem for win2k  $$WIN2k
+
 // CallStack print
 #define CALLSTACK_DEPTH_LIMIT 100 // max stack length is 100 to prevent getting into loop
 
@@ -149,6 +155,8 @@
     fflush(stderr);
 }
 
+*/
+
 /*
  * Information about stack
  */
@@ -367,7 +375,9 @@
 
         if (!vm_get_boolean_property_value_with_default("vm.assert_dialog")) {
             print_state(nt_exception, msg);
-            print_callstack(nt_exception);
+
+            // TODO fix for win2k runtime problem  $$WIN2k
+            // print_callstack(nt_exception);
             LOGGER_EXIT(-1);
 
         }



Mime
View raw message