--- np2/i286c/i286c_mn.c	2003/10/19 14:56:15	1.6
+++ np2/i286c/i286c_mn.c	2003/10/26 06:44:47	1.8
@@ -857,7 +857,7 @@ I286FN _xor_ax_data16(void) {					// 35:
 	WORD_XOR(I286_AX, src);
 }
 
-I286FN _segprefix_ss(void) {					// 36: cs:
+I286FN _segprefix_ss(void) {					// 36: ss:
 
 	SS_FIX = SS_BASE;
 	DS_FIX = SS_BASE;
@@ -1032,7 +1032,7 @@ I286FN _pop_ax(void) REGPOP(I286_AX, 5)	
 I286FN _pop_cx(void) REGPOP(I286_CX, 5)		// 59:	pop		cx
 I286FN _pop_dx(void) REGPOP(I286_DX, 5)		// 5A:	pop		dx
 I286FN _pop_bx(void) REGPOP(I286_BX, 5)		// 5B:	pop		bx
-I286FN _pop_sp(void) REGPOP(I286_SP, 5)		// 5C:	pop		sp
+I286FN _pop_sp(void) SP_POP(I286_SP, 5)		// 5C:	pop		sp
 I286FN _pop_bp(void) REGPOP(I286_BP, 5)		// 5D:	pop		bp
 I286FN _pop_si(void) REGPOP(I286_SI, 5)		// 5E:	pop		si
 I286FN _pop_di(void) REGPOP(I286_DI, 5)		// 5F:	pop		di
@@ -2084,7 +2084,7 @@ I286FN _enter(void) {						// C8:	enter	
 	}
 }
 
-I286FN leave(void) {						// C9:	leave
+I286FN fleave(void) {						// C9:	leave
 
 	I286_WORKCLOCK(5);
 	I286_SP = I286_BP;
@@ -2762,7 +2762,7 @@ const I286OP i286op[] = {
 			_mov_ea8_data8,					// C6:	mov		EA8, DATA8
 			_mov_ea16_data16,				// C7:	mov		EA16, DATA16
 			_enter,							// C8:	enter	DATA16, DATA8
-			leave,							// C9:	leave
+			fleave,							// C9:	leave
 			_ret_far_data16,				// CA:	ret far	DATA16
 			_ret_far,						// CB:	ret far
 			_int_03,						// CC:	int		3
@@ -3108,7 +3108,7 @@ const I286OP i286op_repe[] = {
 			_mov_ea8_data8,					// C6:	mov		EA8, DATA8
 			_mov_ea16_data16,				// C7:	mov		EA16, DATA16
 			_enter,							// C8:	enter	DATA16, DATA8
-			leave,							// C9:	leave
+			fleave,							// C9:	leave
 			_ret_far_data16,				// CA:	ret far	DATA16
 			_ret_far,						// CB:	ret far
 			_int_03,						// CC:	int		3
@@ -3453,7 +3453,7 @@ const I286OP i286op_repne[] = {
 			_mov_ea8_data8,					// C6:	mov		EA8, DATA8
 			_mov_ea16_data16,				// C7:	mov		EA16, DATA16
 			_enter,							// C8:	enter	DATA16, DATA8
-			leave,							// C9:	leave
+			fleave,							// C9:	leave
 			_ret_far_data16,				// CA:	ret far	DATA16
 			_ret_far,						// CB:	ret far
 			_int_03,						// CC:	int		3