[Scummvm-cvs-logs] SF.net SVN: scummvm:[40028] scummvm/trunk/engines/sci/tools.h

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Mon Apr 20 21:27:33 CEST 2009


Revision: 40028
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40028&view=rev
Author:   fingolfin
Date:     2009-04-20 19:27:32 +0000 (Mon, 20 Apr 2009)

Log Message:
-----------
SCI: Mapped BREAKPOINT macro to error() for now

Modified Paths:
--------------
    scummvm/trunk/engines/sci/tools.h

Modified: scummvm/trunk/engines/sci/tools.h
===================================================================
--- scummvm/trunk/engines/sci/tools.h	2009-04-20 19:27:11 UTC (rev 40027)
+++ scummvm/trunk/engines/sci/tools.h	2009-04-20 19:27:32 UTC (rev 40028)
@@ -43,29 +43,7 @@
 int sci_ffs(int bits);
 
 
-/* The following was originally based on glib.h code, which was
- * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
- */
-#if defined (__GNUC__) && __GNUC__ >= 2
-#  if defined (__i386__)
-#    define BREAKPOINT()          {__asm__ __volatile__ ("int $03"); }
-#  elif defined(__alpha__)
-#    define BREAKPOINT()          {__asm__ __volatile__ ("call_pal 0x80"); }
-#  endif /* !__i386__ && !__alpha__ */
-#elif defined (_MSC_VER)
-#  if defined (_M_IX86)
-#    define BREAKPOINT()          { __asm { int 03 } }
-#  elif defined(_M_ALPHA)
-#    define BREAKPOINT()          { __asm { bpt } }
-#  endif /* !_M_IX86 && !_M_ALPHA */
-#elif defined (__DECC)
-#  if defined(__alpha__)
-#    define BREAKPOINT()          {asm ("call_pal 0x80"); }
-#  endif /* !__i386__ && !__alpha__ */
-#endif
-#ifndef BREAKPOINT
-#  define BREAKPOINT() { fprintf(stderr, "Missed breakpoint in %s, line %d\n", __FILE__, __LINE__); *((int *) NULL) = 42; }
-#endif  /* !BREAKPOINT() */
+#  define BREAKPOINT() { error("Breakpoint in %s, line %d\n", __FILE__, __LINE__); }
 
 } // End of namespace Sci
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list