[Prev][Next][Index][Thread]

Small fix to OSKit snapshot 20000901



The last snapshot made it out the door with a little bit of code that
causes it to break on 486 class machines; no timestamp register on 486
machines. Anyway, here is a patch to kern/x86/pc/base_irq_inittab.S, which
you can apply by going to your oskit tree and typing "patch < thisdiff".
Or, you can get from the CVS repository.

Lbs

----------------------------------------
Leigh B. Stoller
University of Utah - Flux Research Group
http://www.cs.utah.edu/~stoller
----------------------------------------

Index: kern/x86/pc/base_irq_inittab.S
===================================================================
RCS file: /usr/lsrc/flux/CVS/oskit/kern/x86/pc/base_irq_inittab.S,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** base_irq_inittab.S	2000/08/22 16:46:36	1.24
--- base_irq_inittab.S	2000/09/11 15:16:19	1.25
***************
*** 25,42 ****
  #define TS_EIP	56
  #define TS_CS	60
  
- 	.data
- 	.globl	EXT(interrupt_start_high)
- LEXT(interrupt_start_high)
- 	.long	0
- 	.globl	EXT(interrupt_start_low)
- LEXT(interrupt_start_low)
- 	.long	0
- tmp1:
- 	.long   0
- tmp2:
- 	.long   0
- 
  	.text
  
  /*
--- 25,30 ----
***************
*** 50,62 ****
  	GATE_ENTRY(BASE_IRQ_MASTER_BASE + (num), 0f, ACC_PL_K|ACC_INTR_GATE) ;\
  	P2ALIGN(TEXT_ALIGN)						;\
  0:									;\
- 	movl    %eax,tmp1	;\
- 	movl    %edx,tmp2	;\
- 	rdtsc   ;\
- 	movl    %eax,EXT(interrupt_start_low) ;\
- 	movl    %edx,EXT(interrupt_start_high) ;\
- 	movl    tmp1,%eax	;\
- 	movl    tmp2,%edx	;\
  	pushl	$(irq)			/* error code = irq vector */	;\
  	pushl	$BASE_IRQ_MASTER_BASE + (num)	/* trap number */	;\
  	pusha				/* save general registers */	;\
--- 38,43 ----

References: