From: Jillian Ye Date: Wed, 8 Apr 1998 17:27:47 +0000 (+0000) Subject: Update testcase to compile with the lastest DVP AS X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b03c88a3719dbbea18547548c667073ad0dcdbfa;p=binutils-gdb.git Update testcase to compile with the lastest DVP AS --- diff --git a/sim/testsuite/sky/sce_test41.dvpasm b/sim/testsuite/sky/sce_test41.dvpasm index ee0cfe214b4..50f8878f72f 100644 --- a/sim/testsuite/sky/sce_test41.dvpasm +++ b/sim/testsuite/sky/sce_test41.dvpasm @@ -1,18 +1,18 @@ -.include "../include/macros.s" +.include "sce_macros.s" .global My_dma_start .text My_dma_start: -.DmaPackPke 1 +.DmaPackVif 0 DMAref *, data0 .section ".dmadata", "aw" .DmaData data0 -STCYCL 4 4 +STCYCL 4, 4 STMASK 0x00000000 -STMOD 0 +STMOD direct .EndDmaData .text @@ -20,17 +20,18 @@ DMAref *, data1 .section ".dmadata", "aw" .DmaData data1 -MPG 0, "test.vubin" +MPG *, * +.include "sce_test41.vuasm" +.endmpg .EndDmaData .text -DMAcnt *, data2 -.DmaData data2 +DMAcnt * DIRECT * -GPUIFpacked REG={A_D}, NLOOP=4099, EOP +GIFpacked REGS={A_D}, NLOOP=4099, EOP iwzyx 0x00000000, 0x00000050, 0x14042580, 0x00000000 iwzyx 0x00000000, 0x00000052, 0x00000100, 0x00000100 iwzyx 0x00000000, 0x00000053, 0x00000000, 0x00000000 @@ -4130,12 +4131,12 @@ iwzyx 0x00000000, 0x00000054, 0x00000000, 0x00000000 iwzyx 0x00000000, 0x00000054, 0x00010000, 0x00000000 iwzyx 0x00000000, 0x00000054, 0x00000000, 0x0100000d iwzyx 0x00000000, 0x00000054, 0x00000000, 0xd00d0000 +.endgif .EndDirect .EndDmaData -DMAcnt *, data3 -.DmaData data3 +DMAcnt * DIRECT * -GPUIFpacked REG={A_D}, NLOOP=8, EOP +GIFpacked REGS={A_D}, NLOOP=8, EOP iwzyx 0x00000000, 0x00000050, 0x02012980, 0x00000000 iwzyx 0x00000000, 0x00000051, 0x00000000, 0x00000000 iwzyx 0x00000000, 0x00000052, 0x00000002, 0x00000008 @@ -4144,12 +4145,12 @@ iwzyx 0x00000000, 0x00000054, 0x66f77318, 0x73597fbd iwzyx 0x00000000, 0x00000054, 0x302030a2, 0x358c5673 iwzyx 0x00000000, 0x00000054, 0x29ae2149, 0x32d72e32 iwzyx 0x00000000, 0x00000054, 0x000021ac, 0x7fff437c +.endgif .EndDirect .EndDmaData -DMAcnt *, data4 -.DmaData data4 +DMAcnt * DIRECT * -GPUIFpacked REG={A_D}, NLOOP=17, EOP +GIFpacked REGS={A_D}, NLOOP=17, EOP iwzyx 0x00000000, 0x0000004c, 0x00000000, 0x000a0000 iwzyx 0x00000000, 0x0000004e, 0x00000000, 0x01000096 iwzyx 0x00000000, 0x00000046, 0x00000000, 0x00000001 @@ -4167,10 +4168,10 @@ iwzyx 0x00000000, 0x0000003b, 0x00000081, 0x00008080 iwzyx 0x00000000, 0x00000014, 0x00000000, 0x00000061 iwzyx 0x00000000, 0x00000049, 0x00000000, 0x00000001 iwzyx 0x00000000, 0x00000006, 0x20153006, 0x21412580 +.endgif .EndDirect .EndDmaData -DMAcnt *, data5 -.DmaData data5 +DMAcnt * unpack V4_32, 895, * iwzyx 0x00000000, 0x43000000, 0x43000000, 0x43000000 .EndUnpack @@ -4222,8 +4223,7 @@ iwzyx 0x3f800000, 0x44480000, 0x00000000, 0x00000000 .EndUnpack .EndDmaData -DMAcnt *, data6 -.DmaData data6 +DMAcnt * MSCAL 0 unpack V4_32, 0, * iwzyx 0x3f800000, 0x00000000, 0xc33e0000, 0x42780000 @@ -4411,7 +4411,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3dc7ffde, 0x3d400000 iwzyx 0x3f800000, 0x3f800000, 0x3dc7ffde, 0x3dc00000 iwzyx 0x3f800000, 0x3f800000, 0x3e47ffde, 0x3d400000 .EndUnpack -ITOP 0 ; -=ihc=- MSCNT unpack V4_32, 421, * iwzyx 0x3f800000, 0x42100000, 0xc3220000, 0x42e00000 @@ -4599,7 +4598,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3e4c0011, 0x3dc7ffde iwzyx 0x3f800000, 0x3f800000, 0x3e4c0011, 0x3e13ffef iwzyx 0x3f800000, 0x3f800000, 0x3e980000, 0x3dc7ffde .EndUnpack -ITOP 421 ; -=ihc=- MSCNT unpack V4_32, 0, * iwzyx 0x3f800000, 0x42be0000, 0xc2ec0000, 0x43030000 @@ -4787,7 +4785,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3e980000, 0x3e180022 iwzyx 0x3f800000, 0x3f800000, 0x3e980000, 0x3e47ffde iwzyx 0x3f800000, 0x3f800000, 0x3ec9fff8, 0x3e180022 .EndUnpack -ITOP 0 ; -=ihc=- MSCNT unpack V4_32, 421, * iwzyx 0x3f800000, 0x431a0000, 0xc2780000, 0x42e00000 @@ -4975,7 +4972,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3ecc0011, 0x3e4c0011 iwzyx 0x3f800000, 0x3f800000, 0x3ecc0011, 0x3e7c0011 iwzyx 0x3f800000, 0x3f800000, 0x3efe0008, 0x3e4c0011 .EndUnpack -ITOP 421 ; -=ihc=- MSCNT unpack V4_32, 0, * iwzyx 0x3f800000, 0x433e0000, 0x00000000, 0x42780000 @@ -5163,7 +5159,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3f000000, 0x3e800000 iwzyx 0x3f800000, 0x3f800000, 0x3f000000, 0x3e980000 iwzyx 0x3f800000, 0x3f800000, 0x3f18fffc, 0x3e800000 .EndUnpack -ITOP 0 ; -=ihc=- MSCNT unpack V4_32, 421, * iwzyx 0x3f800000, 0x433e0000, 0x42780000, 0x00000000 @@ -5351,7 +5346,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3f18fffc, 0x3e980000 iwzyx 0x3f800000, 0x3f800000, 0x3f18fffc, 0x3eb00000 iwzyx 0x3f800000, 0x3f800000, 0x3f31fff8, 0x3e980000 .EndUnpack -ITOP 421 ; -=ihc=- MSCNT unpack V4_32, 0, * iwzyx 0x3f800000, 0x431a0000, 0x42ec0000, 0xc2480000 @@ -5539,7 +5533,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3f330004, 0x3eb1fff8 iwzyx 0x3f800000, 0x3f800000, 0x3f330004, 0x3ec9fff8 iwzyx 0x3f800000, 0x3f800000, 0x3f4c0000, 0x3eb1fff8 .EndUnpack -ITOP 0 ; -=ihc=- MSCNT unpack V4_32, 421, * iwzyx 0x3f800000, 0x42be0000, 0x43220000, 0xc28a0000 @@ -5727,7 +5720,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3f4c0000, 0x3ecc0011 iwzyx 0x3f800000, 0x3f800000, 0x3f4c0000, 0x3ee3ffef iwzyx 0x3f800000, 0x3f800000, 0x3f64fffc, 0x3ecc0011 .EndUnpack -ITOP 421 ; -=ihc=- MSCNT unpack V4_32, 0, * iwzyx 0x3f800000, 0x42100000, 0x433e0000, 0xc2480000 @@ -5915,7 +5907,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3f660008, 0x3ee60008 iwzyx 0x3f800000, 0x3f800000, 0x3f660008, 0x3efe0008 iwzyx 0x3f800000, 0x3f800000, 0x3f7f0004, 0x3ee60008 .EndUnpack -ITOP 0 ; -=ihc=- MSCNT unpack V4_32, 421, * iwzyx 0x3f800000, 0x00000000, 0xc33e0000, 0xc2780000 @@ -6103,7 +6094,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3dc7ffde, 0x3f0c0000 iwzyx 0x3f800000, 0x3f800000, 0x3dc7ffde, 0x3f180000 iwzyx 0x3f800000, 0x3f800000, 0x3e47ffde, 0x3f0c0000 .EndUnpack -ITOP 421 ; -=ihc=- MSCNT unpack V4_32, 0, * iwzyx 0x3f800000, 0xc2100000, 0xc3220000, 0xc2e00000 @@ -6291,7 +6281,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3e4c0011, 0x3f18fffc iwzyx 0x3f800000, 0x3f800000, 0x3e4c0011, 0x3f24fffc iwzyx 0x3f800000, 0x3f800000, 0x3e980000, 0x3f18fffc .EndUnpack -ITOP 0 ; -=ihc=- MSCNT unpack V4_32, 421, * iwzyx 0x3f800000, 0xc2be0000, 0xc2ec0000, 0xc3030000 @@ -6479,7 +6468,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3e980000, 0x3f260008 iwzyx 0x3f800000, 0x3f800000, 0x3e980000, 0x3f31fff8 iwzyx 0x3f800000, 0x3f800000, 0x3ec9fff8, 0x3f260008 .EndUnpack -ITOP 421 ; -=ihc=- MSCNT unpack V4_32, 0, * iwzyx 0x3f800000, 0xc31a0000, 0xc2780000, 0xc2e00000 @@ -6667,7 +6655,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3ecc0011, 0x3f330004 iwzyx 0x3f800000, 0x3f800000, 0x3ecc0011, 0x3f3f0004 iwzyx 0x3f800000, 0x3f800000, 0x3efe0008, 0x3f330004 .EndUnpack -ITOP 0 ; -=ihc=- MSCNT unpack V4_32, 421, * iwzyx 0x3f800000, 0xc33e0000, 0x00000000, 0xc2780000 @@ -6855,7 +6842,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3f000000, 0x3f400000 iwzyx 0x3f800000, 0x3f800000, 0x3f000000, 0x3f4c0000 iwzyx 0x3f800000, 0x3f800000, 0x3f18fffc, 0x3f400000 .EndUnpack -ITOP 421 ; -=ihc=- MSCNT unpack V4_32, 0, * iwzyx 0x3f800000, 0xc33e0000, 0x42780000, 0x00000000 @@ -7043,7 +7029,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3f18fffc, 0x3f4c0000 iwzyx 0x3f800000, 0x3f800000, 0x3f18fffc, 0x3f580000 iwzyx 0x3f800000, 0x3f800000, 0x3f31fff8, 0x3f4c0000 .EndUnpack -ITOP 0 ; -=ihc=- MSCNT unpack V4_32, 421, * iwzyx 0x3f800000, 0xc31a0000, 0x42ec0000, 0x42480000 @@ -7231,7 +7216,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3f330004, 0x3f58fffc iwzyx 0x3f800000, 0x3f800000, 0x3f330004, 0x3f64fffc iwzyx 0x3f800000, 0x3f800000, 0x3f4c0000, 0x3f58fffc .EndUnpack -ITOP 421 ; -=ihc=- MSCNT unpack V4_32, 0, * iwzyx 0x3f800000, 0xc2be0000, 0x43220000, 0x428a0000 @@ -7419,7 +7403,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3f4c0000, 0x3f660008 iwzyx 0x3f800000, 0x3f800000, 0x3f4c0000, 0x3f71fff8 iwzyx 0x3f800000, 0x3f800000, 0x3f64fffc, 0x3f660008 .EndUnpack -ITOP 0 ; -=ihc=- MSCNT unpack V4_32, 421, * iwzyx 0x3f800000, 0xc2100000, 0x433e0000, 0x42480000 @@ -7607,6 +7590,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3f660008, 0x3f730004 iwzyx 0x3f800000, 0x3f800000, 0x3f660008, 0x3f7f0004 iwzyx 0x3f800000, 0x3f800000, 0x3f7f0004, 0x3f730004 .EndUnpack -ITOP 421 ; -=ihc=- MSCNT .EndDmaData +DMAend ; ADDED diff --git a/sim/testsuite/sky/sce_test42.dvpasm b/sim/testsuite/sky/sce_test42.dvpasm index 095cb979631..b0962b79e8b 100644 --- a/sim/testsuite/sky/sce_test42.dvpasm +++ b/sim/testsuite/sky/sce_test42.dvpasm @@ -1,18 +1,18 @@ -.include "../include/macros.s" +.include "sce_macros.s" .global My_dma_start .text My_dma_start: -.DmaPackPke 1 +.DmaPackVif 0 DMAref *, data0 .section ".dmadata", "aw" .DmaData data0 -STCYCL 4 4 +STCYCL 4, 4 STMASK 0x00000000 -STMOD 0 +STMOD direct .EndDmaData .text @@ -20,16 +20,17 @@ DMAref *, data1 .section ".dmadata", "aw" .DmaData data1 -MPG 0, "test.vubin" +MPG *, * +.include "sce_test42.vuasm" +.endmpg .EndDmaData .text -DMAcnt *, data2 -.DmaData data2 +DMAcnt * DIRECT * -GPUIFpacked REG={A_D}, NLOOP=4099, EOP +GIFpacked REGS={A_D}, NLOOP=4099, EOP iwzyx 0x00000000, 0x00000050, 0x14042580, 0x00000000 iwzyx 0x00000000, 0x00000052, 0x00000100, 0x00000100 iwzyx 0x00000000, 0x00000053, 0x00000000, 0x00000000 @@ -4129,12 +4130,12 @@ iwzyx 0x00000000, 0x00000054, 0x00000000, 0x00000000 iwzyx 0x00000000, 0x00000054, 0x00010000, 0x00000000 iwzyx 0x00000000, 0x00000054, 0x00000000, 0x0100000d iwzyx 0x00000000, 0x00000054, 0x00000000, 0xd00d0000 +.endgif .EndDirect .EndDmaData -DMAcnt *, data3 -.DmaData data3 +DMAcnt * DIRECT * -GPUIFpacked REG={A_D}, NLOOP=8, EOP +GIFpacked REGS={A_D}, NLOOP=8, EOP iwzyx 0x00000000, 0x00000050, 0x02012980, 0x00000000 iwzyx 0x00000000, 0x00000051, 0x00000000, 0x00000000 iwzyx 0x00000000, 0x00000052, 0x00000002, 0x00000008 @@ -4143,12 +4144,12 @@ iwzyx 0x00000000, 0x00000054, 0x66f77318, 0x73597fbd iwzyx 0x00000000, 0x00000054, 0x302030a2, 0x358c5673 iwzyx 0x00000000, 0x00000054, 0x29ae2149, 0x32d72e32 iwzyx 0x00000000, 0x00000054, 0x000021ac, 0x7fff437c +.endgif .EndDirect .EndDmaData -DMAcnt *, data4 -.DmaData data4 +DMAcnt * DIRECT * -GPUIFpacked REG={A_D}, NLOOP=17, EOP +GIFpacked REGS={A_D}, NLOOP=17, EOP iwzyx 0x00000000, 0x0000004c, 0x00000000, 0x000a0000 iwzyx 0x00000000, 0x0000004e, 0x00000000, 0x01000096 iwzyx 0x00000000, 0x00000046, 0x00000000, 0x00000001 @@ -4166,10 +4167,10 @@ iwzyx 0x00000000, 0x0000003b, 0x00000081, 0x00008080 iwzyx 0x00000000, 0x00000014, 0x00000000, 0x00000061 iwzyx 0x00000000, 0x00000049, 0x00000000, 0x00000001 iwzyx 0x00000000, 0x00000006, 0x20153006, 0x21412580 +.endgif .EndDirect .EndDmaData -DMAcnt *, data5 -.DmaData data5 +DMAcnt * unpack V4_32, 895, * iwzyx 0x00000000, 0x437f0000, 0x437f0000, 0x437f0000 .EndUnpack @@ -4226,8 +4227,7 @@ iwzyx 0x44480000, 0x3a50aaa8, 0xbf800000, 0x80000000 iwzyx 0x3f800000, 0x00000000, 0x00000000, 0x00000000 .EndUnpack .EndDmaData -DMAcnt *, data6 -.DmaData data6 +DMAcnt * MSCAL 0 unpack V4_32, 0, * iwzyx 0x3f800000, 0x00000000, 0xc33e0000, 0x42780000 @@ -4415,7 +4415,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3dc7ffde, 0x3d400000 iwzyx 0x3f800000, 0x3f800000, 0x3dc7ffde, 0x3dc00000 iwzyx 0x3f800000, 0x3f800000, 0x3e47ffde, 0x3d400000 .EndUnpack -ITOP 0 ; -=ihc=- MSCNT unpack V4_32, 421, * iwzyx 0x3f800000, 0x42100000, 0xc3220000, 0x42e00000 @@ -4603,7 +4602,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3e4c0011, 0x3dc7ffde iwzyx 0x3f800000, 0x3f800000, 0x3e4c0011, 0x3e13ffef iwzyx 0x3f800000, 0x3f800000, 0x3e980000, 0x3dc7ffde .EndUnpack -ITOP 421 ; -=ihc=- MSCNT unpack V4_32, 0, * iwzyx 0x3f800000, 0x42be0000, 0xc2ec0000, 0x43030000 @@ -4791,7 +4789,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3e980000, 0x3e180022 iwzyx 0x3f800000, 0x3f800000, 0x3e980000, 0x3e47ffde iwzyx 0x3f800000, 0x3f800000, 0x3ec9fff8, 0x3e180022 .EndUnpack -ITOP 0 ; -=ihc=- MSCNT unpack V4_32, 421, * iwzyx 0x3f800000, 0x431a0000, 0xc2780000, 0x42e00000 @@ -4979,7 +4976,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3ecc0011, 0x3e4c0011 iwzyx 0x3f800000, 0x3f800000, 0x3ecc0011, 0x3e7c0011 iwzyx 0x3f800000, 0x3f800000, 0x3efe0008, 0x3e4c0011 .EndUnpack -ITOP 421 ; -=ihc=- MSCNT unpack V4_32, 0, * iwzyx 0x3f800000, 0x433e0000, 0x00000000, 0x42780000 @@ -5167,7 +5163,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3f000000, 0x3e800000 iwzyx 0x3f800000, 0x3f800000, 0x3f000000, 0x3e980000 iwzyx 0x3f800000, 0x3f800000, 0x3f18fffc, 0x3e800000 .EndUnpack -ITOP 0 ; -=ihc=- MSCNT unpack V4_32, 421, * iwzyx 0x3f800000, 0x433e0000, 0x42780000, 0x00000000 @@ -5355,7 +5350,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3f18fffc, 0x3e980000 iwzyx 0x3f800000, 0x3f800000, 0x3f18fffc, 0x3eb00000 iwzyx 0x3f800000, 0x3f800000, 0x3f31fff8, 0x3e980000 .EndUnpack -ITOP 421 ; -=ihc=- MSCNT unpack V4_32, 0, * iwzyx 0x3f800000, 0x431a0000, 0x42ec0000, 0xc2480000 @@ -5543,7 +5537,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3f330004, 0x3eb1fff8 iwzyx 0x3f800000, 0x3f800000, 0x3f330004, 0x3ec9fff8 iwzyx 0x3f800000, 0x3f800000, 0x3f4c0000, 0x3eb1fff8 .EndUnpack -ITOP 0 ; -=ihc=- MSCNT unpack V4_32, 421, * iwzyx 0x3f800000, 0x42be0000, 0x43220000, 0xc28a0000 @@ -5731,7 +5724,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3f4c0000, 0x3ecc0011 iwzyx 0x3f800000, 0x3f800000, 0x3f4c0000, 0x3ee3ffef iwzyx 0x3f800000, 0x3f800000, 0x3f64fffc, 0x3ecc0011 .EndUnpack -ITOP 421 ; -=ihc=- MSCNT unpack V4_32, 0, * iwzyx 0x3f800000, 0x42100000, 0x433e0000, 0xc2480000 @@ -5919,7 +5911,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3f660008, 0x3ee60008 iwzyx 0x3f800000, 0x3f800000, 0x3f660008, 0x3efe0008 iwzyx 0x3f800000, 0x3f800000, 0x3f7f0004, 0x3ee60008 .EndUnpack -ITOP 0 ; -=ihc=- MSCNT unpack V4_32, 421, * iwzyx 0x3f800000, 0x00000000, 0xc33e0000, 0xc2780000 @@ -6107,7 +6098,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3dc7ffde, 0x3f0c0000 iwzyx 0x3f800000, 0x3f800000, 0x3dc7ffde, 0x3f180000 iwzyx 0x3f800000, 0x3f800000, 0x3e47ffde, 0x3f0c0000 .EndUnpack -ITOP 421 ; -=ihc=- MSCNT unpack V4_32, 0, * iwzyx 0x3f800000, 0xc2100000, 0xc3220000, 0xc2e00000 @@ -6295,7 +6285,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3e4c0011, 0x3f18fffc iwzyx 0x3f800000, 0x3f800000, 0x3e4c0011, 0x3f24fffc iwzyx 0x3f800000, 0x3f800000, 0x3e980000, 0x3f18fffc .EndUnpack -ITOP 0 ; -=ihc=- MSCNT unpack V4_32, 421, * iwzyx 0x3f800000, 0xc2be0000, 0xc2ec0000, 0xc3030000 @@ -6483,7 +6472,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3e980000, 0x3f260008 iwzyx 0x3f800000, 0x3f800000, 0x3e980000, 0x3f31fff8 iwzyx 0x3f800000, 0x3f800000, 0x3ec9fff8, 0x3f260008 .EndUnpack -ITOP 421 ; -=ihc=- MSCNT unpack V4_32, 0, * iwzyx 0x3f800000, 0xc31a0000, 0xc2780000, 0xc2e00000 @@ -6671,7 +6659,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3ecc0011, 0x3f330004 iwzyx 0x3f800000, 0x3f800000, 0x3ecc0011, 0x3f3f0004 iwzyx 0x3f800000, 0x3f800000, 0x3efe0008, 0x3f330004 .EndUnpack -ITOP 0 ; -=ihc=- MSCNT unpack V4_32, 421, * iwzyx 0x3f800000, 0xc33e0000, 0x00000000, 0xc2780000 @@ -6859,7 +6846,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3f000000, 0x3f400000 iwzyx 0x3f800000, 0x3f800000, 0x3f000000, 0x3f4c0000 iwzyx 0x3f800000, 0x3f800000, 0x3f18fffc, 0x3f400000 .EndUnpack -ITOP 421 ; -=ihc=- MSCNT unpack V4_32, 0, * iwzyx 0x3f800000, 0xc33e0000, 0x42780000, 0x00000000 @@ -7047,7 +7033,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3f18fffc, 0x3f4c0000 iwzyx 0x3f800000, 0x3f800000, 0x3f18fffc, 0x3f580000 iwzyx 0x3f800000, 0x3f800000, 0x3f31fff8, 0x3f4c0000 .EndUnpack -ITOP 0 ; -=ihc=- MSCNT unpack V4_32, 421, * iwzyx 0x3f800000, 0xc31a0000, 0x42ec0000, 0x42480000 @@ -7235,7 +7220,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3f330004, 0x3f58fffc iwzyx 0x3f800000, 0x3f800000, 0x3f330004, 0x3f64fffc iwzyx 0x3f800000, 0x3f800000, 0x3f4c0000, 0x3f58fffc .EndUnpack -ITOP 421 ; -=ihc=- MSCNT unpack V4_32, 0, * iwzyx 0x3f800000, 0xc2be0000, 0x43220000, 0x428a0000 @@ -7423,7 +7407,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3f4c0000, 0x3f660008 iwzyx 0x3f800000, 0x3f800000, 0x3f4c0000, 0x3f71fff8 iwzyx 0x3f800000, 0x3f800000, 0x3f64fffc, 0x3f660008 .EndUnpack -ITOP 0 ; -=ihc=- MSCNT unpack V4_32, 421, * iwzyx 0x3f800000, 0xc2100000, 0x433e0000, 0x42480000 @@ -7611,6 +7594,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3f660008, 0x3f730004 iwzyx 0x3f800000, 0x3f800000, 0x3f660008, 0x3f7f0004 iwzyx 0x3f800000, 0x3f800000, 0x3f7f0004, 0x3f730004 .EndUnpack -ITOP 421 ; -=ihc=- MSCNT .EndDmaData +DMAend ; ADDED diff --git a/sim/testsuite/sky/sce_test43.dvpasm b/sim/testsuite/sky/sce_test43.dvpasm index e2a8bc4a555..13c5a8ee51c 100644 --- a/sim/testsuite/sky/sce_test43.dvpasm +++ b/sim/testsuite/sky/sce_test43.dvpasm @@ -1,18 +1,18 @@ -.include "../include/macros.s" +.include "sce_macros.s" .global My_dma_start .text My_dma_start: -.DmaPackPke 1 +.DmaPackVif 0 DMAref *, data0 .section ".dmadata", "aw" .DmaData data0 -STCYCL 4 4 +STCYCL 4, 4 STMASK 0x00000000 -STMOD 0 +STMOD direct .EndDmaData .text @@ -20,16 +20,17 @@ DMAref *, data1 .section ".dmadata", "aw" .DmaData data1 -MPG 0, "test.vubin" +MPG *, * +.include "sce_test43.vuasm" +.endmpg .EndDmaData .text -DMAcnt *, data2 -.DmaData data2 +DMAcnt * DIRECT * -GPUIFpacked REG={A_D}, NLOOP=4099, EOP +GIFpacked REGS={A_D}, NLOOP=4099, EOP iwzyx 0x00000000, 0x00000050, 0x14042580, 0x00000000 iwzyx 0x00000000, 0x00000052, 0x00000100, 0x00000100 iwzyx 0x00000000, 0x00000053, 0x00000000, 0x00000000 @@ -4129,12 +4130,12 @@ iwzyx 0x00000000, 0x00000054, 0x00000000, 0x00000000 iwzyx 0x00000000, 0x00000054, 0x00010000, 0x00000000 iwzyx 0x00000000, 0x00000054, 0x00000000, 0x0100000d iwzyx 0x00000000, 0x00000054, 0x00000000, 0xd00d0000 +.endgif .EndDirect .EndDmaData -DMAcnt *, data3 -.DmaData data3 +DMAcnt * DIRECT * -GPUIFpacked REG={A_D}, NLOOP=8, EOP +GIFpacked REGS={A_D}, NLOOP=8, EOP iwzyx 0x00000000, 0x00000050, 0x02012980, 0x00000000 iwzyx 0x00000000, 0x00000051, 0x00000000, 0x00000000 iwzyx 0x00000000, 0x00000052, 0x00000002, 0x00000008 @@ -4143,12 +4144,12 @@ iwzyx 0x00000000, 0x00000054, 0x66f77318, 0x73597fbd iwzyx 0x00000000, 0x00000054, 0x302030a2, 0x358c5673 iwzyx 0x00000000, 0x00000054, 0x29ae2149, 0x32d72e32 iwzyx 0x00000000, 0x00000054, 0x000021ac, 0x7fff437c +.endgif .EndDirect .EndDmaData -DMAcnt *, data4 -.DmaData data4 +DMAcnt * DIRECT * -GPUIFpacked REG={A_D}, NLOOP=17, EOP +GIFpacked REGS={A_D}, NLOOP=17, EOP iwzyx 0x00000000, 0x0000004c, 0x00000000, 0x000a0000 iwzyx 0x00000000, 0x0000004e, 0x00000000, 0x01000096 iwzyx 0x00000000, 0x00000046, 0x00000000, 0x00000001 @@ -4166,10 +4167,10 @@ iwzyx 0x00000000, 0x0000003b, 0x00000081, 0x00008080 iwzyx 0x00000000, 0x00000014, 0x00000000, 0x00000061 iwzyx 0x00000000, 0x00000049, 0x00000000, 0x00000001 iwzyx 0x00000000, 0x00000006, 0x20153006, 0x21412580 +.endgif .EndDirect .EndDmaData -DMAcnt *, data5 -.DmaData data5 +DMAcnt * unpack V4_32, 895, * iwzyx 0x00000000, 0x437f0000, 0x437f0000, 0x437f0000 .EndUnpack @@ -4229,8 +4230,7 @@ iwzyx 0x44480000, 0x3f24a3e8, 0x80000000, 0xbf4408d9 iwzyx 0x3f800000, 0x00000000, 0x00000000, 0x00000000 .EndUnpack .EndDmaData -DMAcnt *, data6 -.DmaData data6 +DMAcnt * MSCAL 0 unpack V4_32, 0, * iwzyx 0x3f800000, 0x00000000, 0xc33e0000, 0x42780000 @@ -4418,7 +4418,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3dc7ffde, 0x3d400000 iwzyx 0x3f800000, 0x3f800000, 0x3dc7ffde, 0x3dc00000 iwzyx 0x3f800000, 0x3f800000, 0x3e47ffde, 0x3d400000 .EndUnpack -ITOP 0 ; -=ihc=- MSCNT unpack V4_32, 421, * iwzyx 0x3f800000, 0x42100000, 0xc3220000, 0x42e00000 @@ -4606,7 +4605,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3e4c0011, 0x3dc7ffde iwzyx 0x3f800000, 0x3f800000, 0x3e4c0011, 0x3e13ffef iwzyx 0x3f800000, 0x3f800000, 0x3e980000, 0x3dc7ffde .EndUnpack -ITOP 421 ; -=ihc=- MSCNT unpack V4_32, 0, * iwzyx 0x3f800000, 0x42be0000, 0xc2ec0000, 0x43030000 @@ -4794,7 +4792,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3e980000, 0x3e180022 iwzyx 0x3f800000, 0x3f800000, 0x3e980000, 0x3e47ffde iwzyx 0x3f800000, 0x3f800000, 0x3ec9fff8, 0x3e180022 .EndUnpack -ITOP 0 ; -=ihc=- MSCNT unpack V4_32, 421, * iwzyx 0x3f800000, 0x431a0000, 0xc2780000, 0x42e00000 @@ -4982,7 +4979,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3ecc0011, 0x3e4c0011 iwzyx 0x3f800000, 0x3f800000, 0x3ecc0011, 0x3e7c0011 iwzyx 0x3f800000, 0x3f800000, 0x3efe0008, 0x3e4c0011 .EndUnpack -ITOP 421 ; -=ihc=- MSCNT unpack V4_32, 0, * iwzyx 0x3f800000, 0x433e0000, 0x00000000, 0x42780000 @@ -5170,7 +5166,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3f000000, 0x3e800000 iwzyx 0x3f800000, 0x3f800000, 0x3f000000, 0x3e980000 iwzyx 0x3f800000, 0x3f800000, 0x3f18fffc, 0x3e800000 .EndUnpack -ITOP 0 ; -=ihc=- MSCNT unpack V4_32, 421, * iwzyx 0x3f800000, 0x433e0000, 0x42780000, 0x00000000 @@ -5358,7 +5353,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3f18fffc, 0x3e980000 iwzyx 0x3f800000, 0x3f800000, 0x3f18fffc, 0x3eb00000 iwzyx 0x3f800000, 0x3f800000, 0x3f31fff8, 0x3e980000 .EndUnpack -ITOP 421 ; -=ihc=- MSCNT unpack V4_32, 0, * iwzyx 0x3f800000, 0x431a0000, 0x42ec0000, 0xc2480000 @@ -5546,7 +5540,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3f330004, 0x3eb1fff8 iwzyx 0x3f800000, 0x3f800000, 0x3f330004, 0x3ec9fff8 iwzyx 0x3f800000, 0x3f800000, 0x3f4c0000, 0x3eb1fff8 .EndUnpack -ITOP 0 ; -=ihc=- MSCNT unpack V4_32, 421, * iwzyx 0x3f800000, 0x42be0000, 0x43220000, 0xc28a0000 @@ -5734,7 +5727,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3f4c0000, 0x3ecc0011 iwzyx 0x3f800000, 0x3f800000, 0x3f4c0000, 0x3ee3ffef iwzyx 0x3f800000, 0x3f800000, 0x3f64fffc, 0x3ecc0011 .EndUnpack -ITOP 421 ; -=ihc=- MSCNT unpack V4_32, 0, * iwzyx 0x3f800000, 0x42100000, 0x433e0000, 0xc2480000 @@ -5922,7 +5914,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3f660008, 0x3ee60008 iwzyx 0x3f800000, 0x3f800000, 0x3f660008, 0x3efe0008 iwzyx 0x3f800000, 0x3f800000, 0x3f7f0004, 0x3ee60008 .EndUnpack -ITOP 0 ; -=ihc=- MSCNT unpack V4_32, 421, * iwzyx 0x3f800000, 0x00000000, 0xc33e0000, 0xc2780000 @@ -6110,7 +6101,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3dc7ffde, 0x3f0c0000 iwzyx 0x3f800000, 0x3f800000, 0x3dc7ffde, 0x3f180000 iwzyx 0x3f800000, 0x3f800000, 0x3e47ffde, 0x3f0c0000 .EndUnpack -ITOP 421 ; -=ihc=- MSCNT unpack V4_32, 0, * iwzyx 0x3f800000, 0xc2100000, 0xc3220000, 0xc2e00000 @@ -6298,7 +6288,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3e4c0011, 0x3f18fffc iwzyx 0x3f800000, 0x3f800000, 0x3e4c0011, 0x3f24fffc iwzyx 0x3f800000, 0x3f800000, 0x3e980000, 0x3f18fffc .EndUnpack -ITOP 0 ; -=ihc=- MSCNT unpack V4_32, 421, * iwzyx 0x3f800000, 0xc2be0000, 0xc2ec0000, 0xc3030000 @@ -6486,7 +6475,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3e980000, 0x3f260008 iwzyx 0x3f800000, 0x3f800000, 0x3e980000, 0x3f31fff8 iwzyx 0x3f800000, 0x3f800000, 0x3ec9fff8, 0x3f260008 .EndUnpack -ITOP 421 ; -=ihc=- MSCNT unpack V4_32, 0, * iwzyx 0x3f800000, 0xc31a0000, 0xc2780000, 0xc2e00000 @@ -6674,7 +6662,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3ecc0011, 0x3f330004 iwzyx 0x3f800000, 0x3f800000, 0x3ecc0011, 0x3f3f0004 iwzyx 0x3f800000, 0x3f800000, 0x3efe0008, 0x3f330004 .EndUnpack -ITOP 0 ; -=ihc=- MSCNT unpack V4_32, 421, * iwzyx 0x3f800000, 0xc33e0000, 0x00000000, 0xc2780000 @@ -6862,7 +6849,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3f000000, 0x3f400000 iwzyx 0x3f800000, 0x3f800000, 0x3f000000, 0x3f4c0000 iwzyx 0x3f800000, 0x3f800000, 0x3f18fffc, 0x3f400000 .EndUnpack -ITOP 421 ; -=ihc=- MSCNT unpack V4_32, 0, * iwzyx 0x3f800000, 0xc33e0000, 0x42780000, 0x00000000 @@ -7050,7 +7036,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3f18fffc, 0x3f4c0000 iwzyx 0x3f800000, 0x3f800000, 0x3f18fffc, 0x3f580000 iwzyx 0x3f800000, 0x3f800000, 0x3f31fff8, 0x3f4c0000 .EndUnpack -ITOP 0 ; -=ihc=- MSCNT unpack V4_32, 421, * iwzyx 0x3f800000, 0xc31a0000, 0x42ec0000, 0x42480000 @@ -7238,7 +7223,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3f330004, 0x3f58fffc iwzyx 0x3f800000, 0x3f800000, 0x3f330004, 0x3f64fffc iwzyx 0x3f800000, 0x3f800000, 0x3f4c0000, 0x3f58fffc .EndUnpack -ITOP 421 ; -=ihc=- MSCNT unpack V4_32, 0, * iwzyx 0x3f800000, 0xc2be0000, 0x43220000, 0x428a0000 @@ -7426,7 +7410,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3f4c0000, 0x3f660008 iwzyx 0x3f800000, 0x3f800000, 0x3f4c0000, 0x3f71fff8 iwzyx 0x3f800000, 0x3f800000, 0x3f64fffc, 0x3f660008 .EndUnpack -ITOP 0 ; -=ihc=- MSCNT unpack V4_32, 421, * iwzyx 0x3f800000, 0xc2100000, 0x433e0000, 0x42480000 @@ -7614,6 +7597,6 @@ iwzyx 0x3f800000, 0x3f800000, 0x3f660008, 0x3f730004 iwzyx 0x3f800000, 0x3f800000, 0x3f660008, 0x3f7f0004 iwzyx 0x3f800000, 0x3f800000, 0x3f7f0004, 0x3f730004 .EndUnpack -ITOP 421 ; -=ihc=- MSCNT .EndDmaData +DMAend ; ADDED