Module Name: src
Committed By: christos
Date: Thu Oct 17 21:15:00 UTC 2013
Modified Files:
src/sys/external/bsd/drm/dist/shared-core: mach64_drv.h mach64_state.c
Log Message:
define a new macro that does not declare variables used in output.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/sys/external/bsd/drm/dist/shared-core/mach64_drv.h
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/sys/external/bsd/drm/dist/shared-core/mach64_state.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm/dist/shared-core/mach64_drv.h
diff -u src/sys/external/bsd/drm/dist/shared-core/mach64_drv.h:1.5 src/sys/external/bsd/drm/dist/shared-core/mach64_drv.h:1.6
--- src/sys/external/bsd/drm/dist/shared-core/mach64_drv.h:1.5 Thu Feb 24 02:59:44 2011
+++ src/sys/external/bsd/drm/dist/shared-core/mach64_drv.h Thu Oct 17 17:15:00 2013
@@ -697,9 +697,12 @@ mach64_update_ring_snapshot(drm_mach64_p
* queuing the buffer in the ring.
*/
-#define DMALOCALS \
+#define DMALOCALS_NOOUT \
drm_mach64_freelist_t *_entry = NULL; \
- struct drm_buf *_buf = NULL; \
+ struct drm_buf *_buf = NULL
+
+#define DMALOCALS \
+ DMALOCALS_NOOUT; \
u32 *_buf_wptr; int _outcount
#define GETBUFPTR( __buf ) \
@@ -735,8 +738,12 @@ static __inline__ int mach64_find_pendin
return 0;
}
+#define DMASETPTR_NOOUT( _p ) \
+ _buf = (_p)
+
#define DMASETPTR( _p ) \
do { \
+ DMASETPTR_NOOUT( _p ); \
_buf = (_p); \
_outcount = 0; \
_buf_wptr = GETBUFPTR( _buf ); \
Index: src/sys/external/bsd/drm/dist/shared-core/mach64_state.c
diff -u src/sys/external/bsd/drm/dist/shared-core/mach64_state.c:1.1.1.1 src/sys/external/bsd/drm/dist/shared-core/mach64_state.c:1.2
--- src/sys/external/bsd/drm/dist/shared-core/mach64_state.c:1.1.1.1 Sat Jul 19 01:30:41 2008
+++ src/sys/external/bsd/drm/dist/shared-core/mach64_state.c Thu Oct 17 17:15:00 2013
@@ -560,7 +560,7 @@ static int mach64_dma_dispatch_vertex(st
int i = 0;
int done = 0;
int verify_ret = 0;
- DMALOCALS;
+ DMALOCALS_NOOUT;
DRM_DEBUG("buf=%p used=%lu nbox=%d\n",
buf, used, sarea_priv->nbox);
@@ -587,7 +587,7 @@ static int mach64_dma_dispatch_vertex(st
copy_buf->used = used;
- DMASETPTR(copy_buf);
+ DMASETPTR_NOOUT(copy_buf);
if (sarea_priv->dirty & ~MACH64_UPLOAD_CLIPRECTS) {
ret = mach64_emit_state(file_priv, dev_priv);
