@@ -38,18 +38,13 @@ GameInfo gameInfo;

 NDSSystem nds;

 static std::unique_ptr<CFIRMWARE> firmware;

-namespace DLDI

-{

-	bool tryPatch(void *data, size_t size);

-}

-

 int NDS_Init()

 {

 	MMU_Init();

 	nds.VCount = 0;

 	// got to print this somewhere..

-	printf("%s\n", EMU_DESMUME_NAME_AND_VERSION());

+	fprintf(stderr, "%s\n", EMU_DESMUME_NAME_AND_VERSION());

 	armcpu_new(&NDS_ARM7, 1);

 	armcpu_new(&NDS_ARM9, 0);

@@ -230,7 +225,7 @@ template<int procnum, int num> struct TSequenceItem_Timer : public TSequenceItem

 				}

 #ifndef NDEBUG

 				if (ctr > 1)

-					printf("yikes!!!!! please report!\n");

+					fprintf(stderr, "yikes!!!!! please report!\n");

 #endif

 			}

@@ -267,7 +262,7 @@ template<int procnum, int chan> struct TSequenceItem_DMA : public TSequenceItem

 	void exec()

 	{

-		//printf("exec from TSequenceItem_DMA: %d %d\n",procnum,chan);

+		//fprintf(stderr, "exec from TSequenceItem_DMA: %d %d\n",procnum,chan);

 		this->controller->exec();

 	}

 };

@@ -453,7 +448,7 @@ static void execHardware_hstart_vblankEnd()

 static void execHardware_hstart_vblankStart()

 {

-	//printf("--------VBLANK!!!--------\n");

+	//fprintf(stderr, "--------VBLANK!!!--------\n");

 	// fire vblank interrupts if necessary

 	for (int i = 0; i < 2; ++i)

@@ -794,7 +789,7 @@ template<bool FORCE> void NDS_exec(int32_t)

 			uint64_t next = sequencer.findNext();

 			next = std::min(next, nds_timer + kMaxWork); // lets set an upper limit for now

-			//printf("%d\n", next - nds_timer);

+			//fprintf(stderr, "%d\n", next - nds_timer);

 			sequencer.reschedule = false;

@@ -838,7 +833,7 @@ template<int PROCNUM> static void execHardware_interrupts_core()

 	if (masked && MMU.reg_IME[PROCNUM] && !ARMPROC.CPSR.bits.I)

 	{

-		//printf("Executing IRQ on procnum %d with IF = %08X and IE = %08X\n",PROCNUM,IF,IE);

+		//fprintf(stderr, "Executing IRQ on procnum %d with IF = %08X and IE = %08X\n",PROCNUM,IF,IE);

 		armcpu_irqException(&ARMPROC);

 	}

 }

@@ -36,9 +36,7 @@ TCommonSettings CommonSettings;

 GameInfo gameInfo;

 NDSSystem nds;

-std::unique_ptr<CFIRMWARE> firmware;

-

-bool singleStep;

+static std::unique_ptr<CFIRMWARE> firmware;

 namespace DLDI

 {

@@ -162,7 +160,7 @@ enum ESI_DISPCNT

 };

 uint64_t nds_timer;

-uint64_t nds_arm9_timer, nds_arm7_timer;

+static uint64_t nds_arm9_timer, nds_arm7_timer;

 struct TSequenceItem

 {

@@ -170,6 +168,8 @@ struct TSequenceItem

 	uint32_t param;

 	bool enabled;

+	virtual ~TSequenceItem() { }

+

 	virtual bool isTriggered() const

 	{

 		return this->enabled && nds_timer >= this->timestamp;

@@ -330,7 +330,7 @@ struct TSequenceItem_sqrtunit : public TSequenceItem

 	}

 };

-struct Sequencer

+static struct Sequencer

 {

 	bool nds_vblankEnded;

 	bool reschedule;

@@ -1010,7 +1010,6 @@ static void PrepareBiosARM9()

 void NDS_Reset()

 {

-	singleStep = false;

 	bool fw_success = false;

 	auto header = NDS_getROMHeader();

@@ -164,8 +164,6 @@ enum ESI_DISPCNT

 uint64_t nds_timer;

 uint64_t nds_arm9_timer, nds_arm7_timer;

-static const uint64_t kNever = 0xFFFFFFFFFFFFFFFFULL;

-

 struct TSequenceItem

 {

 	uint64_t timestamp;

@@ -910,7 +908,7 @@ static void PrepareBiosARM9()

 	{

 		// read arm9 bios from inputfile and flag it if it succeeds

 		FILE *arm9inf = fopen(CommonSettings.ARM9BIOS, "rb");

-		if (fread(MMU.ARM9_BIOS, 1, 4096, arm9inf) == 4096) 

+		if (fread(MMU.ARM9_BIOS, 1, 4096, arm9inf) == 4096)

 			NDS_ARM9.BIOS_loaded = true;

 		fclose(arm9inf);

 	}

@@ -919,7 +917,7 @@ static void PrepareBiosARM9()

 	if (CommonSettings.SWIFromBIOS && NDS_ARM9.BIOS_loaded)

 	{

 		NDS_ARM9.swi_tab = 0;

-		

+

 		// if we used routines from bios, apply patches

 		if (CommonSettings.PatchSWI3)

 			_MMU_write16<ARMCPU_ARM9>(0xFFFF07CC, 0x4770);

@@ -927,7 +925,7 @@ static void PrepareBiosARM9()

 	else

 		NDS_ARM9.swi_tab = ARM_swi_tab[ARMCPU_ARM9];

-	if (!NDS_ARM9.BIOS_loaded) 

+	if (!NDS_ARM9.BIOS_loaded)

 	{

 		// fake bios content, critical to normal operations, since we dont have a real bios.

 		// it'd be cool if we could write this in some kind of assembly language, inline or otherwise, without some bulky dependencies

@@ -1038,7 +1036,7 @@ void NDS_Reset()

 	PrepareBiosARM7();

 	PrepareBiosARM9();

-	// according to smea, this is initialized to 3 by the time we get into a user game program. who does this? 

+	// according to smea, this is initialized to 3 by the time we get into a user game program. who does this?

 	// well, the firmware load process is about to write a boot program into SIWRAM for the arm7. so we need it setup by now.

 	// but, this is a bit weird.. I would be expecting the bioses to do that. maybe we have some more detail to emulate.

 	// * is this setting the default, or does the bios do it before loading the firmware programs?

@@ -127,7 +127,7 @@ std::unique_ptr<NDS_header> NDS_getROMHeader()

 	memcpy(header->logo, MMU.CART_ROM + 192, 156);

 	header->logoCRC16 = T1ReadWord(MMU.CART_ROM, 348);

 	header->headerCRC16 = T1ReadWord(MMU.CART_ROM, 350);

-	memcpy(header->reserved, MMU.CART_ROM + 352, std::min(160, static_cast<int>(gameInfo.romsize) - 352));

+	memcpy(header->reserved, MMU.CART_ROM + 352, std::min<size_t>(160, gameInfo.romsize - 352));

 	return header;

 }

@@ -298,10 +298,10 @@ struct TSequenceItem_divider : public TSequenceItem

 		T1WriteQuad(MMU.MMU_MEM[ARMCPU_ARM9][0x40], 0x2A0, MMU.divResult);

 		T1WriteQuad(MMU.MMU_MEM[ARMCPU_ARM9][0x40], 0x2A8, MMU.divMod);

 #else

-		T1WriteLong(MMU.MMU_MEM[ARMCPU_ARM9][0x40], 0x2A0, static_cast<uint32_t>(MMU.divResult));

-		T1WriteLong(MMU.MMU_MEM[ARMCPU_ARM9][0x40], 0x2A4, static_cast<uint32_t>(MMU.divResult >> 32));

-		T1WriteLong(MMU.MMU_MEM[ARMCPU_ARM9][0x40], 0x2A8, static_cast<uint32_t>(MMU.divMod));

-		T1WriteLong(MMU.MMU_MEM[ARMCPU_ARM9][0x40], 0x2AC, static_cast<uint32_t>(MMU.divMod >> 32));

+		T1WriteLong(MMU.MMU_MEM[ARMCPU_ARM9][0x40], 0x2A0, MMU.divResult & 0xFFFFFFFF);

+		T1WriteLong(MMU.MMU_MEM[ARMCPU_ARM9][0x40], 0x2A4, (MMU.divResult >> 32) & 0xFFFFFFFF);

+		T1WriteLong(MMU.MMU_MEM[ARMCPU_ARM9][0x40], 0x2A8, MMU.divMod & 0xFFFFFFFF);

+		T1WriteLong(MMU.MMU_MEM[ARMCPU_ARM9][0x40], 0x2AC, (MMU.divMod >> 32) & 0xFFFFFFFF);

 #endif

 		MMU.divRunning = false;

 	}

@@ -556,10 +556,10 @@ static void execHardware_hstart()

 	}

 	// write the new vcount

-	T1WriteWord(MMU.ARM9_REG, 6, static_cast<uint16_t>(nds.VCount));

-	T1WriteWord(MMU.ARM9_REG, 0x1006, static_cast<uint16_t>(nds.VCount));

-	T1WriteWord(MMU.ARM7_REG, 6, static_cast<uint16_t>(nds.VCount));

-	T1WriteWord(MMU.ARM7_REG, 0x1006, static_cast<uint16_t>(nds.VCount));

+	T1WriteWord(MMU.ARM9_REG, 6, nds.VCount & 0xFFFF);

+	T1WriteWord(MMU.ARM9_REG, 0x1006, nds.VCount & 0xFFFF);

+	T1WriteWord(MMU.ARM7_REG, 6, nds.VCount & 0xFFFF);

+	T1WriteWord(MMU.ARM7_REG, 0x1006, nds.VCount & 0xFFFF);

 	// turn off hblank status bit

 	T1WriteWord(MMU.ARM9_REG, 4, T1ReadWord(MMU.ARM9_REG, 4) & 0xFFFD);

@@ -802,9 +802,9 @@ template<bool FORCE> void NDS_exec(int32_t)

 			// cast these down to 32bits so that things run faster on 32bit procs

 			uint64_t nds_timer_base = nds_timer;

-			int32_t arm9 = static_cast<int32_t>(nds_arm9_timer - nds_timer);

-			int32_t arm7 = static_cast<int32_t>(nds_arm7_timer - nds_timer);

-			int32_t s32next = static_cast<int32_t>(next - nds_timer);

+			int32_t arm9 = (nds_arm9_timer - nds_timer) & 0xFFFFFFFF;

+			int32_t arm7 = (nds_arm7_timer - nds_timer) & 0xFFFFFFFF;

+			int32_t s32next = (next - nds_timer) & 0xFFFFFFFF;

 #ifdef HAVE_JIT

 			auto arm9arm7 = CommonSettings.use_jit ? armInnerLoop<true, true, true>(nds_timer_base, s32next, arm9, arm7) : armInnerLoop<true, true, false>(nds_timer_base, s32next, arm9, arm7);

@@ -1,6 +1,6 @@

 /*

 	Copyright (C) 2006 yopyop

-	Copyright (C) 2008-2012 DeSmuME team

+	Copyright (C) 2008-2013 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

@@ -21,176 +21,72 @@

 #include <cstdlib>

 #include <cmath>

 #include <zlib.h>

-

-#include "common.h"

 #include "NDSSystem.h"

-//#include "render3D.h"

 #include "MMU.h"

-//#include "ROMReader.h"

-//#include "gfx3d.h"

-//#include "utils/decrypt/decrypt.h"

-//#include "utils/decrypt/crc.h"

+#include "cp15.h"

 #include "bios.h"

-//#include "debug.h"

-//#include "cheatSystem.h"

-//#include "movie.h"

-//#include "Disassembler.h"

 #include "readwrite.h"

-//#include "debug.h"

 #include "firmware.h"

 #include "version.h"

 #include "slot1.h"

-#include "path.h"

-

-//#define LOG_ARM9

-//#define LOG_ARM7

-//bool dolog = false;

-//#define LOG_TO_FILE

-//#define LOG_TO_FILE_REGS

-

-//===============================================================

-//FILE *fp_dis7 = NULL;

-//FILE *fp_dis9 = NULL;

-

-PathInfo path;

+// ===============================================================

 TCommonSettings CommonSettings;

-//static BaseDriver _stub_driver;

-//BaseDriver* driver = &_stub_driver;

-//std::string InputDisplayString;

-

-//static bool LidClosed = false;

-//static uint8_t	countLid = 0;

 GameInfo gameInfo;

 NDSSystem nds;

-CFIRMWARE	*firmware = NULL;

-//ADVANsCEne     advsc;

+std::unique_ptr<CFIRMWARE> firmware;

 bool singleStep;

-//bool nds_debug_continuing[2];

-//int lagframecounter;

-//int LagFrameFlag;

-//int lastLag;

-//int TotalLagFrames;

-

-//TSCalInfo TSCal;

 namespace DLDI

 {

-	bool tryPatch(void* data, size_t size);

+	bool tryPatch(void *data, size_t size);

 }

-/*void Desmume_InitOnce()

+int NDS_Init()

 {

-	static bool initOnce = false;

-	if(initOnce) return;

-	initOnce = true;*/

-

-/*#ifdef HAVE_LIBAGG

-	extern void Agg_init(); //no need to include just for this

-	Agg_init();

-#endif*/

-//}

-

-#ifdef GDB_STUB

-int NDS_Init( struct armcpu_memory_iface *arm9_mem_if,

-struct armcpu_ctrl_iface **arm9_ctrl_iface,

-struct armcpu_memory_iface *arm7_mem_if,

-struct armcpu_ctrl_iface **arm7_ctrl_iface) {

-#else

-int NDS_Init() {

-#endif

-	//nds.idleFrameCounter = 0;

-	//memset(nds.runCycleCollector,0,sizeof(nds.runCycleCollector));

 	MMU_Init();

 	nds.VCount = 0;

-	//got to print this somewhere..

+	// got to print this somewhere..

 	printf("%s\n", EMU_DESMUME_NAME_AND_VERSION());

-	/*if (Screen_Init(GFXCORE_DUMMY) != 0)

-		return -1;*/

+	armcpu_new(&NDS_ARM7, 1);

+	armcpu_new(&NDS_ARM9, 0);

-	//gfx3d_init();

-

-#ifdef GDB_STUB

-	armcpu_new(&NDS_ARM7,1, arm7_mem_if, arm7_ctrl_iface);

-	armcpu_new(&NDS_ARM9,0, arm9_mem_if, arm9_ctrl_iface);

-#else

-	armcpu_new(&NDS_ARM7,1);

-	armcpu_new(&NDS_ARM9,0);

-#endif

-

-	if (SPU_Init(SNDCORE_DUMMY, 740) != 0)

+	if (SPU_Init(SNDCORE_DUMMY, 740))

 		return -1;

-	//WIFI_Init() ;

-

-	// Init calibration info

-	//TSCal.adc.x1 = 0x0200;

-	//TSCal.adc.y1 = 0x0200;

-	//TSCal.scr.x1 = 0x20 + 1; // calibration screen coords are 1-based,

-	//TSCal.scr.y1 = 0x20 + 1; // either that or NDS_getADCTouchPosX/Y are wrong.

-	//TSCal.adc.x2 = 0x0E00;

-	//TSCal.adc.y2 = 0x0800;

-	//TSCal.scr.x2 = 0xE0 + 1;

-	//TSCal.scr.y2 = 0x80 + 1;

-	//TSCal.adc.width = (TSCal.adc.x2 - TSCal.adc.x1);

-	//TSCal.adc.height = (TSCal.adc.y2 - TSCal.adc.y1);

-	//TSCal.scr.width = (TSCal.scr.x2 - TSCal.scr.x1);

-	//TSCal.scr.height = (TSCal.scr.y2 - TSCal.scr.y1);

-

-	//cheats = new CHEATS();

-	//cheatSearch = new CHEATSEARCH();

-

 	return 0;

 }

-void NDS_DeInit() {

-	if(MMU.CART_ROM != MMU.UNUSED_RAM)

+void NDS_DeInit()

+{

+	if (MMU.CART_ROM != MMU.UNUSED_RAM)

 		NDS_FreeROM();

 	SPU_DeInit();

-	//Screen_DeInit();

 	MMU_DeInit();

-	//gpu3D->NDS_3D_Close();

-

-	//WIFI_DeInit();

-	/*if (cheats)

-		delete cheats;*/

-	/*if (cheatSearch)

-		delete cheatSearch;*/

-#ifdef LOG_ARM7

-	if (fp_dis7 != NULL)

-	{

-		fclose(fp_dis7);

-		fp_dis7 = NULL;

-	}

-#endif

-

-#ifdef LOG_ARM9

-	if (fp_dis9 != NULL)

-	{

-		fclose(fp_dis9);

-		fp_dis9 = NULL;

-	}

+#ifdef HAVE_JIT

+	arm_jit_close();

 #endif

 }

-bool NDS_SetROM(uint8_t * rom, uint32_t mask)

+bool NDS_SetROM(uint8_t *rom, uint32_t mask)

 {

 	MMU_setRom(rom, mask);

 	return true;

 }

-NDS_header * NDS_getROMHeader()

+std::unique_ptr<NDS_header> NDS_getROMHeader()

 {

-	if(MMU.CART_ROM == MMU.UNUSED_RAM) return NULL;

-	NDS_header * header = new NDS_header;

+	if (MMU.CART_ROM == MMU.UNUSED_RAM)

+		return std::unique_ptr<NDS_header>();

+	auto header = std::unique_ptr<NDS_header>(new NDS_header);

 	memcpy(header->gameTile, MMU.CART_ROM, 12);

 	memcpy(header->gameCode, MMU.CART_ROM + 12, 4);

@@ -231,800 +127,34 @@ NDS_header * NDS_getROMHeader()

 	memcpy(header->logo, MMU.CART_ROM + 192, 156);

 	header->logoCRC16 = T1ReadWord(MMU.CART_ROM, 348);

 	header->headerCRC16 = T1ReadWord(MMU.CART_ROM, 350);

-	memcpy(header->reserved, MMU.CART_ROM + 352, std::min(160, (int)gameInfo.romsize - 352));

+	memcpy(header->reserved, MMU.CART_ROM + 352, std::min(160, static_cast<int>(gameInfo.romsize) - 352));

 	return header;

 }

-

-

-

-/*void debug()

-{

-	//if(NDS_ARM9.R[15]==0x020520DC) emu_halt();

-	//DSLinux

-	//if(NDS_ARM9.CPSR.bits.mode == 0) emu_halt();

-	//if((NDS_ARM9.R[15]&0xFFFFF000)==0) emu_halt();

-	//if((NDS_ARM9.R[15]==0x0201B4F4)&&(NDS_ARM9.R[1]==0x0)) emu_halt();

-	//AOE

-	//if((NDS_ARM9.R[15]==0x01FFE194)&&(NDS_ARM9.R[0]==0)) emu_halt();

-	//if((NDS_ARM9.R[15]==0x01FFE134)&&(NDS_ARM9.R[0]==0)) emu_halt();

-

-	//BBMAN

-	//if(NDS_ARM9.R[15]==0x02098B4C) emu_halt();

-	//if(NDS_ARM9.R[15]==0x02004924) emu_halt();

-	//if(NDS_ARM9.R[15]==0x02004890) emu_halt();

-

-	//if(NDS_ARM9.R[15]==0x0202B800) emu_halt();

-	//if(NDS_ARM9.R[15]==0x0202B3DC) emu_halt();

-	//if((NDS_ARM9.R[1]==0x9AC29AC1)&&(!fait)) {emu_halt();fait = true;}

-	//if(NDS_ARM9.R[1]==0x0400004A) {emu_halt();fait = true;}

-	if(NDS_ARM9.R[4]==0x2E33373C) emu_halt();

-	if(NDS_ARM9.R[15]==0x02036668) //emu_halt();

-	{

-	nds.logcount++;

-	sprintf(logbuf, "%d %08X", nds.logcount, NDS_ARM9.R[13]);

-	log::ajouter(logbuf);

-	if(nds.logcount==89) execute=false;

-	}

-	//if(NDS_ARM9.instruction==0) emu_halt();

-	//if((NDS_ARM9.R[15]>>28)) emu_halt();

-}*/

-

-//#define DSGBA_LOADER_SIZE 512

-/*enum

-{

-	ROM_NDS = 0,

-	ROM_DSGBA

-};*/

-

-#if 0 /* not used */

-//http://www.aggregate.org/MAGIC/#Population%20Count%20(Ones%20Count)

-static uint32_t ones32(uint32_t x)

-{

-	/* 32-bit recursive reduction using SWAR...

-	but first step is mapping 2-bit values

-	into sum of 2 1-bit values in sneaky way

-	*/

-	x -= ((x >> 1) & 0x55555555);

-	x = (((x >> 2) & 0x33333333) + (x & 0x33333333));

-	x = (((x >> 4) + x) & 0x0f0f0f0f);

-	x += (x >> 8);

-	x += (x >> 16);

-	return x & 0x0000003f;

-}

-#endif

-

 RomBanner::RomBanner(bool defaultInit)

 {

-	if(!defaultInit) return;

-	version = 1; //Version  (0001h)

-	crc16 = 0; //CRC16 across entries 020h..83Fh

-	memset(reserved,0,sizeof(reserved));

-	memset(bitmap,0,sizeof(bitmap));

-	memset(palette,0,sizeof(palette));

-	memset(titles,0,sizeof(titles));

-	memset(end0xFF,0,sizeof(end0xFF));

-}

-

-/*bool GameInfo::hasRomBanner()

-{

-	if(header.IconOff + sizeof(RomBanner) > romsize)

-		return false;

-	else return true;

-}*/

-

-/*const RomBanner& GameInfo::getRomBanner()

-{

-	//we may not have a valid banner. return a default one

-	if(!hasRomBanner())

-	{

-		static RomBanner defaultBanner(true);

-		return defaultBanner;

-	}

-

-	return *(RomBanner*)(romdata+header.IconOff);

-}*/

-

-/*void GameInfo::populate()

-{

-	const char *regions[] = {	"JPFSEDIRKH",

-								"JPN",

-								"EUR",

-								"FRA",

-								"ESP",

-								"USA",

-								"NOE",

-								"ITA",

-								"RUS",

-								"KOR",

-								"HOL",

-

-	};

-

-	NDS_header * _header = NDS_getROMHeader();

-	header = *_header;

-	delete _header;

-

-	memset(ROMserial, 0, sizeof(ROMserial));

-	memset(ROMname, 0, sizeof(ROMname));

-

-	if (

-		//Option 1. - look for this instruction in the game title

-		//(did this ever work?)

-		//(header->gameTile[0] == 0x2E) &&

-		//(header->gameTile[1] == 0x00) &&

-		//(header->gameTile[2] == 0x00) &&

-		//(header->gameTile[3] == 0xEA)

-		//) &&

-		//option 2. - look for gamecode #### (default for ndstool)

-		//or an invalid gamecode

-		(

-			((header.gameCode[0] == 0x23) &&

-			(header.gameCode[1] == 0x23) &&

-			(header.gameCode[2] == 0x23) &&

-			(header.gameCode[3] == 0x23)

-			) ||

-			(header.gameCode[0] == 0x00)

-		)

-		&&

-			header.makerCode == 0x0

-		)

-	{

-		//we can't really make a serial for a homebrew game that hasnt set a game code

-		strcpy(ROMserial, "Homebrew");

-	}

-	else

-	{

-		strcpy(ROMserial,"NTR-    -");

-		memcpy(ROMserial+4, header.gameCode, 4);

-

-		uint32_t region = (uint32_t)(std::max<int32_t>(strchr(regions[0],header.gameCode[3]) - regions[0] + 1, 0));

-		if (region != 0)

-			strcat(ROMserial, regions[region]);

-		else

-			strcat(ROMserial, "Unknown");

-	}

-

-	//rom name is probably set even in homebrew

-	memset(ROMname, 0, sizeof(ROMname));

-	memcpy(ROMname, header.gameTile, 12);

-	trim(ROMname,20);

-

-		if(header.IconOff < romsize)

-		{

-			uint8_t num = (T1ReadByte((uint8_t*)romdata, header.IconOff) == 1)?6:7;

-			for (int i = 0; i < num; i++)

-			{

-				wcstombs(ROMfullName[i], (wchar_t *)(romdata+header.IconOff+0x240+(i*0x100)), 0x100);

-				trim(ROMfullName[i]);

-			}

-		}

-

-	//this may look like a poor heuristic for detecting homebrew, but it is actually pretty good.

-	//setting your own game code is stupid, so homebrew should just leave it.

-	//however, non-devkitARM-default makefiles may not have set this.

-	isHomebrew = !memcmp(header.gameCode,"####",4);

-}*/

-

-/*#ifdef _WINDOWS

-

-//static std::vector<char> buffer;

-//static std::vector<char> v;

-

-static void loadrom(std::string fname) {

-

-	FILE* inf = fopen(fname.c_str(),"rb");

-	if(!inf) return;

-

-	fseek(inf,0,SEEK_END);

-	int size = ftell(inf);

-	fseek(inf,0,SEEK_SET);

-

-	gameInfo.resize(size);

-	fread(gameInfo.romdata,1,size,inf);

-	gameInfo.fillGap();

-

-	fclose(inf);

-}

-

-static int rom_init_path(const char *filename, const char *logicalFilename)

-{

-	int	type = ROM_NDS;

-

-	path.init(logicalFilename);

-

-	if ( path.isdsgba(path.path)) {

-		type = ROM_DSGBA;

-		loadrom(path.path);

-	}

-	else if ( !strcasecmp(path.extension().c_str(), "nds")) {

-		type = ROM_NDS;

-		loadrom(path.path); //n.b. this does nothing if the file can't be found (i.e. if it was an extracted tempfile)...

-		//...but since the data was extracted to gameInfo then it is ok

-	}

-	//ds.gba in archives, it's already been loaded into memory at this point

-	else if (path.isdsgba(std::string(logicalFilename))) {

-		type = ROM_DSGBA;

-	} else {

-		//well, try to load it as an nds rom anyway

-		type = ROM_NDS;

-		loadrom(path.path);

-	}

-

-	if(type == ROM_DSGBA)

-	{

-		std::vector<char> v(gameInfo.romdata + DSGBA_LOADER_SIZE, gameInfo.romdata + gameInfo.romsize);

-		gameInfo.loadData(&v[0],gameInfo.romsize - DSGBA_LOADER_SIZE);

-	}

-

-	//check that size is at least the size of the header

-	if (gameInfo.romsize < 352) {

-		return -1;

-	}

-

-	return 1;

-}

-#else

-static int rom_init_path(const char *filename, const char *logicalFilename)

-{

-	int			ret;

-	int			type;

-	ROMReader_struct	*reader;

-	void			*file;

-	uint32_t			size;

-	char			*noext;

-

-	noext = strdup(filename);

-	reader = ROMReaderInit(&noext);

-	free(noext);

-

-	if (logicalFilename)

-		path.init(logicalFilename);

-	else

-		path.init(filename);

-

-	if (!strcasecmp(path.extension().c_str(), "zip"))

-		type = ROM_NDS;

-	else if (!strcasecmp(path.extension().c_str(), "nds"))

-		type = ROM_NDS;

-	else if (path.isdsgba(path.path))

-		type = ROM_DSGBA;

-	else

-		type = ROM_NDS;

-

-	file = reader->Init(filename);

-	if (!file)

-	{

-		reader->DeInit(file);

-		return -1;

-	}

-

-	size = reader->Size(file);

-

-	if(type == ROM_DSGBA)

-	{

-		reader->Seek(file, DSGBA_LOADER_SIZE, SEEK_SET);

-		size -= DSGBA_LOADER_SIZE;

-	}

-

-	//check that size is at least the size of the header

-	if (size < 352) {

-		reader->DeInit(file);

-		return -1;

-	}

-

-	// Make sure old ROM is freed first(at least this way we won't be eating

-	// up a ton of ram before the old ROM is freed)

-	if(MMU.CART_ROM != MMU.UNUSED_RAM)

-		NDS_FreeROM();

-

-	gameInfo.resize(size);

-	ret = reader->Read(file, gameInfo.romdata, size);

-	gameInfo.fillGap();

-	reader->DeInit(file);

-

-	return ret;

+	if (!defaultInit)

+		return;

+	this->version = 1; //Version  (0001h)

+	this->crc16 = 0; //CRC16 across entries 020h..83Fh

+	memset(this->reserved, 0, sizeof(this->reserved));

+	memset(this->bitmap, 0, sizeof(this->bitmap));

+	memset(this->palette, 0, sizeof(this->palette));

+	memset(this->titles, 0, sizeof(this->titles));

+	memset(this->end0xFF, 0, sizeof(this->end0xFF));

 }

-#endif*/

-

-/*int NDS_LoadROM(const char *filename, const char *logicalFilename)

-{

-	int	ret;

-	char	buf[MAX_PATH];

-

-	if (filename == NULL)

-		return -1;

-

-	ret = rom_init_path(filename, logicalFilename);

-	if (ret < 1)

-		return ret;

-

-	//decrypt if necessary..

-	//but this is untested and suspected to fail on big endian, so lets not support this on big endian

-#ifndef WORDS_BIGENDIAN

-	bool okRom = DecryptSecureArea((uint8_t*)gameInfo.romdata,gameInfo.romsize);

-

-	if(!okRom) {

-		printf("Specified file is not a valid rom\n");

-		return -1;

-	}

-#endif

-

-	if (cheatSearch)

-		cheatSearch->close();

-	FCEUI_StopMovie();

-

-	MMU_unsetRom();

-	NDS_SetROM((uint8_t*)gameInfo.romdata, gameInfo.mask);

-

-	gameInfo.populate();

-	gameInfo.crc = crc32(0,(uint8_t*)gameInfo.romdata,gameInfo.romsize);

-	//INFO("\nROM game code: %c%c%c%c\n", gameInfo.header.gameCode[0], gameInfo.header.gameCode[1], gameInfo.header.gameCode[2], gameInfo.header.gameCode[3]);

-	//INFO("ROM crc: %08X\n", gameInfo.crc);

-	//INFO("ROM serial: %s\n", gameInfo.ROMserial);

-	//INFO("ROM internal name: %s\n", gameInfo.ROMname);

-

-	memset(buf, 0, MAX_PATH);

-	strcpy(buf, path.pathToModule);

-	strcat(buf, "desmume.ddb");							// DeSmuME database	:)

-	advsc.setDatabase(buf);

-	buf[0] = gameInfo.header.gameCode[0];

-	buf[1] = gameInfo.header.gameCode[1];

-	buf[2] = gameInfo.header.gameCode[2];

-	buf[3] = gameInfo.header.gameCode[3];

-	buf[4] = 0;

-	if (advsc.checkDB(buf))

-	{

-		u8 sv = advsc.getSaveType();

-		printf("ADVANsCEne database:\n");

-		printf("\t* ROM save type: ");

-		if (sv == 0xFF)

-			printf("Unknown");

-		else

-			if (sv == 0xFE)

-				printf("None");

-			else

-			{

-				printf("%s", save_names[sv]);

-				if (CommonSettings.autodetectBackupMethod == 1)

-					backup_setManualBackupType(sv+1);

-			}

-		printf("\n\t* ROM crc: %08X\n", advsc.getCRC32());

-	}

-	printf("\n");

-

-	//for homebrew, try auto-patching DLDI. should be benign if there is no DLDI or if it fails

-	if(gameInfo.isHomebrew)

-		DLDI::tryPatch((void*)gameInfo.romdata, gameInfo.romsize);

-

-	memset(buf, 0, MAX_PATH);

-	path.getpathnoext(path.BATTERY, buf);

-	strcat(buf, ".dsv");							// DeSmuME memory card	:)

-	MMU_new.backupDevice.load_rom(buf);

-

-	memset(buf, 0, MAX_PATH);

-	path.getpathnoext(path.CHEATS, buf);

-	strcat(buf, ".dct");							// DeSmuME cheat		:)

-	cheats->init(buf);

-

-	NDS_Reset();

-

-	return ret;

-}*/

 void NDS_FreeROM()

 {

-	//FCEUI_StopMovie();

-	if ((uint8_t*)MMU.CART_ROM == (uint8_t*)gameInfo.romdata)

-		gameInfo.romdata = NULL;

+	if (MMU.CART_ROM == reinterpret_cast<uint8_t *>(&gameInfo.romdata[0]))

+		gameInfo.romdata.reset();

 	if (MMU.CART_ROM != MMU.UNUSED_RAM)

 		delete [] MMU.CART_ROM;

 	MMU_unsetRom();

 }

-

-

-/*int NDS_ImportSave(const char *filename)

-{

-	if (strlen(filename) < 4)

-		return 0;

-

-	if (memcmp(filename+strlen(filename)-4, ".duc", 4) == 0)

-		return MMU_new.backupDevice.load_duc(filename);

-	else

-		if (MMU_new.backupDevice.load_no_gba(filename))

-			return 1;

-		else

-			return MMU_new.backupDevice.load_raw(filename);

-

-	//return 0;

-}*/

-

-/*bool NDS_ExportSave(const char *filename)

-{

-	if (strlen(filename) < 4)

-		return false;

-

-	if (memcmp(filename+strlen(filename)-5, ".sav*", 5) == 0)

-	{

-		char tmp[MAX_PATH];

-		memset(tmp, 0, MAX_PATH);

-		strcpy(tmp, filename);

-		tmp[strlen(tmp)-1] = 0;

-		return MMU_new.backupDevice.save_no_gba(tmp);

-	}

-

-	if (memcmp(filename+strlen(filename)-4, ".sav", 4) == 0)

-		return MMU_new.backupDevice.save_raw(filename);

-

-	return false;

-}*/

-

-/*static int WritePNGChunk(FILE *fp, uint32 size, const char *type, const uint8 *data)

-{

-	uint32 crc;

-

-	uint8 tempo[4];

-

-	tempo[0]=size>>24;

-	tempo[1]=size>>16;

-	tempo[2]=size>>8;

-	tempo[3]=size;

-

-	if(fwrite(tempo,4,1,fp)!=1)

-		return 0;

-	if(fwrite(type,4,1,fp)!=1)

-		return 0;

-

-	if(size)

-		if(fwrite(data,1,size,fp)!=size)

-			return 0;

-

-	crc = crc32(0,(uint8 *)type,4);