Ticket #9115: patch.diff

configure

@@ -126 +126 @@
 # Default option behaviour yes/no
 _debug_build=auto
 _release_build=auto
+_gprof_build=no
 _text_console=no
 _mt32emu=yes
 _build_hq_scalers=yes
@@ -643 +644 @@
 
   --with-readline-prefix=DIR    Prefix where readline is installed (optional)
   --disable-readline       disable readline support in text console [autodetect]
+  
+  --enable-gprof           enable gprof support for profiling Scummvm
 
 Some influential environment variables:
   LDFLAGS        linker flags, e.g. -L<lib dir> if you have libraries in a
@@ -754 +757 @@
         --disable-debug)
                 _debug_build=no
                 ;;
+        --enable-gprof)
+                _gprof_build=yes
+                ;;
         --enable-Werror)
                 CXXFLAGS="$CXXFLAGS -Werror"
                 ;;
@@ -959 +965 @@
         CXXFLAGS="$CXXFLAGS -O2 -Wuninitialized"
 fi
 
-
 #
 # Determine extension used for executables
 #
@@ -1317 +1322 @@
                 DEFINES="$DEFINES -D__DS__ -DNDS -DARM9 -DARM -DNONSTANDARD_PORT"
                 ;;
         psp)
-                CXXFLAGS="$CXXFLAGS -O3 -I$PSPSDK/include -D_PSP_FW_VERSION=150"
+                if test "$_gprof_build" = yes; then
+                        CXXFLAGS="$CXXFLAGS -G0 -O0 -I$PSPSDK/include -D_PSP_FW_VERSION=150"
+                else
+                        CXXFLAGS="$CXXFLAGS -O3 -I$PSPSDK/include -D_PSP_FW_VERSION=150"
+                fi
                 ;;
         ps2)
                 # TODO ps2
@@ -2182 +2191 @@
 add_to_config_mk_if_yes $_nasm 'HAVE_NASM = 1'
 
 #
+# Determine extra build flags for gprof build
+#
+
+if test "$_gprof_build" = yes; then
+        echo "Configuring for gprof..."
+        _debug_build=yes
+        CXXFLAGS="$CXXFLAGS -pg -g"
+        DEFINES="$DEFINES -DUSE_GPROF"  
+fi      
+
+#
 # Enable vkeybd / keymapper
 #
 if test "$_vkeybd" = yes ; then
@@ -2319 +2339 @@
                 then
                         LIBS="$LIBS -lGL"
                 fi
+                if test "$_gprof_build" = yes; then
+                        LIBS="$LIBS -pg -lpspprof"
+                fi
                 ;;
         ps2)
                 # TODO ps2

backends/platform/psp/psp_main.cpp

@@ -42 +42 @@
 #include "osys_psp.h"
 #include "./trace.h"
 
+#ifdef USE_GPROF
+#include <pspprof.h>
+#endif
 
-
 /**
  * Define the module info section
  *
  * 2nd arg must 0x1000 so __init is executed in
- * kernelmode for our loaderInit function
+ * kernelmode for our loaderInit function 
  */
 #ifndef USERSPACE_ONLY
 PSP_MODULE_INFO("SCUMMVM-PSP", 0x1000, 1, 1);
@@ -83 +85 @@
 
 /**
  * Function that is called from _init in kernelmode before the
- * main thread is started in usermode.
+ * main thread is started in usermode. 
  */
 __attribute__ ((constructor))
 void loaderInit() {
@@ -94 +96 @@
 
 /* Exit callback */
 int exit_callback(void) {
+#ifdef USE_GPROF
+        gprof_cleanup();
+#endif  
         sceKernelExitGame();
         return 0;
 }

backends/platform/psp/Makefile

@@ -42 +42 @@
 
 #Set to 1 to enable, 0 to disable dynamic modules
 DYNAMIC_MODULES = 1
+#Set to 1 to enable, 0 to disable gprof building
+ENABLE_GPROF = 0
 #Set to 1 to enable, 0 to disable libmad and libogg
 USE_LIBMAD = 1
 USE_LIBOGG = 1
@@ -61 +63 @@
 $(error $$(PSPSDK) cannot be obtained.)
 endif
 
+#check gprof
+ifeq ($(ENABLE_GPROF),1)
+CXX_DEBUG_FLAGS += -g -pg -G0
+LD_DEBUG_FLAGS += -pg
+CXX_OPTIMIZE = -O0
+PSPLIBS += -lpspprof
+DEFINES += -DUSE_GPROF
+else
+CXX_OPTIMIZE = -O3
+endif
 
 # Variables for common Scummvm makefile
 #CC      = psp-gcc
 CXX      = psp-g++
-CXXFLAGS = -O3 -Wall -Wno-multichar -fno-exceptions -fno-rtti
-DEFINES  = -D__PSP__ -DNONSTANDARD_PORT -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE -DUSE_ZLIB
-LDFLAGS  :=
+CXXFLAGS = $(CXX_DEBUG_FLAGS) $(CXX_OPTIMIZE) -Wall -Wno-multichar -fno-exceptions -fno-rtti
+DEFINES  += -D__PSP__ -DNONSTANDARD_PORT -DDISABLE_TEXT_CONSOLE -DDISABLE_COMMAND_LINE -DUSE_ZLIB
+LDFLAGS  := $(LD_DEBUG_FLAGS)
 INCDIR   := $(srcdir) . $(srcdir)/engines/ $(PSPSDK)/include
 INCLUDES := $(addprefix -I, $(INCDIR))
 #EXECUTABLE = $(TARGET)
@@ -123 +135 @@
 SDLFLAGS := $(shell $(PSPBIN)/sdl-config --cflags)
 SDLLIBS  := $(shell $(PSPBIN)/sdl-config --libs)
 # PSP LIBS
-PSPLIBS = -lpspvfpu -lpspdebug -lpspgu -lpspge -lpspdisplay -lpspctrl -lpspsdk \
-        -lpsputility -lpspuser -lpsppower -lpsphprm -lpspsdk -lpsprtc -lpspaudio
+PSPLIBS += -lpspvfpu -lpspdebug -lpspgu -lpspge -lpspdisplay -lpspctrl -lpspsdk \
+        -lpsputility -lpspuser -lpsppower -lpsphprm -lpspsdk -lpsprtc -lpspaudio
 
 # Add in PSPSDK includes and libraries.
 CXXFLAGS += $(SDLFLAGS)