[Scummvm-cvs-logs] SF.net SVN: scummvm: [22887] scummvm/trunk/backends/gp32

wonst719 at users.sourceforge.net wonst719 at users.sourceforge.net
Sat Jun 3 17:07:33 CEST 2006


Revision: 22887
Author:   wonst719
Date:     2006-06-03 08:07:26 -0700 (Sat, 03 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22887&view=rev

Log Message:
-----------
Cleanup. / Add speed meter for 'operator new'

Modified Paths:
--------------
    scummvm/trunk/backends/gp32/gp32_main.cpp
    scummvm/trunk/backends/gp32/gp32std.cpp
Modified: scummvm/trunk/backends/gp32/gp32_main.cpp
===================================================================
--- scummvm/trunk/backends/gp32/gp32_main.cpp	2006-06-03 15:05:17 UTC (rev 22886)
+++ scummvm/trunk/backends/gp32/gp32_main.cpp	2006-06-03 15:07:26 UTC (rev 22887)
@@ -66,9 +66,10 @@
 	gp_setCpuSpeed(g_vars.cpuSpeed);
 
 	// FOR DEBUG PURPOSE!
-	int argc = 1;
+	//int argc = 4;
 	//char *argv[] = { "scummvm", "-enull", "-pgp:\\game\\dott\\", "tentacle" };
-	char *argv[] = { "scummvm", "-d9" };
+	//int argc = 2;
+	//char *argv[] = { "scummvm", "-d5" };
 
 	extern OSystem *OSystem_GP32_create();
 	g_system = OSystem_GP32_create();

Modified: scummvm/trunk/backends/gp32/gp32std.cpp
===================================================================
--- scummvm/trunk/backends/gp32/gp32std.cpp	2006-06-03 15:05:17 UTC (rev 22886)
+++ scummvm/trunk/backends/gp32/gp32std.cpp	2006-06-03 15:07:26 UTC (rev 22887)
@@ -67,7 +67,7 @@
 		//gp_fillRect(frameBuffer1, 0, (243 - (DEBUG_MAX * 8) - 4) + 8 * deba, 320, 8, 0);
 		gp_textOut(frameBuffer1, 0, (240 - (DEBUG_MAX * 8) - 4) + 8 * deba, debline[deb], 0xFFFF);
 	}
-		
+
 //	gp_delay(100);
 }
 
@@ -328,33 +328,41 @@
 int gUsedMem = 1024 * 1024;
 
 //#define CLEAN_MEMORY_WITH_0xE7
-//#define CHECK_FREE_MEMORY
+//#define CHECK_USED_MEMORY
+#define CHECK_NEW_TIME
 
 void *operator new(size_t size) {
+#if defined(CHECK_NEW_TIME)
+	static int ftick;
+	ftick = GpTickCountGet();
+#endif
 //	printf("BP:operator new(%d)", size);
-	void *ptr = malloc(size);
+	void *ptr = gp_malloc(size);
 
 #if defined(CLEAN_MEMORY_WITH_0xE7)
 	if(ptr != NULL) {
-		memset(ptr, 0xE7, size);
+		gp_memset(ptr, 0xE7, size);
 	}
 #endif
-#if defined(CHECK_FREE_MEMORY)
+#if defined(CHECK_USED_MEMORY)
 	// Check free memory.
 	gUsedMem = ((int)(ptr) + size) - 0xc000000;
 
 	sprintf(usedMemStr, "%8d", gUsedMem);
-	//TODO: draw softkeyboard
 	gp_fillRect(frameBuffer1, 0, 0, 64, 12, 0);
 	gp_textOut(frameBuffer1, 0, 0, usedMemStr, 0xfffff);
 #endif
-
+#if defined(CHECK_NEW_TIME)
+	sprintf(usedMemStr, "%2d", GpTickCountGet() - ftick);
+	gp_fillRect(frameBuffer1, 72, 0, 24, 12, 0);
+	gp_textOut(frameBuffer1, 72, 0, usedMemStr, 0xfffff);
+#endif
 	return ptr;
 }
 
 void operator delete(void *ptr) {
 //	printf("operator delete(%x)", ptr);
-	free(ptr);
+	gp_free(ptr);
 }
 
 ////////////////////
@@ -400,7 +408,7 @@
         if (!str)
                 return NULL;
 
-        if (memory = (char *)malloc(strlen(str) + 1))
+        if (memory = (char *)gp_malloc(strlen(str) + 1))
                 return gp_strcpy(memory, str);
 
         return NULL;


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