--- np2/i386c/ia32/exception.c 2008/03/22 04:03:07 1.21 +++ np2/i386c/ia32/exception.c 2012/01/08 11:32:16 1.34 @@ -1,5 +1,3 @@ -/* $Id: exception.c,v 1.21 2008/03/22 04:03:07 monaka Exp $ */ - /* * Copyright (c) 2003 NONAKA Kimihiro * All rights reserved. @@ -63,9 +61,13 @@ static const int dftable[4][4] = { { 1, 1, 1, 1, }, }; -void +void CPUCALL exception(int num, int error_code) { +#if defined(DEBUG) + extern int cpu_debug_rep_cont; + extern CPU_REGS cpu_debug_rep_regs; +#endif int errorp = 0; __ASSERT((unsigned int)num < EXCEPTION_NUM); @@ -78,6 +80,13 @@ exception(int num, int error_code) VERBOSE(("exception: -------------------------------------------------------------- start")); VERBOSE(("exception: %s, error_code = %x at %04x:%08x", exception_str[num], error_code, CPU_CS, CPU_PREV_EIP)); VERBOSE(("%s", cpu_reg2str())); + VERBOSE(("code: %dbit(%dbit), address: %dbit(%dbit)", CPU_INST_OP32 ? 32 : 16, CPU_STATSAVE.cpu_inst_default.op_32 ? 32 : 16, CPU_INST_AS32 ? 32 : 16, CPU_STATSAVE.cpu_inst_default.as_32 ? 32 : 16)); +#if defined(DEBUG) + if (cpu_debug_rep_cont) { + VERBOSE(("rep: original regs: ecx=%08x, esi=%08x, edi=%08x", cpu_debug_rep_regs.reg[CPU_ECX_INDEX].d, cpu_debug_rep_regs.reg[CPU_ESI_INDEX].d, cpu_debug_rep_regs.reg[CPU_EDI_INDEX].d)); + } + VERBOSE(("%s", cpu_disasm2str(CPU_PREV_EIP))); +#endif CPU_STAT_EXCEPTION_COUNTER_INC(); if ((CPU_STAT_EXCEPTION_COUNTER >= 3) @@ -87,34 +96,38 @@ exception(int num, int error_code) } switch (num) { - case DE_EXCEPTION: /* (F) ½ü»»¥¨¥é¡¼ */ - case DB_EXCEPTION: /* (F/T) ¥Ç¥Ð¥Ã¥° */ - case BR_EXCEPTION: /* (F) BOUND ¤ÎÈϰϳ° */ - case UD_EXCEPTION: /* (F) ̵¸ú¥ª¥Ú¥³¡¼¥É */ - case NM_EXCEPTION: /* (F) ¥Ç¥Ð¥¤¥¹»ÈÍÑÉÔ²Ä (FPU ¤¬Ìµ¤¤) */ - case MF_EXCEPTION: /* (F) ÉâÆ°¾®¿ôÅÀ¥¨¥é¡¼ */ + case DE_EXCEPTION: /* (F) ½ü»»¥¨¥é¡¼ */ + case DB_EXCEPTION: /* (F/T) ¥Ç¥Ð¥Ã¥° */ + case BR_EXCEPTION: /* (F) BOUND ¤ÎÈϰϳ° */ + case UD_EXCEPTION: /* (F) ̵¸ú¥ª¥Ú¥³¡¼¥É */ + case NM_EXCEPTION: /* (F) ¥Ç¥Ð¥¤¥¹»ÈÍÑÉÔ²Ä (FPU ¤¬Ìµ¤¤) */ + case MF_EXCEPTION: /* (F) ÉâÆ°¾®¿ôÅÀ¥¨¥é¡¼ */ CPU_EIP = CPU_PREV_EIP; + if (CPU_STATSAVE.cpu_stat.backout_sp) + CPU_ESP = CPU_PREV_ESP; /*FALLTHROUGH*/ - case NMI_EXCEPTION: /* (I) NMI ³ä¤ê¹þ¤ß */ - case BP_EXCEPTION: /* (T) ¥Ö¥ì¡¼¥¯¥Ý¥¤¥ó¥È */ - case OF_EXCEPTION: /* (T) ¥ª¡¼¥Ð¡¼¥Õ¥í¡¼ */ + case NMI_EXCEPTION: /* (I) NMI ³ä¤ê¹þ¤ß */ + case BP_EXCEPTION: /* (T) ¥Ö¥ì¡¼¥¯¥Ý¥¤¥ó¥È */ + case OF_EXCEPTION: /* (T) ¥ª¡¼¥Ð¡¼¥Õ¥í¡¼ */ errorp = 0; break; - case DF_EXCEPTION: /* (A) ¡¦¥¿¡¦¥è¡¦ö§¥æ¡¦¥¥¡¦ö§¥Í (errcode: 0) */ + case DF_EXCEPTION: /* (A) åãc«ã©ã (errcode: 0) */ errorp = 1; error_code = 0; break; - case AC_EXCEPTION: /* (F) ¥¢¥é¥¤¥ó¥á¥ó¥È¥Á¥§¥Ã¥¯ (errcode: 0) */ + case AC_EXCEPTION: /* (F) åâ¡Öå㥥åâ¡¢å㥦åã¡£å㥦åã°å¥áå⥡åã¦å¤± (errcode: 0) */ error_code = 0; /*FALLTHROUGH*/ - case TS_EXCEPTION: /* (F) ¥Õ¥ª¥¯TSS (errcode) */ - case NP_EXCEPTION: /* (F) ¡¦¥µ¡¦¡¼¡¦â§ó¥ÈÉÔº(errcode) */ - case SS_EXCEPTION: /* (F) ¥¹¥¿¥Ã¥¯¥»¥°¥á¥ó¥È¥Õ¥©¥ë¥È (errcode) */ - case GP_EXCEPTION: /* (F) °ìÈÌÊݸîÎã³° (errcode) */ - case PF_EXCEPTION: /* (F) ¥Ú¡¼¥¸¥Õ¥©¥ë¥È (errcode) */ + case TS_EXCEPTION: /* (F) ̵¸ú TSS (errcode) */ + case NP_EXCEPTION: /* (F) ¥»¥°¥á¥ó¥ÈÉＧ (errcode) */ + case SS_EXCEPTION: /* (F) ¥¹¥¿¥Ã¥¯¥»¥°¥á¥ó¥È¥Õ¥©¥ë¥È (errcode) */ + case GP_EXCEPTION: /* (F) °ìÈÌÊݸîÎã³° (errcode) */ + case PF_EXCEPTION: /* (F) ¥Ú¡¼¥¸¥Õ¥©¥ë¥È (errcode) */ CPU_EIP = CPU_PREV_EIP; + if (CPU_STATSAVE.cpu_stat.backout_sp) + CPU_ESP = CPU_PREV_ESP; errorp = 1; break; @@ -123,12 +136,6 @@ exception(int num, int error_code) break; } - if (CPU_STATSAVE.cpu_stat.backout_sp) { - VERBOSE(("exception: restore stack pointer.")); - CPU_ESP = CPU_PREV_ESP; - } - CPU_STATSAVE.cpu_stat.backout_sp = 0; - if (CPU_STAT_EXCEPTION_COUNTER >= 2) { if (dftable[exctype[CPU_STAT_PREV_EXCEPTION]][exctype[num]]) { num = DF_EXCEPTION; @@ -140,7 +147,7 @@ exception(int num, int error_code) VERBOSE(("exception: ---------------------------------------------------------------- end")); - interrupt(num, 0, errorp, error_code); + interrupt(num, INTR_TYPE_EXTINTR, errorp, error_code); #if defined(IA32_SUPPORT_DEBUG_REGISTER) if (num != BP_EXCEPTION) { if (CPU_INST_OP32) { @@ -153,22 +160,22 @@ exception(int num, int error_code) } /* - * ¡¦¥¦¡£¥·¡¦ö£¥ò¡¦¥¤¡£¥·¡¦¥Í¡£¥ò¡¦¥Ì¡¦¡×¡¦¥±¡¦¥Ã¡¦ô§¥é¡¦¥½ + * å⥦å㥷å㥩å㥵å⥤å㥷åã°å¦½åã®å¤¥å⥱åâ¥Ãå㥧åãÎå¤Á * * 31 16 15 14 13 12 8 7 5 4 0 * +------------------------------------+--+-----+----------+-----+---------+ - * | ¡¦¥§¡¦¥æ¡¦¥µ¡¦¥Æ¡¦¥Í 31..16 | P| DPL | 0 D 1 0 0|0 0 0|¡¦¥©¡¦¥ò¡¦ó¥| 4 + * | ¥ª¥Õ¥»¥Ã¥È 31..16 | P| DPL | 0 D 1 0 0|0 0 0|¥«¥¦¥ó¥È | 4 * +------------------------------------+--+-----+----------+-----+---------+ * 31 16 15 0 * +------------------------------------+-----------------------------------+ - * | ¥»¥°¥á¥ó¥È¡¦¥»¥ì¥¯¥¿ | ¥ª¥Õ¥»¥Ã¥È 15..0 | 0 + * | å⥵å⡼åã¡£å㥦åã°å¦½å⥵åã¥ãåâ¥Ãå⥽ | å⥧åãÊ夽åã¦å¥è 15..0 | 0 * +------------------------------------+-----------------------------------+ */ /* - * ¥¦è¦ô»¡¬¡¦¥Ì¡¦¡×¡¦¥±¡¦¥Ã¡¦ô§¥é¡¦¥½ + * é饤åâ´ê¥»¥·å᥽åã®å¤¥å⥱åâ¥Ãå㥧åãÎå¤Á *-- - * ¡¦¥½¡¦¥±¡¦¥Ã¡£¥ò¡¦¥¤¡£¥·¡¦¥Í + * å⥽å⥱åâ¥Ãå㥵å⥤å㥷å㊠* * 31 16 15 14 13 12 8 7 0 * +------------------------------------+--+-----+----------+---------------+ @@ -176,42 +183,42 @@ exception(int num, int error_code) * +------------------------------------+--+-----+----------+---------------+ * 31 16 15 0 * +------------------------------------+-----------------------------------+ - * | TSS ¥»¥°¥á¥ó¥È¡¦¥»¥ì¥¯¥¿ | Reserved | 0 + * | TSS å⥵å⡼åã¡£å㥦åã°å¦½å⥵åã¥ãåâ¥Ãå⥽ | Reserved | 0 * +------------------------------------+-----------------------------------+ *-- - * ¥¦è¦ô»+ * ³ä¤ê¹þ¤ß¡¦¥²¡¼¥È * * 31 16 15 14 13 12 8 7 5 4 0 * +------------------------------------+--+-----+----------+-----+---------+ - * | ¡¦¥§¡¦¥æ¡¦¥µ¡¦¥Æ¡¦¥Í 31..16 | P| DPL | 0 D 1 1 0|0 0 0|Reserved | 4 + * | å⥧åãÊ夽åã¦å¥è 31..16 | P| DPL | 0 D 1 1 0|0 0 0|Reserved | 4 * +------------------------------------+--+-----+----------+-----+---------+ * 31 16 15 0 * +------------------------------------+-----------------------------------+ - * | ¡¦¥µ¡¦¡¼¡¦â§ó¥È¡¦¥»¥ì¥¯¥ | ¥ª¥Õ¥»¥Ã¥È 15..0 | 0 + * | å⥵å⡼åã¡£å㥦åã°å¦½å⥵åã¥ãåâ¥Ãå⥽ | å⥧åãÊ夽åã¦å¥è 15..0 | 0 * +------------------------------------+-----------------------------------+ *-- - * ¡¦¥Í¡¦ò§¥Æ¡¦¥é¡£¥ò¡¦¥¤¡£¥·¡¦¥Í + * åã°å¦«åã¦å¥÷å㥵å⥤å㥷å㊠* * 31 16 15 14 13 12 8 7 5 4 0 * +------------------------------------+--+-----+----------+-----+---------+ - * | ¥ª¥Õ¥»¥Ã¥È 31..16 | P| DPL | 0 D 1 1 1|0 0 0|Reserved | 4 + * | å⥧åãÊ夽åã¦å¥è 31..16 | P| DPL | 0 D 1 1 1|0 0 0|Reserved | 4 * +------------------------------------+--+-----+----------+-----+---------+ * 31 16 15 0 * +------------------------------------+-----------------------------------+ - * | ¡¦¥µ¡¦¡¼¡¦â§ü§¥Í¡£¥ò¡¦¥µ¡¦ø§¥Ã¡¦¥½ | ¡¦¥§¡¦¥æ¡¦¥µ¡¦¥Æ¡¦¥Í 15..0 | 0 + * | å⥵å⡼åã¡£å㥦åã°å¦½å⥵åã¥ãåâ¥Ãå⥽ | å⥧åãÊ夽åã¦å¥è 15..0 | 0 * +------------------------------------+-----------------------------------+ *-- - * DPL : ¡¦¥Ì¡¦¡×¡¦¥±¡¦¥Ã¡¦ô§¥é¡¦¥½¥Ë¥Æ¥¯¡Ö¡¦ø§¥ë¡¦- * ¥ª¥Õ¥»¥Ã¥È : ¥×¥í¥·¡¼¥¸¥ã¡¦¥¨¥ó¥È¥ê¡¦¥Ý¥¤¥ó¥È¤Þ¤Ç¤Î¥ª¥Õ¥»¥Ã¥È - * P : ¥»¥°¥á¥ó¥È¸ºß¥Õ¥é¥° - * ¥»¥ì¥¯¥¿ : ¥Ç¥£¥¹¥Æ¥£¥Í¡¼¥·¥ç¥ó¡¦¥³¡¼¥É¡¦¥»¥°¥á¥ó¥È¤Î¥»¥°¥á¥ó¥È¡¦¥»¥ì¥¯¥¿ - * D : ¥²¡¼¥È¤Î¥µ¥¤¥º¡¥0 = 16 bit, 1 = 32 bit + * DPL : ¥Ç¥£¥¹¥¯¥ê¥×¥¿Æø¢¥ì¥Ù¥ë + * ¥ª¥Õ¥»¥Ã¥È : ¥×¥í¥·¡¼¥¸¥ã¡¦¥¨¥ó¥È¥ê¡¦¥Ý¥¤¥ó¥È¤Þ¤Ç¤Î¥ª¥Õ¥»¥Ã¥È + * P : ¥»¥°¥á¥ó¥È¸ºß¥Õ¥é¥° + * ¥»¥ì¥¯¥¿ : ¥Ç¥£¥¹¥Æ¥£¥Í¡¼¥·¥ç¥ó¡¦¥³¡¼¥É¡¦¥»¥°¥á¥ó¥È¤Î¥»¥°¥á¥ó¥È¡¦¥»¥ì¥¯¥¿ + * D : ¥²¡¼¥È¤Î¥µ¥¤¥º¡¥0 = 16 bit, 1 = 32 bit */ -static void interrupt_task_gate(const descriptor_t *gsdp, int intrtype, int errorp, int error_code); -static void interrupt_intr_or_trap(const descriptor_t *gsdp, int intrtype, int errorp, int error_code); +static void CPUCALL interrupt_task_gate(const descriptor_t *gsdp, int intrtype, int errorp, int error_code); +static void CPUCALL interrupt_intr_or_trap(const descriptor_t *gsdp, int intrtype, int errorp, int error_code); -void +void CPUCALL interrupt(int num, int intrtype, int errorp, int error_code) { descriptor_t gsd; @@ -222,6 +229,8 @@ interrupt(int num, int intrtype, int err VERBOSE(("interrupt: num = 0x%02x, intrtype = %s, errorp = %s, error_code = %08x", num, intrtype ? "on" : "off", errorp ? "on" : "off", error_code)); + CPU_SET_PREV_ESP(); + if (!CPU_STAT_PM) { /* real mode */ CPU_WORKCLOCK(20); @@ -233,6 +242,7 @@ interrupt(int num, int intrtype, int err } if ((intrtype == INTR_TYPE_EXTINTR) && CPU_STAT_HLT) { + VERBOSE(("interrupt: reset HTL in real mode")); CPU_EIP++; CPU_STAT_HLT = 0; } @@ -258,7 +268,7 @@ interrupt(int num, int intrtype, int err #if defined(DEBUG) if (num == 0x80) { /* Linux, FreeBSD, NetBSD, OpenBSD system call */ - VERBOSE(("interrupt: syscall no = %d\n%s", CPU_EAX, cpu_reg2str())); + VERBOSE(("interrupt: syscall# = %d\n%s", CPU_EAX, cpu_reg2str())); } #endif @@ -279,10 +289,6 @@ interrupt(int num, int intrtype, int err VERBOSE(("interrupt: gate descripter is invalid.")); EXCEPTION(GP_EXCEPTION, exc_errcode); } - if (!SEG_IS_PRESENT(&gsd)) { - VERBOSE(("interrupt: gate descriptor is not present.")); - EXCEPTION(GP_EXCEPTION, exc_errcode); - } if (!SEG_IS_SYSTEM(&gsd)) { VERBOSE(("interrupt: gate descriptor is not system segment.")); EXCEPTION(GP_EXCEPTION, exc_errcode); @@ -302,18 +308,19 @@ interrupt(int num, int intrtype, int err break; } - if (gsd.dpl < CPU_STAT_CPL) { - VERBOSE(("interrupt: gate DPL(%d) < CPL(%d)", gsd.dpl, CPU_STAT_CPL)); + /* 5.10.1.1. Îã³°¡¿³ä¤ê¹þ¤ß¥Ï¥ó¥É¥é¡¦¥×¥í¥·¡¼¥¸¥ã¤ÎÊݸî */ + if ((intrtype != INTR_TYPE_EXTINTR) && (gsd.dpl < CPU_STAT_CPL)) { + VERBOSE(("interrupt: intrtype(%d) && DPL(%d) < CPL(%d)", intrtype, gsd.dpl, CPU_STAT_CPL)); EXCEPTION(GP_EXCEPTION, exc_errcode); } - /* 5.10.1.1. Îã³°¡¿³ä¤ê¹þ¤ß¥Ï¥ó¥É¥é¡¦¥×¥í¥·¡¼¥¸¥ã¤ÎÊݸî */ - if ((intrtype != INTR_TYPE_EXTINTR) && (gsd.dpl < CPU_STAT_CPL)) { - VERBOSE(("interrupt: intrtype && DPL(%d) < CPL(%d)", gsd.dpl, CPU_STAT_CPL)); - EXCEPTION(GP_EXCEPTION, exc_errcode); + if (!SEG_IS_PRESENT(&gsd)) { + VERBOSE(("interrupt: gate descriptor is not present.")); + EXCEPTION(NP_EXCEPTION, exc_errcode); } - if (!intrtype && CPU_STAT_HLT) { + if ((intrtype == INTR_TYPE_EXTINTR) && CPU_STAT_HLT) { + VERBOSE(("interrupt: reset HTL in protected mode")); CPU_EIP++; CPU_STAT_HLT = 0; } @@ -337,9 +344,11 @@ interrupt(int num, int intrtype, int err VERBOSE(("interrupt: ---------------------------------------------------------------- end")); } + + CPU_CLEAR_PREV_ESP(); } -static void +static void CPUCALL interrupt_task_gate(const descriptor_t *gsdp, int intrtype, int errorp, int error_code) { selector_t task_sel; @@ -347,8 +356,6 @@ interrupt_task_gate(const descriptor_t * VERBOSE(("interrupt: TASK-GATE")); - (void)intrtype; - rv = parse_selector(&task_sel, gsdp->u.gate.selector); if (rv < 0 || task_sel.ldt || !SEG_IS_SYSTEM(&task_sel.desc)) { VERBOSE(("interrupt: parse_selector (selector = %04x, rv = %d, %cDT, type = %s)", gsdp->u.gate.selector, rv, task_sel.ldt ? 'L' : 'G', task_sel.desc.s ? "code/data" : "system")); @@ -379,12 +386,20 @@ interrupt_task_gate(const descriptor_t * task_switch(&task_sel, TASK_SWITCH_INTR); + CPU_SET_PREV_ESP(); + if (errorp) { XPUSH0(error_code); } + + /* out of range */ + if (CPU_EIP > CPU_STAT_CS_LIMIT) { + VERBOSE(("interrupt: new_ip is out of range. new_ip = %08x, limit = %08x", CPU_EIP, CPU_STAT_CS_LIMIT)); + EXCEPTION(GP_EXCEPTION, 0); + } } -static void +static void CPUCALL interrupt_intr_or_trap(const descriptor_t *gsdp, int intrtype, int errorp, int error_code) { selector_t cs_sel, ss_sel; @@ -426,7 +441,7 @@ interrupt_intr_or_trap(const descriptor_ break; } - exc_errcode = cs_sel.idx; + exc_errcode = gsdp->u.gate.selector & ~3; if (intrtype == INTR_TYPE_EXTINTR) exc_errcode++; @@ -580,7 +595,7 @@ interrupt_intr_or_trap(const descriptor_ EXCEPTION(GP_EXCEPTION, exc_errcode); } if (!SEG_IS_CONFORMING_CODE(&cs_sel.desc) && (cs_sel.desc.dpl != CPU_STAT_CPL)) { - VERBOSE(("interrupt: %sCONFORMING-CODE-SEGMENT(%s) && DPL[CS](%d) != CPL", SEG_IS_CONFORMING_CODE(&cs_sel.desc) ? "" : "NON-", cs_sel.desc.dpl, CPU_STAT_CPL)); + VERBOSE(("interrupt: %sCONFORMING-CODE-SEGMENT(%d) && DPL[CS](%d) != CPL", SEG_IS_CONFORMING_CODE(&cs_sel.desc) ? "" : "NON-", cs_sel.desc.dpl, CPU_STAT_CPL)); EXCEPTION(GP_EXCEPTION, exc_errcode); }