Merge commit 'origin/gallium-0.1'

Conflicts:

	src/gallium/auxiliary/draw/draw_vs_aos.c

diff --git a/src/gallium/auxiliary/draw/draw_vs_aos.c b/src/gallium/auxiliary/draw/draw_vs_aos.c
index 46a36af4180825694ecf9ecbd8d9631c6b4bec0d..1fb69ef81ad957332bc7810c1687ddc17982684c 100644 (file)
--- a/src/gallium/auxiliary/draw/draw_vs_aos.c
+++ b/src/gallium/auxiliary/draw/draw_vs_aos.c
@@ -288,6 +288,7 @@ static void aos_soft_release_xmm( struct aos_compilation *cp,
                                   struct x86_reg reg )
 {
    if (reg.file == file_XMM) {
+      assert(cp->xmm[reg.idx].last_used == cp->insn_counter);
       cp->xmm[reg.idx].last_used = cp->insn_counter - 1;
    }
 }