puae 2.3.1

src/cia.c

@@ -673,12 +673,14 @@ static uae_u8 ReadCIAA (unsigned int addr)
 		if (notinrom())
 			write_log ("BFE001 R %02X %s\n", tmp, debuginfo(0));
 #endif
+
 		if (inputrecord_debug & 2) {
 			if (input_record > 0)
 				inprec_recorddebug_cia (tmp, div10, m68k_getpc ());
 			else if (input_play > 0)
 				inprec_playdebug_cia (tmp, div10, m68k_getpc ());
 		}
+
 		return tmp;
 	case 1:
 #ifdef PARALLEL_PORT

src/compemu_raw_x86.c

@@ -1693,7 +1693,7 @@ STATIC_INLINE void raw_inc_sp(int off)
 static int in_handler=0;
 static uae_u8 *veccode;
 
-# ifdef _WIN32
+#ifdef _WIN32
 
 #if defined(CPU_64_BIT)
 #define ctxPC (pContext->Rip)
@@ -1945,7 +1945,7 @@ int EvalException (LPEXCEPTION_POINTERS blah, int n_except)
 #endif
 						invalidate_block(bi);
 						raise_in_cl_list(bi);
-						set_special (0);
+						set_special(0);
 						return EXCEPTION_CONTINUE_EXECUTION;
 				}
 				bi=bi->next;
@@ -2359,7 +2359,7 @@ static void
 		c->x86_vendor = X86_VENDOR_UNKNOWN;
 }
 
-static void cpuid (uae_u32 op, uae_u32 *eax, uae_u32 *ebx, uae_u32 *ecx, uae_u32 *edx)
+static void cpuid(uae_u32 op, uae_u32 *eax, uae_u32 *ebx, uae_u32 *ecx, uae_u32 *edx)
 {
 	const int CPUID_SPACE = 4096;
 	uae_u8* cpuid_space = (uae_u8*)cache_alloc(CPUID_SPACE);

src/compemu_support.c

@@ -1701,7 +1701,7 @@ MIDFUNC(0,live_flags,(void))
 }
 MENDFUNC(0,live_flags,(void))
 
-MIDFUNC(0,dont_care_flags,(void))
+	MIDFUNC(0,dont_care_flags,(void))
 {
 	live.flags_are_important=0;
 }
@@ -1795,7 +1795,7 @@ MENDFUNC(2,bt_l_ri,(R4 r, IMM i)) /* This is defined as only affecting C */
 }
 MENDFUNC(2,bt_l_rr,(R4 r, R4 b)) /* This is defined as only affecting C */
 
-MIDFUNC(2,btc_l_ri,(RW4 r, IMM i))
+	MIDFUNC(2,btc_l_ri,(RW4 r, IMM i))
 {
 	int size=4;
 	if (i<16)
@@ -1831,7 +1831,7 @@ MENDFUNC(2,btc_l_rr,(RW4 r, R4 b))
 }
 MENDFUNC(2,btr_l_ri,(RW4 r, IMM i))
 
-MIDFUNC(2,btr_l_rr,(RW4 r, R4 b))
+	MIDFUNC(2,btr_l_rr,(RW4 r, R4 b))
 {
 	CLOBBER_BT;
 	b=readreg(b,4);
@@ -1843,7 +1843,7 @@ MIDFUNC(2,btr_l_rr,(RW4 r, R4 b))
 MENDFUNC(2,btr_l_rr,(RW4 r, R4 b))
 
 
-MIDFUNC(2,bts_l_ri,(RW4 r, IMM i))
+	MIDFUNC(2,bts_l_ri,(RW4 r, IMM i))
 {
 	int size=4;
 	if (i<16)
@@ -1855,7 +1855,7 @@ MIDFUNC(2,bts_l_ri,(RW4 r, IMM i))
 }
 MENDFUNC(2,bts_l_ri,(RW4 r, IMM i))
 
-MIDFUNC(2,bts_l_rr,(RW4 r, R4 b))
+	MIDFUNC(2,bts_l_rr,(RW4 r, R4 b))
 {
 	CLOBBER_BT;
 	b=readreg(b,4);

src/expansion.c

@@ -298,13 +298,15 @@ static void REGPARAM2 expamem_wput (uaecptr addr, uae_u32 value)
 					// Z3 P96 RAM
 					p2 = p96ram_start >> 16;
 				}
-				put_word (regs.regs[11] + 0x20, p2);
-				put_word (regs.regs[11] + 0x28, p2);
+				if (value != p2) {
+					put_word (regs.regs[11] + 0x20, p2);
+					put_word (regs.regs[11] + 0x28, p2);
+				}
 				// -Bernd Roesch
 				expamem_hi = p2;
 				(*card_map[ecard]) ();
 				ecard++;
-				if (p1 != p2)
+				if (value != p2)
 					write_log ("   Card %d remapped %04x0000 -> %04x0000\n", ecard, p1, p2);
 				write_log ("   Card %d (Zorro%s) done.\n", ecard, expamem_type () == 0xc0 ? "II" : "III");
 				if (ecard < cardno)
@@ -982,7 +984,7 @@ static void expamem_init_filesys (void)
 
 	expamem_write (0x08, no_shutup);
 
-	expamem_write (0x04, 2);
+	expamem_write (0x04, currprefs.maprom ? 2 : 82);
 	expamem_write (0x10, uae_id >> 8);
 	expamem_write (0x14, uae_id & 0xff);
 

src/newcpu.c

@@ -37,7 +37,7 @@
 #define f_out fprintf
 #define console_out printf
 #ifdef JIT
-extern uae_u8* compiled_code;
+//extern uae_u8* compiled_code;
 #include "compemu.h"
 #else
 /* Need to have these somewhere */