*** sys/i386/isa/icu_vector.s.orig	Mon Mar 27 12:03:51 2006
--- sys/i386/isa/icu_vector.s	Tue Apr 18 15:59:29 2006
***************
*** 121,126 ****
--- 121,132 ----
  	mov	%ax,%es ; \
  	mov	%ax,%fs ; \
  	maybe_extra_ipending ; \
+ 	pushl	%eax		; \
+ 	movw	$1,%eax		; \
+ 	shl	$16,%eax	; \
+ 	movw	$irq_num,%ax	; \
+ 	call	ptstmp		; \
+ 	popl	%eax		; \
  	movb	_imen + IRQ_BYTE(irq_num),%al ; \
  	orb	$IRQ_BIT(irq_num),%al ; \
  	movb	%al,_imen + IRQ_BYTE(irq_num) ; \
***************
*** 141,153 ****
--- 147,177 ----
  	orl	_intr_mask + (irq_num) * 4,%eax ; \
  	movl	%eax,_cpl ; \
  	sti ; \
+ 	pushl	%eax		; \
+ 	movw	$2,%eax		; \
+ 	shl	$16,%eax	; \
+ 	movw	$irq_num,%ax	; \
+ 	call	ptstmp		; \
+ 	popl	%eax		; \
  	call	*_intr_handler + (irq_num) * 4 ; \
+ 	pushl	%eax		; \
+ 	movw	$3,%eax		; \
+ 	shl	$16,%eax	; \
+ 	movw	$irq_num,%ax	; \
+ 	call	ptstmp		; \
+ 	popl	%eax		; \
  	cli ;			/* must unmask _imen and icu atomically */ \
  	movb	_imen + IRQ_BYTE(irq_num),%al ; \
  	andb	$~IRQ_BIT(irq_num),%al ; \
  	movb	%al,_imen + IRQ_BYTE(irq_num) ; \
  	outb	%al,$icu+ICU_IMR_OFFSET ; \
  	sti ;			/* XXX _doreti repeats the cli/sti */ \
+ 	pushl	%eax		; \
+ 	movw	$4,%eax		; \
+ 	shl	$16,%eax	; \
+ 	movw	$irq_num,%ax	; \
+ 	call	ptstmp		; \
+ 	popl	%eax		; \
  	MEXITCOUNT ; \
  	/* We could usually avoid the following jmp by inlining some of */ \
  	/* _doreti, but it's probably better to use less cache. */ \
***************
*** 164,169 ****
--- 188,203 ----
  	addl	$4+4,%esp ; \
  	iret
  
+ 	ALIGN_TEXT 		; \
+ ptstmp:	
+ 	cmpw	$9,%ax		; \
+ 	jnz	3f		; \
+ 	pushl	%eax		; \
+ 	call	_TSTMP		; \
+         add	$4,%esp		; \
+ 3:	; \		
+ 	ret			
+ 	
  MCOUNT_LABEL(bintr)
  	FAST_INTR(0,fastintr0, ENABLE_ICU1)
  	FAST_INTR(1,fastintr1, ENABLE_ICU1)