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

[m_kiewitz at users.sourceforge.net]

Revision: 50525
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50525&view=rev
Author:   m_kiewitz
Date:     2010-06-30 10:31:23 +0000 (Wed, 30 Jun 2010)

Log Message:
-----------
SCI: removing all the remaining debug output from signature matching

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kernel.cpp

Modified: scummvm/trunk/engines/sci/engine/kernel.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel.cpp	2010-06-30 10:17:54 UTC (rev 50524)
+++ scummvm/trunk/engines/sci/engine/kernel.cpp	2010-06-30 10:31:23 UTC (rev 50525)
@@ -771,7 +771,11 @@
 		if (argc) {
 			reg_t parameter = *argv;
 			printf("%04x:%04x (", PRINT_REG(parameter));
-			kernelSignatureDebugType(findRegType(parameter));
+			int regType = findRegType(parameter);
+			if (regType)
+				kernelSignatureDebugType(regType);
+			else
+				printf("unknown type of %04x:%04x", PRINT_REG(parameter));
 			printf(")");
 			argv++;
 			argc--;
@@ -803,15 +807,11 @@
 		if ((*sig & KSIG_ANY) != KSIG_ANY) {
 			int type = findRegType(*argv);
 
-			if (!type) {
-				warning("[KERNEL] call signature: couldn't determine type of ref %04x:%04x", PRINT_REG(*argv));
-				return false;
-			}
+			if (!type)
+				return false; // couldn't determine type
 
-			if (!(type & *sig)) {
-				warning("[KERNEL] call signature: %d args left, is %d, should be %d", argc, type, *sig);
-				return false;
-			}
+			if (!(type & *sig))
+				return false; // type mismatch
 
 		}
 		if (!(*sig & KSIG_ELLIPSIS))
@@ -820,15 +820,12 @@
 		--argc;
 	}
 
-	if (argc) {
-		warning("[KERNEL] call signature: too many arguments");
+	if (argc)
 		return false; // Too many arguments
-	}
 	if (*sig == 0 || (*sig & KSIG_ELLIPSIS))
 		return true;
 
-	warning("[KERNEL] call signature: too few arguments");
-	return false;
+	return false; // Too few arguments
 }
 
 void Kernel::setDefaultKernelNames() {


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