***** yaze version 1.14 of 2004/04/23 *****

Changes since 1.13:

2004-04-23
 * yaze.c, Makefile (VERSION): update version string.
 * simz80.pl: simulate the interrupt register (IR).  (Michael Haardt).
 * bios.c (bios): case 254 incremented pc twice in a macro argument
   (Carl Mascott).

Originated-by: yaze-1.14.tar.gz
Originated-md5: 275499d4444fb998165fc7b30c06868f
Originated-URL: ftp://ftp.ping.de/pub/misc/emulators/yaze-1.14.tar.gz

Signed-off-by: Stephan Linz <linz@li-pro.net>

Author: rexut

ChangeLog

@@ -1,3 +1,14 @@
+**** Version 1.14 released ****
+
+2004-04-23  Frank D. Cringle  <fdc@sabre.ping.de>
+
+	* yaze.c, Makefile (VERSION): update version string.
+
+	* simz80.pl: simulate the interrupt register (IR).  (Michael Haardt).
+
+	* bios.c (bios): case 254 incremented pc twice in a macro argument
+	(Carl Mascott).
+
 **** Version 1.13 released ****
 
 2004-01-24  Frank D. Cringle  <fdc@cliwe.ping.de>

Makefile

@@ -1,8 +1,8 @@
 # Makefile for yaze
 
-#	$Id: Makefile,v 1.4 2004/01/24 22:18:52 fdc Exp $	
+#	$Id: Makefile,v 1.5 2004/04/23 10:05:25 fdc Exp $	
 
-VERSION		= 1.13
+VERSION		= 1.14
 
 # CC must be an ANSI-C compiler
 CC            =	gcc

bios.c

@@ -35,10 +35,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 #include "yaze.h"
 #include "bios.h"
 
-/* 	$Id: bios.c,v 1.3 2004/01/11 16:49:58 fdc Exp $	 */
+/* 	$Id: bios.c,v 1.4 2004/04/23 09:50:15 fdc Exp $	 */
 
 #ifndef lint
-static char vcid[] = "$Id: bios.c,v 1.3 2004/01/11 16:49:58 fdc Exp $";
+static char vcid[] = "$Id: bios.c,v 1.4 2004/04/23 09:50:15 fdc Exp $";
 #endif /* lint */
 
 
@@ -532,8 +532,9 @@ bios(int func)
 	break;
     case 253:			/* return from recursive call */
 	return;
-    case 254:			/* meta-level command */
-	if (GetBYTE(++pc) == 0)
+    case 254:
+	++pc;			/* meta-level command */
+	if (GetBYTE(pc) == 0)
 	    monitor(0);
 	else {
 	    /* need a copy because docmd() scratches its argument */

simz80.c

@@ -1947,7 +1947,7 @@ simz80(FASTREG PC)
 			POP(PC);
 			break;
 		case 0x46:			/* IM 0 */
-			/* interrupt mode 0 */
+			IM = 0;
 			break;
 		case 0x47:			/* LD I,A */
 			ir = (ir & 255) | (AF & ~255);
@@ -2012,7 +2012,7 @@ simz80(FASTREG PC)
 			PC += 2;
 			break;
 		case 0x56:			/* IM 1 */
-			/* interrupt mode 1 */
+			IM = 1;
 			break;
 		case 0x57:			/* LD A,I */
 			AF = (AF & 0x29) | (ir & ~255) | ((ir >> 8) & 0x80) | (((ir & ~255) == 0) << 6) | ((IFF & 2) << 1);
@@ -2044,7 +2044,7 @@ simz80(FASTREG PC)
 			PC += 2;
 			break;
 		case 0x5E:			/* IM 2 */
-			/* interrupt mode 2 */
+			IM = 2;
 			break;
 		case 0x5F:			/* LD A,R */
 			AF = (AF & 0x29) | ((ir & 255) << 8) | (ir & 0x80) | (((ir & 255) == 0) << 6) | ((IFF & 2) << 1);

simz80.h

@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
 along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
-/* 	$Id: simz80.h,v 1.3 2004/01/24 22:18:52 fdc Exp $	 */
+/* 	$Id: simz80.h,v 1.4 2004/04/23 09:50:15 fdc Exp $	 */
 
 #include <limits.h>
 
@@ -67,6 +67,7 @@ extern WORD iy;
 extern WORD sp;
 extern WORD pc;
 extern WORD IFF;
+extern WORD IM; 
 
 #ifndef MEMSIZE
 #define MEMSIZE 64

simz80.pl

@@ -20,7 +20,7 @@
 
 EOT
 
-# 	$Id: simz80.pl,v 1.2 2004/01/11 16:11:17 fdc Exp $
+# 	$Id: simz80.pl,v 1.3 2004/04/23 09:50:15 fdc Exp $
 
 
 # This perl script generates the z80 instruction set simulator simz80().
@@ -1084,7 +1084,7 @@ sub ed_switch {
 				2 | (temp != 0);
 EOT
     &case(0x45, "RETN");		print "\t\t\tIFF |= IFF >> 1;\n\t\t\tPOP(PC);\n";
-    &case(0x46, "IM 0");		print "\t\t\t/* interrupt mode 0 */\n";
+    &case(0x46, "IM 0");		print "\t\t\tIM = 0;\n";
     &case(0x47, "LD I,A");		print "\t\t\tir = (ir & 255) | (AF & ~255);\n";
     &case(0x48, "IN C,(C)");		&INP(BC, "l");
     &case(0x49, "OUT (C),C");		&OUTP(BC, "l");
@@ -1096,15 +1096,15 @@ sub ed_switch {
     &case(0x51, "OUT (C),D");		&OUTP(DE, "h");
     &case(0x52, "SBC HL,DE");		&SBCdd(HL, DE);
     &case(0x53, "LD (nnnn),DE");	&LDmemdd(DE);
-    &case(0x56, "IM 1");		print "\t\t\t/* interrupt mode 1 */\n";
+    &case(0x56, "IM 1");		print "\t\t\tIM = 1;\n";
     &case(0x57, "LD A,I");		print "\t\t\tAF = (AF & 0x29) | (ir & ~255) | ",
 					      "((ir >> 8) & 0x80) | (((ir & ~255) == 0) << 6)",
 					      " | ((IFF & 2) << 1);\n";
     &case(0x58, "IN E,(C)");		&INP(DE, "l");
     &case(0x59, "OUT (C),E");		&OUTP(DE, "l");
     &case(0x5A, "ADC HL,DE");		&ADCdd(HL, DE);
     &case(0x5B, "LD DE,(nnnn)");	&LDddmem(DE);
-    &case(0x5E, "IM 2");		print "\t\t\t/* interrupt mode 2 */\n";
+    &case(0x5E, "IM 2");		print "\t\t\tIM = 2;\n";
     &case(0x5F, "LD A,R");		print "\t\t\tAF = (AF & 0x29) | ((ir & 255) << 8) | ",
 					      "(ir & 0x80) | (((ir & 255) == 0) << 6)",
 					      " | ((IFF & 2) << 1);\n";

yaze.c

@@ -22,14 +22,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 #include "simz80.h"
 #include "yaze.h"
 
-/* 	$Id: yaze.c,v 1.3 2004/01/24 22:18:52 fdc Exp $	 */
+/* 	$Id: yaze.c,v 1.5 2004/04/23 10:05:25 fdc Exp $	 */
 
 #ifndef lint
-static char vcid[] = "$Id: yaze.c,v 1.3 2004/01/24 22:18:52 fdc Exp $";
+static char vcid[] = "$Id: yaze.c,v 1.5 2004/04/23 10:05:25 fdc Exp $";
 #endif /* lint */
 
 
-#define VERSION	"1.13"
+#define VERSION	"1.14"
 
 /* Z80 registers */
 WORD af[2];			/* accumulator and flags (2 banks) */
@@ -44,6 +44,7 @@ WORD iy;
 WORD sp;
 WORD pc;
 WORD IFF;
+WORD IM;
 
 BYTE ram[MEMSIZE*1024];		/* Z80 memory space */
 #ifdef MMU