From owner-freebsd-current@FreeBSD.ORG Mon Jul 28 07:33:25 2003 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 000E737B401 for ; Mon, 28 Jul 2003 07:33:24 -0700 (PDT) Received: from mail.qubesoft.com (gate.qubesoft.com [217.169.36.34]) by mx1.FreeBSD.org (Postfix) with ESMTP id BFF7D43FCB for ; Mon, 28 Jul 2003 07:33:23 -0700 (PDT) (envelope-from dfr@nlsystems.com) Received: from bluebottle.qubesoft.com (bluebottle.qubesoft.com [192.168.1.2]) by mail.qubesoft.com (8.12.9/8.12.6) with ESMTP id h6SEXGX9018875; Mon, 28 Jul 2003 15:33:20 +0100 (BST) (envelope-from dfr@nlsystems.com) Received: from builder02.qubesoft.com (builder02.qubesoft.com [192.168.1.8]) h6SEXFjj030392; Mon, 28 Jul 2003 15:33:15 +0100 (BST) (envelope-from dfr@nlsystems.com) From: Doug Rabson To: Poul-Henning Kamp In-Reply-To: <24666.1058986500@critter.freebsd.dk> References: <24666.1058986500@critter.freebsd.dk> Content-Type: text/plain Message-Id: <1059402794.3977.1.camel@builder02.qubesoft.com> Mime-Version: 1.0 X-Mailer: Ximian Evolution 1.4.0 Date: 28 Jul 2003 15:33:15 +0100 Content-Transfer-Encoding: 7bit cc: current@freebsd.org Subject: Re: Last inline offenders... X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 28 Jul 2003 14:33:25 -0000 The code in mga_stage.c is externally maintained. Its probably not a good idea to edit that one. On Wed, 2003-07-23 at 19:55, Poul-Henning Kamp wrote: > The following patch are my suggestion (already sent to maintainers) > for inlines to remove so we can get under the 2000 limit in GCC on > i386. > > > Index: dev/aic7xxx/aic79xx_inline.h > =================================================================== > RCS file: /home/ncvs/src/sys/dev/aic7xxx/aic79xx_inline.h,v > retrieving revision 1.12 > diff -u -r1.12 aic79xx_inline.h > --- dev/aic7xxx/aic79xx_inline.h 28 Jun 2003 04:43:19 -0000 1.12 > +++ dev/aic7xxx/aic79xx_inline.h 23 Jul 2003 16:37:59 -0000 > @@ -451,7 +451,7 @@ > static __inline void ahd_set_sescb_qoff(struct ahd_softc *ahd, u_int value); > static __inline u_int ahd_get_sdscb_qoff(struct ahd_softc *ahd); > static __inline void ahd_set_sdscb_qoff(struct ahd_softc *ahd, u_int value); > -static __inline u_int ahd_inb_scbram(struct ahd_softc *ahd, u_int offset); > +static u_int ahd_inb_scbram(struct ahd_softc *ahd, u_int offset); > static __inline u_int ahd_inw_scbram(struct ahd_softc *ahd, u_int offset); > static __inline uint32_t > ahd_inl_scbram(struct ahd_softc *ahd, u_int offset); > @@ -664,7 +664,7 @@ > ahd_outb(ahd, SDSCB_QOFF+1, (value >> 8) & 0xFF); > } > > -static __inline u_int > +static u_int > ahd_inb_scbram(struct ahd_softc *ahd, u_int offset) > { > u_int value; > Index: dev/drm/mga_state.c > =================================================================== > RCS file: /home/ncvs/src/sys/dev/drm/mga_state.c,v > retrieving revision 1.6 > diff -u -r1.6 mga_state.c > --- dev/drm/mga_state.c 25 Apr 2003 01:18:46 -0000 1.6 > +++ dev/drm/mga_state.c 23 Jul 2003 18:33:33 -0000 > @@ -71,7 +71,7 @@ > ADVANCE_DMA(); > } > > -static __inline__ void mga_g200_emit_context( drm_mga_private_t *dev_priv ) > +static void mga_g200_emit_context( drm_mga_private_t *dev_priv ) > { > drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv; > drm_mga_context_regs_t *ctx = &sarea_priv->context_state; > @@ -97,7 +97,7 @@ > ADVANCE_DMA(); > } > > -static __inline__ void mga_g400_emit_context( drm_mga_private_t *dev_priv ) > +static void mga_g400_emit_context( drm_mga_private_t *dev_priv ) > { > drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv; > drm_mga_context_regs_t *ctx = &sarea_priv->context_state; > @@ -128,7 +128,7 @@ > ADVANCE_DMA(); > } > > -static __inline__ void mga_g200_emit_tex0( drm_mga_private_t *dev_priv ) > +static void mga_g200_emit_tex0( drm_mga_private_t *dev_priv ) > { > drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv; > drm_mga_texture_regs_t *tex = &sarea_priv->tex_state[0]; > @@ -159,7 +159,7 @@ > ADVANCE_DMA(); > } > > -static __inline__ void mga_g400_emit_tex0( drm_mga_private_t *dev_priv ) > +static void mga_g400_emit_tex0( drm_mga_private_t *dev_priv ) > { > drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv; > drm_mga_texture_regs_t *tex = &sarea_priv->tex_state[0]; > @@ -203,7 +203,7 @@ > ADVANCE_DMA(); > } > > -static __inline__ void mga_g400_emit_tex1( drm_mga_private_t *dev_priv ) > +static void mga_g400_emit_tex1( drm_mga_private_t *dev_priv ) > { > drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv; > drm_mga_texture_regs_t *tex = &sarea_priv->tex_state[1]; > @@ -244,7 +244,7 @@ > ADVANCE_DMA(); > } > > -static __inline__ void mga_g200_emit_pipe( drm_mga_private_t *dev_priv ) > +static void mga_g200_emit_pipe( drm_mga_private_t *dev_priv ) > { > drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv; > unsigned int pipe = sarea_priv->warp_pipe; > @@ -274,7 +274,7 @@ > ADVANCE_DMA(); > } > > -static __inline__ void mga_g400_emit_pipe( drm_mga_private_t *dev_priv ) > +static void mga_g400_emit_pipe( drm_mga_private_t *dev_priv ) > { > drm_mga_sarea_t *sarea_priv = dev_priv->sarea_priv; > unsigned int pipe = sarea_priv->warp_pipe; > Index: dev/drm/r128_state.c > =================================================================== > RCS file: /home/ncvs/src/sys/dev/drm/r128_state.c,v > retrieving revision 1.6 > diff -u -r1.6 r128_state.c > --- dev/drm/r128_state.c 25 Apr 2003 01:18:46 -0000 1.6 > +++ dev/drm/r128_state.c 23 Jul 2003 18:33:33 -0000 > @@ -98,7 +98,7 @@ > ADVANCE_RING(); > } > > -static __inline__ void r128_emit_context( drm_r128_private_t *dev_priv ) > +static void r128_emit_context( drm_r128_private_t *dev_priv ) > { > drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; > drm_r128_context_regs_t *ctx = &sarea_priv->context_state; > @@ -140,7 +140,7 @@ > ADVANCE_RING(); > } > > -static __inline__ void r128_emit_masks( drm_r128_private_t *dev_priv ) > +static void r128_emit_masks( drm_r128_private_t *dev_priv ) > { > drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; > drm_r128_context_regs_t *ctx = &sarea_priv->context_state; > @@ -174,7 +174,7 @@ > ADVANCE_RING(); > } > > -static __inline__ void r128_emit_tex0( drm_r128_private_t *dev_priv ) > +static void r128_emit_tex0( drm_r128_private_t *dev_priv ) > { > drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; > drm_r128_context_regs_t *ctx = &sarea_priv->context_state; > @@ -201,7 +201,7 @@ > ADVANCE_RING(); > } > > -static __inline__ void r128_emit_tex1( drm_r128_private_t *dev_priv ) > +static void r128_emit_tex1( drm_r128_private_t *dev_priv ) > { > drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; > drm_r128_texture_regs_t *tex = &sarea_priv->tex_state[1]; > @@ -225,7 +225,7 @@ > ADVANCE_RING(); > } > > -static __inline__ void r128_emit_state( drm_r128_private_t *dev_priv ) > +static void r128_emit_state( drm_r128_private_t *dev_priv ) > { > drm_r128_sarea_t *sarea_priv = dev_priv->sarea_priv; > unsigned int dirty = sarea_priv->dirty; > Index: dev/drm/radeon_state.c > =================================================================== > RCS file: /home/ncvs/src/sys/dev/drm/radeon_state.c,v > retrieving revision 1.6 > diff -u -r1.6 radeon_state.c > --- dev/drm/radeon_state.c 25 Apr 2003 01:18:46 -0000 1.6 > +++ dev/drm/radeon_state.c 23 Jul 2003 18:33:33 -0000 > @@ -41,7 +41,7 @@ > * CP hardware state programming functions > */ > > -static __inline__ void radeon_emit_clip_rect( drm_radeon_private_t *dev_priv, > +static void radeon_emit_clip_rect( drm_radeon_private_t *dev_priv, > drm_clip_rect_t *box ) > { > RING_LOCALS; > @@ -1825,7 +1825,7 @@ > return 0; > } > > -static __inline__ int radeon_emit_scalars( > +static int radeon_emit_scalars( > drm_radeon_private_t *dev_priv, > drm_radeon_cmd_header_t header, > drm_radeon_cmd_buffer_t *cmdbuf ) > @@ -1849,7 +1849,7 @@ > > /* God this is ugly > */ > -static __inline__ int radeon_emit_scalars2( > +static int radeon_emit_scalars2( > drm_radeon_private_t *dev_priv, > drm_radeon_cmd_header_t header, > drm_radeon_cmd_buffer_t *cmdbuf ) > @@ -1871,7 +1871,7 @@ > return 0; > } > > -static __inline__ int radeon_emit_vectors( > +static int radeon_emit_vectors( > drm_radeon_private_t *dev_priv, > drm_radeon_cmd_header_t header, > drm_radeon_cmd_buffer_t *cmdbuf )