[Scummvm-cvs-logs] SF.net SVN: scummvm:[44041] scummvm/trunk/engines/sci/engine

[thebluegr at users.sourceforge.net]

Revision: 44041
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44041&view=rev
Author:   thebluegr
Date:     2009-09-12 17:31:29 +0000 (Sat, 12 Sep 2009)

Log Message:
-----------
Removed the unused ASSERT()-related code and changed a warning where BREAKPOINT() was used to an error

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kgraphics.cpp
    scummvm/trunk/engines/sci/engine/memobj.cpp
    scummvm/trunk/engines/sci/engine/vm.cpp
    scummvm/trunk/engines/sci/engine/vm.h

Modified: scummvm/trunk/engines/sci/engine/kgraphics.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-09-12 13:16:47 UTC (rev 44040)
+++ scummvm/trunk/engines/sci/engine/kgraphics.cpp	2009-09-12 17:31:29 UTC (rev 44041)
@@ -98,15 +98,6 @@
 		s->visual->print(s->visual, 0);
 #endif
 
-#define ASSERT(x) { \
-	int val = !!(x); \
-	if (!val) { \
-		error("Fatal error condition on \"" #x "\""); \
-		BREAKPOINT(); \
-		vm_handle_fatal_error(s, __LINE__, __FILE__); \
-	} \
-}
-
 static inline int sign_extend_byte(int value) {
 	if (value & 0x80)
 		return value - 256;

Modified: scummvm/trunk/engines/sci/engine/memobj.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/memobj.cpp	2009-09-12 13:16:47 UTC (rev 44040)
+++ scummvm/trunk/engines/sci/engine/memobj.cpp	2009-09-12 17:31:29 UTC (rev 44041)
@@ -303,9 +303,7 @@
 //	assert(addr.segment == _segId);
 
 	if (!clone_table->isValidEntry(addr.offset)) {
-		warning("Unexpected request for outgoing references from clone at %04x:%04x", PRINT_REG(addr));
-//		BREAKPOINT();
-		return;
+		error("Unexpected request for outgoing references from clone at %04x:%04x", PRINT_REG(addr));
 	}
 
 	clone = &(clone_table->_table[addr.offset]);

Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp	2009-09-12 13:16:47 UTC (rev 44040)
+++ scummvm/trunk/engines/sci/engine/vm.cpp	2009-09-12 17:31:29 UTC (rev 44041)
@@ -462,10 +462,6 @@
 #  define kernel_matches_signature(a, b, c, d) 1
 #endif
 
-void vm_handle_fatal_error(EngineState *s, int line, const char *file) {
-	error("Fatal VM error in %s, L%d; aborting...", file, line);
-}
-
 static reg_t pointer_add(EngineState *s, reg_t base, int offset) {
 	MemObject *mobj = s->segMan->getMemObject(base.segment);
 

Modified: scummvm/trunk/engines/sci/engine/vm.h
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.h	2009-09-12 13:16:47 UTC (rev 44040)
+++ scummvm/trunk/engines/sci/engine/vm.h	2009-09-12 17:31:29 UTC (rev 44041)
@@ -395,15 +395,6 @@
 void run_vm(EngineState *s, int restoring);
 
 /**
- * Handles a fatal error condition
- * @param[in] s		The state to recover from
- * @param[in] line	Source code line number the error occured in
- * @param[in] file	File the error occured in
- */
-void vm_handle_fatal_error(EngineState *s, int line, const char *file);
-
-
-/**
  * Debugger functionality
  * @param[in] s					The state at which debugging should take place
  * @param[in] bp				Flag, set to true when a breakpoint is triggered


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