Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 9 May 1997 04:33:55 +0200 (MET DST)
From:      Eivind Eklund <perhaps@yes.no>
To:        peter@freebsd.org, current@freebsd.org
Subject:   -current kernel breakage
Message-ID:  <199705090233.EAA00875@bitbox.follo.net>

next in thread | raw e-mail | index | archive | help
(Resent due to typo - should go to -current, too)

The following commit seems breaks src/sys/i386/i386/math_emulate.h

1.8 Wed May 7 19:55:13 1997 by peter 
CVS Tags: HEAD
Diffs to 1.7 

Convert md_regs from an int[] to a struct trapframe *.  It simplifies
some code.

===================================================================
RCS file: /home/ncvs/src/sys/i386/include/proc.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -p -u -r1.7 -r1.8
--- src/sys/i386/include/proc.h 1997/02/22 09:34:59     1.7
+++ /home/ncvs/src/sys/i386/include/proc.h      1997/05/07 19:55:13     1.8
@@ -31,20 +31,17 @@
  * SUCH DAMAGE.
  *
  *     from: @(#)proc.h        7.1 (Berkeley) 5/15/91
- *     $Id: proc.h,v 1.7 1997/02/22 09:34:59 peter Exp $
+ *     $Id: proc.h,v 1.8 1997/05/07 19:55:13 peter Exp $
  */
 
 #ifndef _MACHINE_PROC_H_
-#define _MACHINE_PROC_H_ 1
+#define        _MACHINE_PROC_H_
 
 /*
  * Machine-dependent part of the proc structure for i386.
  */
 struct mdproc {
-       int     md_flags;               /* machine-dependent flags */
-       int     *md_regs;               /* registers on current frame */
+       struct trapframe *md_regs;      /* registers on current frame */
 };
 
-/* md_flags */
-#define        MDP_AST         0x0001  /* async trap pending */
-#endif /* _MACHINE_PROC_H_ */
+#endif /* !_MACHINE_PROC_H_ */

The following patch fix it, but I'm not certain whether that or a
further rewrite of math_emulate is the best way to go.

--- ../../i386/i386/math_emulate.c.orig	Fri May  9 04:20:05 1997
+++ ../../i386/i386/math_emulate.c	Fri May  9 04:22:48 1997
@@ -613,7 +613,7 @@
 	tEAX, tECX, tEDX, tEBX, tESP, tEBP, tESI, tEDI
 };
 
-#define REG(x) (curproc->p_md.md_regs[__regoffset[(x)]])
+#define REG(x) (((int*)curproc->p_md.md_regs)[__regoffset[(x)]])
 
 static char *
 sib(struct trapframe * info, int mod)

Eivind.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199705090233.EAA00875>