Xbox: Fix exception handling

stepmania/src/RageSound.cpp

@@ -34,10 +34,6 @@
 #include "RageSoundReader_Resample.h"
 #include "RageSoundReader_FileReader.h"
 
-#if defined(XBOX)
-#include "archutils/Xbox/VirtualMemory.h"
-#endif
-
 const int channels = 2;
 const int framesize = 2 * channels; /* 16-bit */
 #define samplerate() Sample->GetSampleRate()
@@ -343,11 +339,6 @@ int RageSound::FillBuf( int frames )
  * that would be read. */
 int RageSound::GetData( char *buffer, int frames )
 {
-#if defined(XBOX)
-	// should prevent a page fault crash
-	vmem_Manager.Lock(buffer);
-#endif
-
 	if( m_Param.m_LengthSeconds != -1 )
 	{
 		/* We have a length; only read up to the end. */
@@ -376,10 +367,6 @@ int RageSound::GetData( char *buffer, int frames )
 			databuf.read( buffer, got*framesize );
 	}
 
-#if defined(XBOX)
-	vmem_Manager.Unlock(buffer);
-#endif
-
 	return got;
 }
 

stepmania/src/RageSoundManager.cpp

@@ -12,10 +12,6 @@
 #include "arch/arch.h"
 #include "arch/Sound/RageSoundDriver.h"
 
-#if defined(XBOX)
-#include "archutils/Xbox/VirtualMemory.h"
-#endif
-
 /*
  * The lock ordering requirements are:
  * RageSound::Lock before g_SoundManMutex
@@ -212,10 +208,6 @@ RageSound *RageSoundManager::PlaySound( RageSound &snd, const RageSoundParams *p
 	else
 	{
 		sound_to_play = new RageSound(snd);
-#if defined(XBOX)
-		// keep the sound data committed to memory
-		vmem_Manager.Lock(sound_to_play);
-#endif
 
 		/* We're responsible for freeing it. */
 		g_SoundManMutex.Lock(); /* lock for access to owned_sounds */

stepmania/src/StepMania.cpp

@@ -918,21 +918,7 @@ static void ProcessArgsSecond()
 }
 
 #ifdef _XBOX
-void XboxMain();
-
 void __cdecl main()
-{
-	_set_new_handler(NoMemory);
-	_set_new_mode(1);
-
-	__try
-	{
-		XboxMain();
-	}
-	__except(CheckPageFault(GetExceptionInformation())) { }
-}
-
-void XboxMain()
 #else
 int main(int argc, char* argv[])
 #endif
@@ -940,6 +926,10 @@ int main(int argc, char* argv[])
 #if defined(XBOX)
 	int argc = 1;
 	char *argv[] = {"default.xbe"};
+
+	_set_new_handler(NoMemory);
+	_set_new_mode(1);
+	SetUnhandledExceptionFilter((LPTOP_LEVEL_EXCEPTION_FILTER) CheckPageFault);
 #endif
 	
 	g_argc = argc;