The MECHANISM_STATUS CD-ROM command now correctly calculates length from the CDB instead of the CD buffer, fixes crash with NT 4.0 and the BT-542b controller;

Applied the remaining mainline PCem commits.
This commit is contained in:
OBattler
2017-07-20 08:24:07 +02:00
parent 790938fb94
commit a9f9523174
3 changed files with 13 additions and 7 deletions

View File

@@ -2197,14 +2197,17 @@ void taskswitch286(uint16_t seg, uint16_t *segdat, int is32)
if (optype==OPTYPE_INT || optype==CALL)
{
writememl(base,0,tr.seg);
new_flags|=NT_FLAG;
if (cpu_state.abrt)
return;
}
if (cpu_state.abrt) return;
new_cr3=readmeml(base,0x1C);
new_pc=readmeml(base,0x20);
new_flags=readmeml(base,0x24);
if (optype == OPTYPE_INT || optype == CALL)
new_flags |= NT_FLAG;
new_eax=readmeml(base,0x28);
new_ecx=readmeml(base,0x2C);
new_edx=readmeml(base,0x30);
@@ -2383,13 +2386,16 @@ void taskswitch286(uint16_t seg, uint16_t *segdat, int is32)
if (optype==OPTYPE_INT || optype==CALL)
{
writememw(base,0,tr.seg);
new_flags|=NT_FLAG;
if (cpu_state.abrt)
return;
}
if (cpu_state.abrt) return;
new_pc=readmemw(base,0x0E);
new_flags=readmemw(base,0x10);
if (optype == OPTYPE_INT || optype == CALL)
new_flags |= NT_FLAG;
new_eax=readmemw(base,0x12);
new_ecx=readmemw(base,0x14);
new_edx=readmemw(base,0x16);