Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-29 17:13:05 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

From: hoge hoge [mailto:c8cv@hotmail.com]

Browse Source 
Sent: Thursday, August 06, 2009 7:09 AM
To: submit@mamedev.org
Subject: i8080 daa + multiple memreads fix, gottlieb audio, looping log

Hello,

i8080_daa_multiplememreads.zip: diff for 0133u1 i8080/i8085 cpu, removing the 
DAA table and fixing multiple memory reads on some opcodes (which would possibly 
only trigger on memorymapped I/O), and making M_ANA(R) halfcarry calculation a 
bit more straightforward. The functionality is basically the same as before.
i8080_newdaa_test.zip was used to test the new DAA implementation.
src/emu/cpu/i8085/i8085daa.h can be removed in 0.134, or is DIFF capable of 
removing files completely?

Greets,
hap
This commit is contained in:
Aaron Giles 2009-08-13 05:02:01 +00:00
parent 3379123e40
commit 53a55a0548
3 changed files with 32 additions and 2066 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/emu/cpu/i8085/i8085.c
View File

@ -125,7 +125,6 @@
#include "debugger.h"
#include "i8085.h"
#include "i8085cpu.h"
#include "i8085daa.h"
#define VERBOSE 0
@ -644,11 +643,19 @@ static void execute_one(i8085_state *cpustate, int opcode)
M_MVI(cpustate->HL.b.h);
break;
case 0x27: cpustate->icount -= 4; /* DAA */
cpustate->XX.d = cpustate->AF.b.h;
if (cpustate->AF.b.l & CF) cpustate->XX.d |= 0x100;
if (cpustate->AF.b.l & HF) cpustate->XX.d |= 0x200;
if (cpustate->AF.b.l & NF) cpustate->XX.d |= 0x400;
cpustate->AF.w.l = DAA[cpustate->XX.d];
cpustate->XX.b.h = cpustate->AF.b.h;
if (cpustate->AF.b.l&NF) {
if ((cpustate->AF.b.l&HF) | ((cpustate->AF.b.h&0xf)>9)) cpustate->XX.b.h-=6;
if ((cpustate->AF.b.l&CF) | (cpustate->AF.b.h>0x99)) cpustate->XX.b.h-=0x60;
}
else {
if ((cpustate->AF.b.l&HF) | ((cpustate->AF.b.h&0xf)>9)) cpustate->XX.b.h+=6;
if ((cpustate->AF.b.l&CF) | (cpustate->AF.b.h>0x99)) cpustate->XX.b.h+=0x60;
}
cpustate->AF.b.l=(cpustate->AF.b.l&3) | (cpustate->AF.b.h&0x28) | (cpustate->AF.b.h>0x99) | ((cpustate->AF.b.h^cpustate->XX.b.h)&0x10) | ZSP[cpustate->XX.b.h];
cpustate->AF.b.h=cpustate->XX.b.h;
if (IS_8080(cpustate))
{
cpustate->AF.b.l &= 0xd5; // Ignore not used flags
@ -1024,7 +1031,8 @@ static void execute_one(i8085_state *cpustate, int opcode)
M_ADD(cpustate->HL.b.l);
break;
case 0x86: cpustate->icount -= 7; /* ADD M */
M_ADD(RM(cpustate, cpustate->HL.d));
cpustate->XX.b.l = RM(cpustate, cpustate->HL.d);
M_ADD(cpustate->XX.b.l);
break;
case 0x87: cpustate->icount -= 4; /* ADD A */
M_ADD(cpustate->AF.b.h);
@ -1049,7 +1057,8 @@ static void execute_one(i8085_state *cpustate, int opcode)
M_ADC(cpustate->HL.b.l);
break;
case 0x8e: cpustate->icount -= 7; /* ADC M */
M_ADC(RM(cpustate, cpustate->HL.d));
cpustate->XX.b.l = RM(cpustate, cpustate->HL.d);
M_ADC(cpustate->XX.b.l);
break;
case 0x8f: cpustate->icount -= 4; /* ADC A */
M_ADC(cpustate->AF.b.h);
@ -1074,7 +1083,8 @@ static void execute_one(i8085_state *cpustate, int opcode)
M_SUB(cpustate->HL.b.l);
break;
case 0x96: cpustate->icount -= 7; /* SUB M */
M_SUB(RM(cpustate, cpustate->HL.d));
cpustate->XX.b.l = RM(cpustate, cpustate->HL.d);
M_SUB(cpustate->XX.b.l);
break;
case 0x97: cpustate->icount -= 4; /* SUB A */
M_SUB(cpustate->AF.b.h);
@ -1099,7 +1109,8 @@ static void execute_one(i8085_state *cpustate, int opcode)
M_SBB(cpustate->HL.b.l);
break;
case 0x9e: cpustate->icount -= 7; /* SBB M */
M_SBB(RM(cpustate, cpustate->HL.d));
cpustate->XX.b.l = RM(cpustate, cpustate->HL.d);
M_SBB(cpustate->XX.b.l);
break;
case 0x9f: cpustate->icount -= 4; /* SBB A */
M_SBB(cpustate->AF.b.h);
@ -1124,7 +1135,8 @@ static void execute_one(i8085_state *cpustate, int opcode)
M_ANA(cpustate->HL.b.l);
break;
case 0xa6: cpustate->icount -= 7; /* ANA M */
M_ANA(RM(cpustate, cpustate->HL.d));
cpustate->XX.b.l = RM(cpustate, cpustate->HL.d);
M_ANA(cpustate->XX.b.l);
break;
case 0xa7: cpustate->icount -= 4; /* ANA A */
M_ANA(cpustate->AF.b.h);
@ -1149,7 +1161,8 @@ static void execute_one(i8085_state *cpustate, int opcode)
M_XRA(cpustate->HL.b.l);
break;
case 0xae: cpustate->icount -= 7; /* XRA M */
M_XRA(RM(cpustate, cpustate->HL.d));
cpustate->XX.b.l = RM(cpustate, cpustate->HL.d);
M_XRA(cpustate->XX.b.l);
break;
case 0xaf: cpustate->icount -= 4; /* XRA A */
M_XRA(cpustate->AF.b.h);
@ -1174,7 +1187,8 @@ static void execute_one(i8085_state *cpustate, int opcode)
M_ORA(cpustate->HL.b.l);
break;
case 0xb6: cpustate->icount -= 7; /* ORA M */
M_ORA(RM(cpustate, cpustate->HL.d));
cpustate->XX.b.l = RM(cpustate, cpustate->HL.d);
M_ORA(cpustate->XX.b.l);
break;
case 0xb7: cpustate->icount -= 4; /* ORA A */
M_ORA(cpustate->AF.b.h);
@ -1199,7 +1213,8 @@ static void execute_one(i8085_state *cpustate, int opcode)
M_CMP(cpustate->HL.b.l);
break;
case 0xbe: cpustate->icount -= 7; /* CMP M */
M_CMP(RM(cpustate, cpustate->HL.d));
cpustate->XX.b.l = RM(cpustate, cpustate->HL.d);
M_CMP(cpustate->XX.b.l);
break;
case 0xbf: cpustate->icount -= 4; /* CMP A */
M_CMP(cpustate->AF.b.h);

4
src/emu/cpu/i8085/i8085cpu.h
View File

@ -39,7 +39,7 @@
#define M_DCR(R) {UINT8 hc = ((R & 0x0f) == 0x00) ? HF : 0; --R; cpustate->AF.b.l= (cpustate->AF.b.l & CF ) | ZSP[R] | hc | NF; }
#define M_MVI(R) R=ARG(cpustate)
#define M_ANA(R) { int i = (((cpustate->AF.b.h | R)>>3) & 1)*HF; cpustate->AF.b.h&=R; cpustate->AF.b.l=ZSP[cpustate->AF.b.h]; if( cpustate->cputype ) { cpustate->AF.b.l |= HF; } else {cpustate->AF.b.l |= i; } }
#define M_ANA(R) {UINT8 hc = ((cpustate->AF.b.h | R)<<1) & HF; cpustate->AF.b.h&=R; cpustate->AF.b.l=ZSP[cpustate->AF.b.h]; if( cpustate->cputype ) { cpustate->AF.b.l |= HF; } else {cpustate->AF.b.l |= hc; } }
#define M_ORA(R) cpustate->AF.b.h|=R; cpustate->AF.b.l=ZSP[cpustate->AF.b.h]
#define M_XRA(R) cpustate->AF.b.h^=R; cpustate->AF.b.l=ZSP[cpustate->AF.b.h]
@ -66,7 +66,7 @@
}
#define M_ADD(R) { \
int q = cpustate->AF.b.h+R; \
int q = cpustate->AF.b.h+R; \
cpustate->AF.b.l=ZSP[q&255]|((q>>8)&CF)| \
((cpustate->AF.b.h^q^R)&HF)| \
(((R^cpustate->AF.b.h^SF)&(R^q)&SF)>>5); \

2051
src/emu/cpu/i8085/i8085daa.h
View File

File diff suppressed because it is too large Load Diff