head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.42
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.40
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.38
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.36
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.34
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.32
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.30
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.28
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.26
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.24
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.22
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.20
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.18
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.16
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.14
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.12
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.10
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.8
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.2.0.6
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.4
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.2.0.2
	pkgsrc-2005Q2-base:1.2
	pkgsrc-2005Q1:1.1.0.2
	pkgsrc-2005Q1-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2005.03.30.00.32.47;	author xtraeme;	state dead;
branches;
next	1.1;

1.1
date	2005.03.14.14.59.36;	author rillig;	state Exp;
branches;
next	;


desc
@@


1.2
log
@mips64emul has been renamed to gxemul.
@
text
@$NetBSD: patch-aa,v 1.1 2005/03/14 14:59:36 rillig Exp $

The author didn't know the offsetof macro.

--- src/bintrans_i386.c.orig	Wed Feb  2 21:12:45 2005
+++ src/bintrans_i386.c	Sat Mar 12 02:17:23 2005
@@@@ -37,6 +37,7 @@@@
  *	ebp		contains cpu->bintrans_instructions_executed
  */
 
+#include <stddef.h>
 
 struct cpu dummy_cpu;
 struct mips_coproc dummy_coproc;
@@@@ -55,9 +56,9 @@@@ static void bintrans_host_cacheinvalidat
 }
 
 
-#define ofs_i		(((size_t)&dummy_cpu.cd.mips.bintrans_instructions_executed) - ((size_t)&dummy_cpu))
-#define ofs_pc		(((size_t)&dummy_cpu.cd.mips.pc) - ((size_t)&dummy_cpu))
-#define ofs_pc_last	(((size_t)&dummy_cpu.cd.mips.pc_last) - ((size_t)&dummy_cpu))
+#define ofs_i		(offsetof(struct cpu, cd.mips.bintrans_instructions_executed))
+#define ofs_pc		(offsetof(struct cpu, cd.mips.pc))
+#define ofs_pc_last	(offsetof(struct cpu, cd.mips.pc_last))
 
 
 unsigned char bintrans_i386_runchunk[41] = {
@@@@ -120,7 +121,7 @@@@ static unsigned char bintrans_i386_jump_
 	 *
 	 *  8b 8e 34 12 00 00       mov    0x1234(%esi),%ecx
 	 */
-#define ofs_tabl0	(((size_t)&dummy_cpu.cd.mips.vaddr_to_hostaddr_table0) - ((size_t)&dummy_cpu))
+#define ofs_tabl0	(offsetof(struct cpu, cd.mips.vaddr_to_hostaddr_table0))
 	0x8b, 0x8e,
 	ofs_tabl0 & 255, (ofs_tabl0 >> 8) & 255, (ofs_tabl0 >> 16) & 255, (ofs_tabl0 >> 24) & 255,
 
@@@@ -147,7 +148,7 @@@@ static unsigned char bintrans_i386_jump_
 	 *
 	 *  8b 8c 19 56 34 12 00    mov    0x123456(%ecx,%ebx,1),%ecx
 	 */
-#define ofs_chunks	((size_t)&dummy_vth32_table.bintrans_chunks[0] - (size_t)&dummy_vth32_table)
+#define ofs_chunks	(offsetof(struct vth32_table, bintrans_chunks[0]))
 	0x8b, 0x8c, 0x19,
 	    ofs_chunks & 255, (ofs_chunks >> 8) & 255, (ofs_chunks >> 16) & 255, (ofs_chunks >> 24) & 255,
 
@@@@ -182,7 +183,7 @@@@ static unsigned char bintrans_i386_jump_
 
 	/*  03 86 78 56 34 12       add    0x12345678(%esi),%eax  */
 	/*  ff e0                   jmp    *%eax  */
-#define ofs_chunkbase	((size_t)&dummy_cpu.cd.mips.chunk_base_address - (size_t)&dummy_cpu)
+#define ofs_chunkbase	(offsetof(struct cpu, cd.mips.chunk_base_address))
 	0x03, 0x86,
 	    ofs_chunkbase & 255, (ofs_chunkbase >> 8) & 255, (ofs_chunkbase >> 16) & 255, (ofs_chunkbase >> 24) & 255,
 	0xff, 0xe0
@


1.1
log
@Added a patch that uses the <stddef.h> offsetof macro for constant
expressions. Approved by wiz.
@
text
@d1 1
a1 1
$NetBSD$
@