Reference the correct gdt[] entry on SMP. Remove the `generation' flag,

and always reload the selectors for every bios call.

2 files changed, 13 insertions, 15 deletions

diff --git a/sys/amd64/amd64/bios.c b/sys/amd64/amd64/bios.c
index 595f6f5..baf2018 100644
--- a/sys/amd64/amd64/bios.c
+++ b/sys/amd64/amd64/bios.c
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: bios.c,v 1.20 1999/08/25 06:44:32 peter Exp $
+ *      $Id: bios.c,v 1.21 1999/08/25 06:56:36 msmith Exp $
  */
 
 /*
@@ -237,7 +237,6 @@ union {
 void
 set_bios_selectors(struct bios_segments *seg, int flags)
 {
-    static u_int curgen = 1;
     struct soft_segment_descriptor ssd = {
 	0,			/* segment base address (overwritten) */
 	0,			/* length (overwritten) */
@@ -248,41 +247,42 @@ set_bios_selectors(struct bios_segments *seg, int flags)
 	1,			/* descriptor size (overwritten) */
 	0			/* granularity == byte units */
     };
+    union descriptor *p_gdt;
 
-    if (seg->generation == curgen)
-	return;
-    if (++curgen == 0)
-	curgen = 1;
-    seg->generation = curgen;
+#ifdef SMP
+    p_gdt = &gdt[cpuid];
+#else
+    p_gdt = gdt;
+#endif
 	
     ssd.ssd_base = seg->code32.base;
     ssd.ssd_limit = seg->code32.limit;
-    ssdtosd(&ssd, &gdt[GBIOSCODE32_SEL].sd);
+    ssdtosd(&ssd, &p_gdt[GBIOSCODE32_SEL].sd);
 
     ssd.ssd_def32 = 0;
     if (flags & BIOSCODE_FLAG) {
 	ssd.ssd_base = seg->code16.base;
 	ssd.ssd_limit = seg->code16.limit;
-	ssdtosd(&ssd, &gdt[GBIOSCODE16_SEL].sd);
+	ssdtosd(&ssd, &p_gdt[GBIOSCODE16_SEL].sd);
     }
 
     ssd.ssd_type = SDT_MEMRWA;
     if (flags & BIOSDATA_FLAG) {
 	ssd.ssd_base = seg->data.base;
 	ssd.ssd_limit = seg->data.limit;
-	ssdtosd(&ssd, &gdt[GBIOSDATA_SEL].sd);
+	ssdtosd(&ssd, &p_gdt[GBIOSDATA_SEL].sd);
     }
 
     if (flags & BIOSUTIL_FLAG) {
 	ssd.ssd_base = seg->util.base;
 	ssd.ssd_limit = seg->util.limit;
-	ssdtosd(&ssd, &gdt[GBIOSUTIL_SEL].sd);
+	ssdtosd(&ssd, &p_gdt[GBIOSUTIL_SEL].sd);
     }
 
     if (flags & BIOSARGS_FLAG) {
 	ssd.ssd_base = seg->args.base;
 	ssd.ssd_limit = seg->args.limit;
-	ssdtosd(&ssd, &gdt[GBIOSARGS_SEL].sd);
+	ssdtosd(&ssd, &p_gdt[GBIOSARGS_SEL].sd);
     }
 }
 
@@ -432,7 +432,6 @@ bios16(struct bios_args *args, char *fmt, ...)
 	}
     }
 
-    args->seg.generation = 0;			/* reload selectors */
     set_bios_selectors(&args->seg, flags);
     bioscall_vector.vec16.offset = (u_short)args->entry;
     bioscall_vector.vec16.segment = GSEL(GBIOSCODE16_SEL, SEL_KPL);
diff --git a/sys/amd64/include/pc/bios.h b/sys/amd64/include/pc/bios.h
index f08d33e..1ea2f92 100644
--- a/sys/amd64/include/pc/bios.h
+++ b/sys/amd64/include/pc/bios.h
@@ -24,7 +24,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *      $Id: bios.h,v 1.4 1999/08/17 07:10:34 msmith Exp $
+ *      $Id: bios.h,v 1.5 1999/08/18 02:20:04 msmith Exp $
  */
 
 /* 
@@ -102,7 +102,6 @@ struct segment_info {
 #define BIOSARGS_FLAG	0x08
 
 struct bios_segments {
-	u_int 	generation;
 	struct	segment_info code32;		/* 32-bit code (mandatory) */
 	struct	segment_info code16;		/* 16-bit code */
 	struct	segment_info data;		/* 16-bit data */