fix build with JIT disabled and set default JIT maxblock size to 32

src/ARM.cpp

@@ -173,6 +173,7 @@ void ARM::DoSavestate(Savestate* file)
     file->VarArray(R_IRQ, 3*sizeof(u32));
     file->VarArray(R_UND, 3*sizeof(u32));
     file->Var32(&CurInstr);
+#ifdef JIT_ENABLED
     if (!file->Saving && Config::JIT_Enable)
     {
         // hack, the JIT doesn't really pipeline
@@ -180,6 +181,7 @@ void ARM::DoSavestate(Savestate* file)
         // loaded while running the interpreter
         FillPipeline();
     }
+#endif
     file->VarArray(NextInstr, 2*sizeof(u32));
 
     file->Var32(&ExceptionBase);

src/CMakeLists.txt

@@ -11,7 +11,6 @@ add_library(core STATIC
 	ARMInterpreter_ALU.cpp
 	ARMInterpreter_Branch.cpp
 	ARMInterpreter_LoadStore.cpp
-	ARM_InstrInfo.cpp
 	Config.cpp
 	CP15.cpp
 	CRC32.cpp
@@ -57,6 +56,7 @@ if (ENABLE_JIT)
 
 	target_sources(core PRIVATE
 		ARMJIT.cpp
+		ARM_InstrInfo.cpp
 
 		dolphin/CommonFuncs.cpp
 	)

src/CP15.cpp

@@ -562,11 +562,15 @@ void ARMv5::CP15Write(u32 id, u32 val)
 
 
     case 0x750:
+#ifdef JIT_ENABLED
         ARMJIT::InvalidateAll();
+#endif
         ICacheInvalidateAll();
         return;
     case 0x751:
+#ifdef JIT_ENABLED
         ARMJIT::InvalidateByAddr(ARMJIT::TranslateAddr<0>(val));
+#endif
         ICacheInvalidateByAddr(val);
         return;
     case 0x752:

src/Config.cpp

@@ -39,7 +39,7 @@ char DSiNANDPath[1024];
 
 #ifdef JIT_ENABLED
 int JIT_Enable = false;
-int JIT_MaxBlockSize = 12;
+int JIT_MaxBlockSize = 32;
 int JIT_BrancheOptimisations = 2;
 int JIT_LiteralOptimisations = true;
 #endif
@@ -57,7 +57,7 @@ ConfigEntry ConfigFile[] =
 
 #ifdef JIT_ENABLED
     {"JIT_Enable", 0, &JIT_Enable, 0, NULL, 0},
-    {"JIT_MaxBlockSize", 0, &JIT_MaxBlockSize, 10, NULL, 0},
+    {"JIT_MaxBlockSize", 0, &JIT_MaxBlockSize, 32, NULL, 0},
     {"JIT_BranchOptimisations", 0, &JIT_BrancheOptimisations, 2, NULL, 0},
     {"JIT_LiteralOptimisations", 0, &JIT_LiteralOptimisations, 1, NULL, 0},
 #endif