Merge latest TomB version as of 6 April

src/jit/codegen_arm.cpp

@@ -92,9 +92,9 @@ extern void __clear_cache (char*, char*);
 #define STACK_ALIGN		4
 #define STACK_OFFSET	sizeof(void *)
 
-uae_s8 always_used[]={2,3,-1};
-uae_s8 can_byte[]={0,1,4,5,6,7,8,9,10,11,12,-1};
-uae_s8 can_word[]={0,1,4,5,6,7,8,9,10,11,12,-1};
+uae_u8 always_used[]={2,3,0xff};
+uae_u8 can_byte[]={0,1,4,5,6,7,8,9,10,11,12,0xff};
+uae_u8 can_word[]={0,1,4,5,6,7,8,9,10,11,12,0xff};
 
 uae_u8 call_saved[]={0,0,0,0, 1,1,1,1, 1,1,1,1, 0,1,1,1};
 

src/jit/compemu.cpp

@@ -3,9 +3,8 @@
 #include "sysdeps.h"
 #include "options.h"
 #include "memory.h"
-#include "custom.h"
-#include "events.h"
 #include "newcpu.h"
+#include "custom.h"
 #include "comptbl.h"
 #include "debug.h"
 #include "compemu.h"

src/jit/compemu.h

@@ -76,8 +76,6 @@ typedef union {
     struct blockinfo_t* bi;
 } cacheline;
 
-extern signed long pissoff;
-
 #define USE_ALIAS 1
 #define USE_F_ALIAS 1
 #define USE_OFFSET 0
@@ -143,23 +141,21 @@ extern void init_comp(void);
 extern void flush(int save_regs);
 extern void small_flush(int save_regs);
 extern void set_target(uae_u8* t);
-extern uae_u8* get_target(void);
 extern void freescratch(void);
 extern void build_comp(void);
 extern void set_cache_state(int enabled);
 extern int get_cache_state(void);
 extern uae_u32 get_jitted_size(void);
 #ifdef JIT
-extern void (*flush_icache)(int n);
+extern void (*flush_icache)(uaecptr ptr, int n);
 #endif
 extern void alloc_cache(void);
 extern void compile_block(cpu_history* pc_hist, int blocklen, int totcyles);
 extern int check_for_cache_miss(void);
 
-#define scaled_cycles(x) (currprefs.m68k_speed==-1?(((x)/SCALE)?(((x)/SCALE<MAXCYCLES?((x)/SCALE):MAXCYCLES)):1):(x))
+#define scaled_cycles(x) (currprefs.m68k_speed<0?(((x)/SCALE)?(((x)/SCALE<MAXCYCLES?((x)/SCALE):MAXCYCLES)):1):(x))
 
 extern uae_u32 needed_flags;
-extern cacheline cache_tags[];
 extern uae_u8* comp_pc_p;
 extern void* pushall_call_handler;
 
@@ -281,7 +277,6 @@ typedef struct {
   uae_s8 nat[N_REGS];
 } smallstate;
 
-extern bigstate live;
 extern int touchcnt;
 
 
@@ -349,9 +344,6 @@ extern void register_branch(uae_u32 not_taken, uae_u32 taken, uae_u8 cond);
 #define comp_get_iword(o) do_get_mem_word((uae_u16 *)(comp_pc_p + (o)))
 #define comp_get_ilong(o) do_get_mem_long((uae_u32 *)(comp_pc_p + (o)))
 
-/* Preferences handling */
-int check_prefs_changed_comp (void);
-
 struct blockinfo_t;
 
 typedef struct dep_t {

src/jit/compemu_fpp.cpp

@@ -15,8 +15,8 @@
 
 #include "options.h"
 #include "memory.h"
-#include "custom.h"
 #include "newcpu.h"
+#include "custom.h"
 #include "ersatz.h"
 #include "compemu.h"
 

src/jit/compstbl.cpp

@@ -3,9 +3,8 @@
 #include "sysdeps.h"
 #include "options.h"
 #include "memory.h"
-#include "custom.h"
-#include "events.h"
 #include "newcpu.h"
+#include "custom.h"
 #include "comptbl.h"
 #include "debug.h"
 extern const struct comptbl op_smalltbl_0_comp_ff[] = {

src/jit/gencomp.cpp

@@ -2784,7 +2784,7 @@ gen_opcode (unsigned long int opcode)
 	isjump;  /* Not really, but it's probably a good idea to stop
 		    translating at this point */
 	failure;
-	comprintf ("\tflush_icache();\n");  /* Differentiate a bit more? */
+	comprintf ("\tflush_icache(0, 3);\n");  /* Differentiate a bit more? */
 	break;
      case i_CPUSHL:
      case i_CPUSHP:

src/jit/gencomp_arm.cpp

@@ -2738,7 +2738,7 @@ gen_opcode (unsigned long int opcode)
 	isjump;  /* Not really, but it's probably a good idea to stop
 		    translating at this point */
 	failure;
-	comprintf ("\tflush_icache();\n");  /* Differentiate a bit more? */
+	comprintf ("\tflush_icache(0, 3);\n");  /* Differentiate a bit more? */
 	break;
      case i_CPUSHL:
      case i_CPUSHP: