[Desmume-cvs] SF.net SVN: desmume:[3934] trunk/desmume/src

[<ze...@us...>]

Revision: 3934
          http://desmume.svn.sourceforge.net/desmume/?rev=3934&view=rev
Author:   zeromus
Date:     2011-02-21 20:12:04 +0000 (Mon, 21 Feb 2011)

Log Message:
-----------
add --debug-console=1 which affects arm9 swi 0x0F and whether 8MB ewram is installed

Modified Paths:
--------------
    trunk/desmume/src/bios.cpp
    trunk/desmume/src/commandline.cpp
    trunk/desmume/src/commandline.h

Modified: trunk/desmume/src/bios.cpp
===================================================================
--- trunk/desmume/src/bios.cpp	2011-02-16 09:31:14 UTC (rev 3933)
+++ trunk/desmume/src/bios.cpp	2011-02-21 20:12:04 UTC (rev 3934)
@@ -1,5 +1,5 @@
 /*  Copyright (C) 2006 yopyop
-	Copyright (C) 2008-2010 DeSmuME team
+	Copyright (C) 2008-2011 DeSmuME team
 	
 	This file is free software: you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -1079,11 +1079,10 @@
 TEMPLATE static u32 isDebugger()
 {
 	//gbatek has additional specifications which are not emulated here
-#ifdef DEVELOPER
-	cpu->R[0] = 1;
-#else
-	cpu->R[0] = 0;
-#endif
+	if(CommonSettings.DebugConsole)
+		cpu->R[0] = 1;
+	else
+		cpu->R[0] = 0;
 	return 1;
 }
 

Modified: trunk/desmume/src/commandline.cpp
===================================================================
--- trunk/desmume/src/commandline.cpp	2011-02-16 09:31:14 UTC (rev 3933)
+++ trunk/desmume/src/commandline.cpp	2011-02-21 20:12:04 UTC (rev 3934)
@@ -52,6 +52,7 @@
 , _slot1(NULL)
 , _slot1_fat_dir(NULL)
 , depth_threshold(-1)
+, debug_console(-1)
 , load_slot(-1)
 , arm9_gdb_port(0)
 , arm7_gdb_port(0)
@@ -95,6 +96,7 @@
 		{ "slot1", 0, 0, G_OPTION_ARG_STRING, &_slot1, "Device to load in slot 1 (default retail)", "SLOT1"},
 		{ "slot1-fat-dir", 0, 0, G_OPTION_ARG_STRING, &_slot1_fat_dir, "Directory to scan for slot 1", "SLOT1_DIR"},
 		{ "depth-threshold", 0, 0, G_OPTION_ARG_INT, &depth_threshold, "Depth comparison threshold (default 0)", "DEPTHTHRESHOLD"},
+		{ "debug-console", 0, 0, G_OPTION_ARG_INT, &debug_console, "Behave as 8MB debug console (default 0)", "DEBUGCONSOLE"},
 #ifndef _MSC_VER
 		{ "disable-sound", 0, 0, G_OPTION_ARG_NONE, &disable_sound, "Disables the sound emulation", NULL},
 		{ "disable-limiter", 0, 0, G_OPTION_ARG_NONE, &disable_limiter, "Disables the 60fps limiter", NULL},
@@ -133,6 +135,8 @@
 	if(_advanced_timing != -1) CommonSettings.advanced_timing = _advanced_timing==1;
 	if(depth_threshold != -1)
 		CommonSettings.GFX3D_Zelda_Shadow_Depth_Hack = depth_threshold;
+	if(debug_console != -1)
+		CommonSettings.DebugConsole = true;
 
 	//TODO MAX PRIORITY! change ARM9BIOS etc to be a std::string
 	if(_bios_arm9) { CommonSettings.UseExtBIOS = true; strcpy(CommonSettings.ARM9BIOS,_bios_arm9); }

Modified: trunk/desmume/src/commandline.h
===================================================================
--- trunk/desmume/src/commandline.h	2011-02-16 09:31:14 UTC (rev 3933)
+++ trunk/desmume/src/commandline.h	2011-02-21 20:12:04 UTC (rev 3934)
@@ -39,6 +39,7 @@
 	//actual options: these may move to another sturct
 	int load_slot;
 	int depth_threshold;
+	int debug_console;
 	std::string nds_file;
 	std::string play_movie_file;
 	std::string record_movie_file;


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