Use [u]intptr_t instead of [u_]long for casts between pointers and

integers.  Don't forget to cast to (void *) as well.

6 files changed, 28 insertions, 22 deletions

diff --git a/sys/gnu/i386/fpemul/fpu_entry.c b/sys/gnu/i386/fpemul/fpu_entry.c
index 5d737fd..1d8b44d 100644
--- a/sys/gnu/i386/fpemul/fpu_entry.c
+++ b/sys/gnu/i386/fpemul/fpu_entry.c
@@ -55,7 +55,7 @@
  *
  * W. Metzenthen   June 1994.
  *
- *  $Id: fpu_entry.c,v 1.12 1997/06/14 15:11:03 bde Exp $
+ *  $Id: fpu_entry.c,v 1.13 1997/07/20 08:46:23 bde Exp $
  *
  */
 
@@ -395,7 +395,7 @@ do_another_FPU_instruction:
 
 reg_mem_instr_done:
 
-		data_operand_offset = (unsigned long) FPU_data_address;
+		data_operand_offset = (intptr_t) (void *) FPU_data_address;
 	} else {
 		/* None of these instructions access user memory */
 		unsigned char instr_index = (FPU_modrm & 0x38) | (code & 7);
diff --git a/sys/gnu/i386/fpemul/get_address.c b/sys/gnu/i386/fpemul/get_address.c
index 84ac531..ccaf684 100644
--- a/sys/gnu/i386/fpemul/get_address.c
+++ b/sys/gnu/i386/fpemul/get_address.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id$
+ *     $Id: get_address.c,v 1.6 1997/02/22 09:29:09 peter Exp $
  *
  */
 
@@ -129,7 +129,7 @@ sib(int mod)
 			REENTRANT_CHECK(ON);
 			FPU_EIP += 4;
 		}
-	return (void *) offset;
+	return (void *) (intptr_t) offset;
 }
 
 
@@ -175,9 +175,8 @@ get_address(unsigned char FPU_modrm)
 			FPU_data_address = (void *) offset;
 			return;
 		} else {
-			FPU_data_address = (void *) *cpu_reg_ptr;	/* Just return the
-									 * contents of the cpu
-									 * register */
+			/* Just return the contents of the cpu register */
+			FPU_data_address = (void *) (intptr_t) *cpu_reg_ptr;
 			return;
 		}
 	case 1:
@@ -199,5 +198,5 @@ get_address(unsigned char FPU_modrm)
 		EXCEPTION(EX_Invalid);
 	}
 
-	FPU_data_address = offset + (char *) *cpu_reg_ptr;
+	FPU_data_address = (void *) (intptr_t) (offset + *cpu_reg_ptr);
 }
diff --git a/sys/gnu/i386/fpemul/load_store.c b/sys/gnu/i386/fpemul/load_store.c
index 5eee2b4..50eec3e 100644
--- a/sys/gnu/i386/fpemul/load_store.c
+++ b/sys/gnu/i386/fpemul/load_store.c
@@ -57,7 +57,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *    $Id: load_store.c,v 1.10 1997/07/01 00:08:33 bde Exp $
+ *    $Id: load_store.c,v 1.11 1997/08/31 22:22:19 bde Exp $
  *
  */
 
@@ -208,7 +208,8 @@ load_store_instr(char type)
 			control_word |= EX_Underflow;
 		}
 #endif
-		FPU_data_address = (void *) data_operand_offset;	/* We want no net effect */
+		/* We want no net effect: */
+		FPU_data_address = (void *) (intptr_t) data_operand_offset;
 		FPU_entry_eip = ip_offset;	/* We want no net effect */
 		break;
 	case 025:		/* fld m80real */
@@ -223,12 +224,14 @@ load_store_instr(char type)
 		break;
 	case 030:		/* fstenv  m14/28byte */
 		fstenv();
-		FPU_data_address = (void *) data_operand_offset;	/* We want no net effect */
+		/* We want no net effect: */
+		FPU_data_address = (void *) (intptr_t) data_operand_offset;
 		FPU_entry_eip = ip_offset;	/* We want no net effect */
 		break;
 	case 032:		/* fsave */
 		fsave();
-		FPU_data_address = (void *) data_operand_offset;	/* We want no net effect */
+		/* We want no net effect: */
+		FPU_data_address = (void *) (intptr_t) data_operand_offset;
 		FPU_entry_eip = ip_offset;	/* We want no net effect */
 		break;
 	case 033:		/* fbstp m80dec */
@@ -241,7 +244,8 @@ load_store_instr(char type)
 /*		    verify_area(VERIFY_WRITE, FPU_data_address, 2);*/
 		susword( (short *) FPU_data_address,control_word);
 		REENTRANT_CHECK(ON);
-		FPU_data_address = (void *) data_operand_offset;	/* We want no net effect */
+		/* We want no net effect: */
+		FPU_data_address = (void *) (intptr_t ) data_operand_offset;
 		FPU_entry_eip = ip_offset;	/* We want no net effect */
 		break;
 	case 035:		/* fstp m80real */
@@ -256,7 +260,8 @@ load_store_instr(char type)
 /*		    verify_area(VERIFY_WRITE, FPU_data_address, 2);*/
 		susword( (short *) FPU_data_address,status_word);
 		REENTRANT_CHECK(ON);
-		FPU_data_address = (void *) data_operand_offset;	/* We want no net effect */
+		/* We want no net effect: */
+		FPU_data_address = (void *) (intptr_t) data_operand_offset;
 		FPU_entry_eip = ip_offset;	/* We want no net effect */
 		break;
 	case 037:		/* fistp m64int */
diff --git a/sys/gnu/i386/fpemul/reg_ld_str.c b/sys/gnu/i386/fpemul/reg_ld_str.c
index 214e161..bb569b8 100644
--- a/sys/gnu/i386/fpemul/reg_ld_str.c
+++ b/sys/gnu/i386/fpemul/reg_ld_str.c
@@ -56,7 +56,7 @@
  * W. Metzenthen   June 1994.
  *
  *
- *     $Id: reg_ld_str.c,v 1.10 1997/06/14 15:11:05 bde Exp $
+ *     $Id: reg_ld_str.c,v 1.11 1997/08/31 22:22:21 bde Exp $
  *
  */
 
@@ -1195,7 +1195,8 @@ fldenv(void)
 		}
 	}
 
-	FPU_data_address = (void *) data_operand_offset;	/* We want no net effect */
+	/* We want no net effect: */
+	FPU_data_address = (void *) (intptr_t) data_operand_offset;
 	FPU_entry_eip = ip_offset;	/* We want no net effect */
 
 	return s + 0x1c;
@@ -1233,7 +1234,8 @@ frstor(void)
 	control_word = saved_control;
 	status_word = saved_status;
 
-	FPU_data_address = (void *) data_operand_offset;	/* We want no net effect */
+	/* We want no net effect: */
+	FPU_data_address = (void *) (intptr_t) data_operand_offset;
 }
 
 
diff --git a/sys/gnu/i386/isa/dgb.c b/sys/gnu/i386/isa/dgb.c
index 06f1679..9537c12 100644
--- a/sys/gnu/i386/isa/dgb.c
+++ b/sys/gnu/i386/isa/dgb.c
@@ -1,5 +1,5 @@
 /*-
- *  dgb.c $Id: dgb.c,v 1.37 1998/08/12 16:16:10 bde Exp $
+ *  dgb.c $Id: dgb.c,v 1.38 1998/08/12 23:44:22 brian Exp $
  *
  *  Digiboard driver.
  *
@@ -419,7 +419,7 @@ dgbprobe(dev)
 		sc->altpin=0;
 
 	/* left 24 bits only (ISA address) */
-	sc->pmem=((long)dev->id_maddr & 0xFFFFFF); 
+	sc->pmem=((intptr_t)(void *)dev->id_maddr & 0xFFFFFF); 
 	
 	DPRINT4(DB_INFO,"dgb%d: port 0x%x mem 0x%lx\n",unit,sc->port,sc->pmem);
 
@@ -493,7 +493,7 @@ dgbprobe(dev)
 					dev->id_unit, sc->pmem,
 					sc->pmem & 0xFFE000);
 
-				dev->id_maddr= (u_char *)( (long)sc->pmem & 0xFFE000 );
+				dev->id_maddr= (u_char *)(void *)(intptr_t)( sc->pmem & 0xFFE000 );
 			}
 		}
 	}
diff --git a/sys/gnu/i386/isa/dgm.c b/sys/gnu/i386/isa/dgm.c
index c10e403..487b1aa 100644
--- a/sys/gnu/i386/isa/dgm.c
+++ b/sys/gnu/i386/isa/dgm.c
@@ -1,5 +1,5 @@
 /*-
- *	$Id: dgm.c,v 1.2 1998/08/05 20:19:03 brian Exp $
+ *	$Id: dgm.c,v 1.3 1998/08/12 17:38:09 bde Exp $
  *
  *  This driver and the associated header files support the ISA PC/Xem
  *  Digiboards.  Its evolutionary roots are described below.
@@ -392,7 +392,7 @@ dgmprobe(dev)
 		sc->altpin=0;
 
 	/* left 24 bits only (ISA address) */
-	sc->pmem=((long)dev->id_maddr & 0xFFFFFF); 
+	sc->pmem=((intptr_t)(void *)dev->id_maddr & 0xFFFFFF); 
 	
 	DPRINT4(DB_INFO,"dgm%d: port 0x%x mem 0x%lx\n",unit,sc->port,sc->pmem);