np2/i386c/ia32/exception.c - diff

Return to exception.c CVS log

Up to [RetroPC.NET] / np2 / i386c / ia32

Diff for /np2/i386c/ia32/exception.c between versions 1.29 and 1.31

version 1.29, 2011/12/21 16:27:10	version 1.31, 2011/12/23 04:19:43
Line 74 exception(int num, int error_code)	Line 74 exception(int num, int error_code)
#endif	#endif

VERBOSE(("exception: -------------------------------------------------------------- start"));	VERBOSE(("exception: -------------------------------------------------------------- start"));
VERBOSE(("exception: %s, error_code = %x at %04x:%08x", exception_str[num], error_code, CPU_CS, CPU_PREV_EIP));	VERBOSE(("exception: %s, error_code = %x at %04x:%08x, %04x:%08x", exception_str[num], error_code, CPU_CS, CPU_PREV_EIP, CPU_SS, CPU_ESP));
VERBOSE(("%s", cpu_reg2str()));	VERBOSE(("%s", cpu_reg2str()));

CPU_STAT_EXCEPTION_COUNTER_INC();	CPU_STAT_EXCEPTION_COUNTER_INC();
Line 85 exception(int num, int error_code)	Line 85 exception(int num, int error_code)
}	}

switch (num) {	switch (num) {
case DE_EXCEPTION: /* (F) 輪遙巨仿□ */	case DE_EXCEPTION: /* (F) 輪遙巨仿□ */
case DB_EXCEPTION: /* (F/T) 犯田永弘 */	case DB_EXCEPTION: /* (F/T) 犯田永弘 */
case BR_EXCEPTION: /* (F) BOUND 及＇區陸 */	case BR_EXCEPTION: /* (F) BOUND 及＇區陸 */
case UD_EXCEPTION: /* (F) 拑躲左矢戊□玉 */	case UD_EXCEPTION: /* (F) 拑躲左矢戊□玉 */
case NM_EXCEPTION: /* (F) 犯田奶旦銀迕尕第 (FPU 互拑中) */	case NM_EXCEPTION: /* (F) 犯田奶旦銀迕尕第 (FPU 互拑中) */
case MF_EXCEPTION: /* (F) 忏⑹凝醒鰾巨仿□ */	case MF_EXCEPTION: /* (F) 忏⑹凝醒鰾巨仿□ */
CPU_EIP = CPU_PREV_EIP;	CPU_EIP = CPU_PREV_EIP;
if (CPU_STATSAVE.cpu_stat.backout_sp)	if (CPU_STATSAVE.cpu_stat.backout_sp)
CPU_ESP = CPU_PREV_ESP;	CPU_ESP = CPU_PREV_ESP;
/FALLTHROUGH/	/FALLTHROUGH/
case NMI_EXCEPTION: /* (I) NMI 喃曰慇心 */	case NMI_EXCEPTION: /* (I) NMI 喃曰慇心 */
case BP_EXCEPTION: /* (T) 皮伊□弁禾奶件玄 */	case BP_EXCEPTION: /* (T) 皮伊□弁禾奶件玄 */
case OF_EXCEPTION: /* (T) 左□田□白伕□ */	case OF_EXCEPTION: /* (T) 左□田□白伕□ */
errorp = 0;	errorp = 0;
break;	break;

case DF_EXCEPTION: /* (A) ’正’亥’鬺交’孕’鬺生 (errcode: 0) */	case DF_EXCEPTION: /* (A) 樍c怒押�(errcode: 0) */
errorp = 1;	errorp = 1;
error_code = 0;	error_code = 0;
break;	break;

case AC_EXCEPTION: /* (F) 失仿奶件丟件玄民尼永弁 (errcode: 0) */	case AC_EXCEPTION: /* (F) 槻＞樍孕槻﹜樍它樍﹝樍它樍啣丟槻央樍血仃 (errcode: 0) */
error_code = 0;	error_code = 0;
/FALLTHROUGH/	/FALLTHROUGH/
case TS_EXCEPTION: /* (F) 白左弁TSS (errcode) */	case TS_EXCEPTION: /* (F) 拑躲 TSS (errcode) */
case NP_EXCEPTION: /* (F) ’扔’□’漰韞�埏(errcode) */	case NP_EXCEPTION: /* (F) 本弘丟件玄尕箕 (errcode) */
case SS_EXCEPTION: /* (F) 旦正永弁本弘丟件玄白巧伙玄 (errcode) */	case SS_EXCEPTION: /* (F) 旦正永弁本弘丟件玄白巧伙玄 (errcode) */
case GP_EXCEPTION: /* (F) 域�忡賃拺陸 (errcode) */	case GP_EXCEPTION: /* (F) 域�忡賃拺陸 (errcode) */
case PF_EXCEPTION: /* (F) 矢□斥白巧伙玄 (errcode) */	case PF_EXCEPTION: /* (F) 矢□斥白巧伙玄 (errcode) */
CPU_EIP = CPU_PREV_EIP;	CPU_EIP = CPU_PREV_EIP;
if (CPU_STATSAVE.cpu_stat.backout_sp)	if (CPU_STATSAVE.cpu_stat.backout_sp)
CPU_ESP = CPU_PREV_ESP;	CPU_ESP = CPU_PREV_ESP;
Line 149 exception(int num, int error_code)	Line 149 exception(int num, int error_code)
}	}

/*	/*
* ’它﹝扑’鬕仲’奶﹝扑’生﹝仲’甘’＝’弗’永’籈仿’末	* 槻它樍扑樍巧樍扔槻奶樍扑樍啣汗樍桀丰槻弗槻永樍尼樍拻切
*	*
* 31 16 15 14 13 12 8 7 5 4 0	* 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	* 31 16 15 0
* +------------------------------------+-----------------------------------+	* +------------------------------------+-----------------------------------+
* \| 本弘丟件玄’本伊弁正 \| 左白本永玄 15..0 \| 0	* \| 槻扔槻□樍﹝樍它樍啣汗槻扔樍乓槻永槻末 \| 槻尼樍忴公樍血亥 15..0 \| 0
* +------------------------------------+-----------------------------------+	* +------------------------------------+-----------------------------------+
*/	*/

/*	/*
* 它閬藾′’甘’＝’弗’永’籈仿’末	* 澭奶槻湊本扑槦末樍桀丰槻弗槻永樍尼樍拻切
*--	*--
* ’末’弗’永﹝仲’奶﹝扑’生	* 槻末槻弗槻永樍扔槻奶樍扑樍� *
* 31 16 15 14 13 12 8 7 0	* 31 16 15 14 13 12 8 7 0
* +------------------------------------+--+-----+----------+---------------+	* +------------------------------------+--+-----+----------+---------------+
Line 172 exception(int num, int error_code)	Line 172 exception(int num, int error_code)
* +------------------------------------+--+-----+----------+---------------+	* +------------------------------------+--+-----+----------+---------------+
* 31 16 15 0	* 31 16 15 0
* +------------------------------------+-----------------------------------+	* +------------------------------------+-----------------------------------+
* \| TSS 本弘丟件玄’本伊弁正 \| Reserved \| 0	* \| TSS 槻扔槻□樍﹝樍它樍啣汗槻扔樍乓槻永槻末 \| Reserved \| 0
* +------------------------------------+-----------------------------------+	* +------------------------------------+-----------------------------------+
*--	*--
* 它閬藾+ * 喃曰慇心’必□玄
*	*
* 31 16 15 14 13 12 8 7 5 4 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	* 31 16 15 0
* +------------------------------------+-----------------------------------+	* +------------------------------------+-----------------------------------+
* \| ’扔’□’漰韞龰戎誑鴠砲 \| 左白本永玄 15..0 \| 0	* \| 槻扔槻□樍﹝樍它樍啣汗槻扔樍乓槻永槻末 \| 槻尼樍忴公樍血亥 15..0 \| 0
* +------------------------------------+-----------------------------------+	* +------------------------------------+-----------------------------------+
*--	*--
* ’生’穨氾’仿﹝仲’奶﹝扑’生	* 樍啣托樍血份樍扔槻奶樍扑樍� *
* 31 16 15 14 13 12 8 7 5 4 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	* 31 16 15 0
* +------------------------------------+-----------------------------------+	* +------------------------------------+-----------------------------------+
* \| ’扔’□’漰𢦀生﹝仲’扔’孎永’末 \| ’尼’交’扔’氾’生 15..0 \| 0	* \| 槻扔槻□樍﹝樍它樍啣汗槻扔樍乓槻永槻末 \| 槻尼樍忴公樍血亥 15..0 \| 0
* +------------------------------------+-----------------------------------+	* +------------------------------------+-----------------------------------+
*--	*--
* DPL : ’甘’＝’弗’永’籈仿’末瓦氾弁＞’孎伙’- * 左白本永玄 : 皿伕扑□斥乓’巨件玄伉’禾奶件玄引匹及左白本永玄	* DPL : 犯奴旦弁伉皿正冂腺伊矛伙
* P : 本弘丟件玄繡箕白仿弘	* 左白本永玄 : 皿伕扑□斥乓’巨件玄伉’禾奶件玄引匹及左白本永玄
* 本伊弁正 : 犯奴旦氾奴生□扑亦件’戊□玉’本弘丟件玄及本弘丟件玄’本伊弁正	* P : 本弘丟件玄繡箕白仿弘
* D : 必□玄及扔奶朮‘0 = 16 bit, 1 = 32 bit	* 本伊弁正 : 犯奴旦氾奴生□扑亦件’戊□玉’本弘丟件玄及本弘丟件玄’本伊弁正
	* 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_task_gate(const descriptor_t *gsdp, int intrtype, int errorp, int error_code);
Line 297 interrupt(int num, int intrtype, int err	Line 297 interrupt(int num, int intrtype, int err
break;	break;
}	}

/* 5.10.1.1. 拺陸▼喃曰慇心甩件玉仿’皿伕扑□斥乓及忡賃 */	/* 5.10.1.1. 靘▼喃曰慇心甩件玉仿’皿伕扑□斥乓及忡賃 */
if ((intrtype != INTR_TYPE_EXTINTR) && (gsd.dpl < CPU_STAT_CPL)) {	if ((intrtype != INTR_TYPE_EXTINTR) && (gsd.dpl < CPU_STAT_CPL)) {
VERBOSE(("interrupt: intrtype(%d) && DPL(%d) < CPL(%d)", intrtype, gsd.dpl, CPU_STAT_CPL));	VERBOSE(("interrupt: intrtype(%d) && DPL(%d) < CPL(%d)", intrtype, gsd.dpl, CPU_STAT_CPL));
EXCEPTION(GP_EXCEPTION, exc_errcode);	EXCEPTION(GP_EXCEPTION, exc_errcode);

RetroPC.NET-CVS <cvs@retropc.net>

Removed from v.1.29
changed lines
	Added in v.1.31