Previous 15994 Revisions Next

r9616 Friday 19th November, 2010 at 10:22:12 UTC by Miodrag Milanović
Fixed interrupt handing in V810 core,and flag position in PCW
[src/emu/cpu/v810]v810.c
[src/mess/drivers]vboy.c

src/emu/cpu/v810/v810.c
r9615r9616
9797#define GET_S               ((cpustate->PSW & 0x00000002)>>1)
9898#define GET_OV               ((cpustate->PSW & 0x00000004)>>2)
9999#define GET_CY               ((cpustate->PSW & 0x00000008)>>3)
100#define GET_ID               ((cpustate->PSW & 0x00008000)>>15)
101#define GET_EP               ((cpustate->PSW & 0x00010000)>>16)
102#define GET_NP               ((cpustate->PSW & 0x00020000)>>17)
103#define GET_AE               ((cpustate->PSW & 0x00040000)>>18)
100#define GET_ID               ((cpustate->PSW & 0x00001000)>>12)
101#define GET_AE               ((cpustate->PSW & 0x00002000)>>13)
102#define GET_EP               ((cpustate->PSW & 0x00004000)>>14)
103#define GET_NP               ((cpustate->PSW & 0x00008000)>>15)
104104
105105#define SET_Z(val)            (cpustate->PSW = (cpustate->PSW & ~0x00000001) | (val))
106106#define SET_S(val)            (cpustate->PSW = (cpustate->PSW & ~0x00000002) | ((val) << 1))
107107#define SET_OV(val)            (cpustate->PSW = (cpustate->PSW & ~0x00000004) | ((val) << 2))
108108#define SET_CY(val)            (cpustate->PSW = (cpustate->PSW & ~0x00000008) | ((val) << 3))
109#define SET_ID(val)            (cpustate->PSW = (cpustate->PSW & ~0x00008000) | ((val) << 15))
110#define SET_EP(val)            (cpustate->PSW = (cpustate->PSW & ~0x00010000) | ((val) << 16))
111#define SET_NP(val)            (cpustate->PSW = (cpustate->PSW & ~0x00020000) | ((val) << 17))
112#define SET_AE(val)            (cpustate->PSW = (cpustate->PSW & ~0x00040000) | ((val) << 18))
109#define SET_ID(val)            (cpustate->PSW = (cpustate->PSW & ~0x00001000) | ((val) << 12))
110#define SET_AE(val)            (cpustate->PSW = (cpustate->PSW & ~0x00002000) | ((val) << 13))
111#define SET_EP(val)            (cpustate->PSW = (cpustate->PSW & ~0x00004000) | ((val) << 14))
112#define SET_NP(val)            (cpustate->PSW = (cpustate->PSW & ~0x00008000) | ((val) << 15))
113113
114114#define R_B(cs, addr) ((cs)->program->read_byte(addr))
115115#define R_H(cs, addr) ((cs)->program->read_word(addr))
r9615r9616
10171017{
10181018   v810_state *cpustate = get_safe_token(device);
10191019
1020   cpustate->irq_line = CLEAR_LINE;
1020   cpustate->irq_state = CLEAR_LINE;
1021   cpustate->irq_line = 0;
10211022   cpustate->nmi_line = CLEAR_LINE;
10221023   cpustate->irq_callback = irqcallback;
10231024   cpustate->device = device;
r9615r9616
10271028
10281029   state_save_register_device_item_array(device, 0, cpustate->reg);
10291030   state_save_register_device_item(device, 0, cpustate->irq_line);
1031   state_save_register_device_item(device, 0, cpustate->irq_state);
10301032   state_save_register_device_item(device, 0, cpustate->nmi_line);
10311033   state_save_register_device_item(device, 0, cpustate->PPC);
10321034
r9615r9616
10381040   int i;
10391041   for(i=0;i<64;i++)   cpustate->reg[i]=0;
10401042   cpustate->PC = 0xfffffff0;
1041   cpustate->PSW = 0x8000;
1043   cpustate->PSW = 0x1000;
10421044   cpustate->ECR   = 0x0000fff0;
10431045}
10441046
r9615r9616
10481050   cpustate->EIPSW = cpustate->PSW;
10491051   
10501052   cpustate->PC = 0xfffffe00 | (cpustate->irq_line << 4);
1053   cpustate->ECR = 0xfe00 | (cpustate->irq_line << 4);
1054   
1055   UINT8 num = cpustate->irq_line + 1;
1056   if (num==0x10) num=0x0f;
1057   
1058   cpustate->PSW &= 0xfff0ffff; // clear interrupt level
10511059   SET_EP(1);
1052    SET_ID(1);
1053    UINT8 num = cpustate->irq_line + 1;
1054   if (num==0x10) num=0x0f;
1055   cpustate->PSW &= 0xffff;
1060    SET_ID(1);   
10561061   cpustate->PSW |= num << 16;
1062   
1063   cpustate->icount-= clkIF;
10571064}
10581065
10591066static CPU_EXECUTE( v810 )
10601067{
10611068   v810_state *cpustate = get_safe_token(device);
10621069
1070   if (cpustate->irq_state != CLEAR_LINE) {
1071      if (!(GET_NP | GET_EP | GET_ID)) {
1072         if (cpustate->irq_line >=((cpustate->PSW & 0xF0000) >> 16)) {
1073            take_interrupt(cpustate);
1074         }
1075      }
1076   }
10631077   while(cpustate->icount>0)
10641078   {
10651079      UINT32 op;
1066      if (cpustate->irq_state != CLEAR_LINE) {
1067         if (!(GET_NP | GET_EP | GET_ID)) {
1068            if (cpustate->irq_line >=((cpustate->PSW & 0xF0000) >> 16)) {
1069               take_interrupt(cpustate);                 
1070            }
1071         }
1072      }
1080
10731081      cpustate->PPC=cpustate->PC;
10741082      debugger_instruction_hook(device, cpustate->PC);
10751083      op=R_OP(cpustate,cpustate->PC);
r9615r9616
11931201         break;
11941202
11951203      case CPUINFO_INT_CONTEXT_SIZE:               info->i = sizeof(v810_state);         break;
1196      case CPUINFO_INT_INPUT_LINES:               info->i = 9;                     break;
1204      case CPUINFO_INT_INPUT_LINES:               info->i = 16;                     break;
11971205      case CPUINFO_INT_DEFAULT_IRQ_VECTOR:         info->i = 0;                     break;
11981206      case DEVINFO_INT_ENDIANNESS:               info->i = ENDIANNESS_LITTLE;         break;
11991207      case CPUINFO_INT_CLOCK_MULTIPLIER:            info->i = 1;                     break;
12001208      case CPUINFO_INT_CLOCK_DIVIDER:               info->i = 1;                     break;
12011209      case CPUINFO_INT_MIN_INSTRUCTION_BYTES:         info->i = 2;                     break;
12021210      case CPUINFO_INT_MAX_INSTRUCTION_BYTES:         info->i = 4;                     break;
1203      case CPUINFO_INT_MIN_CYCLES:               info->i = 1;                     break;
1204      case CPUINFO_INT_MAX_CYCLES:               info->i = 1;                     break;
1211      case CPUINFO_INT_MIN_CYCLES:               info->i = 3;                     break;
1212      case CPUINFO_INT_MAX_CYCLES:               info->i = 6;                     break;
12051213
12061214      case DEVINFO_INT_DATABUS_WIDTH + ADDRESS_SPACE_PROGRAM:   info->i = 32;               break;
12071215      case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_PROGRAM: info->i = 32;               break;
r9615r9616
12131221      case DEVINFO_INT_ADDRBUS_WIDTH + ADDRESS_SPACE_IO:      info->i = 32;               break;
12141222      case DEVINFO_INT_ADDRBUS_SHIFT + ADDRESS_SPACE_IO:      info->i = 0;               break;
12151223
1216      case CPUINFO_INT_INPUT_STATE + 0:            info->i = cpustate->irq_line;         break;
1224      case CPUINFO_INT_INPUT_STATE + 0:            info->i = (cpustate->irq_line == 0) ? cpustate->irq_state : CLEAR_LINE;         break;
1225      case CPUINFO_INT_INPUT_STATE + 1:            info->i = (cpustate->irq_line == 1) ? cpustate->irq_state : CLEAR_LINE;         break;
1226      case CPUINFO_INT_INPUT_STATE + 2:            info->i = (cpustate->irq_line == 2) ? cpustate->irq_state : CLEAR_LINE;         break;
1227      case CPUINFO_INT_INPUT_STATE + 3:            info->i = (cpustate->irq_line == 3) ? cpustate->irq_state : CLEAR_LINE;         break;
1228      case CPUINFO_INT_INPUT_STATE + 4:            info->i = (cpustate->irq_line == 4) ? cpustate->irq_state : CLEAR_LINE;         break;
1229      case CPUINFO_INT_INPUT_STATE + 5:            info->i = (cpustate->irq_line == 5) ? cpustate->irq_state : CLEAR_LINE;         break;
1230      case CPUINFO_INT_INPUT_STATE + 6:            info->i = (cpustate->irq_line == 6) ? cpustate->irq_state : CLEAR_LINE;         break;
1231      case CPUINFO_INT_INPUT_STATE + 7:            info->i = (cpustate->irq_line == 7) ? cpustate->irq_state : CLEAR_LINE;         break;
1232      case CPUINFO_INT_INPUT_STATE + 8:            info->i = (cpustate->irq_line == 8) ? cpustate->irq_state : CLEAR_LINE;         break;
1233      case CPUINFO_INT_INPUT_STATE + 9:            info->i = (cpustate->irq_line == 9) ? cpustate->irq_state : CLEAR_LINE;         break;
1234      case CPUINFO_INT_INPUT_STATE + 10:            info->i = (cpustate->irq_line == 10) ? cpustate->irq_state : CLEAR_LINE;         break;
1235      case CPUINFO_INT_INPUT_STATE + 11:            info->i = (cpustate->irq_line == 11) ? cpustate->irq_state : CLEAR_LINE;         break;
1236      case CPUINFO_INT_INPUT_STATE + 12:            info->i = (cpustate->irq_line == 12) ? cpustate->irq_state : CLEAR_LINE;         break;
1237      case CPUINFO_INT_INPUT_STATE + 13:            info->i = (cpustate->irq_line == 13) ? cpustate->irq_state : CLEAR_LINE;         break;
1238      case CPUINFO_INT_INPUT_STATE + 14:            info->i = (cpustate->irq_line == 14) ? cpustate->irq_state : CLEAR_LINE;         break;
1239      case CPUINFO_INT_INPUT_STATE + 15:            info->i = (cpustate->irq_line == 15) ? cpustate->irq_state : CLEAR_LINE;         break;
12171240      case CPUINFO_INT_INPUT_STATE + INPUT_LINE_NMI:   info->i = cpustate->nmi_line;         break;
12181241
12191242      case CPUINFO_INT_PREVIOUSPC:               info->i = cpustate->PPC;            break;
src/mess/drivers/vboy.c
r9615r9616
225225               break;
226226      case 0x02:   //INTENB
227227               state->vip_regs.INTENB = data;
228               printf("%04x ENB\n",data);
228               //printf("%04x ENB\n",data);
229229               break;
230230      case 0x04:   //INTCLR
231231               state->vip_regs.INTPND &= ~data;
232               //cputag_set_input_line(space->machine, "maincpu", 4, CLEAR_LINE);
232               cputag_set_input_line(space->machine, "maincpu", 4, CLEAR_LINE);
233233               //printf("%04x ACK\n",data);
234234               break;
235235      case 0x20:   //DPSTTS
r9615r9616
712712
713713   if(state->vip_regs.INTENB)
714714   {
715      cputag_set_input_line(device->machine, "maincpu", 4, ASSERT_LINE);
715      cputag_set_input_line(device->machine, "maincpu", 4, HOLD_LINE);
716716      state->vip_regs.INTPND |= 0x4000;
717717   }
718718}

Previous 15994 Revisions Next


© 1998-2018 The MESS Team