Minor fast copper improvements

BlitterStudio · Mar 22, 2021 · ea45865 · ea45865
1 parent 18617e8
commit ea45865
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 9 deletions.
diff --git a/src/akiko.cpp b/src/akiko.cpp
@@ -217,6 +217,7 @@ static void nvram_read (void)
 	if (!cd32_nvram || cd32_nvram_size != maxlen) {
 		xfree(cd32_nvram);
 		cd32_nvram = xmalloc(uae_u8, maxlen);
+		cd32_nvram_size = maxlen;
 	}
 	memset(cd32_nvram, 0, maxlen);
 	//if (is_board_enabled(&currprefs, ROMTYPE_CUBO, 0)) {

diff --git a/src/cfgfile.cpp b/src/cfgfile.cpp
@@ -7407,7 +7407,7 @@ int cfgfile_searchconfig(const TCHAR *in, int index, TCHAR *out, int outsize)
 			goto end;
 		}
 		if (b == '\n') {
-			if (!_tcsncmp (tmp, in, inlen) && ((inlen > 0 && _tcslen (tmp) > inlen && tmp[inlen] == '=') || (joker))) {
+			if (inlen >= 0 && !_tcsncmp (tmp, in, inlen) && ((inlen > 0 && _tcslen (tmp) > inlen && tmp[inlen] == '=') || (joker))) {
 				if (index <= 0) {
 					TCHAR *p;
 					if (joker)

diff --git a/src/custom.cpp b/src/custom.cpp
@@ -7189,8 +7189,8 @@ static void predict_copper(void)
 	int until_hpos = maxhpos - 3;
 	int force_exit = 0;
 
-	w1 = cop_state.i1;
-	w2 = cop_state.i2;
+	w1 = cop_state.saved_i1;
+	w2 = cop_state.saved_i2;
 
 	switch (state) {
 	case COP_stop:
@@ -7200,6 +7200,11 @@ static void predict_copper(void)
 	case COP_skip1:
 		return;
 
+	case COP_read1:
+	case COP_read2:
+		w1 = cop_state.i1;
+		break;
+
 	case COP_wait:
 		if ((w2 & 0x8000) == 0)
 			return; // wait for blitter
@@ -7433,6 +7438,9 @@ static void update_copper (int until_hpos)
 	if (until_hpos > (maxhpos & ~1))
 		until_hpos = maxhpos & ~1;
 
+	bool never_blocked = currprefs.fast_copper &&
+		((toscr_nr_planes2 < 5 && toscr_res == RES_LORES) || (toscr_nr_planes2 < 3 && toscr_res != RES_LORES));
+
 	for (;;) {
 		int old_hpos = c_hpos;
 		int hp;
@@ -7441,10 +7449,12 @@ static void update_copper (int until_hpos)
 			break;
 
 
+		if (!never_blocked) { // copper never blocked by bitplane dma
 		/* So we know about the fetch state.  */
-		decide_line (c_hpos);
-		// bitplane only, don't want blitter to steal our cycles.
-		decide_fetch (c_hpos);
+			decide_line(c_hpos);
+			// bitplane only, don't want blitter to steal our cycles.
+			decide_fetch(c_hpos);
+		}
 
 		if (cop_state.movedelay > 0) {
 			cop_state.movedelay--;

diff --git a/src/main.cpp b/src/main.cpp
@@ -57,7 +57,7 @@
 #include <sys/ioctl.h>
 #include "keyboard.h"
 
-static const char __ver[40] = "$VER: Amiberry 4.0 BETA (2021-03-18)";
+static const char __ver[40] = "$VER: Amiberry 4.0 BETA (2021-03-22)";
 long int version = 256 * 65536L * UAEMAJOR + 65536L * UAEMINOR + UAESUBREV;
 
 struct uae_prefs currprefs, changed_prefs;

diff --git a/src/osdep/target.h b/src/osdep/target.h
@@ -24,8 +24,8 @@
 #define GETBDM(x) (((x) - (((x) / 10000) * 10000)) / 100)
 #define GETBDD(x) ((x) % 100)
 
-#define AMIBERRYVERSION _T("Amiberry v4.0 BETA (2021-03-18)")
-#define AMIBERRYDATE MAKEBD(2021, 3, 18)
+#define AMIBERRYVERSION _T("Amiberry v4.0 BETA (2021-03-22)")
+#define AMIBERRYDATE MAKEBD(2021, 3, 22)
 
 #define IHF_WINDOWHIDDEN 6