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

Add Amstrad PC5086 emulation. Patch from davide78.

Browse source
This commit is contained in:
SarahW 2020-11-15 11:11:41 +00:00
commit a89347d415
18 changed files with 428 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

89
src/pic.c
View file

@ -10,13 +10,19 @@ int pic_intpending;
void pic_updatepending()
{
if ((pic2.pend&~pic2.mask)&~pic2.mask2)
pic.pend |= (1 << 2);
if (AT || romset == ROM_XI8088)
{
if ((pic2.pend&~pic2.mask)&~pic2.mask2)
pic.pend |= (1 << 2);
else
pic.pend &= ~(1 << 2);
pic_intpending = (pic.pend & ~pic.mask) & ~pic.mask2;
if (!((pic.mask | pic.mask2) & (1 << 2)))
pic_intpending |= ((pic2.pend&~pic2.mask)&~pic2.mask2);
}
else
pic.pend &= ~(1 << 2);
pic_intpending = (pic.pend & ~pic.mask) & ~pic.mask2;
if (!((pic.mask | pic.mask2) & (1 << 2)))
pic_intpending |= ((pic2.pend&~pic2.mask)&~pic2.mask2);
pic_intpending = (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 %i %i\n", pic2.ins, pic2.pend, pic2.mask, pic2.mask2, ((pic.mask | pic.mask2) & (1 << 2)), ((pic2.pend&~pic2.mask)&~pic2.mask2));*/
}
@ -64,7 +70,7 @@ static void pic_autoeoi()
pic.ins&=~(1<<c);
pic_update_mask(&pic.mask2, pic.ins);
if (c == 2 && (pic2.pend&~pic2.mask)&~pic2.mask2)
if ((AT || romset == ROM_XI8088) && c == 2 && (pic2.pend&~pic2.mask)&~pic2.mask2)
pic.pend |= (1 << 2);
pic_updatepending();
@ -326,14 +332,13 @@ void picint(uint16_t num)
if ((AT || romset == ROM_XI8088) && num == (1 << 2))
num = 1 << 9;
// pclog("picint : %04X\n", num);
// if (num == 0x10) pclog("PICINT 10\n");
if (num>0xFF)
if ((AT || romset == ROM_XI8088) && num>0xFF)
{
pic2.pend|=(num>>8);
if ((pic2.pend&~pic2.mask)&~pic2.mask2)
pic.pend |= (1 << 2);
}
else
else if (num <= 0xff)
{
pic.pend|=num;
}
@ -379,13 +384,13 @@ void picintc(uint16_t num)
// pclog("INTC %04X %i\n", num, c);
pic_current[c]=0;
if (num > 0xff)
if ((AT || romset == ROM_XI8088) && num > 0xff)
{
pic2.pend &= ~(num >> 8);
if (!((pic2.pend&~pic2.mask)&~pic2.mask2))
pic.pend &= ~(1 << 2);
}
else
else if(num <= 0xff)
{
pic.pend&=~num;
}
@ -396,54 +401,35 @@ uint8_t picinterrupt()
{
uint8_t temp=pic.pend&~pic.mask;
int c;
for (c = 0; c < 2; c++)
for (c = 0; c < 8; c++)
{
if (temp & (1 << c))
if ((AT || romset == ROM_XI8088) && (temp & (1 << 2)))
{
if (!(pic.level_sensitive & (1 << c)))
pic.pend &= ~(1 << c);
pic.ins |= (1 << c);
pic_update_mask(&pic.mask2, pic.ins);
pic_updatepending();
if (!c)
pit_set_gate(&pit2, 0, 0);
if (pic.icw4 & 0x02)
pic_autoeoi();
return c+pic.vector;
}
}
if (temp & (1 << 2))
{
uint8_t temp2 = pic2.pend & ~pic2.mask;
for (c = 0; c < 8; c++)
{
if (temp2 & (1 << c))
uint8_t temp2 = pic2.pend & ~pic2.mask;
for (c = 0; c < 8; c++)
{
if (!(pic2.level_sensitive & (1 << c)))
pic2.pend &= ~(1 << c);
pic2.ins |= (1 << c);
pic_update_mask(&pic2.mask2, pic2.ins);
if (temp2 & (1 << c))
{
if (!(pic2.level_sensitive & (1 << c)))
pic2.pend &= ~(1 << c);
pic2.ins |= (1 << c);
pic_update_mask(&pic2.mask2, pic2.ins);
if (!(pic2.level_sensitive & (1 << c)))
pic.pend &= ~(1 << c);
pic.ins |= (1 << 2); /*Cascade IRQ*/
pic_update_mask(&pic.mask2, pic.ins);
if (!(pic2.level_sensitive & (1 << c)))
pic.pend &= ~(1 << c);
pic.ins |= (1 << 2); /*Cascade IRQ*/
pic_update_mask(&pic.mask2, pic.ins);
pic_updatepending();
pic_updatepending();
if (pic2.icw4 & 0x02)
pic2_autoeoi();
if (pic2.icw4 & 0x02)
pic2_autoeoi();
return c+pic2.vector;
return c+pic2.vector;
}
}
}
}
for (c = 3; c < 8; c++)
{
if (temp & (1 << c))
else if (temp & (1 << c))
{
if (!(pic.level_sensitive & (1 << c)))
pic.pend &= ~(1 << c);
@ -453,7 +439,6 @@ uint8_t picinterrupt()
if (pic.icw4 & 0x02)
pic_autoeoi();
return c+pic.vector;
}
}