puae 2.3.1

configure.in

@@ -1749,6 +1749,7 @@ dnl 64 bit?
 dnl //mtufan
 dnl
 is_64bit=no
+is_64bit=yes
 AC_MSG_CHECKING([whether CPU is 64bit])
 if [[ "$HOST_CPU" = amd64 ]]; then
 is_64bit=yes

release_.sh

@@ -86,6 +86,31 @@ rm -rf src/td-sdl/Makefile.in
 rm -rf src/td-win32/Makefile.in
 rm -rf src/test/Makefile.in
 
+# remove generated files, just in case
+# blitter
+rm -rf src/blit.h
+rm -rf src/blitfunc.c
+rm -rf src/blitfunc.h
+rm -rf src/blittable.c
+rm -rf src/linetoscr.c
+# cpu
+rm -rf src/cpudefs.c
+rm -rf src/cputbl.h
+rm -rf src/cpustbl.c
+rm -rf src/compemu.c
+rm -rf src/comptbl.h
+rm -rf src/compstbl.c
+rm -rf src/cpuemu_0.c
+rm -rf src/cpuemu_11.c
+rm -rf src/cpuemu_12.c
+rm -rf src/cpuemu_20.c
+rm -rf src/cpuemu_21.c
+rm -rf src/cpuemu_31.c
+# jit
+rm -rf src/compemu.cpp
+rm -rf src/compstbl.h
+rm -rf src/compstbl.cpp
+
 echo "=================================================="
 echo "Current Commit: "
 tail -1 .git/packed-refs | awk '{print $1}'

src/cfgfile.c

@@ -3621,17 +3621,17 @@ void default_prefs (struct uae_prefs *p, int type)
 	p->sound_auto = 1;
 
 #ifdef JIT
-# ifdef NATMEM_OFFSET
+#ifdef NATMEM_OFFSET
 	p->comptrustbyte = 0;
 	p->comptrustword = 0;
 	p->comptrustlong = 0;
 	p->comptrustnaddr= 0;
-# else
+#else
 	p->comptrustbyte = 1;
 	p->comptrustword = 1;
 	p->comptrustlong = 1;
 	p->comptrustnaddr= 1;
-# endif
+#endif
 	p->compnf = 1;
 	p->comp_hardflush = 0;
 	p->comp_constjump = 1;

src/compemu_support.c

@@ -5394,6 +5394,8 @@ void alloc_cache(void)
 		max_compile_start=compiled_code+currprefs.cachesize*1024-BYTES_PER_INST;
 		current_compile_p=compiled_code;
 	}
+
+	write_log ("JIT: Allocated %d KB translation cache.\n", currprefs.cachesize);
 }
 
 static void calc_checksum(blockinfo* bi, uae_u32* c1, uae_u32* c2)

src/gui-cocoa/cocoaui.m

@@ -73,6 +73,12 @@ static unsigned long memsizes[] = {
         /* 21*/ 0xC0000000, //3GB
 };
 
+static int quickstart_model = 0, quickstart_conf = 0, quickstart_compa = 1;
+static int quickstart_floppy = 1, quickstart_cd = 0, quickstart_ntsc = 0;
+static int quickstart_cdtype = 0;
+static char quickstart_cddrive[16];
+static int quickstart_ok, quickstart_ok_floppy;
+
 //----------
 
 #import <Cocoa/Cocoa.h>
@@ -207,17 +213,17 @@ static BOOL wasFullscreen = NO; // used by ensureNotFullscreen() and restoreFull
 
 	// quick starts
 	NSMenu *quickstartMenu = [[NSMenu alloc] initWithTitle:@"QuickStart"];
-		[self createMenuItemInMenu:quickstartMenu withTitle:@"Amiga 500" action:@selector(QuickStart:) tag:500];
-		[self createMenuItemInMenu:quickstartMenu withTitle:@"Amiga 500+" action:@selector(QuickStart:) tag:501];
-		[self createMenuItemInMenu:quickstartMenu withTitle:@"Amiga 600" action:@selector(QuickStart:) tag:600];
-		[self createMenuItemInMenu:quickstartMenu withTitle:@"Amiga 1000" action:@selector(QuickStart:) tag:1000];
-		[self createMenuItemInMenu:quickstartMenu withTitle:@"Amiga 1200" action:@selector(QuickStart:) tag:1200];
-		[self createMenuItemInMenu:quickstartMenu withTitle:@"Amiga 3000" action:@selector(QuickStart:) tag:3000];
-		[self createMenuItemInMenu:quickstartMenu withTitle:@"Amiga 4000" action:@selector(QuickStart:) tag:4000];
-		[self createMenuItemInMenu:quickstartMenu withTitle:@"Amiga 4000T" action:@selector(QuickStart:) tag:4001];
-		[self createMenuItemInMenu:quickstartMenu withTitle:@"CD32" action:@selector(QuickStart:) tag:32];
-		[self createMenuItemInMenu:quickstartMenu withTitle:@"CDTV" action:@selector(QuickStart:) tag:33];
-		[self createMenuItemInMenu:quickstartMenu withTitle:@"Arcadia" action:@selector(QuickStart:) tag:34];
+		[self createMenuItemInMenu:quickstartMenu withTitle:@"Amiga 500" action:@selector(QuickStart:) tag:0];
+		[self createMenuItemInMenu:quickstartMenu withTitle:@"Amiga 500+" action:@selector(QuickStart:) tag:1];
+		[self createMenuItemInMenu:quickstartMenu withTitle:@"Amiga 600" action:@selector(QuickStart:) tag:2];
+		[self createMenuItemInMenu:quickstartMenu withTitle:@"Amiga 1000" action:@selector(QuickStart:) tag:3];
+		[self createMenuItemInMenu:quickstartMenu withTitle:@"Amiga 1200" action:@selector(QuickStart:) tag:4];
+		[self createMenuItemInMenu:quickstartMenu withTitle:@"Amiga 3000" action:@selector(QuickStart:) tag:5];
+		[self createMenuItemInMenu:quickstartMenu withTitle:@"Amiga 4000" action:@selector(QuickStart:) tag:6];
+		[self createMenuItemInMenu:quickstartMenu withTitle:@"Amiga 4000T" action:@selector(QuickStart:) tag:7];
+		[self createMenuItemInMenu:quickstartMenu withTitle:@"CD32" action:@selector(QuickStart:) tag:8];
+		[self createMenuItemInMenu:quickstartMenu withTitle:@"CDTV" action:@selector(QuickStart:) tag:9];
+		[self createMenuItemInMenu:quickstartMenu withTitle:@"Arcadia" action:@selector(QuickStart:) tag:10];
 	menuItem = [[NSMenuItem alloc] initWithTitle:@"QuickStart" action:nil keyEquivalent:@""];
 	[menuItem setSubmenu:quickstartMenu];
 	[vAmigaMenu addItem:menuItem];
@@ -1349,6 +1355,21 @@ static BOOL wasFullscreen = NO; // used by ensureNotFullscreen() and restoreFull
 	write_log ("done\n");
 }
 
+/*
+- (void)QuickStart:(id)sender
+{
+	unsigned int romcheck = 0;
+	quickstart_model = [((NSMenuItem*)sender) tag];
+	quickstart_conf = 0;
+	quickstart_compa = 0;
+
+	changed_prefs.nr_floppies = quickstart_floppy;
+	quickstart_ok = built_in_prefs (&changed_prefs, quickstart_model, quickstart_conf, quickstart_compa, romcheck);
+
+	uae_reset(0);
+}
+*/
+
 - (void)hebeHebe:(id)sender
 {
 	NSRect frame = NSMakeRect(100, 100, 200, 200);

src/od-generic/memory.c

@@ -61,8 +61,13 @@ uae_u8 *cache_alloc (int size)
 
 	size = size < getpagesize() ? getpagesize() : size;
 
-	if ((cache = valloc (size)))
-		mprotect (cache, size, PROT_READ|PROT_WRITE|PROT_EXEC);
+	if ((cache = valloc (size))) {
+		if (mprotect (cache, size, PROT_READ|PROT_WRITE|PROT_EXEC)) {
+			write_log ("MProtect Cache of %d failed. ERR=%d\n", size, errno);
+		}
+	} else {
+		write_log ("Cache_Alloc of %d failed. ERR=%d\n", size, errno);
+	}
 
 	return cache;
 }