gallium: added comment/annotation support to PPC rtasm

2 files changed, 187 insertions, 62 deletions

diff --git a/src/gallium/auxiliary/rtasm/rtasm_ppc.c b/src/gallium/auxiliary/rtasm/rtasm_ppc.c
index e9015ec2eb8..1bb90262051 100644
--- a/src/gallium/auxiliary/rtasm/rtasm_ppc.c
+++ b/src/gallium/auxiliary/rtasm/rtasm_ppc.c
@@ -1,6 +1,7 @@
 /**************************************************************************
  *
  * Copyright (C) 2008 Tungsten Graphics, Inc.   All Rights Reserved.
+ * Copyright (C) 2009 VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -47,6 +48,8 @@ ppc_init_func(struct ppc_function *p)
 {
    uint i;
 
+   memset(p, 0, sizeof(*p));
+
    p->num_inst = 0;
    p->max_inst = 100; /* first guess at buffer size */
    p->store = rtasm_exec_malloc(p->max_inst * PPC_INST_SIZE);
@@ -54,6 +57,9 @@ ppc_init_func(struct ppc_function *p)
    p->fp_used = 0x0;
    p->vec_used = 0x0;
 
+   p->print = FALSE;
+   p->indent = 0;
+
    /* only allow using gp registers 3..12 for now */
    for (i = 0; i < 3; i++)
       ppc_reserve_register(p, i);
@@ -105,6 +111,42 @@ ppc_dump_func(const struct ppc_function *p)
 }
 
 
+void
+ppc_print_code(struct ppc_function *p, boolean enable)
+{
+   p->print = enable;
+}
+
+
+void
+ppc_indent(struct ppc_function *p, int spaces)
+{
+   p->indent += spaces;
+}
+
+
+static void
+indent(const struct ppc_function *p)
+{
+   int i;
+   for (i = 0; i < p->indent; i++) {
+      putchar(' ');
+   }
+}
+
+
+void
+ppc_comment(struct ppc_function *p, int rel_indent, const char *s)
+{
+   if (p->print) {
+      p->indent += rel_indent;
+      indent(p);
+      p->indent -= rel_indent;
+      printf("# %s\n", s);
+   }
+}
+
+
 /**
  * Mark a register as being unavailable.
  */
@@ -132,6 +174,7 @@ ppc_allocate_register(struct ppc_function *p)
          return i;
       }
    }
+   printf("OUT OF PPC registers!\n");
    return -1;
 }
 
@@ -163,6 +206,7 @@ ppc_allocate_fp_register(struct ppc_function *p)
          return i;
       }
    }
+   printf("OUT OF PPC FP registers!\n");
    return -1;
 }
 
@@ -194,6 +238,7 @@ ppc_allocate_vec_register(struct ppc_function *p)
          return i;
       }
    }
+   printf("OUT OF PPC VEC registers!\n");
    return -1;
 }
 
@@ -252,7 +297,8 @@ union vx_inst {
 };
 
 static INLINE void
-emit_vx(struct ppc_function *p, uint op2, uint vD, uint vA, uint vB)
+emit_vx(struct ppc_function *p, uint op2, uint vD, uint vA, uint vB,
+        const char *format, boolean transpose)
 {
    union vx_inst inst;
    inst.inst.op = 4;
@@ -261,6 +307,13 @@ emit_vx(struct ppc_function *p, uint op2, uint vD, uint vA, uint vB)
    inst.inst.vB = vB;
    inst.inst.op2 = op2;
    emit_instruction(p, inst.bits);
+   if (p->print) {
+      indent(p);
+      if (transpose)
+         printf(format, vD, vB, vA);
+      else
+         printf(format, vD, vA, vB);
+   }
 }
 
 
@@ -277,7 +330,8 @@ union vxr_inst {
 };
 
 static INLINE void
-emit_vxr(struct ppc_function *p, uint op2, uint vD, uint vA, uint vB)
+emit_vxr(struct ppc_function *p, uint op2, uint vD, uint vA, uint vB,
+         const char *format)
 {
    union vxr_inst inst;
    inst.inst.op = 4;
@@ -287,6 +341,10 @@ emit_vxr(struct ppc_function *p, uint op2, uint vD, uint vA, uint vB)
    inst.inst.rC = 0;
    inst.inst.op2 = op2;
    emit_instruction(p, inst.bits);
+   if (p->print) {
+      indent(p);
+      printf(format, vD, vA, vB);
+   }
 }
 
 
@@ -303,7 +361,8 @@ union va_inst {
 };
 
 static INLINE void
-emit_va(struct ppc_function *p, uint op2, uint vD, uint vA, uint vB, uint vC)
+emit_va(struct ppc_function *p, uint op2, uint vD, uint vA, uint vB, uint vC,
+        const char *format)
 {
    union va_inst inst;
    inst.inst.op = 4;
@@ -313,6 +372,10 @@ emit_va(struct ppc_function *p, uint op2, uint vD, uint vA, uint vB, uint vC)
    inst.inst.vC = vC;
    inst.inst.op2 = op2;
    emit_instruction(p, inst.bits);
+   if (p->print) {
+      indent(p);
+      printf(format, vD, vA, vB, vC);
+   }
 }
 
 
@@ -396,7 +459,8 @@ union x_inst {
 };
 
 static INLINE void
-emit_x(struct ppc_function *p, uint op, uint vrs, uint ra, uint rb, uint op2)
+emit_x(struct ppc_function *p, uint op, uint vrs, uint ra, uint rb, uint op2,
+       const char *format)
 {
    union x_inst inst;
    inst.inst.op = op;
@@ -406,6 +470,10 @@ emit_x(struct ppc_function *p, uint op, uint vrs, uint ra, uint rb, uint op2)
    inst.inst.op2 = op2;
    inst.inst.unused = 0x0;
    emit_instruction(p, inst.bits);
+   if (p->print) {
+      indent(p);
+      printf(format, vrs, ra, rb);
+   }
 }
 
 
@@ -420,7 +488,8 @@ union d_inst {
 };
 
 static INLINE void
-emit_d(struct ppc_function *p, uint op, uint rt, uint ra, int si)
+emit_d(struct ppc_function *p, uint op, uint rt, uint ra, int si,
+       const char *format, boolean transpose)
 {
    union d_inst inst;
    assert(si >= -32768);
@@ -430,6 +499,13 @@ emit_d(struct ppc_function *p, uint op, uint rt, uint ra, int si)
    inst.inst.ra = ra;
    inst.inst.si = (unsigned) (si & 0xffff);
    emit_instruction(p, inst.bits);
+   if (p->print) {
+      indent(p);
+      if (transpose)
+         printf(format, rt, si, ra);
+      else
+         printf(format, rt, ra, si);
+   }
 }
 
 
@@ -448,7 +524,7 @@ union a_inst {
 
 static INLINE void
 emit_a(struct ppc_function *p, uint op, uint frt, uint fra, uint frb, uint op2,
-       uint rc)
+       uint rc, const char *format)
 {
    union a_inst inst;
    inst.inst.op = op;
@@ -459,6 +535,10 @@ emit_a(struct ppc_function *p, uint op, uint frt, uint fra, uint frb, uint op2,
    inst.inst.op2 = op2;
    inst.inst.rc = rc;
    emit_instruction(p, inst.bits);
+   if (p->print) {
+      indent(p);
+      printf(format, frt, fra, frb);
+   }
 }
 
 
@@ -477,7 +557,7 @@ union xo_inst {
 
 static INLINE void
 emit_xo(struct ppc_function *p, uint op, uint rt, uint ra, uint rb, uint oe,
-        uint op2, uint rc)
+        uint op2, uint rc, const char *format)
 {
    union xo_inst inst;
    inst.inst.op = op;
@@ -488,6 +568,10 @@ emit_xo(struct ppc_function *p, uint op, uint rt, uint ra, uint rb, uint oe,
    inst.inst.op2 = op2;
    inst.inst.rc = rc;
    emit_instruction(p, inst.bits);
+   if (p->print) {
+      indent(p);
+      printf(format, rt, ra, rb);
+   }
 }
 
 
@@ -502,140 +586,142 @@ emit_xo(struct ppc_function *p, uint op, uint rt, uint ra, uint rb, uint oe,
 void
 ppc_vaddfp(struct ppc_function *p, uint vD, uint vA, uint vB)
 {
-   emit_vx(p, 10, vD, vA, vB);
+   emit_vx(p, 10, vD, vA, vB, "vaddfp\t%u, v%u, v%u\n", FALSE);
 }
 
 /** vector float substract */
 void
 ppc_vsubfp(struct ppc_function *p, uint vD, uint vA, uint vB)
 {
-   emit_vx(p, 74, vD, vA, vB);
+   emit_vx(p, 74, vD, vA, vB, "vsubfp\tv%u, v%u, v%u\n", FALSE);
 }
 
 /** vector float min */
 void
 ppc_vminfp(struct ppc_function *p, uint vD, uint vA, uint vB)
 {
-   emit_vx(p, 1098, vD, vA, vB);
+   emit_vx(p, 1098, vD, vA, vB, "vminfp\tv%u, v%u, v%u\n", FALSE);
 }
 
 /** vector float max */
 void
 ppc_vmaxfp(struct ppc_function *p, uint vD, uint vA, uint vB)
 {
-   emit_vx(p, 1034, vD, vA, vB);
+   emit_vx(p, 1034, vD, vA, vB, "vmaxfp\tv%u, v%u, v%u\n", FALSE);
 }
 
 /** vector float mult add: vD = vA * vB + vC */
 void
 ppc_vmaddfp(struct ppc_function *p, uint vD, uint vA, uint vB, uint vC)
 {
-   emit_va(p, 46, vD, vA, vC, vB); /* note arg order */
+   /* note arg order */
+   emit_va(p, 46, vD, vA, vC, vB, "vmaddfp\tv%u, v%u, v%u, v%u\n");
 }
 
 /** vector float negative mult subtract: vD = vA - vB * vC */
 void
 ppc_vnmsubfp(struct ppc_function *p, uint vD, uint vA, uint vB, uint vC)
 {
-   emit_va(p, 47, vD, vB, vA, vC); /* note arg order */
+   /* note arg order */
+   emit_va(p, 47, vD, vB, vA, vC, "vnmsubfp\tv%u, v%u, v%u, v%u\n");
 }
 
 /** vector float compare greater than */
 void
 ppc_vcmpgtfpx(struct ppc_function *p, uint vD, uint vA, uint vB)
 {
-   emit_vxr(p, 710, vD, vA, vB);
+   emit_vxr(p, 710, vD, vA, vB, "vcmpgtfpx\tv%u, v%u, v%u");
 }
 
 /** vector float compare greater than or equal to */
 void
 ppc_vcmpgefpx(struct ppc_function *p, uint vD, uint vA, uint vB)
 {
-   emit_vxr(p, 454, vD, vA, vB);
+   emit_vxr(p, 454, vD, vA, vB, "vcmpgefpx\tv%u, v%u, v%u");
 }
 
 /** vector float compare equal */
 void
 ppc_vcmpeqfpx(struct ppc_function *p, uint vD, uint vA, uint vB)
 {
-   emit_vxr(p, 198, vD, vA, vB);
+   emit_vxr(p, 198, vD, vA, vB, "vcmpeqfpx\tv%u, v%u, v%u");
 }
 
 /** vector float 2^x */
 void
 ppc_vexptefp(struct ppc_function *p, uint vD, uint vB)
 {
-   emit_vx(p, 394, vD, 0, vB);
+   emit_vx(p, 394, vD, 0, vB, "vexptefp\tv%u, 0%u, v%u\n", FALSE);
 }
 
 /** vector float log2(x) */
 void
 ppc_vlogefp(struct ppc_function *p, uint vD, uint vB)
 {
-   emit_vx(p, 458, vD, 0, vB);
+   emit_vx(p, 458, vD, 0, vB, "vlogefp\tv%u, 0%u, v%u\n", FALSE);
 }
 
 /** vector float reciprocol */
 void
 ppc_vrefp(struct ppc_function *p, uint vD, uint vB)
 {
-   emit_vx(p, 266, vD, 0, vB);
+   emit_vx(p, 266, vD, 0, vB, "vrefp\tv%u, 0%u, v%u\n", FALSE);
 }
 
 /** vector float reciprocol sqrt estimate */
 void
 ppc_vrsqrtefp(struct ppc_function *p, uint vD, uint vB)
 {
-   emit_vx(p, 330, vD, 0, vB);
+   emit_vx(p, 330, vD, 0, vB, "vrsqrtefp\tv%u, 0%u, v%u\n", FALSE);
 }
 
 /** vector float round to negative infinity */
 void
 ppc_vrfim(struct ppc_function *p, uint vD, uint vB)
 {
-   emit_vx(p, 714, vD, 0, vB);
+   emit_vx(p, 714, vD, 0, vB, "vrfim\tv%u, 0%u, v%u\n", FALSE);
 }
 
 /** vector float round to positive infinity */
 void
 ppc_vrfip(struct ppc_function *p, uint vD, uint vB)
 {
-   emit_vx(p, 650, vD, 0, vB);
+   emit_vx(p, 650, vD, 0, vB, "vrfip\tv%u, 0%u, v%u\n", FALSE);
 }
 
 /** vector float round to nearest int */
 void
 ppc_vrfin(struct ppc_function *p, uint vD, uint vB)
 {
-   emit_vx(p, 522, vD, 0, vB);
+   emit_vx(p, 522, vD, 0, vB, "vrfin\tv%u, 0%u, v%u\n", FALSE);
 }
 
 /** vector float round to int toward zero */
 void
 ppc_vrfiz(struct ppc_function *p, uint vD, uint vB)
 {
-   emit_vx(p, 586, vD, 0, vB);
+   emit_vx(p, 586, vD, 0, vB, "vrfiz\tv%u, 0%u, v%u\n", FALSE);
 }
 
-/** vector store: store vR at mem[vA+vB] */
+/** vector store: store vR at mem[rA+rB] */
 void
-ppc_stvx(struct ppc_function *p, uint vR, uint vA, uint vB)
+ppc_stvx(struct ppc_function *p, uint vR, uint rA, uint rB)
 {
-   emit_x(p, 31, vR, vA, vB, 231);
+   emit_x(p, 31, vR, rA, rB, 231, "stvx\tv%u, r%u, r%u\n");
 }
 
-/** vector load: vR = mem[vA+vB] */
+/** vector load: vR = mem[rA+rB] */
 void
-ppc_lvx(struct ppc_function *p, uint vR, uint vA, uint vB)
+ppc_lvx(struct ppc_function *p, uint vR, uint rA, uint rB)
 {
-   emit_x(p, 31, vR, vA, vB, 103);
+   emit_x(p, 31, vR, rA, rB, 103, "lvx\tv%u, r%u, r%u\n");
 }
 
 /** load vector element word: vR = mem_word[ra+rb] */
 void
-ppc_lvewx(struct ppc_function *p, uint vr, uint ra, uint rb)
+ppc_lvewx(struct ppc_function *p, uint vR, uint rA, uint rB)
 {
-   emit_x(p, 31, vr, ra, rb, 71);
+   emit_x(p, 31, vR, rA, rB, 71, "lvewx\tv%u, r%u, r%u\n");
 }
 
 
@@ -649,49 +735,63 @@ ppc_lvewx(struct ppc_function *p, uint vr, uint ra, uint rb)
 void
 ppc_vand(struct ppc_function *p, uint vD, uint vA, uint vB)
 {
-   emit_vx(p, 1028, vD, vA, vB);
+   emit_vx(p, 1028, vD, vA, vB, "vand\tv%u, v%u, v%u\n", FALSE);
 }
 
 /** vector and complement */
 void
 ppc_vandc(struct ppc_function *p, uint vD, uint vA, uint vB)
 {
-   emit_vx(p, 1092, vD, vA, vB);
+   emit_vx(p, 1092, vD, vA, vB, "vandc\tv%u, v%u, v%u\n", FALSE);
 }
 
 /** vector or */
 void
 ppc_vor(struct ppc_function *p, uint vD, uint vA, uint vB)
 {
-   emit_vx(p, 1156, vD, vA, vB);
+   emit_vx(p, 1156, vD, vA, vB, "vor\tv%u, v%u, v%u\n", FALSE);
 }
 
 /** vector nor */
 void
 ppc_vnor(struct ppc_function *p, uint vD, uint vA, uint vB)
 {
-   emit_vx(p, 1284, vD, vA, vB);
+   emit_vx(p, 1284, vD, vA, vB, "vnor\tv%u, v%u, v%u\n", FALSE);
 }
 
 /** vector xor */
 void
 ppc_vxor(struct ppc_function *p, uint vD, uint vA, uint vB)
 {
-   emit_vx(p, 1220, vD, vA, vB);
+   emit_vx(p, 1220, vD, vA, vB, "vxor\tv%u, v%u, v%u\n", FALSE);
 }
 
 /** Pseudo-instruction: vector move */
 void
 ppc_vmove(struct ppc_function *p, uint vD, uint vA)
 {
+   boolean print = p->print;
+   p->print = FALSE;
    ppc_vor(p, vD, vA, vA);
+   if (print) {
+      indent(p);
+      printf("vor\tv%u, v%u, v%u \t# v%u = v%u\n", vD, vA, vA, vD, vA);
+   }
+   p->print = print;
 }
 
 /** Set vector register to {0,0,0,0} */
 void
 ppc_vzero(struct ppc_function *p, uint vr)
 {
+   boolean print = p->print;
+   p->print = FALSE;
    ppc_vxor(p, vr, vr, vr);
+   if (print) {
+      indent(p);
+      printf("vxor\tv%u, v%u, v%u \t# v%u = {0,0,0,0}\n", vr, vr, vr, vr);
+   }
+   p->print = print;
 }
 
 
@@ -705,35 +805,35 @@ ppc_vzero(struct ppc_function *p, uint vr)
 void
 ppc_vperm(struct ppc_function *p, uint vD, uint vA, uint vB, uint vC)
 {
-   emit_va(p, 43, vD, vA, vB, vC);
+   emit_va(p, 43, vD, vA, vB, vC, "vperm\tr%u, r%u, r%u, r%u");
 }
 
 /** vector select */
 void
 ppc_vsel(struct ppc_function *p, uint vD, uint vA, uint vB, uint vC)
 {
-   emit_va(p, 42, vD, vA, vB, vC);
+   emit_va(p, 42, vD, vA, vB, vC, "vsel\tr%u, r%u, r%u, r%u");
 }
 
 /** vector splat byte */
 void
 ppc_vspltb(struct ppc_function *p, uint vD, uint vB, uint imm)
 {
-   emit_vx(p, 42, vD, imm, vB);
+   emit_vx(p, 42, vD, imm, vB, "vspltb\tv%u, v%u, %u\n", TRUE);
 }
 
 /** vector splat half word */
 void
 ppc_vsplthw(struct ppc_function *p, uint vD, uint vB, uint imm)
 {
-   emit_vx(p, 588, vD, imm, vB);
+   emit_vx(p, 588, vD, imm, vB, "vsplthw\tv%u, v%u, %u\n", TRUE);
 }
 
 /** vector splat word */
 void
 ppc_vspltw(struct ppc_function *p, uint vD, uint vB, uint imm)
 {
-   emit_vx(p, 652, vD, imm, vB);
+   emit_vx(p, 652, vD, imm, vB, "vspltw\tv%u, v%u, %u\n", TRUE);
 }
 
 /** vector splat signed immediate word */
@@ -742,14 +842,14 @@ ppc_vspltisw(struct ppc_function *p, uint vD, int imm)
 {
    assert(imm >= -16);
    assert(imm < 15);
-   emit_vx(p, 908, vD, imm, 0);
+   emit_vx(p, 908, vD, imm, 0, "vspltisw\tv%u, %d, %u\n", FALSE);
 }
 
 /** vector shift left word: vD[word] = vA[word] << (vB[word] & 0x1f) */
 void
 ppc_vslw(struct ppc_function *p, uint vD, uint vA, uint vB)
 {
-   emit_vx(p, 388, vD, vA, vB);
+   emit_vx(p, 388, vD, vA, vB, "vslw\tv%u, v%u, v%u\n", FALSE);
 }
 
 
@@ -763,63 +863,66 @@ ppc_vslw(struct ppc_function *p, uint vD, uint vA, uint vB)
 void
 ppc_addi(struct ppc_function *p, uint rt, uint ra, int imm)
 {
-   emit_d(p, 14, rt, ra, imm);
+   emit_d(p, 14, rt, ra, imm, "addi\tr%u, r%u, %d\n", FALSE);
 }
 
 /** rt = ra + (imm << 16) */
 void
 ppc_addis(struct ppc_function *p, uint rt, uint ra, int imm)
 {
-   emit_d(p, 15, rt, ra, imm);
+   emit_d(p, 15, rt, ra, imm, "addis\tr%u, r%u, %d\n", FALSE);
 }
 
 /** rt = ra + rb */
 void
 ppc_add(struct ppc_function *p, uint rt, uint ra, uint rb)
 {
-   emit_xo(p, 31, rt, ra, rb, 0, 266, 0);
+   emit_xo(p, 31, rt, ra, rb, 0, 266, 0, "add\tr%u, r%u, r%u\n");
 }
 
 /** rt = ra AND ra */
 void
 ppc_and(struct ppc_function *p, uint rt, uint ra, uint rb)
 {
-   emit_x(p, 31, ra, rt, rb, 28);  /* note argument order */
+   emit_x(p, 31, ra, rt, rb, 28, "and\tr%u, r%u, r%u\n");  /* note argument order */
 }
 
 /** rt = ra AND imm */
 void
 ppc_andi(struct ppc_function *p, uint rt, uint ra, int imm)
 {
-   emit_d(p, 28, ra, rt, imm);  /* note argument order */
+   /* note argument order */
+   emit_d(p, 28, ra, rt, imm, "andi\tr%u, r%u, %d\n", FALSE);
 }
 
 /** rt = ra OR ra */
 void
 ppc_or(struct ppc_function *p, uint rt, uint ra, uint rb)
 {
-   emit_x(p, 31, ra, rt, rb, 444);  /* note argument order */
+   emit_x(p, 31, ra, rt, rb, 444, "or\tr%u, r%u, r%u\n");  /* note argument order */
 }
 
 /** rt = ra OR imm */
 void
 ppc_ori(struct ppc_function *p, uint rt, uint ra, int imm)
 {
-   emit_d(p, 24, ra, rt, imm);  /* note argument order */
+   /* note argument order */
+   emit_d(p, 24, ra, rt, imm, "ori\tr%u, r%u, %d\n", FALSE);
 }
 
 /** rt = ra XOR ra */
 void
 ppc_xor(struct ppc_function *p, uint rt, uint ra, uint rb)
 {
-   emit_x(p, 31, ra, rt, rb, 316);  /* note argument order */
+   emit_x(p, 31, ra, rt, rb, 316, "xor\tr%u, r%u, r%u\n");  /* note argument order */
 }
 
 /** rt = ra XOR imm */
 void
 ppc_xori(struct ppc_function *p, uint rt, uint ra, int imm)
 {
-   emit_d(p, 26, ra, rt, imm);  /* note argument order */
+   /* note argument order */
+   emit_d(p, 26, ra, rt, imm, "xori\tr%u, r%u, %d\n", FALSE);
 }
 
 /** pseudo instruction: move: rt = ra */
@@ -833,7 +936,14 @@ ppc_mr(struct ppc_function *p, uint rt, uint ra)
 void
 ppc_li(struct ppc_function *p, uint rt, int imm)
 {
+   boolean print = p->print;
+   p->print = FALSE;
    ppc_addi(p, rt, 0, imm);
+   if (print) {
+      indent(p);
+      printf("addi\tr%u, r0, %d \t# r%u = %d\n", rt, imm, rt, imm);
+   }
+   p->print = print;
 }
 
 /** rt = imm << 16 */
@@ -864,21 +974,21 @@ ppc_load_int(struct ppc_function *p, uint rt, int imm)
 void
 ppc_stwu(struct ppc_function *p, uint rs, uint ra, int d)
 {
-   emit_d(p, 37, rs, ra, d);
+   emit_d(p, 37, rs, ra, d, "stwu\tr%u, %d(r%u)\n", TRUE);
 }
 
 /** store rs at memory[(ra)+d] */
 void
 ppc_stw(struct ppc_function *p, uint rs, uint ra, int d)
 {
-   emit_d(p, 36, rs, ra, d);
+   emit_d(p, 36, rs, ra, d, "stw\tr%u, %d(r%u)\n", TRUE);
 }
 
 /** Load rt = mem[(ra)+d];  then zero set high 32 bits to zero. */
 void
 ppc_lwz(struct ppc_function *p, uint rt, uint ra, int d)
 {
-   emit_d(p, 32, rt, ra, d);
+   emit_d(p, 32, rt, ra, d, "lwz\tr%u, %d(r%u)\n", TRUE);
 }
 
 
@@ -891,42 +1001,42 @@ ppc_lwz(struct ppc_function *p, uint rt, uint ra, int d)
 void
 ppc_fadd(struct ppc_function *p, uint frt, uint fra, uint frb)
 {
-   emit_a(p, 63, frt, fra, frb, 21, 0);
+   emit_a(p, 63, frt, fra, frb, 21, 0, "fadd\tf%u, f%u, f%u\n");
 }
 
 /** sub: frt = fra - frb */
 void
 ppc_fsub(struct ppc_function *p, uint frt, uint fra, uint frb)
 {
-   emit_a(p, 63, frt, fra, frb, 20, 0);
+   emit_a(p, 63, frt, fra, frb, 20, 0, "fsub\tf%u, f%u, f%u\n");
 }
 
 /** convert to int: rt = (int) ra */
 void
 ppc_fctiwz(struct ppc_function *p, uint rt, uint fra)
 {
-   emit_x(p, 63, rt, 0, fra, 15);
+   emit_x(p, 63, rt, 0, fra, 15, "fctiwz\tr%u, r%u, r%u\n");
 }
 
 /** store frs at mem[(ra)+offset] */
 void
 ppc_stfs(struct ppc_function *p, uint frs, uint ra, int offset)
 {
-   emit_d(p, 52, frs, ra, offset);
+   emit_d(p, 52, frs, ra, offset, "stfs\tr%u, %d(r%u)\n", TRUE);
 }
 
 /** store frs at mem[(ra)+(rb)] */
 void
 ppc_stfiwx(struct ppc_function *p, uint frs, uint ra, uint rb)
 {
-   emit_x(p, 31, frs, ra, rb, 983);
+   emit_x(p, 31, frs, ra, rb, 983, "stfiwx\tr%u, r%u, r%u\n");
 }
 
 /** load frt = mem[(ra)+offset] */
 void
 ppc_lfs(struct ppc_function *p, uint frt, uint ra, int offset)
 {
-   emit_d(p, 48, frt, ra, offset);
+   emit_d(p, 48, frt, ra, offset, "stfs\tr%u, %d(r%u)\n", TRUE);
 }
 
 
@@ -942,6 +1052,10 @@ void
 ppc_blr(struct ppc_function *p)
 {
    emit_i(p, 18, 0, 0, 1);
+   if (p->print) {
+      indent(p);
+      printf("blr\n");
+   }
 }
 
 /** Branch Conditional to Link Register (p. 36) */
@@ -949,6 +1063,10 @@ void
 ppc_bclr(struct ppc_function *p, uint condOp, uint branchHint, uint condReg)
 {
    emit_xl(p, 19, condOp, condReg, branchHint, 16, 0);
+   if (p->print) {
+      indent(p);
+      printf("bclr\t%u %u %u\n", condOp, branchHint, condReg);
+   }
 }
 
 /** Pseudo instruction: return from subroutine */
diff --git a/src/gallium/auxiliary/rtasm/rtasm_ppc.h b/src/gallium/auxiliary/rtasm/rtasm_ppc.h
index 08212a2a253..93e5f5187de 100644
--- a/src/gallium/auxiliary/rtasm/rtasm_ppc.h
+++ b/src/gallium/auxiliary/rtasm/rtasm_ppc.h
@@ -1,6 +1,7 @@
 /**************************************************************************
  *
  * Copyright (C) 2008 Tungsten Graphics, Inc.   All Rights Reserved.
+ * Copyright (C) 2009 VMware, Inc.  All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -58,6 +59,8 @@ struct ppc_function
    uint32_t reg_used;   /** used/free general-purpose registers bitmask */
    uint32_t fp_used;   /** used/free floating point registers bitmask */
    uint32_t vec_used;   /** used/free vector registers bitmask */
+   int indent;
+   boolean print;
 };
 
 
@@ -68,6 +71,10 @@ extern uint ppc_num_instructions(const struct ppc_function *p);
 extern void (*ppc_get_func( struct ppc_function *p ))( void );
 extern void ppc_dump_func(const struct ppc_function *p);
 
+extern void ppc_print_code(struct ppc_function *p, boolean enable);
+extern void ppc_indent(struct ppc_function *p, int spaces);
+extern void ppc_comment(struct ppc_function *p, int rel_indent, const char *s);
+
 extern int ppc_reserve_register(struct ppc_function *p, int reg);
 extern int ppc_allocate_register(struct ppc_function *p);
 extern void ppc_release_register(struct ppc_function *p, int reg);