Fixes for Qt, Symbian and Blackberry. Reorder and remove some redundant ArmEmitter includes so that _SP doesn't conflict.

Core/MIPS/ARM/ArmAsm.cpp

@@ -15,11 +15,11 @@
 // Official git repository and contact information can be found at
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
-#include "ArmEmitter.h"
 
 #include "../../MemMap.h"
 
 #include "../MIPS.h"
+#include "ArmEmitter.h"
 #include "../../CoreTiming.h"
 #include "MemoryUtil.h"
 
@@ -181,4 +181,4 @@ void Jit::GenerateFixedCode()
 	FlushIcache();
 }
 
-}  // namespace
+}  // namespace

Core/MIPS/ARM/ArmAsm.h

@@ -18,8 +18,8 @@
 #ifndef _JIT64ASM_H
 #define _JIT64ASM_H
 
-#include <ArmEmitter.h>
 #include "../MIPS.h"
+#include <ArmEmitter.h>
 
 // Runtime generated assembly routines, like the Dispatcher.
 

Core/MIPS/ARM/ArmCompALU.cpp

@@ -16,8 +16,6 @@
 // https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
 
 #include "ArmJit.h"
-#include "ArmRegCache.h"
-#include "ArmEmitter.h"
 
 using namespace MIPSAnalyst;
 #define _RS ((op>>21) & 0x1F)

Core/MIPS/ARM/ArmJit.h

@@ -18,11 +18,10 @@
 #pragma once
 
 #include "../../../Globals.h"
-#include "ArmAsm.h"
 
-#include <ArmEmitter.h>
 #include "ArmJitCache.h"
 #include "ArmRegCache.h"
+#include "ArmAsm.h"
 
 namespace MIPSComp
 {

Core/MIPS/ARM/ArmRegCache.h

@@ -17,9 +17,9 @@
 
 #pragma once
 
-#include "ArmEmitter.h"
 #include "../MIPS.h"
 #include "../MIPSAnalyst.h"
+#include "ArmEmitter.h"
 
 using namespace ArmGen;
 
@@ -58,6 +58,8 @@ struct RegMIPS {
 	// If loc == ML_MEM, it's back in its location in the CPU context struct.
 };
 
+#undef MAP_DIRTY
+#undef MAP_NOINIT
 // Initing is the default so the flag is reversed.
 enum {
 	MAP_DIRTY = 1,