* A bunch of changes which get us closer to running the sample.

diff --git a/sim/mips/sky-pke.c b/sim/mips/sky-pke.c
index 456cbafb4ac8cbb411aa345e8587fcbce0f4f7b6..aec68c4c8cd0faaedeca5f6c42d7a9fc410e6e3d 100644 (file)
--- a/sim/mips/sky-pke.c
+++ b/sim/mips/sky-pke.c
@@ -883,6 +883,11 @@ pke_check_stall(struct pke_device* me, enum pke_check_target what)
 void
 pke_flip_dbf(struct pke_device* me)
 {
+  /* compute new ITOP and TOP */
+  PKE_REG_MASK_SET(me, ITOP, ITOP,
+                  PKE_REG_MASK_GET(me, ITOPS, ITOPS));
+  PKE_REG_MASK_SET(me, TOP, TOP,
+                  PKE_REG_MASK_GET(me, TOPS, TOPS));
   /* flip DBF */
   PKE_REG_MASK_SET(me, DBF, DF,
                   PKE_REG_MASK_GET(me, DBF, DF) ? 0 : 1);
@@ -892,11 +897,6 @@ pke_flip_dbf(struct pke_device* me)
                   (PKE_REG_MASK_GET(me, BASE, BASE) +
                    (PKE_REG_MASK_GET(me, DBF, DF) *
                     PKE_REG_MASK_GET(me, OFST, OFFSET))));
-  /* compute new ITOP and TOP */
-  PKE_REG_MASK_SET(me, ITOP, ITOP,
-                  PKE_REG_MASK_GET(me, ITOPS, ITOPS));
-  PKE_REG_MASK_SET(me, TOP, TOP,
-                  PKE_REG_MASK_GET(me, TOPS, TOPS));
 }
 
 
@@ -1428,7 +1428,7 @@ pke_code_mpg(struct pke_device* me, unsigned_4 pkecode)
              /* imm: in 64-bit units for MPG instruction */
              /* VU*_MEM0 : instruction memory */
              vu_addr_base = (me->pke_number == 0) ?
-               VU0_MEM0_WINDOW_START : VU0_MEM0_WINDOW_START;
+               VU0_MEM0_WINDOW_START : VU1_MEM0_WINDOW_START;
              vu_addr = vu_addr_base + (imm + i) * 8;
 
              /* XXX: overflow check! */

diff --git a/sim/mips/sky-vu1.c b/sim/mips/sky-vu1.c
index 2d01fec0da65f0ff55729b7578c3d43320b792a5..b1b853c3a85097adcee296a03174a839a75d725d 100644 (file)
--- a/sim/mips/sky-vu1.c
+++ b/sim/mips/sky-vu1.c
@@ -23,6 +23,16 @@ static char vu1_mem_buffer[VU1_MEM1_SIZE]  __attribute__ ((aligned(16)));
 void init_vu1(void);
 void init_vu(VectorUnitState *state, char* umem_buffer, char* mem_buffer);
 
+static void dump_mem() {
+    int i;
+    typedef int T[2048][4];  
+    T *mem = (T*)&vu1_mem_buffer;
+
+    for (i = 0; i < 200; i++) {
+       printf("%d: %x %x %x %x\n", i, (*mem)[i][0], (*mem)[i][1], (*mem)[i][2], (*mem)[i][3]);
+    }
+}
+
 void 
 vu1_issue(void) 
 {