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

Restore correct ESP value on fault during IRET - fixes issues in at least Windows NT 3.51, NT 4.0, OS/2 2.0, OS/2 Warp. Thanks to SA1988.

Browse source 
Hack to mirror IDE register writes to both drives, fixes IDE issues on NT.
Fixed occasional PCem crash when accessing a faulting page, fixes crash in OS/2 2.0.
This commit is contained in:
TomW 2014-04-09 19:55:14 +01:00
commit 1493306d5e
3 changed files with 50 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/ide.c
View file

@ -645,6 +645,7 @@ void writeidel(int ide_board, uint32_t val)
void writeide(int ide_board, uint16_t addr, uint8_t val)
{
IDE *ide = &ide_drives[cur_ide[ide_board]];
IDE *ide_other = &ide_drives[cur_ide[ide_board] ^ 1];
#ifndef RPCEMU_IDE
/* if (ide_board && (cr0&1) && !(eflags&VM_FLAG))
{
@ -671,27 +672,35 @@ void writeide(int ide_board, uint16_t addr, uint8_t val)
return;
case 0x1F1: /* Features */
ide->cylprecomp=val;
ide->cylprecomp = val;
ide_other->cylprecomp = val;
return;
case 0x1F2: /* Sector count */
ide->secount=val;
ide->secount = val;
ide_other->secount = val;
return;
case 0x1F3: /* Sector */
ide->sector=val;
ide->lba_addr=(ide->lba_addr&0xFFFFF00)|val;
ide->sector = val;
ide->lba_addr = (ide->lba_addr & 0xFFFFF00) | val;
ide_other->sector = val;
ide_other->lba_addr = (ide_other->lba_addr & 0xFFFFF00) | val;
return;
case 0x1F4: /* Cylinder low */
ide->cylinder=(ide->cylinder&0xFF00)|val;
ide->lba_addr=(ide->lba_addr&0xFFF00FF)|(val<<8);
ide->cylinder = (ide->cylinder & 0xFF00) | val;
ide->lba_addr = (ide->lba_addr & 0xFFF00FF) | (val << 8);
ide_other->cylinder = (ide_other->cylinder&0xFF00) | val;
ide_other->lba_addr = (ide_other->lba_addr&0xFFF00FF) | (val << 8);
// pclog("Write cylinder low %02X\n",val);
return;
case 0x1F5: /* Cylinder high */
ide->cylinder=(ide->cylinder&0xFF)|(val<<8);
ide->lba_addr=(ide->lba_addr&0xF00FFFF)|(val<<16);
ide->cylinder = (ide->cylinder & 0xFF) | (val << 8);
ide->lba_addr = (ide->lba_addr & 0xF00FFFF) | (val << 16);
ide_other->cylinder = (ide_other->cylinder & 0xFF) | (val << 8);
ide_other->lba_addr = (ide_other->lba_addr & 0xF00FFFF) | (val << 16);
return;
case 0x1F6: /* Drive/Head */
@ -720,11 +729,14 @@ void writeide(int ide_board, uint16_t addr, uint8_t val)
ide = &ide_drives[cur_ide[ide_board]];
}
ide->head=val&0xF;
ide->lba=val&0x40;
ide->lba_addr=(ide->lba_addr&0x0FFFFFF)|((val&0xF)<<24);
ide->head = val & 0xF;
ide->lba = val & 0x40;
ide_other->head = val & 0xF;
ide_other->lba = val & 0x40;
ide->lba_addr = (ide->lba_addr & 0x0FFFFFF) | ((val & 0xF) << 24);
ide_other->lba_addr = (ide_other->lba_addr & 0x0FFFFFF)|((val & 0xF) << 24);
ide_irq_update(ide);
return;