--- np2/i386c/ia32/task.c 2011/12/17 01:36:54 1.25 +++ np2/i386c/ia32/task.c 2011/12/23 04:16:51 1.29 @@ -33,7 +33,7 @@ #define TSS_32_LIMIT (TSS_32_SIZE - 1) static void -set_task_busy(UINT16 selector, descriptor_t *sdp) +set_task_busy(UINT16 selector) { UINT32 addr; UINT32 h; @@ -41,7 +41,6 @@ set_task_busy(UINT16 selector, descripto addr = CPU_GDTR_BASE + (selector & CPU_SEGMENT_SELECTOR_INDEX_MASK); h = cpu_kmemoryread_d(addr + 4); if (!(h & CPU_TSS_H_BUSY)) { - sdp->type |= CPU_SYSDESC_TYPE_TSS_BUSY_IND; h |= CPU_TSS_H_BUSY; cpu_kmemorywrite_d(addr + 4, h); } else { @@ -50,7 +49,7 @@ set_task_busy(UINT16 selector, descripto } static void -set_task_free(UINT16 selector, descriptor_t *sdp) +set_task_free(UINT16 selector) { UINT32 addr; UINT32 h; @@ -58,7 +57,6 @@ set_task_free(UINT16 selector, descripto addr = CPU_GDTR_BASE + (selector & CPU_SEGMENT_SELECTOR_INDEX_MASK); h = cpu_kmemoryread_d(addr + 4); if (h & CPU_TSS_H_BUSY) { - sdp->type &= ~CPU_SYSDESC_TYPE_TSS_BUSY_IND; h &= ~CPU_TSS_H_BUSY; cpu_kmemorywrite_d(addr + 4, h); } else { @@ -112,16 +110,17 @@ load_tr(UINT16 selector) tr_dump(task_sel.selector, task_sel.desc.u.seg.segbase, task_sel.desc.u.seg.limit); #endif - set_task_busy(task_sel.selector, &task_sel.desc); + set_task_busy(task_sel.selector); CPU_TR = task_sel.selector; CPU_TR_DESC = task_sel.desc; + CPU_TR_DESC.type |= CPU_SYSDESC_TYPE_TSS_BUSY_IND; /* I/O deny bitmap */ CPU_STAT_IOLIMIT = 0; - if (task_sel.desc.type == CPU_SYSDESC_TYPE_TSS_BUSY_32) { - if (iobase != 0 && iobase < task_sel.desc.u.seg.limit) { - CPU_STAT_IOLIMIT = (UINT16)(task_sel.desc.u.seg.limit - iobase); - CPU_STAT_IOADDR = task_sel.desc.u.seg.segbase + iobase; + if (CPU_TR_DESC.type == CPU_SYSDESC_TYPE_TSS_BUSY_32) { + if (iobase != 0 && iobase < CPU_TR_DESC.u.seg.limit) { + CPU_STAT_IOLIMIT = (UINT16)(CPU_TR_DESC.u.seg.limit - iobase); + CPU_STAT_IOADDR = CPU_TR_DESC.u.seg.segbase + iobase; } } @@ -202,6 +201,7 @@ task_switch(selector_t *task_sel, task_s UINT16 ldtr; UINT16 iobase; UINT16 t; + int new_cpl; selector_t cs_sel, ss_sel; int rv; @@ -334,7 +334,7 @@ task_switch(selector_t *task_sel, task_s /*FALLTHROUGH*/ case TASK_SWITCH_JMP: /* clear busy flags in current task */ - set_task_free(CPU_TR, &CPU_TR_DESC); + set_task_free(CPU_TR); break; case TASK_SWITCH_CALL: @@ -409,9 +409,9 @@ task_switch(selector_t *task_sel, task_s new_flags |= NT_FLAG; /*FALLTHROUGH*/ case TASK_SWITCH_JMP: - set_task_busy(task_sel->selector, &task_sel->desc); + set_task_busy(task_sel->selector); break; - + case TASK_SWITCH_IRET: /* check busy flag is active */ if (SEG_IS_VALID(&task_sel->desc)) { @@ -431,15 +431,13 @@ task_switch(selector_t *task_sel, task_s /* load task selector to CPU_TR */ CPU_TR = task_sel->selector; CPU_TR_DESC = task_sel->desc; - - /* clear BUSY flag in descriptor cache */ - CPU_TR_DESC.type &= ~CPU_SYSDESC_TYPE_TSS_BUSY_IND; + CPU_TR_DESC.type |= CPU_SYSDESC_TYPE_TSS_BUSY_IND; /* set CR0 image CPU_CR0_TS */ CPU_CR0 |= CPU_CR0_TS; /* - * load task state (CR3, EFLAG, EIP, GPR, segreg, LDTR) + * load task state (CR3, EIP, GPR, segregs, LDTR, EFLAGS) */ /* set new CR3 */ @@ -447,22 +445,27 @@ task_switch(selector_t *task_sel, task_s set_cr3(cr3); } - /* set new EIP, GPR */ + /* set new EIP, GPR, segregs */ CPU_EIP = eip; for (i = 0; i < CPU_REG_NUM; i++) { CPU_REGS_DWORD(i) = regs[i]; } for (i = 0; i < CPU_SEGREG_NUM; i++) { segdesc_init(i, sreg[i], &CPU_STAT_SREG(i)); + /* invalidate segreg descriptor */ + CPU_STAT_SREG(i).valid = 0; } + CPU_CLEAR_PREV_ESP(); + /* load new LDTR */ + CPU_LDTR_DESC.valid = 0; load_ldtr(ldtr, TS_EXCEPTION); /* I/O deny bitmap */ CPU_STAT_IOLIMIT = 0; - if (!task16 && iobase != 0 && iobase < task_sel->desc.u.seg.limit) { - CPU_STAT_IOLIMIT = (UINT16)(task_sel->desc.u.seg.limit - iobase); + if (!task16 && iobase != 0 && iobase < CPU_TR_DESC.u.seg.limit) { + CPU_STAT_IOLIMIT = (UINT16)(CPU_TR_DESC.u.seg.limit - iobase); CPU_STAT_IOADDR = task_base + iobase; } VERBOSE(("task_switch: ioaddr = %08x, limit = %08x", CPU_STAT_IOADDR, CPU_STAT_IOLIMIT)); @@ -488,11 +491,41 @@ task_switch(selector_t *task_sel, task_s /* set new segment register */ if (!CPU_STAT_VM86) { - /* clear segment descriptor cache */ - for (i = 0; i < CPU_SEGREG_NUM; i++) { - segdesc_clear(&CPU_STAT_SREG(i)); + /* load SS */ + rv = parse_selector(&ss_sel, sreg[CPU_SS_INDEX]); + if (rv < 0) { + VERBOSE(("task_switch: load SS failure (sel = 0x%04x, rv = %d)", sreg[CPU_SS_INDEX], rv)); + EXCEPTION(TS_EXCEPTION, ss_sel.idx); + } + + /* SS must be writable data segment */ + if (SEG_IS_SYSTEM(&ss_sel.desc) + || SEG_IS_CODE(&ss_sel.desc) + || !SEG_IS_WRITABLE_DATA(&ss_sel.desc)) { + EXCEPTION(TS_EXCEPTION, ss_sel.idx); } + /* check privilege level */ + if ((ss_sel.desc.dpl != cs_sel.rpl) + || (ss_sel.desc.dpl != ss_sel.rpl)) { + EXCEPTION(TS_EXCEPTION, ss_sel.idx); + } + + /* stack segment is not present */ + rv = selector_is_not_present(&ss_sel); + if (rv < 0) { + EXCEPTION(SS_EXCEPTION, ss_sel.idx); + } + + /* Now loading SS register */ + load_ss(ss_sel.selector, &ss_sel.desc, cs_sel.rpl); + + /* load ES, DS, FS, GS segment register */ + LOAD_SEGREG1(CPU_ES_INDEX, sreg[CPU_ES_INDEX], TS_EXCEPTION); + LOAD_SEGREG1(CPU_DS_INDEX, sreg[CPU_DS_INDEX], TS_EXCEPTION); + LOAD_SEGREG1(CPU_FS_INDEX, sreg[CPU_FS_INDEX], TS_EXCEPTION); + LOAD_SEGREG1(CPU_GS_INDEX, sreg[CPU_GS_INDEX], TS_EXCEPTION); + /* load CS */ rv = parse_selector(&cs_sel, sreg[CPU_CS_INDEX]); if (rv < 0) { @@ -524,48 +557,8 @@ task_switch(selector_t *task_sel, task_s EXCEPTION(NP_EXCEPTION, cs_sel.idx); } - /* load SS */ - rv = parse_selector(&ss_sel, sreg[CPU_SS_INDEX]); - if (rv < 0) { - VERBOSE(("task_switch: load SS failure (sel = 0x%04x, rv = %d)", sreg[CPU_SS_INDEX], rv)); - EXCEPTION(TS_EXCEPTION, ss_sel.idx); - } - - /* SS must be writable data segment */ - if (SEG_IS_SYSTEM(&ss_sel.desc) - || SEG_IS_CODE(&ss_sel.desc) - || !SEG_IS_WRITABLE_DATA(&ss_sel.desc)) { - EXCEPTION(TS_EXCEPTION, ss_sel.idx); - } - - /* check privilege level */ - if ((ss_sel.desc.dpl != cs_sel.rpl) - || (ss_sel.desc.dpl != ss_sel.rpl)) { - EXCEPTION(TS_EXCEPTION, ss_sel.idx); - } - - /* stack segment is not present */ - rv = selector_is_not_present(&ss_sel); - if (rv < 0) { - EXCEPTION(SS_EXCEPTION, ss_sel.idx); - } - - /* Now loading CS/SS register */ + /* Now loading CS register */ load_cs(cs_sel.selector, &cs_sel.desc, cs_sel.rpl); - load_ss(ss_sel.selector, &ss_sel.desc, cs_sel.rpl); - - /* load ES, DS, FS, GS segment register */ - for (i = 0; i < CPU_SEGREG_NUM; i++) { - if (i != CPU_CS_INDEX || i != CPU_SS_INDEX) { - LOAD_SEGREG1(i, sreg[i], TS_EXCEPTION); - } - } - } - - /* out of range */ - if (CPU_EIP > CPU_STAT_CS_LIMIT) { - VERBOSE(("task_switch: new_ip is out of range. new_ip = %08x, limit = %08x", CPU_EIP, CPU_STAT_CS_LIMIT)); - EXCEPTION(GP_EXCEPTION, 0); } VERBOSE(("task_switch: done."));