--- np2/i386c/ia32/segments.h	2004/02/05 16:43:44	1.6
+++ np2/i386c/ia32/segments.h	2005/03/12 12:32:54	1.10
@@ -1,4 +1,4 @@
-/*	$Id: segments.h,v 1.6 2004/02/05 16:43:44 monaka Exp $	*/
+/*	$Id: segments.h,v 1.10 2005/03/12 12:32:54 monaka Exp $	*/
 
 /*
  * Copyright (c) 2003 NONAKA Kimihiro
@@ -12,8 +12,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -40,37 +38,37 @@ extern "C" {
 typedef struct {
 	union {
 		struct {
-			DWORD	segbase;
-			DWORD	segend;
-			DWORD	limit;
-
-			BYTE	c;	/* 0 = data, 1 = code */
-			BYTE	g;	/* 4k base */
-			BYTE	wr;	/* readable/writable */
-			BYTE	ec;	/* expand down/conforming */
+			UINT32	segbase;
+			UINT32	segend;
+			UINT32	limit;
+
+			UINT8	c;	/* 0 = data, 1 = code */
+			UINT8	g;	/* 4k base */
+			UINT8	wr;	/* readable/writable */
+			UINT8	ec;	/* expand down/conforming */
 		} seg;
 
 		struct {
-			WORD	selector;
-			WORD	w_pad;
-			DWORD	offset;
+			UINT16	selector;
+			UINT16	w_pad;
+			UINT32	offset;
 
-			BYTE	count;		/* parameter count:call gate */
+			UINT8	count;		/* parameter count:call gate */
 
-			BYTE	b_pad[7];
+			UINT8	b_pad[7];
 		} gate;
 	} u;
 
-	BYTE	valid;	/* descriptor valid flag */
-	BYTE	p;	/* avail flag */
+	UINT8	valid;	/* descriptor valid flag */
+	UINT8	p;	/* avail flag */
 
-	BYTE	type;	/* descriptor type */
-	BYTE	dpl;	/* DPL */
-	BYTE	rpl;	/* RPL */
-	BYTE	s;	/* 0 = system, 1 = code/data */
-	BYTE	d;	/* 0 = 16bit, 1 = 32bit */
+	UINT8	type;	/* descriptor type */
+	UINT8	dpl;	/* DPL */
+	UINT8	rpl;	/* RPL */
+	UINT8	s;	/* 0 = system, 1 = code/data */
+	UINT8	d;	/* 0 = 16bit, 1 = 32bit */
 
-	BYTE	flag;
+	UINT8	flag;
 #define	CPU_DESC_FLAG_READABLE	(1 << 0)
 #define	CPU_DESC_FLAG_WRITABLE	(1 << 1)
 } descriptor_t;
@@ -140,10 +138,11 @@ typedef struct {
 
 #define	CPU_SET_SEGDESC_DEFAULT(dscp, idx, selector) \
 do { \
-	(dscp)->u.seg.segbase = (DWORD)(selector) << 4; \
+	(dscp)->u.seg.segbase = (UINT32)(selector) << 4; \
 	(dscp)->u.seg.segend = (dscp)->u.seg.segbase + (dscp)->u.seg.limit; \
 	(dscp)->u.seg.c = ((idx) == CPU_CS_INDEX) ? 1 : 0; \
 	(dscp)->u.seg.g = 0; \
+	(dscp)->u.seg.wr = 1; \
 	(dscp)->valid = 1; \
 	(dscp)->p = 1; \
 	(dscp)->type = 0x02; /* writable */ \
@@ -155,8 +154,8 @@ do { \
 
 #define	CPU_SET_TASK_BUSY(selector, dscp) \
 do { \
-	DWORD addr; \
-	DWORD h; \
+	UINT32 addr; \
+	UINT32 h; \
 	addr = CPU_GDTR_BASE + ((selector) & CPU_SEGMENT_SELECTOR_INDEX_MASK); \
 	h = cpu_kmemoryread_d(addr + 4); \
 	if (!(h & CPU_TSS_H_BUSY)) { \
@@ -170,8 +169,8 @@ do { \
 
 #define	CPU_SET_TASK_FREE(selector, dscp) \
 do { \
-	DWORD addr; \
-	DWORD h; \
+	UINT32 addr; \
+	UINT32 h; \
 	addr = CPU_GDTR_BASE + ((selector) & CPU_SEGMENT_SELECTOR_INDEX_MASK); \
 	h = cpu_kmemoryread_d(addr + 4); \
 	if (h & CPU_TSS_H_BUSY) { \
@@ -183,13 +182,13 @@ do { \
 	} \
 } while (/*CONSTCOND*/ 0)
 
-void load_descriptor(descriptor_t *descp, DWORD addr);
+void load_descriptor(descriptor_t *descp, UINT32 addr);
 
 #define	CPU_SET_SEGREG(idx, selector)	load_segreg(idx, selector, GP_EXCEPTION)
-void load_segreg(int idx, WORD selector, int exc);
-void load_ss(WORD selector, descriptor_t* sdp, DWORD cpl);
-void load_cs(WORD selector, descriptor_t* sdp, DWORD cpl);
-void load_ldtr(WORD selector, int exc);
+void load_segreg(int idx, UINT16 selector, int exc);
+void load_ss(UINT16 selector, const descriptor_t *sd, UINT cpl);
+void load_cs(UINT16 selector, const descriptor_t *sd, UINT cpl);
+void load_ldtr(UINT16 selector, int exc);
 
 
 /*
@@ -200,19 +199,19 @@ void load_ldtr(WORD selector, int exc);
 #define	CPU_SEGMENT_TABLE_IND		(1 << 2)	/* 0 = GDT, 1 = LDT */
 
 typedef struct {
-	WORD		selector;
-	WORD		idx;
-	WORD		rpl;
-	BYTE		ldt;
-	BYTE		pad;
+	UINT16		selector;
+	UINT16		idx;
+	UINT16		rpl;
+	UINT8		ldt;
+	UINT8		pad;
 
-	DWORD		addr;		/* descriptor linear address */
+	UINT32		addr;		/* descriptor linear address */
 
 	descriptor_t	desc;
 } selector_t;
 
-int parse_selector(selector_t *ssp, WORD selector);
-int selector_is_not_present(selector_t *ssp);
+int parse_selector(selector_t *ssp, UINT16 selector);
+int selector_is_not_present(const selector_t *ssp);
 
 #ifdef __cplusplus
 }