Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-23 14:19:01 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

added two opcodes in the nec cpu; this is a temporary fix; we need to check if cb2001 use a custom cpu; in this case we need to split different cpu

Browse Source 
cb2001: added more opcodes
This commit is contained in:
Roberto Zandona 2009-12-29 21:39:49 +00:00
parent 674fcdc548
commit 1284b17000
5 changed files with 72 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/emu/cpu/nec/nec.c
View File

@ -924,6 +924,9 @@ OP( 0xd6, i_setalc ) { nec_state->regs.b[AL] = (CF)?0xff:0x00; nec_state->icount
OP( 0xd7, i_trans ) { UINT32 dest = (nec_state->regs.w[BW]+nec_state->regs.b[AL])&0xffff; nec_state->regs.b[AL] = GetMemB(DS0, dest); CLKS(9,9,5); }
OP( 0xd8, i_fpo ) { GetModRM; nec_state->icount-=2; logerror("%06x: Unimplemented floating point control %04x\n",PC(nec_state),ModRM); }
OP( 0xda, i_mov_pre_r8b ) { UINT8 src; GetModRM; src = GetPreRMByte(ModRM); RegByte(ModRM)=src; CLKM(2,2,2,11,11,5); } // cycles wrong
OP( 0xdb, i_mov_pre_r16w ) { UINT16 src; GetModRM; src = GetPreRMWord(ModRM); RegWord(ModRM)=src; CLKR(15,15,7,15,11,5,2,EA); } // cycles wrong
OP( 0xe0, i_loopne ) { INT8 disp = (INT8)FETCH(); nec_state->regs.w[CW]--; if (!ZF && nec_state->regs.w[CW]) { nec_state->ip = (WORD)(nec_state->ip+disp); /*CHANGE_PC;*/ CLKS(14,14,6); } else CLKS(5,5,3); }
OP( 0xe1, i_loope ) { INT8 disp = (INT8)FETCH(); nec_state->regs.w[CW]--; if ( ZF && nec_state->regs.w[CW]) { nec_state->ip = (WORD)(nec_state->ip+disp); /*CHANGE_PC;*/ CLKS(14,14,6); } else CLKS(5,5,3); }
OP( 0xe2, i_loop ) { INT8 disp = (INT8)FETCH(); nec_state->regs.w[CW]--; if (nec_state->regs.w[CW]) { nec_state->ip = (WORD)(nec_state->ip+disp); /*CHANGE_PC;*/ CLKS(13,13,6); } else CLKS(5,5,3); }
@ -946,8 +949,8 @@ OP( 0xf0, i_lock ) { logerror("%06x: Warning - BUSLOCK\n",PC(nec_state)); ne
OP( 0xf2, i_repne ) { UINT32 next = fetchop(nec_state); UINT16 c = nec_state->regs.w[CW];
switch(next) { /* Segments */
case 0x26: nec_state->seg_prefix=TRUE; nec_state->prefix_base=nec_state->sregs[DS1]<<4; next = fetchop(nec_state); CLK(2); break;
case 0x2e: nec_state->seg_prefix=TRUE; nec_state->prefix_base=nec_state->sregs[PS]<<4; next = fetchop(nec_state); CLK(2); break;
case 0x36: nec_state->seg_prefix=TRUE; nec_state->prefix_base=nec_state->sregs[SS]<<4; next = fetchop(nec_state); CLK(2); break;
case 0x2e: nec_state->seg_prefix=TRUE; nec_state->prefix_base=nec_state->sregs[PS]<<4; next = fetchop(nec_state); CLK(2); break;
case 0x36: nec_state->seg_prefix=TRUE; nec_state->prefix_base=nec_state->sregs[SS]<<4; next = fetchop(nec_state); CLK(2); break;
case 0x3e: nec_state->seg_prefix=TRUE; nec_state->prefix_base=nec_state->sregs[DS0]<<4; next = fetchop(nec_state); CLK(2); break;
}

4
src/emu/cpu/nec/necdasm.c
View File

@ -325,8 +325,8 @@ static const I386_OPCODE necv_opcode_table1[256] =
{"trans", 0, 0, 0, 0 },
{"escape", FPU, 0, 0, 0 },
{"escape", FPU, 0, 0, 0 },
{"escape", FPU, 0, 0, 0 },
{"escape", FPU, 0, 0, 0 },
{"premov", MODRM, PARAM_REG8, PARAM_RM8, 0 },
{"premov", MODRM, PARAM_REG16, PARAM_RM16, 0 },
{"escape", FPU, 0, 0, 0 },
{"escape", FPU, 0, 0, 0 },
{"escape", FPU, 0, 0, 0 },

18
src/emu/cpu/nec/necinstr.h
View File

@ -213,6 +213,8 @@ static void i_aad(nec_state_t *nec_state);
static void i_setalc(nec_state_t *nec_state);
static void i_trans(nec_state_t *nec_state);
static void i_fpo(nec_state_t *nec_state);
static void i_mov_pre_r8b(nec_state_t *nec_state);
static void i_mov_pre_r16w(nec_state_t *nec_state);
static void i_loopne(nec_state_t *nec_state);
static void i_loope(nec_state_t *nec_state);
static void i_loop(nec_state_t *nec_state);
@ -264,7 +266,7 @@ static void (*const nec_instruction[256])(nec_state_t *nec_state) =
i_or_ald8, /* 0x0c */
i_or_axd16, /* 0x0d */
i_push_cs, /* 0x0e */
i_pre_nec /* 0x0f */,
i_pre_nec /* 0x0f */,
i_adc_br8, /* 0x10 */
i_adc_wr16, /* 0x11 */
i_adc_r8b, /* 0x12 */
@ -379,7 +381,7 @@ static void (*const nec_instruction[256])(nec_state_t *nec_state) =
i_jnle, /* 0x7f */
i_80pre, /* 0x80 */
i_81pre, /* 0x81 */
i_82pre, /* 0x82 */
i_82pre, /* 0x82 */
i_83pre, /* 0x83 */
i_test_br8, /* 0x84 */
i_test_wr16, /* 0x85 */
@ -463,12 +465,12 @@ static void (*const nec_instruction[256])(nec_state_t *nec_state) =
i_rotshft_wcl, /* 0xd3 */
i_aam, /* 0xd4 */
i_aad, /* 0xd5 */
i_setalc,
i_setalc, /* 0xd6 */
i_trans, /* 0xd7 */
i_fpo, /* 0xd8 */
i_fpo, /* 0xd9 */
i_fpo, /* 0xda */
i_fpo, /* 0xdb */
i_mov_pre_r8b, /* 0xda wrong? */
i_mov_pre_r16w, /* 0xdb wrong? */
i_fpo, /* 0xdc */
i_fpo, /* 0xdd */
i_fpo, /* 0xde */
@ -493,14 +495,14 @@ static void (*const nec_instruction[256])(nec_state_t *nec_state) =
i_invalid, /* 0xf1 */
i_repne, /* 0xf2 */
i_repe, /* 0xf3 */
i_hlt, /* 0xf4 */
i_hlt, /* 0xf4 */
i_cmc, /* 0xf5 */
i_f6pre, /* 0xf6 */
i_f7pre, /* 0xf7 */
i_clc, /* 0xf8 */
i_stc, /* 0xf9 */
i_di, /* 0xfa */
i_ei, /* 0xfb */
i_di, /* 0xfa */
i_ei, /* 0xfb */
i_cld, /* 0xfc */
i_std, /* 0xfd */
i_fepre, /* 0xfe */

5
src/emu/cpu/nec/necmodrm.h
View File

@ -15,6 +15,9 @@ static struct {
#define GetRMWord(ModRM) \
((ModRM) >= 0xc0 ? nec_state->regs.w[Mod_RM.RM.w[ModRM]] : ( (*GetEA[ModRM])(nec_state), read_word( EA ) ))
#define GetPreRMWord(ModRM) \
((ModRM) >= 0xc0 ? nec_state->regs.w[Mod_RM.RM.w[ModRM]] : ( (*GetEA[ModRM])(nec_state), ( EA ) ))
#define PutbackRMWord(ModRM,val) \
{ \
if (ModRM >= 0xc0) nec_state->regs.w[Mod_RM.RM.w[ModRM]]=val; \
@ -47,6 +50,8 @@ static struct {
#define GetRMByte(ModRM) \
((ModRM) >= 0xc0 ? nec_state->regs.b[Mod_RM.RM.b[ModRM]] : read_byte( (*GetEA[ModRM])(nec_state) ))
#define GetPreRMByte(ModRM) \
((ModRM) >= 0xc0 ? nec_state->regs.b[Mod_RM.RM.b[ModRM]] : ( (*GetEA[ModRM])(nec_state) ))
#define PutRMByte(ModRM,val) \
{ \

93
src/mame/drivers/cb2001.c
View File

@ -46,14 +46,14 @@ In test mode (c) is 2000
#define xxxx 0x90 /* Unknown */
static const UINT8 cb2001_decryption_table[256] = {
0xe8,xxxx,0x94,xxxx,0x80,0x61,0x12,0x27, 0x3c,xxxx,xxxx,0x23,xxxx,xxxx,xxxx,xxxx, /* 00 */
// pppp ???? pppp ???? pppp p?p? pppp p?p?
xxxx,xxxx,xxxx,0x27,0x1c,xxxx,xxxx,xxxx, 0x32,xxxx,0xa0,0xd3,0x3a,0x14,0xbb,0x1f, /* 10 */
// p?p? pppp pppp ???? pppp pppp pppp pppp pppp
xxxx,0x8e,xxxx,0x0f,xxxx,0x49,0xb5,xxxx, xxxx,xxxx,xxxx,0x75,0x33,xxxx,xxxx,xxxx, /* 20 */
// !!!! pppp ???? pppp pppp ????
0xe8,xxxx,xxxx,xxxx,0x80,0x61,0x12,0x27, 0x3c,xxxx,xxxx,0x23,xxxx,xxxx,xxxx,xxxx, /* 00 */
// pppp pppp ???? pppp p?p? pppp p?p?
xxxx,xxxx,xxxx,0x27,0x1c,xxxx,xxxx,xxxx, 0x32,xxxx,0xa0,0xd3,0x3a,0x14,0xa2,0x1f, /* 10 */
// p?p? pppp pppp ???? pppp pppp pppp p?p? pppp
xxxx,0x8e,xxxx,0x0f,xxxx,0x49,0xbc,xxxx, xxxx,xxxx,xxxx,0x75,0x33,xxxx,xxxx,xxxx, /* 20 */
// !!!! pppp pppp p?p? pppp ????
0x9d,xxxx,xxxx,xxxx,xxxx,xxxx,0xbe,xxxx, xxxx,xxxx,0x74,xxxx,xxxx,0xa6,0xbf,0x74, /* 30 */
// ???? pppp ???? ???? ???? pppp
// ???? p?p? ???? ???? p?p? pppp
xxxx,0xea,xxxx,xxxx,xxxx,0xb0,xxxx,xxxx, xxxx,0xa2,xxxx,xxxx,0xa3,xxxx,xxxx,xxxx, /* 40 */
// !!!! gggg pppp pppp
xxxx,xxxx,0x2c,xxxx,xxxx,xxxx,0x42,0xc0, xxxx,xxxx,xxxx,xxxx,0xeb,xxxx,xxxx,xxxx, /* 50 */
@ -62,16 +62,16 @@ static const UINT8 cb2001_decryption_table[256] = {
// pppp pppp ???? pppp gggg
0xc3,xxxx,0x02,xxxx,xxxx,xxxx,0x24,xxxx, 0x72,xxxx,0xf2,xxxx,xxxx,0x43,xxxx,xxxx, /* 70 */
// pppp pppp pppp pppp ???? pppp
xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,0x34, xxxx,xxxx,0x59,xxxx,0x73,xxxx,0x2a,xxxx, /* 80 */
// ???? pppp pppp ????
0x26,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,0x34, xxxx,xxxx,0x59,xxxx,0x73,xxxx,0x2a,xxxx, /* 80 */
// pppp ???? pppp pppp ????
xxxx,xxxx,0xe9,xxxx,xxxx,0xbe,xxxx,xxxx, xxxx,xxxx,xxxx,xxxx,0xb9,xxxx,xxxx,xxxx, /* 90 */
// ???? p?p? pppp
xxxx,xxxx,xxxx,0x06,0xaa,0x9c,xxxx,0xb8, xxxx,xxxx,0xfc,xxxx,0x51,xxxx,xxxx,0x1a, /* A0 */
// ???? ???? ???? !!!! ???? pppp pppp
0x75,xxxx,0xb4,xxxx,xxxx,xxxx,xxxx,xxxx, xxxx,xxxx,0x03,xxxx,0x1e,xxxx,0x07,0xcf, /* B0 */
// ???? pppp pppp pppp ???? ????
// pppp p?p? pppp
xxxx,xxxx,xxxx,0x06,0xaa,0x9c,xxxx,0xb8, xxxx,xxxx,0xdb,xxxx,0x51,xxxx,xxxx,0x1a, /* A0 */
// pppp pppp ???? !!!! p?p? pppp pppp
0xac,xxxx,0xb4,xxxx,xxxx,0x83,xxxx,xxxx, xxxx,xxxx,0x03,xxxx,0x1e,xxxx,0x07,0xcf, /* B0 */
// pppp pppp ???? pppp pppp pppp ????
xxxx,0xec,0xee,xxxx,xxxx,0xe2,xxxx,xxxx, xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,0x2e,xxxx, /* C0 */
// pppp ???? pppp pppp
// pppp pppp pppp pppp
xxxx,xxxx,0x46,xxxx,0x60,xxxx,xxxx,0x47, 0x88,xxxx,xxxx,xxxx,xxxx,0xfa,0xc7,0x8b, /* D0 */
// pppp ???? pppp pppp ???? !!!! pppp
0x8a,xxxx,xxxx,0xc6,xxxx,xxxx,xxxx,xxxx, xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx, /* E0 */
@ -82,10 +82,35 @@ static const UINT8 cb2001_decryption_table[256] = {
/* robiza's notes:
aa opcode:
e0086 aa
e0087 3e cc 00 mov iy,0cc
e008a aa
e008b 36 1c 05 mov ix,51c
e008e 9c 08 00 mov cw,8h
e0091 23 26 cmp4s
e0093 78 03 bc e0098
probably "aa" is an undocumented opcode
1) aa 1e ## ## -> bb mov bw,####
_ 1e ## ## -> 89 mov
2) aa 26 ## ## -> bc mov sp,####
_ 26 ## -> b5 mov ch,##
3) aa 36 ## ## -> be mov ix,####
_ 36 -> ????
4) aa 3e ## ## -> bf mov iy,####
_ 3e -> ????
e01f7-e0204 (b0 -> ac) (ce -> 2e) (a4 -> aa) : this routine write the "dyna..." string in nvram
e0022 a5 push psw ?
e0023 d4 push r ?
e0024 bc push ds0 (bc -> 1e)
e0025 a3 push ds1 ?
e0024 bc push ds0 (bc -> 1e)
e0025 a3 push ds1 (a3 -> 06)
e0026 dd di ?
e0027 a7 00 00 mov aw,0
e002a 21 d8 mov ds0,aw
@ -137,13 +162,13 @@ e0035 49 d3 06 mov [6d3],al
e00a6 be pop ds1 ?
e00a7 1f pop ds0 (1f -> 1f)
e00a6 be pop ds1 (be -> 07)
e00a7 1f pop ds0 (1f -> 1f)
e00a8 05 pop r ?
e0030 30 pop psw ?
e00aa cb ?
e00ab 54 ?
e00ac 23 92 fint
e00ac 23 92 fint (23 -> 0f)
e00ae bf reti
@ -182,8 +207,8 @@ cmv4 cb2001 (en -> de)
029f ld b,$fc
02a1 call $0c38 e0239 call 0e30b8h
02a4 ld hl,$d023 e023d mov ix,90h (36 -> be)
02a7 call $2b2d e0240 call 0e32a6h
2b2d ld a,$01 e32a6 mov al,1h
02a7 call $2b2d e0240 call 0e32a6h (00 -> e8)
2b2d ld a,$01 e32a6 mov al,1h c3ecf
2b2f or a e32a8 and al,al
2b30 add a,(hl) e32aa add al,b ptr [ix]
2b31 daa e32ac daa (13 -> 27) not sure
@ -288,40 +313,22 @@ cmv4 cb2001 (en -> de)
-------------------------------------------------
56 -> ????
5c -> conditional jmp for sure
56 -> 42 (inc dw or dec dw)
aa -> ????
92 -> e9 (probably)
1c ????
d8 ????
dd -> fa (di)
guessed:
45 -> b0 (mov al,#value)
6e -> ba (mov dw,#value)
c2 -> ee (out dw,al)
probably:
2b -> conditional jmp for sure (75)
36 -> be
9c -> it's a counter (like mov cw,#value) -> not sure the register (cw,bw,....) -> b9 (cw)
c5 -> 75 (loop?)
very probably:
00 -> e8 (call)
checked against gussun (from 10000) and quizf1 (start up code):
41 -> ea (jmp_far)
70 -> c3 (ret)
checked against gussun and quizf1 (start up code):
21 -> 8e
a7 -> b8
de -> c7
e3 -> c6
opcodes: 36,9c,00,18,d8,d2,c5,70 probably:
opcodes: 18,c5 probably:
e1af1 36 62 06 mov ix,0662
9c 04 00 mov cw,0004
00 94 17 call e328e