Retro/pcem
Watch
1
0
Fork
You've already forked pcem
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PIC fixes. OAKCDROM.SYS works again.

Browse source
This commit is contained in:
TomW 2014-03-08 15:10:55 +00:00
commit f48b0cf7b8
1 changed files with 16 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/pic.c
View file

@ -9,11 +9,15 @@ int pic_intpending;
void pic_updatepending() void pic_updatepending()
{ {
if ((pic2.pend&~pic2.mask)&~pic2.mask2)
pic.pend |= (1 << 2);
else
pic.pend &= ~(1 << 2);
pic_intpending = (pic.pend & ~pic.mask) & ~pic.mask2; pic_intpending = (pic.pend & ~pic.mask) & ~pic.mask2;
if (!((pic.mask | pic.mask2) & (1 << 2))) if (!((pic.mask | pic.mask2) & (1 << 2)))
pic_intpending |= ((pic2.pend&~pic2.mask)&~pic2.mask2); pic_intpending |= ((pic2.pend&~pic2.mask)&~pic2.mask2);
/* pclog("pic_intpending = %i %02X %02X %02X %02X\n", pic_intpending, pic.ins, pic.pend, pic.mask, pic.mask2); /* pclog("pic_intpending = %i %02X %02X %02X %02X\n", pic_intpending, pic.ins, pic.pend, pic.mask, pic.mask2);
pclog(" %02X %02X %02X %02X\n", pic_intpending, pic2.ins, pic2.pend, pic2.mask, pic2.mask2);*/ pclog(" %02X %02X %02X %02X %i %i\n", pic2.ins, pic2.pend, pic2.mask, pic2.mask2, ((pic.mask | pic.mask2) & (1 << 2)), ((pic2.pend&~pic2.mask)&~pic2.mask2));*/
} }
@ -217,8 +221,8 @@ void pic2_write(uint16_t addr, uint8_t val, void *priv)
uint8_t pic2_read(uint16_t addr, void *priv) uint8_t pic2_read(uint16_t addr, void *priv)
{ {
if (addr&1) { /*pclog("Read PIC2 mask %02X %04X:%08X\n",pic2.mask,CS,pc); */return pic2.mask; } if (addr&1) { /*pclog("Read PIC2 mask %02X %04X:%08X\n",pic2.mask,CS,pc);*/ return pic2.mask; }
if (pic2.read) { /*pclog("Read PIC2 ins %02X %04X:%08X\n",pic2.ins,CS,pc); */return pic2.ins; } if (pic2.read) { /*pclog("Read PIC2 ins %02X %04X:%08X\n",pic2.ins,CS,pc);*/ return pic2.ins; }
/*pclog("Read PIC2 pend %02X %04X:%08X\n",pic2.pend,CS,pc);*/ /*pclog("Read PIC2 pend %02X %04X:%08X\n",pic2.pend,CS,pc);*/
return pic2.pend; return pic2.pend;
} }
@ -279,15 +283,20 @@ void picintc(uint16_t num)
{ {
int c = 0; int c = 0;
while (!(num & (1 << c))) c++; while (!(num & (1 << c))) c++;
//pclog("INTC %04X %i\n", num, c); // pclog("INTC %04X %i\n", num, c);
pic_current[c]=0; pic_current[c]=0;
#if 0
if (num>0xFF) pic2.pend&=~(num>>8); if (num > 0xff)
{
pic2.pend &= ~(num >> 8);
if (!((pic2.pend&~pic2.mask)&~pic2.mask2))
pic.pend &= ~(1 << 2);
}
else else
{ {
pic.pend&=~num; pic.pend&=~num;
} }
#endif pic_updatepending();
} }
uint8_t picinterrupt() uint8_t picinterrupt()