- Fix memory issues when returning to menu by clearing some of the re…

…compiler cache

- Remove unnecessary menu2 makefiles

Makefile.base

@@ -4,7 +4,7 @@ CC		= powerpc-eabi-gcc
 CXX		= powerpc-eabi-g++
 AS		= powerpc-eabi-as
 
-LTO			 = #-flto # Uncomment to use link-time optimization
+LTO			 = -flto # Uncomment to use link-time optimization
 DEBUG_FLAGS += #-DPROFILE #-DSHOW_DEBUG #-DDEBUGON #-DPRINTGECKO #-DGLN64_SDLOG #-DSHOW_STATS #-DNO_BT
 FEATURES	+= #-DUSE_EXPANSION #-DUSE_TLB_CACHE #-DUSE_ROM_CACHE_L1 #-DEMBEDDED_FONTS
 

Rice_GX/TextureManager.cpp

@@ -38,7 +38,7 @@ CTextureManager gTextureManager;
 #ifdef __GX__
 //Note: Rice's tex mem usage isn't calculated correctly because it assumes 32bit textures.
 //TODO: Revisit cache handling once Enhanced & Framebuffer textures are implemented.
-DWORD g_maxTextureMemUsage = 2*GX_TEXTURE_CACHE_SIZE;
+DWORD g_maxTextureMemUsage = GX_TEXTURE_CACHE_SIZE;
 DWORD g_amountToFree = (512*1024);
 bool g_bUseSetTextureMem = true;
 #else //__GX__

menu/MainFrame.cpp

@@ -43,6 +43,7 @@ extern "C" {
 #include "../fileBrowser/fileBrowser-libfat.h"
 #include "../fileBrowser/fileBrowser-CARD.h"
 #include "../main/guifuncs.h"
+#include "../r4300/Recomp-Cache.h"
 }
 
 void Func_LoadROM();
@@ -256,6 +257,7 @@ void Func_PlayGame()
 	new_frame();
 	new_vi();
 	go();
+	RecompCache_Release(4*1024*1024);
 #ifdef DEBUGON
 	_break();
 #endif

menu/MiniMenuFrame.cpp

@@ -44,6 +44,7 @@ extern "C" {
 #include "../fileBrowser/fileBrowser.h"
 #include "../fileBrowser/fileBrowser-libfat.h"
 #include "../fileBrowser/fileBrowser-CARD.h"
+#include "../r4300/Recomp-Cache.h"
 }
 
 void Func_MMResetROM();
@@ -511,6 +512,7 @@ void Func_MMPlayGame()
 	_break();
 #endif
 	go();
+	RecompCache_Release(4*1024*1024);
 #ifdef DEBUGON
 	_break();
 #endif

r4300/Recomp-Cache-Heap.c

@@ -215,6 +215,10 @@ static void release(int minNeeded){
 	}
 }
 
+void RecompCache_Release(int bytesRequired) {
+	release(bytesRequired);
+}
+
 void RecompCache_Alloc(unsigned int size, unsigned int address, PowerPC_func* func){
 	CacheMetaNode* newBlock = malloc( sizeof(CacheMetaNode) );
 	newBlock->addr = address;

r4300/Recomp-Cache.h

@@ -33,6 +33,7 @@
 #else
 #define RECOMP_CACHE_SIZE (7*1024*1024)
 #endif
+#include "ppc/Recompile.h"
 
 void RecompCache_Init(void);
 // Allocate and free memory to be used for recompiled code
@@ -41,6 +42,7 @@ void RecompCache_Init(void);
 void RecompCache_Alloc(unsigned int size, unsigned int address, PowerPC_func* func);
 void RecompCache_Realloc(PowerPC_func* func, unsigned int new_size);
 void RecompCache_Free(unsigned int addr);
+void RecompCache_Release(int bytesRequired);
 // Update the LRU info of the indicated block
 //   (call when the block is accessed)
 void RecompCache_Update(PowerPC_func* func);