[Scummvm-cvs-logs] SF.net SVN: scummvm:[53174] scummvm/trunk/engines/sword25/kernel

[sev at users.sourceforge.net]

Revision: 53174
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53174&view=rev
Author:   sev
Date:     2010-10-12 21:39:36 +0000 (Tue, 12 Oct 2010)

Log Message:
-----------
SWORD25: removed ASM usage

Modified Paths:
--------------
    scummvm/trunk/engines/sword25/kernel/common.h
    scummvm/trunk/engines/sword25/kernel/kernel.h

Modified: scummvm/trunk/engines/sword25/kernel/common.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/common.h	2010-10-12 21:39:16 UTC (rev 53173)
+++ scummvm/trunk/engines/sword25/kernel/common.h	2010-10-12 21:39:36 UTC (rev 53174)
@@ -41,15 +41,6 @@
 #include "memleaks.h"
 #include "log.h"
 
-#ifdef DEBUG
-#define BS_ASSERT(EXP) \
-	if (!(EXP)) \
-	{ \
-		BS_Log::Log("!!ASSERTION FAILED!! - FILE: %s - LINE: %d.\n", __FILE__, __LINE__); \
-		__asm { int 3 }; \
-	}
-#else
-#define BS_ASSERT(EXP) do { (void)(EXP); } while(0) 
-#endif
+#define BS_ASSERT(EXP) assert(EXP)
 
 #endif

Modified: scummvm/trunk/engines/sword25/kernel/kernel.h
===================================================================
--- scummvm/trunk/engines/sword25/kernel/kernel.h	2010-10-12 21:39:16 UTC (rev 53173)
+++ scummvm/trunk/engines/sword25/kernel/kernel.h	2010-10-12 21:39:36 UTC (rev 53174)
@@ -236,11 +236,7 @@
 	*/
 	void Crash() const
 	{
-		__asm
-		{
-			xor eax, eax
-			mov [eax], 0
-		}
+		error(0);
 	}
 	
 private:


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