--- np2/i386c/ia32/ctrlxfer.c 2004/02/20 16:09:04 1.15 +++ np2/i386c/ia32/ctrlxfer.c 2005/03/12 12:32:54 1.18 @@ -1,4 +1,4 @@ -/* $Id: ctrlxfer.c,v 1.15 2004/02/20 16:09:04 monaka Exp $ */ +/* $Id: ctrlxfer.c,v 1.18 2005/03/12 12:32:54 monaka Exp $ */ /* * Copyright (c) 2003 NONAKA Kimihiro @@ -12,8 +12,6 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES @@ -37,8 +35,8 @@ /*------------------------------------------------------------------------------ * JMPfar_pm */ -static void JMPfar_pm_code_segment(selector_t *cs_sel, UINT32 new_ip); -static void JMPfar_pm_call_gate(selector_t *callgate_sel); +static void JMPfar_pm_code_segment(const selector_t *cs_sel, UINT32 new_ip); +static void JMPfar_pm_call_gate(const selector_t *callgate_sel); static void JMPfar_pm_task_gate(selector_t *taskgate_sel); static void JMPfar_pm_tss(selector_t *tss_sel); @@ -106,7 +104,7 @@ JMPfar_pm(UINT16 selector, UINT32 new_ip * JMPfar: code segment */ static void -JMPfar_pm_code_segment(selector_t *cs_sel, UINT32 new_ip) +JMPfar_pm_code_segment(const selector_t *cs_sel, UINT32 new_ip) { VERBOSE(("JMPfar_pm: CODE-SEGMENT")); @@ -152,7 +150,7 @@ JMPfar_pm_code_segment(selector_t *cs_se * JMPfar: call gate */ static void -JMPfar_pm_call_gate(selector_t *callgate_sel) +JMPfar_pm_call_gate(const selector_t *callgate_sel) { selector_t cs_sel; int rv; @@ -318,8 +316,8 @@ JMPfar_pm_tss(selector_t *tss_sel) /*------------------------------------------------------------------------------ * CALLfar_pm */ -static void CALLfar_pm_code_segment(selector_t *cs_sel, UINT32 new_ip); -static void CALLfar_pm_call_gate(selector_t *callgate_sel); +static void CALLfar_pm_code_segment(const selector_t *cs_sel, UINT32 new_ip); +static void CALLfar_pm_call_gate(const selector_t *callgate_sel); static void CALLfar_pm_task_gate(selector_t *taskgate_sel); static void CALLfar_pm_tss(selector_t *tss_sel); @@ -387,7 +385,7 @@ CALLfar_pm(UINT16 selector, UINT32 new_i * CALLfar_pm: code segment */ static void -CALLfar_pm_code_segment(selector_t *cs_sel, UINT32 new_ip) +CALLfar_pm_code_segment(const selector_t *cs_sel, UINT32 new_ip) { UINT32 sp; @@ -426,7 +424,7 @@ CALLfar_pm_code_segment(selector_t *cs_s sp = CPU_SP; } if (CPU_INST_OP32) { - CHECK_STACK_PUSH(&CPU_STAT_SREG(CPU_SS_INDEX), sp, 8); + STACK_PUSH_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), sp, 8); /* out of range */ if (new_ip > cs_sel->desc.u.seg.limit) { @@ -437,7 +435,7 @@ CALLfar_pm_code_segment(selector_t *cs_s PUSH0_32(CPU_CS); PUSH0_32(CPU_EIP); } else { - CHECK_STACK_PUSH(&CPU_STAT_SREG(CPU_SS_INDEX), sp, 4); + STACK_PUSH_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), sp, 4); /* out of range */ if (new_ip > cs_sel->desc.u.seg.limit) { @@ -456,11 +454,11 @@ CALLfar_pm_code_segment(selector_t *cs_s /*--- * CALLfar_pm: call gate */ -static void CALLfar_pm_call_gate_same_privilege(selector_t *call_sel, selector_t *cs_sel); -static void CALLfar_pm_call_gate_more_privilege(selector_t *call_sel, selector_t *cs_sel); +static void CALLfar_pm_call_gate_same_privilege(const selector_t *call_sel, selector_t *cs_sel); +static void CALLfar_pm_call_gate_more_privilege(const selector_t *call_sel, selector_t *cs_sel); static void -CALLfar_pm_call_gate(selector_t *callgate_sel) +CALLfar_pm_call_gate(const selector_t *callgate_sel) { selector_t cs_sel; int rv; @@ -529,7 +527,7 @@ CALLfar_pm_call_gate(selector_t *callgat * CALLfar_pm: call gate (SAME-PRIVILEGE) */ static void -CALLfar_pm_call_gate_same_privilege(selector_t *callgate_sel, selector_t *cs_sel) +CALLfar_pm_call_gate_same_privilege(const selector_t *callgate_sel, selector_t *cs_sel) { UINT32 sp; @@ -542,7 +540,7 @@ CALLfar_pm_call_gate_same_privilege(sele } if (callgate_sel->desc.type == CPU_SYSDESC_TYPE_CALL_32) { - CHECK_STACK_PUSH(&CPU_STAT_SREG(CPU_SS_INDEX), sp, 8); + STACK_PUSH_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), sp, 8); PUSH0_32(CPU_CS); PUSH0_32(CPU_EIP); @@ -550,7 +548,7 @@ CALLfar_pm_call_gate_same_privilege(sele load_cs(cs_sel->selector, &cs_sel->desc, CPU_STAT_CPL); SET_EIP(callgate_sel->desc.u.gate.offset); } else { - CHECK_STACK_PUSH(&CPU_STAT_SREG(CPU_SS_INDEX), sp, 4); + STACK_PUSH_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), sp, 4); PUSH0_16(CPU_CS); PUSH0_16(CPU_IP); @@ -564,7 +562,7 @@ CALLfar_pm_call_gate_same_privilege(sele * CALLfar_pm: call gate (MORE-PRIVILEGE) */ static void -CALLfar_pm_call_gate_more_privilege(selector_t *callgate_sel, selector_t *cs_sel) +CALLfar_pm_call_gate_more_privilege(const selector_t *callgate_sel, selector_t *cs_sel) { UINT32 param[32]; /* copy param */ selector_t ss_sel; @@ -631,7 +629,7 @@ CALLfar_pm_call_gate_more_privilege(sele VERBOSE(("CALLfar_pm: param_count = %d", param_count)); if (callgate_sel->desc.type == CPU_SYSDESC_TYPE_CALL_32) { - CHECK_STACK_PUSH(&ss_sel.desc, new_esp, 16 + param_count * 4); + STACK_PUSH_CHECK(ss_sel.idx, &ss_sel.desc, new_esp, 16 + param_count * 4); /* dump param */ for (i = 0; i < param_count; i++) { @@ -661,7 +659,7 @@ CALLfar_pm_call_gate_more_privilege(sele PUSH0_32(old_cs); PUSH0_32(old_eip); } else { - CHECK_STACK_PUSH(&ss_sel.desc, new_esp, 8 + param_count * 2); + STACK_PUSH_CHECK(ss_sel.idx, &ss_sel.desc, new_esp, 8 + param_count * 2); /* dump param */ for (i = 0; i < param_count; i++) { @@ -803,11 +801,11 @@ RETfar_pm(UINT nbytes) sp = CPU_SP; } if (CPU_INST_OP32) { - CHECK_STACK_POP(&CPU_STAT_SREG(CPU_SS_INDEX), sp, nbytes + 8); + STACK_POP_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), sp, nbytes + 8); new_ip = cpu_vmemoryread_d(CPU_SS_INDEX, sp); new_cs = cpu_vmemoryread_w(CPU_SS_INDEX, sp + 4); } else { - CHECK_STACK_POP(&CPU_STAT_SREG(CPU_SS_INDEX), sp, nbytes + 4); + STACK_POP_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), sp, nbytes + 4); new_ip = cpu_vmemoryread_w(CPU_SS_INDEX, sp); new_cs = cpu_vmemoryread_w(CPU_SS_INDEX, sp + 2); } @@ -872,11 +870,11 @@ RETfar_pm(UINT nbytes) VERBOSE(("RETfar_pm: RETURN-OUTER-PRIVILEGE-LEVEL")); if (CPU_INST_OP32) { - CHECK_STACK_POP(&CPU_STAT_SREG(CPU_SS_INDEX), sp, 8 + 8 + nbytes); + STACK_POP_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), sp, 8 + 8 + nbytes); new_sp = cpu_vmemoryread_d(CPU_SS_INDEX, sp + 8 + nbytes); new_ss = cpu_vmemoryread_w(CPU_SS_INDEX, sp + 8 + nbytes + 4); } else { - CHECK_STACK_POP(&CPU_STAT_SREG(CPU_SS_INDEX), sp, 4 + 4 + nbytes); + STACK_POP_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), sp, 4 + 4 + nbytes); new_sp = cpu_vmemoryread_w(CPU_SS_INDEX, sp + 4 + nbytes); new_ss = cpu_vmemoryread_w(CPU_SS_INDEX, sp + 4 + nbytes + 2); } @@ -990,8 +988,8 @@ RETfar_pm(UINT nbytes) */ static void IRET_pm_nested_task(void); static void IRET_pm_protected_mode_return(UINT16 new_cs, UINT32 new_ip, UINT32 new_flags); -static void IRET_pm_protected_mode_return_same_privilege(selector_t *cs_sel, UINT32 new_ip, UINT32 new_flags); -static void IRET_pm_protected_mode_return_outer_privilege(selector_t *cs_sel, UINT32 new_ip, UINT32 new_flags); +static void IRET_pm_protected_mode_return_same_privilege(const selector_t *cs_sel, UINT32 new_ip, UINT32 new_flags); +static void IRET_pm_protected_mode_return_outer_privilege(const selector_t *cs_sel, UINT32 new_ip, UINT32 new_flags); static void IRET_pm_return_to_vm86(UINT16 new_cs, UINT32 new_ip, UINT32 new_flags); static void IRET_pm_return_from_vm86(UINT16 new_cs, UINT32 new_ip, UINT32 new_flags); @@ -1014,12 +1012,12 @@ IRET_pm(void) sp = CPU_SP; } if (CPU_INST_OP32) { - CHECK_STACK_POP(&CPU_STAT_SREG(CPU_SS_INDEX), sp, 12); + STACK_POP_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), sp, 12); new_ip = cpu_vmemoryread_d(CPU_SS_INDEX, sp); new_cs = cpu_vmemoryread_w(CPU_SS_INDEX, sp + 4); new_flags = cpu_vmemoryread_d(CPU_SS_INDEX, sp + 8); } else { - CHECK_STACK_POP(&CPU_STAT_SREG(CPU_SS_INDEX), sp, 6); + STACK_POP_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), sp, 6); new_ip = cpu_vmemoryread_w(CPU_SS_INDEX, sp); new_cs = cpu_vmemoryread_w(CPU_SS_INDEX, sp + 2); new_flags = cpu_vmemoryread_w(CPU_SS_INDEX, sp + 4); @@ -1147,10 +1145,13 @@ IRET_pm_protected_mode_return(UINT16 new * IRET_pm: SAME-PRIVILEGE */ static void -IRET_pm_protected_mode_return_same_privilege(selector_t *cs_sel, UINT32 new_ip, UINT32 new_flags) +IRET_pm_protected_mode_return_same_privilege(const selector_t *cs_sel, UINT32 new_ip, UINT32 new_flags) { UINT32 mask; UINT stacksize; +#if defined(IA32_DONT_USE_SET_EFLAGS_FUNCTION) + UINT32 old_flags = CPU_EFLAG; +#endif VERBOSE(("IRET_pm: RETURN-TO-SAME-PRIVILEGE-LEVEL")); @@ -1160,6 +1161,17 @@ IRET_pm_protected_mode_return_same_privi EXCEPTION(GP_EXCEPTION, 0); } +#if defined(IA32_DONT_USE_SET_EFLAGS_FUNCTION) + mask = ALL_EFLAG; + if (CPU_STAT_CPL > CPU_STAT_IOPL) + mask &= ~I_FLAG; + if (CPU_STAT_CPL > 0) { + mask &= ~IOPL_FLAG; + if (CPU_INST_OP32) { + mask &= ~(VM_FLAG|VIF_FLAG|VIP_FLAG); + } + } +#else mask = 0; if (CPU_INST_OP32) mask |= RF_FLAG; @@ -1171,6 +1183,8 @@ IRET_pm_protected_mode_return_same_privi mask |= VM_FLAG|VIF_FLAG|VIP_FLAG; } } +#endif + if (CPU_INST_OP32) { stacksize = 12; } else { @@ -1181,7 +1195,20 @@ IRET_pm_protected_mode_return_same_privi load_cs(cs_sel->selector, &cs_sel->desc, CPU_STAT_CPL); SET_EIP(new_ip); +#if defined(IA32_DONT_USE_SET_EFLAGS_FUNCTION) + CPU_EFLAG = (new_flags & mask) | (CPU_EFLAG & ~mask); + CPU_OV = CPU_FLAG & O_FLAG; + CPU_TRAP = (CPU_FLAG & (I_FLAG|T_FLAG)) == (I_FLAG|T_FLAG); + if ((old_flags ^ CPU_EFLAG) & VM_FLAG) { + if (CPU_EFLAG & VM_FLAG) { + change_vm(1); + } else { + change_vm(0); + } + } +#else set_eflags(new_flags, mask); +#endif if (CPU_STAT_SS32) { CPU_ESP += stacksize; @@ -1194,7 +1221,7 @@ IRET_pm_protected_mode_return_same_privi * IRET_pm: OUTER-PRIVILEGE */ static void -IRET_pm_protected_mode_return_outer_privilege(selector_t *cs_sel, UINT32 new_ip, UINT32 new_flags) +IRET_pm_protected_mode_return_outer_privilege(const selector_t *cs_sel, UINT32 new_ip, UINT32 new_flags) { descriptor_t *dp; selector_t ss_sel; @@ -1204,6 +1231,9 @@ IRET_pm_protected_mode_return_outer_priv UINT16 new_ss; int rv; int i; +#if defined(IA32_DONT_USE_SET_EFLAGS_FUNCTION) + UINT32 old_flags = CPU_EFLAG; +#endif VERBOSE(("IRET_pm: RETURN-OUTER-PRIVILEGE-LEVEL")); @@ -1213,11 +1243,11 @@ IRET_pm_protected_mode_return_outer_priv sp = CPU_SP; } if (CPU_INST_OP32) { - CHECK_STACK_POP(&CPU_STAT_SREG(CPU_SS_INDEX), sp, 20); + STACK_POP_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), sp, 20); new_sp = cpu_vmemoryread_d(CPU_SS_INDEX, sp + 12); new_ss = cpu_vmemoryread_w(CPU_SS_INDEX, sp + 16); } else { - CHECK_STACK_POP(&CPU_STAT_SREG(CPU_SS_INDEX), sp, 10); + STACK_POP_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), sp, 10); new_sp = cpu_vmemoryread_w(CPU_SS_INDEX, sp + 6); new_ss = cpu_vmemoryread_w(CPU_SS_INDEX, sp + 8); } @@ -1265,6 +1295,17 @@ IRET_pm_protected_mode_return_outer_priv EXCEPTION(GP_EXCEPTION, 0); } +#if defined(IA32_DONT_USE_SET_EFLAGS_FUNCTION) + mask = ALL_EFLAG; + if (CPU_STAT_CPL > CPU_STAT_IOPL) + mask &= ~I_FLAG; + if (CPU_STAT_CPL > 0) { + mask &= ~IOPL_FLAG; + if (CPU_INST_OP32) { + mask &= ~(VM_FLAG|VIF_FLAG|VIP_FLAG); + } + } +#else mask = 0; if (CPU_INST_OP32) mask |= RF_FLAG; @@ -1276,12 +1317,26 @@ IRET_pm_protected_mode_return_outer_priv mask |= VM_FLAG|VIF_FLAG|VIP_FLAG; } } +#endif /* set new register */ load_cs(cs_sel->selector, &cs_sel->desc, cs_sel->rpl); SET_EIP(new_ip); +#if defined(IA32_DONT_USE_SET_EFLAGS_FUNCTION) + CPU_EFLAG = (new_flags & mask) | (CPU_EFLAG & ~mask); + CPU_OV = CPU_FLAG & O_FLAG; + CPU_TRAP = (CPU_FLAG & (I_FLAG|T_FLAG)) == (I_FLAG|T_FLAG); + if ((old_flags ^ CPU_EFLAG) & VM_FLAG) { + if (CPU_EFLAG & VM_FLAG) { + change_vm(1); + } else { + change_vm(0); + } + } +#else set_eflags(new_flags, mask); +#endif load_ss(ss_sel.selector, &ss_sel.desc, cs_sel->rpl); if (CPU_STAT_SS32) { @@ -1314,6 +1369,9 @@ IRET_pm_return_to_vm86(UINT16 new_cs, UI UINT32 sp; UINT32 new_sp; int i; +#if defined(IA32_DONT_USE_SET_EFLAGS_FUNCTION) + UINT32 old_flags = CPU_EFLAG; +#endif VERBOSE(("IRET_pm: Interrupt procedure was in virtual-8086 mode: PE=1, VM=1 in flags image")); @@ -1330,7 +1388,7 @@ IRET_pm_return_to_vm86(UINT16 new_cs, UI } else { sp = CPU_SP; } - CHECK_STACK_POP(&CPU_STAT_SREG(CPU_SS_INDEX), sp, 36); + STACK_POP_CHECK(CPU_REGS_SREG(CPU_SS_INDEX), &CPU_STAT_SREG(CPU_SS_INDEX), sp, 36); new_sp = cpu_vmemoryread_d(CPU_SS_INDEX, sp + 12); segsel[CPU_SS_INDEX] = cpu_vmemoryread_w(CPU_SS_INDEX, sp + 16); segsel[CPU_ES_INDEX] = cpu_vmemoryread_w(CPU_SS_INDEX, sp + 20); @@ -1345,7 +1403,20 @@ IRET_pm_return_to_vm86(UINT16 new_cs, UI } /* to VM86 mode */ +#if defined(IA32_DONT_USE_SET_EFLAGS_FUNCTION) + CPU_EFLAG = new_flags; + CPU_OV = CPU_FLAG & O_FLAG; + CPU_TRAP = (CPU_FLAG & (I_FLAG|T_FLAG)) == (I_FLAG|T_FLAG); + if ((old_flags ^ CPU_EFLAG) & VM_FLAG) { + if (CPU_EFLAG & VM_FLAG) { + change_vm(1); + } else { + change_vm(0); + } + } +#else set_eflags(new_flags, IOPL_FLAG|I_FLAG|VM_FLAG|RF_FLAG); +#endif new_sp &= 0xffff; new_ip &= 0xffff; @@ -1377,7 +1448,13 @@ IRET_pm_return_from_vm86(UINT16 new_cs, CPU_SP += (UINT16)stacksize; } +#if defined(IA32_DONT_USE_SET_EFLAGS_FUNCTION) + CPU_EFLAG = (new_flags & ~(IOPL_FLAG|VM_FLAG|VIF_FLAG|VIP_FLAG)) | (CPU_EFLAG & (IOPL_FLAG|VM_FLAG|VIF_FLAG|VIP_FLAG)); + CPU_OV = CPU_FLAG & O_FLAG; + CPU_TRAP = (CPU_FLAG & (I_FLAG|T_FLAG)) == (I_FLAG|T_FLAG); +#else set_eflags(new_flags, I_FLAG|RF_FLAG); +#endif CPU_SET_SEGREG(CPU_CS_INDEX, new_cs); SET_EIP(new_ip);