Previous 15994 Revisions Next

r5553 Tuesday 1st September, 2009 at 09:04:28 UTC by Curt Coder
[Z8] Fixed opcodes TM, TMC, JR.
[src/emu/cpu/z8]z8.c z8dasm.c z8ops.c

src/emu/cpu/z8/z8.c
r5552r5553
1212   TODO:
1313
1414   - expose register file to disassembler
15   - arithmetic opcodes
15   - decimal adjust instruction
1616   - interrupts
1717   - counter/timer
1818   - serial
r5552r5553
5252   Z8_REGISTER_SPL
5353};
5454
55#define Z8_P3_DAV0_RDY0            0x04   /* not supported */
56#define Z8_P3_DAV1_RDY1            0x08   /* not supported */
57#define Z8_P3_DAV2_RDY2            0x02   /* not supported */
58#define Z8_P3_IRQ0               0x04   /* not supported */
59#define Z8_P3_IRQ1               0x08   /* not supported */
60#define Z8_P3_IRQ2               0x02   /* not supported */
61#define Z8_P3_IRQ3               0x01   /* not supported */
62#define Z8_P3_DI               0x01   /* not supported */
63#define Z8_P3_DO               0x80   /* not supported */
64#define Z8_P3_TIN               0x02   /* not supported */
65#define Z8_P3_TOUT               0x40   /* not supported */
66#define Z8_P3_DM               0x10   /* not supported */
67
5568#define Z8_P01M_P0L_MODE_MASK      0x03
5669#define Z8_P01M_P0L_MODE_OUTPUT      0x00
5770#define Z8_P01M_P0L_MODE_INPUT      0x01
r5552r5553
6982#define Z8_P01M_P0H_MODE_A12_A15   0x80   /* not supported */
7083
7184#define Z8_P3M_P2_ACTIVE_PULLUPS   0x01   /* not supported */
72#define Z8_P3M_P0_STROBED         0x04
85#define Z8_P3M_P0_STROBED         0x04   /* not supported */
7386#define Z8_P3M_P1_MODE_MASK         0x18
7487//#define Z8_P3M_ 0x00
7588//#define Z8_P3M_ 0x08
7689//#define Z8_P3M_ 0x10
77#define Z8_P3M_P1_STROBED         0x18
78#define Z8_P3M_P2_STROBED         0x20
90#define Z8_P3M_P1_STROBED         0x18   /* not supported */
91#define Z8_P3M_P2_STROBED         0x20   /* not supported */
7992#define Z8_P3M_P3_SERIAL         0x40   /* not supported */
8093#define Z8_P3M_PARITY            0x80   /* not supported */
8194
r5552r5553
117130   /* registers */
118131   UINT16 pc;            /* program counter */
119132   UINT8 r[256];         /* register file */
120   UINT16 fake_sp;         /* fake stack pointer */
121   UINT8 fake_rp;         /* fake register pointer */
122   UINT8 fake_r[16];      /* fake working registers */
123133   UINT8 input[4];         /* port input latches */
124134   UINT8 output[4];      /* port output latches */
125135
136   /* fake registers */
137   UINT16 fake_sp;         /* fake stack pointer */
138   UINT8 fake_r[16];      /* fake working registers */
139
126140   /* interrupts */
127141   int irq[4];            /* external interrupt flip-flops */
128142
r5552r5553
532546   { ld_r1_R2, 6, 5 }, { ld_r2_R1, 6, 5 }, { djnz_r1_RA, 10, 5 },   { jr_cc_RA, 10, 0 },   { ld_r1_IM, 6, 5 },      { jp_cc_DA, 10, 0 },   { inc_r1, 6, 5 },      { illegal, 0, 0 },
533547
534548   { decw_RR1, 10, 5 },{ decw_IR1, 10, 5 },{ lde_r1_Irr2, 12, 0 },   { ldei_Ir1_Irr2, 18, 0 },{ illegal, 0, 0 },      { illegal, 0, 0 },      { illegal, 0, 0 },      { illegal, 0, 0 },     
535   { ld_r1_R2, 6, 5 }, { ld_r2_R1, 6, 5 }, { djnz_r1_RA, 10, 5 },   { jr_cc_RA, 10, 0 },   { ld_r1_IM, 6, 5 },      { jp_cc_DA, 10, 0 },   { inc_r1, 6, 5 },      { illegal, 0, 0 },
549   { ld_r1_R2, 6, 5 }, { ld_r2_R1, 6, 5 }, { djnz_r1_RA, 10, 5 },   { jr_cc_RA, 10, 0 },   { ld_r1_IM, 6, 5 },      { jp_cc_DA, 10, 0 },   { inc_r1, 6, 5 },      { di, 6, 1 },
536550
537551   { rl_R1, 6, 5 },   { rl_IR1, 6, 5 },   { lde_r2_Irr1, 12, 0 },   { ldei_Ir2_Irr1, 18, 0 },{ illegal, 0, 0 },      { illegal, 0, 0 },      { illegal, 0, 0 },      { illegal, 0, 0 },   
538   { ld_r1_R2, 6, 5 }, { ld_r2_R1, 6, 5 }, { djnz_r1_RA, 10, 5 },   { jr_cc_RA, 10, 0 },   { ld_r1_IM, 6, 5 },      { jp_cc_DA, 10, 0 },   { inc_r1, 6, 5 },      { di, 6, 1 },
552   { ld_r1_R2, 6, 5 }, { ld_r2_R1, 6, 5 }, { djnz_r1_RA, 10, 5 },   { jr_cc_RA, 10, 0 },   { ld_r1_IM, 6, 5 },      { jp_cc_DA, 10, 0 },   { inc_r1, 6, 5 },      { ei, 6, 1 },
539553
540554   { incw_RR1, 10, 5 },{ incw_IR1, 10, 5 },{ cp_r1_r2, 6, 5 },      { cp_r1_Ir2, 6, 5 },   { cp_R2_R1, 10, 5 },   { cp_IR2_R1, 10, 5 },   { cp_R1_IM, 10, 5 },   { cp_IR1_IM, 10, 5 },
541   { ld_r1_R2, 6, 5 }, { ld_r2_R1, 6, 5 }, { djnz_r1_RA, 10, 5 },   { jr_cc_RA, 10, 0 },   { ld_r1_IM, 6, 5 },      { jp_cc_DA, 10, 0 },   { inc_r1, 6, 5 },      { ei, 6, 1 },
555   { ld_r1_R2, 6, 5 }, { ld_r2_R1, 6, 5 }, { djnz_r1_RA, 10, 5 },   { jr_cc_RA, 10, 0 },   { ld_r1_IM, 6, 5 },      { jp_cc_DA, 10, 0 },   { inc_r1, 6, 5 },      { ret, 14, 0 },
542556
543557   { clr_R1, 6, 5 },   { clr_IR1, 6, 5 },   { xor_r1_r2, 6, 5 },   { xor_r1_Ir2, 6, 5 },   { xor_R2_R1, 10, 5 },   { xor_IR2_R1, 10, 5 },   { xor_R1_IM, 10, 5 },   { xor_IR1_IM, 10, 5 },
544   { ld_r1_R2, 6, 5 }, { ld_r2_R1, 6, 5 }, { djnz_r1_RA, 10, 5 },   { jr_cc_RA, 10, 0 },   { ld_r1_IM, 6, 5 },      { jp_cc_DA, 10, 0 },   { inc_r1, 6, 5 },      { ret, 14, 0 },
558   { ld_r1_R2, 6, 5 }, { ld_r2_R1, 6, 5 }, { djnz_r1_RA, 10, 5 },   { jr_cc_RA, 10, 0 },   { ld_r1_IM, 6, 5 },      { jp_cc_DA, 10, 0 },   { inc_r1, 6, 5 },      { iret, 16, 0 },
545559
546560   { rrc_R1, 6, 5 },   { rrc_IR1, 6, 5 },   { ldc_r1_Irr2, 12, 0 },   { ldci_Ir1_Irr2, 18, 0 },{ illegal, 0, 0 },      { illegal, 0, 0 },      { illegal, 0, 0 },      { ld_r1_x_R2, 10, 5 },
547   { ld_r1_R2, 6, 5 }, { ld_r2_R1, 6, 5 }, { djnz_r1_RA, 10, 5 },   { jr_cc_RA, 10, 0 },   { ld_r1_IM, 6, 5 },      { jp_cc_DA, 10, 0 },   { inc_r1, 6, 5 },      { iret, 16, 0 },
561   { ld_r1_R2, 6, 5 }, { ld_r2_R1, 6, 5 }, { djnz_r1_RA, 10, 5 },   { jr_cc_RA, 10, 0 },   { ld_r1_IM, 6, 5 },      { jp_cc_DA, 10, 0 },   { inc_r1, 6, 5 },      { rcf, 6, 5 },
548562
549563   { sra_R1, 6, 5 },   { sra_IR1, 6, 5 },   { ldc_r2_Irr1, 12, 0 },   { ldci_Ir2_Irr1, 18, 0 },{ call_IRR1, 20, 0 },   { illegal, 0, 0 },      { call_DA, 20, 0 },      { ld_r2_x_R1, 10, 5 },
550564   { ld_r1_R2, 6, 5 }, { ld_r2_R1, 6, 5 }, { djnz_r1_RA, 10, 5 },   { jr_cc_RA, 10, 0 },   { ld_r1_IM, 6, 5 },      { jp_cc_DA, 10, 0 },   { inc_r1, 6, 5 },      { scf, 6, 5 },
r5552r5553
577591   /* register for state saving */
578592   state_save_register_device_item(device, 0, cpustate->pc);
579593   state_save_register_device_item_array(device, 0, cpustate->r);
594   state_save_register_device_item_array(device, 0, cpustate->input);
595   state_save_register_device_item_array(device, 0, cpustate->output);
596   state_save_register_device_item_array(device, 0, cpustate->irq);
580597}
581598
582599/***************************************************************************
r5552r5553
640657   AM_RANGE(0x0000, 0x0fff) AM_ROM
641658ADDRESS_MAP_END
642659
643static ADDRESS_MAP_START( register_128b, ADDRESS_SPACE_DATA, 8 )
644   AM_RANGE(0x0000, 0x007f) AM_RAM
645   AM_RANGE(0x00f0, 0x00ff) AM_RAM
646ADDRESS_MAP_END
647
648660/**************************************************************************
649661 * STATE IMPORT/EXPORT
650662 **************************************************************************/
r5552r5553
778790   {
779791      /* --- the following bits of info are returned as pointers --- */
780792      case CPUINFO_PTR_INTERNAL_MEMORY_MAP_PROGRAM:   info->internal_map8 = ADDRESS_MAP_NAME(program_2kb);   break;
781      case CPUINFO_PTR_INTERNAL_MEMORY_MAP_DATA:      info->internal_map8 = ADDRESS_MAP_NAME(register_128b);   break;
782793
783794      /* --- the following bits of info are returned as NULL-terminated strings --- */
784795      case DEVINFO_STR_NAME:                     strcpy(info->s, "Z8601");                        break;
r5552r5553
793804   {
794805      /* --- the following bits of info are returned as pointers --- */
795806      case CPUINFO_PTR_INTERNAL_MEMORY_MAP_PROGRAM:   info->internal_map8 = ADDRESS_MAP_NAME(program_2kb);   break;
796      case CPUINFO_PTR_INTERNAL_MEMORY_MAP_DATA:      info->internal_map8 = ADDRESS_MAP_NAME(register_128b);   break;
797807
798808      /* --- the following bits of info are returned as NULL-terminated strings --- */
799809      case DEVINFO_STR_NAME:                     strcpy(info->s, "UB8830D");                        break;
r5552r5553
808818   {
809819      /* --- the following bits of info are returned as pointers --- */
810820      case CPUINFO_PTR_INTERNAL_MEMORY_MAP_PROGRAM:   info->internal_map8 = ADDRESS_MAP_NAME(program_4kb);   break;
811      case CPUINFO_PTR_INTERNAL_MEMORY_MAP_DATA:      info->internal_map8 = ADDRESS_MAP_NAME(register_128b);   break;
812821
813822      /* --- the following bits of info are returned as NULL-terminated strings --- */
814823      case DEVINFO_STR_NAME:                     strcpy(info->s, "Z8611");                        break;
src/emu/cpu/z8/z8ops.c
r5552r5553
495495
496496INSTRUCTION( djnz_r1_RA )
497497{
498   INT8 ra = (INT8) fetch(cpustate);
498   INT8 ra = (INT8)fetch(cpustate);
499499
500500   /* r <- r - 1 */
501501   int r = get_working_register(cpustate, opcode >> 4);
r5552r5553
580580
581581INSTRUCTION( jr_cc_RA )
582582{
583   UINT16 dst = cpustate->pc + (INT8)fetch(cpustate) - 1;
584   
583   INT8 ra = (INT8)fetch(cpustate);
584   UINT16 dst = cpustate->pc + ra;
585
585586   /* if cc is true, then PC <- dst */
586587   if (check_condition_code(cpustate, opcode >> 4))
587588   {
r5552r5553
597598static void test_complement_under_mask(z8_state *cpustate, UINT8 dst, UINT8 src)
598599{
599600   /* NOT(dst) AND src */
600   UINT8 data = (dst ^ 0xff) & src;
601   UINT8 data = (register_read(cpustate, dst) ^ 0xff) & src;
601602   
602603   set_flag_z(data == 0);
603604   set_flag_s(data & 0x80);
r5552r5553
614615static void test_under_mask(z8_state *cpustate, UINT8 dst, UINT8 src)
615616{
616617   /* dst AND src */
617   UINT8 data = dst & src;
618   UINT8 data = register_read(cpustate, dst) & src;
618619   
619620   set_flag_z(data == 0);
620621   set_flag_s(data & 0x80);
src/emu/cpu/z8/z8dasm.c
r5552r5553
2828
2929static const char* CONDITION_CODE[16] =
3030{
31   "F", "LT", "LE", "ULE", "OV", "MI", "EQ", "ULT",
32   "", "GE", "GT", "UGT", "NOV", "PL", "NZ", "UGE"
31   "F", "LT", "LE", "ULE", "OV", "MI", "Z", "C",
32   "", "GE", "GT", "UGT", "NOV", "PL", "NZ", "NC"
3333};
3434
3535/***************************************************************************
r5552r5553
6666#define arg_IR(_value)            if ((_value & 0xf0) == 0xe0) ARG(Ir, _value & 0x0f) else ARG(IR, _value)
6767#define arg_IRR(_value)            if ((_value & 0xf0) == 0xe0) ARG(Irr, _value & 0x0f) else ARG(IRR, _value)
6868#define arg_IM(_value)            ARG(IM, _value)
69#define arg_RA                  ARG(RA, pc + B0)
69#define arg_RA                  ARG(RA, pc + (INT8)B0 + 2)
7070#define arg_DA                  ARG(DA, B0 << 8 | B1)
7171#define arg_X(_value1, _value2)      { if (argc) dst += sprintf(dst, ", "); dst += sprintf(dst, X, _value1, _value2); argc++; }
7272

Previous 15994 Revisions Next


© 1998-2018 The MESS Team