Skip to content

Commit

Permalink
- add spumars sample
Browse files Browse the repository at this point in the history 
- improve cgcomp (add more shader functions)
- change commands.c to macro style code gen
- add more methods to rsx lib
- add spu_printf
- changes to related subprojects
  • Loading branch information
Mike Wiedenbauer committed Jul 10, 2020
1 parent 02e56af commit d0eea6e
Show file tree
Hide file tree
Showing 53 changed files with 5,809 additions and 2,934 deletions.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
*.elf
*.self
*.pkg
*.bin
*.o
*.a
*.d
*.so
*.dll
*.task
*.elf.map
build/
.idea/
Expand Down
106 changes: 53 additions & 53 deletions common/libspumars/ppu/ppu/mars_kernel.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,46 +140,46 @@ __attribute__((aligned(128))) const unsigned char mars_kernel_entry[] = {
0x18,0x20,0x81,0x83,0x33,0x82,0xdb,0x8c,0x16,0x01,0x02,0x07,0x35,0x80,0x00,0x05,
0x08,0x21,0xc1,0x88,0x08,0x21,0x84,0x09,0x18,0x22,0x84,0x8b,0x08,0x23,0x05,0x83,
0x35,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x3f,0xbe,0x41,0x83,0x3f,0xe1,0x01,0x82,
0x14,0x1c,0x01,0x03,0x35,0x00,0x00,0x00,0x14,0x00,0x41,0x8b,0x24,0x00,0x40,0x80,
0x04,0x00,0x01,0x8a,0x35,0x90,0x00,0x00,0x24,0xfe,0x00,0x81,0x04,0x00,0x02,0x06,
0x1c,0xe0,0x00,0x81,0x40,0x80,0x00,0x05,0x40,0x80,0x00,0x09,0x00,0x20,0x00,0x00,
0x40,0x80,0x00,0x07,0x20,0x00,0x0f,0x0b,0x42,0x11,0x80,0x08,0x40,0x80,0x00,0x05,
0x1c,0x1e,0x04,0x0c,0x35,0x90,0x00,0x00,0x40,0x80,0x00,0x09,0x40,0x80,0x00,0x07,
0x40,0x80,0x04,0x0d,0x40,0x80,0x00,0x8e,0x40,0x20,0x00,0x7f,0x38,0x83,0x44,0x03,
0x1c,0x02,0x04,0x08,0x12,0x7f,0xfe,0x91,0x3b,0x82,0x01,0x82,0x3f,0xbe,0x41,0x04,
0x3f,0xbe,0x81,0x0f,0x3f,0xe1,0x02,0x10,0x3f,0xe1,0x07,0x91,0x14,0x04,0x08,0x12,
0x14,0x1c,0x01,0x03,0x35,0x00,0x00,0x00,0x14,0x00,0x41,0x8c,0x24,0x00,0x40,0x80,
0x04,0x00,0x01,0x89,0x35,0x90,0x00,0x00,0x24,0xfe,0x00,0x81,0x04,0x00,0x02,0x06,
0x1c,0xe0,0x00,0x81,0x40,0x80,0x00,0x05,0x40,0x80,0x00,0x08,0x00,0x20,0x00,0x00,
0x40,0x80,0x00,0x07,0x20,0x00,0x0f,0x0c,0x42,0x11,0x80,0x02,0x40,0x80,0x00,0x05,
0x40,0x80,0x00,0x08,0x35,0x90,0x00,0x00,0x40,0x80,0x00,0x07,0x40,0x80,0x04,0x0d,
0x40,0x80,0x00,0x8e,0x40,0x80,0x07,0x8a,0x40,0x20,0x00,0x7f,0x38,0x83,0x41,0x03,
0x1c,0x02,0x01,0x02,0x12,0x7f,0xfe,0x91,0x3b,0x80,0x81,0x8b,0x3f,0xbe,0x45,0x84,
0x3f,0xbe,0x85,0x8f,0x3f,0xe1,0x02,0x10,0x3f,0xe1,0x07,0x91,0x14,0x04,0x08,0x12,
0x14,0x08,0x08,0x13,0x56,0xc0,0x09,0x14,0x5a,0x04,0x42,0x95,0x00,0x20,0x00,0x00,
0x56,0xc0,0x09,0x96,0x00,0x20,0x00,0x00,0x22,0x00,0x27,0x14,0x80,0xa1,0x48,0x95,
0x40,0x80,0x00,0x87,0x78,0x02,0x06,0x18,0x20,0x7f,0xf6,0x18,0x12,0x02,0x46,0x89,
0x40,0x80,0x00,0x87,0x1c,0xff,0xc5,0x0a,0x21,0x7f,0xf6,0x0a,0x12,0x02,0x46,0x89,
0x42,0x11,0xc0,0x04,0x33,0x83,0x61,0x83,0x24,0x01,0x00,0x85,0x24,0x00,0x80,0x86,
0x24,0x01,0x80,0x87,0x24,0x01,0x40,0x89,0x24,0x00,0xc0,0x8a,0x24,0x01,0xc0,0x8b,
0x33,0x02,0x42,0x00,0x34,0x01,0xc0,0x9e,0x34,0x01,0x00,0x99,0x34,0x00,0x80,0x9a,
0x35,0x90,0x00,0x00,0x34,0x01,0x80,0x9b,0x34,0x01,0x40,0x9c,0x34,0x00,0xc0,0x9d,
0x40,0x20,0x00,0x7f,0x20,0x00,0x1d,0x9e,0x18,0x06,0x8d,0x3e,0x33,0x82,0xb8,0x8b,
0x42,0x11,0xc0,0x3f,0x32,0xfe,0xfe,0x84,0x40,0x80,0x0e,0x33,0x18,0x0f,0x9f,0xb2,
0x35,0x90,0x00,0x00,0x14,0x3f,0xcd,0xc5,0x1c,0x0a,0x99,0x43,0x38,0x8c,0xd9,0x41,
0x42,0x7f,0xff,0xc0,0x3f,0xbf,0x22,0xc7,0x14,0x3f,0xcc,0xc8,0x38,0x8c,0xd9,0x42,
0x14,0x3f,0xce,0x46,0x3e,0xa3,0x19,0x44,0x3f,0xbf,0x24,0x4b,0x3f,0x82,0x23,0xcc,
0x3b,0x90,0xe0,0xc9,0x3f,0x82,0x25,0x8a,0x3f,0xe2,0x26,0x4d,0x18,0x30,0x24,0xca,
0x3f,0xbf,0x25,0x4f,0x3f,0x60,0x66,0xce,0x3f,0xe2,0x45,0x06,0x18,0x22,0xe7,0x85,
0x08,0x33,0x82,0x8c,0x3f,0xe1,0x06,0x07,0x14,0xff,0x83,0x8d,0x08,0x31,0x86,0x8e,
0x18,0x30,0x07,0x03,0x3f,0xbf,0x01,0x82,0x18,0x21,0x01,0x0f,0x08,0x21,0x87,0x90,
0x3f,0xe1,0x08,0x11,0xb7,0xb0,0x88,0xc4,0x40,0x20,0x00,0x7f,0x28,0x8c,0xd9,0x3d,
0x42,0x11,0xc0,0x12,0x33,0x83,0x34,0x15,0x40,0x80,0x02,0x18,0x12,0x02,0x5c,0x8c,
0x1c,0x01,0x09,0x13,0x33,0x83,0x32,0x09,0x1c,0x20,0x00,0x81,0x3e,0xc1,0x09,0x14,
0x04,0x00,0x09,0x04,0x33,0x83,0x41,0x83,0x3b,0x84,0xca,0x96,0x1c,0x00,0x4b,0x17,
0xb1,0x02,0x4b,0x94,0x28,0x86,0x09,0x08,0x34,0x00,0x40,0x80,0x32,0x02,0x56,0x80,
0x7d,0x00,0x0b,0x17,0x00,0x20,0x00,0x00,0x81,0x22,0x47,0x17,0x32,0x7f,0xd9,0x00,
0x20,0x7f,0xf6,0x1d,0x18,0x06,0x8d,0x1f,0x42,0x11,0xc0,0x20,0x40,0x80,0x0e,0x22,
0x18,0x07,0xd0,0x21,0x42,0x7f,0xff,0xa7,0x1c,0x0a,0x90,0xa4,0x38,0x88,0x90,0xa3,
0x14,0x00,0x8e,0xa5,0x40,0x80,0x00,0x2e,0x3b,0x89,0x11,0xa6,0x18,0x29,0xd3,0x28,
0x3f,0xbf,0x14,0x29,0x20,0x00,0x04,0xa5,0x3f,0x3f,0x94,0xaa,0x3f,0xe1,0x15,0x2b,
0x14,0x0f,0xd5,0xae,0x7e,0x0f,0xd7,0x2c,0x56,0xc0,0x16,0x2d,0x23,0x00,0x01,0xad,
0x1d,0x00,0x57,0x2e,0x00,0x20,0x00,0x00,0x14,0x3f,0xd7,0x2f,0x33,0x82,0x92,0xb4,
0x42,0x11,0xc0,0x31,0x12,0x7f,0xe8,0x8d,0x40,0x80,0x0e,0x33,0x3f,0xbf,0x17,0xb0,
0x18,0x07,0xd8,0xb2,0x38,0x8c,0xd9,0x37,0x18,0x2d,0x14,0xb5,0x3f,0x82,0x18,0x38,
0x3e,0xa3,0x19,0x36,0x3f,0xe2,0x1c,0x39,0x3f,0x60,0x9c,0xba,0x08,0x2e,0x9a,0xbb,
0x3f,0xe1,0x1d,0xbc,0xb7,0xad,0xde,0x36,0x32,0x7f,0xe2,0x00,0x00,0x20,0x00,0x00,
0x24,0x01,0x80,0x87,0x24,0x01,0x40,0x88,0x24,0x00,0xc0,0x89,0x24,0x01,0xc0,0x8c,
0x33,0x02,0x42,0x00,0x34,0x01,0xc0,0x9d,0x34,0x01,0x00,0x98,0x34,0x00,0x80,0x99,
0x35,0x90,0x00,0x00,0x34,0x01,0x80,0x9a,0x34,0x01,0x40,0x9b,0x34,0x00,0xc0,0x9c,
0x40,0x20,0x00,0x7f,0x20,0x00,0x1d,0x9d,0x18,0x06,0x4c,0xbd,0x33,0x82,0xb8,0x86,
0x42,0x11,0xc0,0x3e,0x32,0xfe,0xfe,0x8b,0x40,0x80,0x0e,0x32,0x18,0x0f,0x5f,0x31,
0x35,0x90,0x00,0x00,0x14,0x3f,0xcd,0x44,0x1c,0x0a,0x98,0xc2,0x38,0x8c,0x98,0xc0,
0x42,0x7f,0xff,0xbf,0x3f,0xbf,0x22,0x46,0x14,0x3f,0xcc,0x47,0x38,0x8c,0x98,0xc1,
0x14,0x3f,0xcd,0xc5,0x3e,0xa3,0x18,0xc3,0x3f,0xbf,0x23,0xca,0x3f,0x82,0x23,0x4b,
0x3b,0x90,0xa0,0x48,0x3f,0x82,0x25,0x4f,0x3f,0xe2,0x25,0xcc,0x18,0x2f,0xe4,0x49,
0x3f,0xbf,0x24,0xce,0x3f,0x60,0x66,0x4d,0x3f,0xe2,0x67,0x89,0x18,0x21,0xa7,0x0c,
0x08,0x33,0x46,0x05,0x3f,0xe1,0x02,0x87,0x14,0xff,0x83,0x8d,0x08,0x31,0x46,0x8e,
0x18,0x2f,0xc7,0x03,0x3f,0xbf,0x01,0x82,0x18,0x22,0xc1,0x04,0x08,0x22,0x42,0x0f,
0x3f,0xe1,0x07,0x90,0xb7,0x90,0x48,0x43,0x40,0x20,0x00,0x7f,0x28,0x8c,0x98,0xbc,
0x42,0x11,0xc0,0x11,0x33,0x83,0x34,0x14,0x40,0x80,0x02,0x0a,0x12,0x02,0x5c,0x8c,
0x1c,0x01,0x08,0x92,0x33,0x83,0x32,0x17,0x1c,0x20,0x00,0x81,0x3e,0xc1,0x08,0x93,
0x04,0x00,0x08,0x84,0x33,0x83,0x41,0x83,0x3b,0x84,0x8a,0x15,0x1c,0x00,0x4a,0x96,
0xb1,0x05,0xcb,0x13,0x28,0x82,0x88,0x88,0x34,0x00,0x40,0x80,0x32,0x02,0x56,0x80,
0x7d,0x00,0x0b,0x17,0x00,0x20,0x00,0x00,0x81,0x02,0x07,0x17,0x32,0x7f,0xd9,0x00,
0x20,0x7f,0xf6,0x1c,0x18,0x06,0x4c,0x9e,0x42,0x11,0xc0,0x1f,0x40,0x80,0x0e,0x21,
0x18,0x07,0x8f,0xa0,0x42,0x7f,0xff,0xa6,0x1c,0x0a,0x90,0x23,0x38,0x88,0x50,0x22,
0x14,0x00,0x8e,0x24,0x40,0x80,0x00,0x2d,0x3b,0x88,0xd1,0x25,0x18,0x29,0x92,0xa7,
0x3f,0xbf,0x13,0xa8,0x20,0x00,0x04,0xa4,0x3f,0x3f,0x94,0x29,0x3f,0xe1,0x14,0xaa,
0x14,0x0f,0xd5,0x2d,0x7e,0x0f,0xd6,0xab,0x56,0xc0,0x15,0xac,0x23,0x00,0x01,0xac,
0x1d,0x00,0x56,0xad,0x00,0x20,0x00,0x00,0x14,0x3f,0xd6,0xae,0x33,0x82,0x92,0xb3,
0x42,0x11,0xc0,0x30,0x12,0x7f,0xe8,0x8d,0x40,0x80,0x0e,0x32,0x3f,0xbf,0x17,0x2f,
0x18,0x07,0x98,0x31,0x38,0x8c,0x98,0xb6,0x18,0x2c,0xd4,0x34,0x3f,0x82,0x17,0xb7,
0x3e,0xa3,0x18,0xb5,0x3f,0xe2,0x1b,0xb8,0x3f,0x60,0x9c,0x39,0x08,0x2e,0x5a,0x3a,
0x3f,0xe1,0x1d,0x3b,0xb7,0x8d,0x9d,0xb5,0x32,0x7f,0xe2,0x00,0x00,0x20,0x00,0x00,
0x12,0x7f,0xb1,0x0c,0x3f,0x82,0x02,0x05,0x40,0x80,0x00,0x04,0x33,0x82,0x82,0x82,
0x24,0x00,0x40,0x80,0x24,0xff,0x40,0x81,0x1c,0xf4,0x00,0x81,0x3f,0xe3,0x02,0x86,
0x18,0x20,0x81,0x83,0x08,0x21,0x81,0x87,0x40,0x80,0x00,0x03,0x24,0x00,0x80,0x87,
Expand Down Expand Up @@ -447,26 +447,26 @@ __attribute__((aligned(128))) const unsigned char mars_kernel_entry[] = {
0x08,0x22,0x84,0x8b,0x56,0xc0,0x05,0x8c,0x23,0x00,0x2d,0x0c,0x32,0x80,0x80,0x8d,
0x16,0x1f,0xc6,0x8e,0x18,0x23,0x81,0x8f,0x78,0x01,0xc7,0x90,0x36,0x00,0x08,0x11,
0x4c,0x02,0xc8,0x92,0x20,0x00,0x2a,0x92,0x14,0x1f,0xc2,0x25,0x21,0x00,0x29,0xa5,
0x40,0x82,0x00,0x07,0x21,0xa0,0x00,0x87,0x40,0x80,0x00,0x37,0x40,0x80,0x01,0x99,
0x04,0x00,0x02,0x18,0x3f,0xbf,0x01,0x9b,0x1c,0x04,0x02,0x1a,0x3e,0x80,0xc2,0x13,
0x04,0x00,0x03,0x9c,0x3e,0x80,0x02,0x16,0x40,0x80,0x01,0x1d,0x3e,0x80,0x82,0x17,
0x1c,0x03,0xc2,0x14,0x3f,0xe1,0x0d,0x9e,0x40,0x80,0x00,0x95,0x3f,0xe1,0x01,0x83,
0x04,0x00,0x1b,0x9f,0x40,0x80,0x40,0x20,0x40,0x80,0x68,0x21,0x40,0x80,0x5a,0x22,
0x12,0x00,0x00,0x17,0x21,0xa0,0x08,0x18,0x21,0xa0,0x08,0x9e,0x21,0xa0,0x09,0x03,
0x21,0xa0,0x09,0xa0,0x21,0xa0,0x0a,0x1f,0x21,0xa0,0x0a,0xa1,0x01,0xa0,0x0d,0x85,
0x40,0x82,0x00,0x07,0x21,0xa0,0x00,0x87,0x40,0x80,0x00,0x37,0x40,0x80,0x40,0x1a,
0x04,0x00,0x02,0x18,0x3f,0xbf,0x01,0x94,0x04,0x00,0x1b,0x99,0x3f,0xe1,0x01,0x83,
0x40,0x80,0x68,0x1b,0x3e,0x80,0xc2,0x13,0x40,0x80,0x5a,0x1c,0x3e,0x80,0x02,0x16,
0x40,0x80,0x01,0x9d,0x3f,0xe1,0x0a,0x1f,0x1c,0x04,0x02,0x1e,0x3e,0x80,0x82,0x17,
0x04,0x00,0x03,0xa0,0x40,0x80,0x01,0x21,0x1c,0x03,0xc2,0x22,0x40,0x80,0x00,0x95,
0x12,0x00,0x00,0x17,0x21,0xa0,0x08,0x18,0x21,0xa0,0x08,0x9f,0x21,0xa0,0x09,0x03,
0x21,0xa0,0x09,0x9a,0x21,0xa0,0x0a,0x19,0x21,0xa0,0x0a,0x9b,0x01,0xa0,0x0d,0x85,
0x20,0x00,0x14,0xb7,0x34,0x00,0x02,0x28,0x3f,0x83,0x54,0x29,0x7e,0x00,0x54,0xaa,
0x56,0xc0,0x15,0x2b,0x00,0x20,0x00,0x00,0x23,0x00,0x03,0xab,0x38,0x87,0x42,0x2c,
0x3b,0x85,0x16,0x2d,0x7a,0x09,0x56,0xae,0x56,0xc0,0x17,0x2f,0x00,0x20,0x00,0x00,
0x23,0x00,0x02,0x2f,0x01,0xa0,0x00,0x05,0x21,0xa0,0x01,0x1c,0x32,0x7f,0xf4,0x80,
0x56,0xc0,0x15,0x2b,0x00,0x20,0x00,0x00,0x23,0x00,0x03,0xab,0x38,0x88,0x42,0x2c,
0x3b,0x88,0x96,0x2d,0x7a,0x09,0x56,0xae,0x56,0xc0,0x17,0x2f,0x00,0x20,0x00,0x00,
0x23,0x00,0x02,0x2f,0x01,0xa0,0x00,0x05,0x21,0xa0,0x01,0x20,0x32,0x7f,0xf4,0x80,
0x1d,0x00,0x52,0xb1,0x34,0x00,0x02,0x30,0x04,0x00,0x16,0xa5,0xb6,0x4c,0x0a,0x96,
0x24,0x00,0x02,0x32,0x38,0x87,0x42,0x33,0xb6,0x8c,0xd8,0x97,0x28,0x87,0x42,0x34,
0x00,0x60,0x00,0x00,0x21,0xa0,0x08,0x18,0x21,0xa0,0x08,0x9e,0x21,0xa0,0x09,0x03,
0x21,0xa0,0x09,0xa0,0x21,0xa0,0x0a,0x1f,0x21,0xa0,0x0a,0xa2,0x01,0xa0,0x0d,0xb5,
0x24,0x00,0x02,0x32,0x38,0x88,0x42,0x33,0xb6,0x8c,0xd8,0x97,0x28,0x88,0x42,0x34,
0x00,0x60,0x00,0x00,0x21,0xa0,0x08,0x18,0x21,0xa0,0x08,0x9f,0x21,0xa0,0x09,0x03,
0x21,0xa0,0x09,0x9a,0x21,0xa0,0x0a,0x19,0x21,0xa0,0x0a,0x9c,0x01,0xa0,0x0d,0xb5,
0x14,0x00,0x5a,0xb6,0x21,0x7f,0xeb,0xb6,0x1c,0x00,0x5b,0xb7,0x7c,0x00,0x9b,0xb8,
0x20,0x7f,0xea,0x38,0x40,0x82,0x00,0x04,0x21,0xa0,0x01,0x04,0x40,0x80,0x00,0x03,
0x35,0x00,0x00,0x00,0x12,0x7f,0xf7,0x8a,0x40,0x20,0x00,0x7f,0x38,0x86,0x42,0x23,
0x40,0x20,0x00,0x7f,0x38,0x86,0x42,0x24,0x3b,0x86,0x91,0xa5,0x1d,0x00,0x52,0xa6,
0xb4,0xe9,0x13,0x13,0x28,0x86,0x42,0x27,0x40,0x20,0x00,0x7f,0x32,0x7f,0xf2,0x80,
0x35,0x00,0x00,0x00,0x12,0x7f,0xf7,0x8a,0x40,0x20,0x00,0x7f,0x38,0x87,0x42,0x23,
0x40,0x20,0x00,0x7f,0x38,0x87,0x42,0x24,0x3b,0x87,0x91,0xa5,0x1d,0x00,0x52,0xa6,
0xb4,0xe9,0x13,0x13,0x28,0x87,0x42,0x27,0x40,0x20,0x00,0x7f,0x32,0x7f,0xf2,0x80,
0x40,0x80,0x00,0x83,0x32,0x7f,0xf9,0x80,0x40,0x80,0x02,0x83,0x32,0x7f,0xf8,0x80,
0x40,0x80,0x00,0x07,0x12,0x00,0x22,0x89,0x7c,0x00,0x02,0x06,0x78,0x01,0xc1,0x85,
0x0c,0x00,0x03,0x09,0x36,0x00,0x02,0x82,0x4c,0x02,0xc1,0x08,0x0c,0x00,0x04,0x0a,
Expand Down
2 changes: 2 additions & 0 deletions ppu/include/lv2/spu.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@ s32 sysSpuPrintfDetachThread(sys_spu_thread_t thread);
*/
s32 sysSpuPrintfFinalize();

s32 sysSpuImageOpenELF(sysSpuImage* image, const char* path);

#ifdef __cplusplus
}
#endif
Expand Down
Loading

0 comments on commit d0eea6e

Please sign in to comment.