Previous 15994 Revisions Next

r11699 Sunday 29th May, 2011 at 08:44:47 UTC by Miodrag Milanović
i286 - enabling 287 emulation by trapping when needed by Carl credited in MAME (no whatsnew)
idectrl - Clears error status on driver initialization by Carl credited in MAME (no whatsnew)
[src/emu/cpu/i86]instr286.c instr286.h instr86.c table286.h
[src/emu/machine]idectrl.c

src/emu/cpu/i86/instr286.c
r11698r11699
212212   UINT32 naddr, oaddr, ldtaddr;
213213   int i;
214214   logerror("This program uses TSSs, how rare. Expect a crash.\n");
215   if (TBL(ntask)) TRAP(INVALID_TSS,IDXTBL(ntask));
216   if ((naddr = i80286_selector_address(cpustate,ntask)) == -1) TRAP(INVALID_TSS,IDXTBL(ntask));
215   if (TBL(ntask)) throw TRAP(INVALID_TSS,IDXTBL(ntask));
216   if ((naddr = i80286_selector_address(cpustate,ntask)) == -1) throw TRAP(INVALID_TSS,IDXTBL(ntask));
217217   oaddr = i80286_selector_address(cpustate,cpustate->tr.sel);
218218   ndesc[0] = ReadWord(naddr);
219219   ndesc[1] = ReadWord(naddr+2);
r11698r11699
222222   r = RIGHTS(ndesc);
223223   if (SEGDESC(r) || (GATE(r) != TSSDESCIDLE)) throw TRAP(GENERAL_PROTECTION_FAULT,IDXTBL(ntask));
224224   if (!PRES(r)) throw TRAP(SEG_NOT_PRESENT, IDXTBL(ntask));
225   if (LIMIT(ndesc) < 44) TRAP(INVALID_TSS,IDXTBL(ntask));
225   if (LIMIT(ndesc) < 44) throw TRAP(INVALID_TSS,IDXTBL(ntask));
226226   for (i = 0; i < 44; i+=2) ntss[i/2] = ReadWord(BASE(ndesc)+i);
227227
228228   cpustate->flags = CompressFlags();
r11698r11699
271271   cpustate->regs.w[SI] = ntss[TSS_SI];
272272   cpustate->regs.w[DI] = ntss[TSS_DI];
273273
274   if (TBL(ntss[TSS_LDT])) TRAP(INVALID_TSS,IDXTBL(ntss[TSS_LDT]));
275   if ((ldtaddr = i80286_selector_address(cpustate,ntss[TSS_LDT])) == -1) TRAP(INVALID_TSS,IDXTBL(ntss[TSS_LDT]));
276   desc[0] = ReadWord(ldtaddr);
277   desc[1] = ReadWord(ldtaddr+2);
278   desc[2] = ReadWord(ldtaddr+4);
279   r = RIGHTS(desc);
280   if (SEGDESC(r) || (GATE(r) != LDTDESC)) throw TRAP(INVALID_TSS,IDXTBL(ntss[TSS_LDT]));
281   if (!PRES(r)) TRAP(INVALID_TSS,IDXTBL(ntss[TSS_LDT]));
274   if (TBL(ntss[TSS_LDT])) throw TRAP(INVALID_TSS,IDXTBL(ntss[TSS_LDT]));
275   if (IDXTBL(ntss[TSS_LDT])) {
276      if ((ldtaddr = i80286_selector_address(cpustate,ntss[TSS_LDT])) == -1) throw TRAP(INVALID_TSS,IDXTBL(ntss[TSS_LDT]));
277      desc[0] = ReadWord(ldtaddr);
278      desc[1] = ReadWord(ldtaddr+2);
279      desc[2] = ReadWord(ldtaddr+4);
280      r = RIGHTS(desc);
281      if (SEGDESC(r) || (GATE(r) != LDTDESC)) throw TRAP(INVALID_TSS,IDXTBL(ntss[TSS_LDT]));
282      if (!PRES(r)) throw TRAP(INVALID_TSS,IDXTBL(ntss[TSS_LDT]));
283      cpustate->ldtr.sel=ntss[TSS_LDT];
284      cpustate->ldtr.limit=LIMIT(desc);
285      cpustate->ldtr.base=BASE(desc);
286      cpustate->ldtr.rights=RIGHTS(desc);
287   } else {
288      cpustate->ldtr.sel=0;
289      cpustate->ldtr.limit=0;
290      cpustate->ldtr.base=0;
291      cpustate->ldtr.rights=0;
292   }
282293
283294   if (type == CALL) cpustate->flags |= 0x4000;
284295   cpustate->msw |= 8;
285
286   cpustate->ldtr.sel=ntss[TSS_LDT]; // docs say nothing about whether a null ldt can be in a tss
287   cpustate->ldtr.limit=LIMIT(desc);
288   cpustate->ldtr.base=BASE(desc);
289   cpustate->ldtr.rights=RIGHTS(desc);
290
291296   i80286_data_descriptor_full(cpustate, SS, ntss[TSS_SS], RPL(ntss[TSS_CS]), TRAP(INVALID_TSS,IDXTBL(ntss[TSS_SS])));
292297
293298   cpustate->sregs[CS] = IDXTBL(cpustate->sregs[CS]) | RPL(ntss[TSS_CS]);  // fixme
r11698r11699
823828   ICOUNT -= timing.ret_far;
824829}
825830
831static void PREFIX286(_escape)(i8086_state *cpustate)    /* Opcodes 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde */
832{
833   if ((cpustate->msw&8) || (cpustate->msw&4)) throw TRAP(FPU_UNAVAILABLE,-1);
834   unsigned ModRM = FETCH;
835   ICOUNT -= timing.nop;
836    GetRMByte(ModRM);
837}
838
839static void PREFIX286(_escape_7)(i8086_state *cpustate)    /* Opcode 0xdf */
840{
841   if ((cpustate->msw&8) || (cpustate->msw&4)) throw TRAP(FPU_UNAVAILABLE,-1);
842   unsigned ModRM = FETCH;
843   ICOUNT -= timing.nop;
844    GetRMByte(ModRM);
845   if (ModRM == 0xe0) cpustate->regs.w[AX] = 0xffff;  // FPU not present
846}
847
826848static void i80286_check_permission(i8086_state *cpustate, UINT8 check_seg, UINT16 offset, i80286_size size, i80286_operation operation)
827849{
828850   int trap = 0;
src/emu/cpu/i86/instr286.h
r11698r11699
55#define INTO_OVERFLOW 4
66#define BOUND_OVERRUN 5
77#define ILLEGAL_INSTRUCTION 6
8#define CPU_EXT_UNAVAILABLE 7
8#define FPU_UNAVAILABLE 7
99#define DOUBLE_FAULT 8
10#define CPU_EXT_SEG_OVERRUN 9
10#define FPU_SEG_OVERRUN 9
1111#define INVALID_TSS 10
1212#define SEG_NOT_PRESENT 11
1313#define STACK_FAULT 12
r11698r11699
2222static void i80286_data_descriptor(i80286_state *cpustate,int reg, UINT16 selector);
2323static void PREFIX286(_0fpre)(i80286_state *cpustate);
2424static void PREFIX286(_arpl)(i80286_state *cpustate);
25static void PREFIX286(_escape_7)(i8086_state *cpustate);
2526static void i80286_pop_seg(i80286_state *cpustate,int reg);
2627static void i80286_load_flags(i80286_state *cpustate, UINT16 flags, int cpl);
2728
src/emu/cpu/i86/instr86.c
r11698r11699
19711971
19721972static void PREFIX86(_wait)(i8086_state *cpustate)    /* Opcode 0x9b */
19731973{
1974#ifdef I80286
1975   if ((cpustate->msw&0x0a) == 0x0a) throw TRAP(FPU_UNAVAILABLE,-1);
1976#endif
19741977   if (cpustate->test_state)
19751978   {
19761979      ICOUNT = 0;
r11698r11699
24642467   cpustate->regs.b[AL] = GetMemB(DS, dest);
24652468}
24662469
2470#ifndef I80286
24672471static void PREFIX86(_escape)(i8086_state *cpustate)    /* Opcodes 0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde and 0xdf */
24682472{
24692473   unsigned ModRM = FETCH;
24702474   ICOUNT -= timing.nop;
24712475    GetRMByte(ModRM);
24722476}
2477#endif
24732478
24742479static void PREFIX86(_loopne)(i8086_state *cpustate)    /* Opcode 0xe0 */
24752480{
src/emu/cpu/i86/table286.h
r11698r11699
221221    PREFIX86(_aad),            /* 0xd5 */
222222    PREFIX286(_invalid),
223223    PREFIX86(_xlat),            /* 0xd7 */
224    PREFIX86(_escape),          /* 0xd8 */
225    PREFIX86(_escape),          /* 0xd9 */
226    PREFIX86(_escape),          /* 0xda */
227    PREFIX86(_escape),          /* 0xdb */
228    PREFIX86(_escape),          /* 0xdc */
229    PREFIX86(_escape),          /* 0xdd */
230    PREFIX86(_escape),          /* 0xde */
231    PREFIX86(_escape),          /* 0xdf */
224    PREFIX286(_escape),          /* 0xd8 */
225    PREFIX286(_escape),          /* 0xd9 */
226    PREFIX286(_escape),          /* 0xda */
227    PREFIX286(_escape),          /* 0xdb */
228    PREFIX286(_escape),          /* 0xdc */
229    PREFIX286(_escape),          /* 0xdd */
230    PREFIX286(_escape),          /* 0xde */
231    PREFIX286(_escape_7),          /* 0xdf */
232232    PREFIX86(_loopne),          /* 0xe0 */
233233    PREFIX86(_loope),            /* 0xe1 */
234234    PREFIX86(_loop),            /* 0xe2 */
r11698r11699
484484   case 0xd5: PREFIX86(_aad)(cpustate); break;\
485485   case 0xd6: PREFIX286(_invalid)(cpustate); break;\
486486   case 0xd7: PREFIX86(_xlat)(cpustate); break;\
487   case 0xd8: PREFIX86(_escape)(cpustate); break;\
488   case 0xd9: PREFIX86(_escape)(cpustate); break;\
489   case 0xda: PREFIX86(_escape)(cpustate); break;\
490   case 0xdb: PREFIX86(_escape)(cpustate); break;\
491   case 0xdc: PREFIX86(_escape)(cpustate); break;\
492   case 0xdd: PREFIX86(_escape)(cpustate); break;\
493   case 0xde: PREFIX86(_escape)(cpustate); break;\
494   case 0xdf: PREFIX86(_escape)(cpustate); break;\
487   case 0xd8: PREFIX286(_escape)(cpustate); break;\
488   case 0xd9: PREFIX286(_escape)(cpustate); break;\
489   case 0xda: PREFIX286(_escape)(cpustate); break;\
490   case 0xdb: PREFIX286(_escape)(cpustate); break;\
491   case 0xdc: PREFIX286(_escape)(cpustate); break;\
492   case 0xdd: PREFIX286(_escape)(cpustate); break;\
493   case 0xde: PREFIX286(_escape)(cpustate); break;\
494   case 0xdf: PREFIX286(_escape_7)(cpustate); break;\
495495   case 0xe0: PREFIX86(_loopne)(cpustate); break;\
496496   case 0xe1: PREFIX86(_loope)(cpustate); break;\
497497   case 0xe2: PREFIX86(_loop)(cpustate); break;\
src/emu/machine/idectrl.c
r11698r11699
11771177
11781178      case IDE_COMMAND_SET_CONFIG:
11791179         LOGPRINT(("IDE Set configuration (%d heads, %d sectors)\n", ide->cur_head + 1, ide->sector_count));
1180         ide->status &= ~IDE_STATUS_ERROR;
1181         ide->error = IDE_ERROR_NONE;
11801182
11811183         ide->num_sectors = ide->sector_count;
11821184         ide->num_heads = ide->cur_head + 1;

Previous 15994 Revisions Next


© 1998-2018 The MESS Team