puae 2.3.3

build_macos_qt.sh

@@ -9,9 +9,11 @@ cd32=" --enable-cd32 "
 a600=" --enable-gayle "
 scsi=" --enable-scsi-device --enable-ncr --enable-a2091 "
 other=" --with-caps --enable-amax "
+debug="--enable-profiling"
+debug=""
 #
 #
 ./bootstrap.sh
-./configure $base $cd32 $a600 $scsi $other CFLAGS="-m32" LDFLAGS="-m32" CPPFLAGS="-m32" CXXFLAGS="-m32"
+./configure $base $cd32 $a600 $scsi $other $debug CFLAGS="-m32" LDFLAGS="-m32" CPPFLAGS="-m32" CXXFLAGS="-m32"
 make clean
 make

src/audio.c

@@ -371,6 +371,7 @@ static int filter (int input, struct filter_state *fs)
 
 	case FILTER_NONE:
 		return input;
+
 	case FILTER_MODEL_A500:
 		fs->rc1 = a500e_filter1_a0 * input + (1 - a500e_filter1_a0) * fs->rc1 + DENORMAL_OFFSET;
 		fs->rc2 = a500e_filter2_a0 * fs->rc1 + (1-a500e_filter2_a0) * fs->rc2;

src/blitter.c

@@ -359,6 +359,7 @@ STATIC_INLINE void chipmem_agnus_wput2 (uaecptr addr, uae_u32 w)
 	last_custom_value1 = w;
 #ifndef BLITTER_DEBUG_NO_D
 	chipmem_wput_indirect (addr, w);
+	debug_wputpeekdma (addr, w);
 #endif
 }
 

src/blkdev.c

@@ -40,7 +40,8 @@ static uae_u8 play_qcode[MAX_TOTAL_SCSI_DEVICES][SUBQ_SIZE];
 
 static TCHAR newimagefiles[MAX_TOTAL_SCSI_DEVICES][256];
 static int imagechangetime[MAX_TOTAL_SCSI_DEVICES];
-static bool cdimagefileinuse[MAX_TOTAL_SCSI_DEVICES], wasopen[MAX_TOTAL_SCSI_DEVICES];
+static bool cdimagefileinuse[MAX_TOTAL_SCSI_DEVICES];
+static bool wasopen[MAX_TOTAL_SCSI_DEVICES];
 
 /* convert minutes, seconds and frames -> logical sector number */
 int msf2lsn (int msf)
@@ -552,7 +553,7 @@ static void check_changes (int unitnum)
 					imagechangetime[unitnum] = 8 * 50;
 			}
 		}
-		write_log ("CD: eject (%s)\n", pollmode ? "slow" : "fast");
+		write_log ("CD: eject (%s) open=%d\n", pollmode ? L"slow" : L"fast", wasopen[unitnum] ? 1 : 0);
 #ifdef RETROPLATFORM
 		rp_cd_image_change (unitnum, NULL); 
 #endif
@@ -570,12 +571,14 @@ static void check_changes (int unitnum)
 	_tcscpy (changed_prefs.cdslots[unitnum].name, newimagefiles[unitnum]);
 	currprefs.cdslots[unitnum].inuse = changed_prefs.cdslots[unitnum].inuse = cdimagefileinuse[unitnum];
 	newimagefiles[unitnum][0] = 0;
-	write_log ("CD: delayed insert '%s'\n", currprefs.cdslots[unitnum].name[0] ? currprefs.cdslots[unitnum].name : "<EMPTY>");
+	write_log ("CD: delayed insert '%s' (open=%d)\n", currprefs.cdslots[unitnum].name[0] ? currprefs.cdslots[unitnum].name : L"<EMPTY>", wasopen[unitnum] ? 1 : 0);
 	device_func_init (0);
 	if (wasopen[unitnum]) {
 		if (!device_func[unitnum]->opendev (unitnum, currprefs.cdslots[unitnum].name, 0)) {
 			write_log ("-> device open failed\n");
                 	wasopen[unitnum] = 0;
+		} else {
+			write_log ("-> device reopened\n");
 		}
 	}
 	if (currprefs.scsi && wasopen[unitnum]) {

src/drawing.c

@@ -7,7 +7,7 @@
  *
  * Copyright 1995-2000 Bernd Schmidt
  * Copyright 1995 Alessandro Bissacco
- * Copyright 2000-2008 Toni Wilen
+ * Copyright 2000-2011 Toni Wilen
  */
 
 /* There are a couple of concepts of "coordinates" in this file.

src/filesys.asm

@@ -70,14 +70,6 @@ bootcode:
 
 residenthack
 	movem.l d0-d2/a0-a2/a6,-(sp)
-
-	move.w #$FF38,d0
-	moveq #17,d1
-	bsr.w getrtbase
-	jsr (a0)
-	tst.l d0
-	beq.s .rsh
-
 	move.l 4.w,a6
 	cmp.w #37,20(a6)
 	bcs.s .rsh
@@ -232,6 +224,7 @@ FSIN_none:
 ;FSIN_scandone:
 ;	jsr -$007e(a6) ; Enable
 
+
 filesys_dev_storeinfo
 	moveq #3,d4 ; MEMF_CHIP | MEMF_PUBLIC
 	cmp.w #36,20(a6)
@@ -240,11 +233,6 @@ filesys_dev_storeinfo
 FSIN_ksold
 
 	; add >2MB-6MB chip RAM to memory list
-	lea $210000,a1
-	; do not add if RAM detected already
-	jsr -$216(a6) ; TypeOfMem
-	tst.l d0
-	bne.s FSIN_chip_done
 	move.w #$FF80,d0
 	bsr.w getrtbase
 	jsr (a0)
@@ -1238,15 +1226,15 @@ FSML_loop:
 	clr.b 172(a3)
 .nodc
 	move.l a4,d0
-	beq.s nonnotif
+	beq.s FSML_loop
 
 	; notify reply?
 	cmp.w #38, 18(a4)
-	bne.s nonnotif
+	bne.s nonotif
 	cmp.l #NOTIFY_CLASS, 20(a4)
-	bne.s nonnotif
+	bne.s nonotif
 	cmp.w #NOTIFY_CODE, 24(a4)
-	bne.s nonnotif
+	bne.s nonotif
 	move.l 26(a4),a0 ; NotifyRequest
 	move.l 12(a0),d0 ; flags
 	and.l #NRF_WAIT_REPLY|NRF_MAGIC,d0
@@ -1264,20 +1252,15 @@ nonoti
 	jsr FreeMem(a6)
 	bra.w FSML_loop
 
-nonnotif
-	moveq #-2,d2 ; lock timeout "done" value
-	move.l a4,d0
-	beq.s FSML_check_queue_other
+nonotif
 	move.l 10(a4),d3 ; ln_Name
 	bne.b FSML_FromDOS
-	moveq #-1,d2 ; normal "done" value
 
 	; It's a dummy packet indicating that some queued command finished.
 	move.w #$FF50,d0 ; exter_int_helper
 	bsr.w getrtbase
 	moveq.l #1,d0
 	jsr (a0)
-FSML_check_queue_other:
 	; Go through the queue and reply all those that finished.
 	lea.l 4(a3),a2
 	move.l (a2),a0
@@ -1289,8 +1272,7 @@ FSML_check_old:
 	; This field may be accessed concurrently by several UAE threads.
 	; This _should_ be harmless on all reasonable machines.
 	move.l 4(a0),d0
-	cmp.l d0,d2
-	bne.b FSML_check_next
+	bpl.b FSML_check_next
 	movem.l a0/a1,-(a7)
 	move.l 10(a0),a4
 	bsr.b ReplyOne
@@ -2079,14 +2061,6 @@ CLIP_END = (CLIP_POINTER_PREFS+32)
 
 clipboard_init:
 	movem.l a5/a6,-(sp)
-
-	move.w #$FF38,d0
-	moveq #17,d1
-	bsr.w getrtbase
-	jsr (a0)
-	btst #0,d0
-	beq.s .noclip
-
 	move.l 4.w,a6
 	move.l #CLIP_END,d0
 	move.l #$10001,d1
@@ -2108,7 +2082,7 @@ clipboard_init:
 	moveq #-10,d0
 	move.l #10000,d1
 	bsr.w createproc
-.noclip
+
 	moveq #0,d0
 	movem.l (sp)+,a5/a6
 	rts
@@ -2439,15 +2413,13 @@ cliphook:
 
 consolehook:
 	move.l 4.w,a6
-
 	moveq #-1,d2
 	move.w #$FF38,d0
-	moveq #17,d1
+	moveq #100,d1
 	bsr.w getrtbase
 	jsr (a0)
-	btst #1,d0
+	tst.l d0
 	beq.s .ch2
-
 	moveq #0,d2
 	jsr -$0084(a6) ;Forbid
 	lea 350(a6),a0 ;DeviceList

src/gfx-cocoa/cocoa_gfx.m

@@ -138,7 +138,7 @@ int input_get_default_mouse (struct uae_input_device *uid, int i, int port, int
 {
 }
 
-uae_u8 *gfx_lock_picasso (void)
+uae_u8 *gfx_lock_picasso (int fullupdate)
 {
 }
 

src/gfx-sdl/sdlgfx.c

@@ -1843,7 +1843,7 @@ void gfx_set_picasso_state (int on)
 		DX_SetPalette (0, 256);
 }
 
-uae_u8 *gfx_lock_picasso (void)
+uae_u8 *gfx_lock_picasso (int fullupdate)
 {
 	DEBUG_LOG ("Function: gfx_lock_picasso\n");
 

src/gfx-svga/svga.c

@@ -891,7 +891,7 @@ void gfx_set_picasso_state (int on)
 	set_window_for_amiga ();
 }
 
-uae_u8 *gfx_lock_picasso (void)
+uae_u8 *gfx_lock_picasso (int fullupdate)
 {
     return linear_mem;
 }

src/gfx-x11/xwin.c

@@ -1485,7 +1485,7 @@ void gfx_set_picasso_state (int on)
 	DX_SetPalette_real (0, 256);
 }
 
-uae_u8 *gfx_lock_picasso (void)
+uae_u8 *gfx_lock_picasso (int fullupdate)
 {
 #ifdef USE_DGA_EXTENSION
     if (dgamode)

src/include/picasso96.h

@@ -751,7 +751,7 @@ extern void gfx_set_picasso_modeinfo (uae_u32 w, uae_u32 h, uae_u32 d, RGBFTYPE
 extern void gfx_set_picasso_colors (RGBFTYPE rgbfmt);
 extern void gfx_set_picasso_baseaddr (uaecptr);
 extern void gfx_set_picasso_state (int on);
-extern uae_u8 *gfx_lock_picasso (void);
+extern uae_u8 *gfx_lock_picasso (int fullupdate);
 extern void gfx_unlock_picasso (void);
 extern void picasso_clip_mouse (int *, int *);
 

src/main.c

@@ -199,7 +199,6 @@ void fixup_cpu (struct uae_prefs *p)
 		p->mmu_model = 0;
 }
 
-
 void fixup_prefs (struct uae_prefs *p)
 {
 	int err = 0;

src/zfile.c

@@ -2596,8 +2596,11 @@ static struct zvolume *prepare_recursive_volume (struct zvolume *zv, const TCHAR
 	if (!zvnew && !(flags & ZFD_NORECURSE)) {
 #if 1
 /*		zvnew = archive_directory_plain (zf);
+		if (zvnew) {
         		zfile_fopen_archive_recurse (zvnew);
-		done = 1;*/
+        		done = 1;
+                }
+*/
 #else
 		int rc;
 		int index;
@@ -2626,7 +2629,7 @@ static struct zvolume *prepare_recursive_volume (struct zvolume *zv, const TCHAR
 			break; // TODO
 		}
 #endif
-	} else {
+	} else if (zvnew) {
 		zvnew->parent = zv->parent;
 		zfile_fopen_archive_recurse (zvnew);
 		done = 1;