From 9efd2dae90abe5921c3fa890e43688e44a7ae7d2 Mon Sep 17 00:00:00 2001 From: Jay Oster Date: Mon, 30 Jun 2014 00:49:02 -0700 Subject: [PATCH] Fix more insidious whitespace --- utils.c | 888 +++++++++++++++++++++++++++----------------------------- 1 file changed, 433 insertions(+), 455 deletions(-) diff --git a/utils.c b/utils.c index a5e7ec8..f01e4b5 100644 --- a/utils.c +++ b/utils.c @@ -12,9 +12,6 @@ #include "utils.h" #include "sram.h" - - - #define STBI_HEADER_FILE_ONLY #include "stb_image.c" @@ -34,13 +31,10 @@ typedef struct gscEntry gscEntry_t; extern gscEntry_t gGSCodes[]; - - static u8 __attribute__((aligned(16))) dmaBuf[128*1024]; static volatile struct _PI_regs_s * const _PI_regs = (struct _PI_regs_s *)0xa4600000; -int is_valid_rom(unsigned char *buffer) -{ +int is_valid_rom(unsigned char *buffer) { /* Test if rom is a native .z64 image with header 0x80371240. [ABCD] */ if((buffer[0]==0x80)&&(buffer[1]==0x37)&&(buffer[2]==0x12)&&(buffer[3]==0x40)) return 0; @@ -54,48 +48,35 @@ int is_valid_rom(unsigned char *buffer) return 0; } -void swap_header(unsigned char* header, int loadlength) -{ +void swap_header(unsigned char* header, int loadlength) { unsigned char temp; int i; /* Btyeswap if .v64 image. */ - if( header[0]==0x37) - { - // *imagetype = V64IMAGE; - for (i = 0; i < loadlength; i+=2) - { + if( header[0]==0x37) { + for (i = 0; i < loadlength; i+=2) { temp= header[i]; - header[i]= header[i+1]; - header[i+1]=temp; + header[i]= header[i+1]; + header[i+1]=temp; } } /* Wordswap if .n64 image. */ - else if( header[0]==0x40) - { - // *imagetype = N64IMAGE; - for (i = 0; i < loadlength; i+=4) - { + else if( header[0]==0x40) { + for (i = 0; i < loadlength; i+=4) { temp= header[i]; - header[i]= header[i+3]; - header[i+3]=temp; + header[i]= header[i+3]; + header[i+3]=temp; temp= header[i+1]; - header[i+1]= header[i+2]; - header[i+2]=temp; - } + header[i+1]= header[i+2]; + header[i+2]=temp; } - // else - // *imagetype = Z64IMAGE; + } } - - - u8 getCicType(u8 bios_cic) { - u8 cic_buff[2048]; volatile u8 cic_chip; - volatile u32 val; // = *(u32 *) 0xB0000170; + volatile u32 val; if (bios_cic) { evd_setCfgBit(ED_CFG_SDRAM_ON, 0); sleep(10); @@ -104,64 +85,153 @@ u8 getCicType(u8 bios_cic) { cic_chip = get_cic(cic_buff); evd_setCfgBit(ED_CFG_SDRAM_ON, 1); sleep(10); - - } else { + } + else { val = *(u32 *) 0xB0000170; dma_read_s(cic_buff, 0xB0000040, 1024); cic_chip = get_cic(cic_buff); - } + return cic_chip; } -int get_cic(unsigned char *buffer) -{ +int get_cic(unsigned char *buffer) { unsigned int crc; // figure out the CIC crc = CRC_Calculate(0, buffer, 1000); - switch(crc) - { - case 0x303faac9: - case 0xf0da3d50: - return 1; - case 0xf3106101: - return 2; - case 0xe7cd9d51: - return 3; - case 0x7ae65c9: - return 5; - case 0x86015f8f: - return 6; + switch(crc) { + case 0x303faac9: + case 0xf0da3d50: + return 1; + case 0xf3106101: + return 2; + case 0xe7cd9d51: + return 3; + case 0x7ae65c9: + return 5; + case 0x86015f8f: + return 6; } + return 2; } -int get_cic_save(char *cartid, int *cic, int *save) -{ +int get_cic_save(char *cartid, int *cic, int *save) { // variables int NUM_CARTS = 137; int i; //data arrays - //char *names[] = {"gnuboy64lite", "FRAMTestRom", "SRAMTestRom", "Worms Armageddon", "Super Smash Bros.", "Banjo-Tooie", "Blast Corps", "Bomberman Hero", "Body Harvest", "Banjo-Kazooie", "Bomberman 64", "Bomberman 64: Second Attack", "Command & Conquer", "Chopper Attack", "NBA Courtside 2 featuring Kobe Bryant", "Penny Racers", "Chameleon Twist", "Cruis'n USA", "Cruis'n World", "Legend of Zelda: Majora's Mask, The", "Donkey Kong 64", "Donkey Kong 64", "Donald Duck: Goin' Quackers", "Loony Toons: Duck Dodgers", "Diddy Kong Racing", "PGA European Tour", "Star Wars Episode 1 Racer", "AeroFighters Assault", "Bass Hunter 64", "Conker's Bad Fur Day", "F-1 World Grand Prix", "Star Fox 64", "F-Zero X", "GT64 Championship Edition", "GoldenEye 007", "Glover", "Bomberman 64", "Indy Racing 2000", "Indiana Jones and the Infernal Machine", "Jet Force Gemini", "Jet Force Gemini", "Earthworm Jim 3D", "Snowboard Kids 2", "Kirby 64: The Crystal Shards", "Fighters Destiny", "Major League Baseball featuring Ken Griffey Jr.", "Killer Instinct Gold", "Ken Griffey Jr's Slugfest", "Mario Kart 64", "Mario Party", "Lode Runner 3D", "Megaman 64", "Mario Tennis", "Mario Golf", "Mission: Impossible", "Mickey's Speedway USA", "Monopoly", "Paper Mario", "Multi-Racing Championship", "Big Mountain 2000", "Mario Party 3", "Mario Party 2", "Excitebike 64", "Dr. Mario 64", "Star Wars Episode 1: Battle for Naboo", "Kobe Bryant in NBA Courtside", "Excitebike 64", "Ogre Battle 64: Person of Lordly Caliber", "Pokémon Stadium 2", "Pokémon Stadium 2", "Perfect Dark", "Pokémon Snap", "Hey you, Pikachu!", "Pokémon Snap", "Pokémon Puzzle League", "Pokémon Stadium", "Pokémon Stadium", "Pilotwings 64", "Top Gear Overdrive", "Resident Evil 2", "New Tetris, The", "Star Wars: Rogue Squadron", "Ridge Racer 64", "Star Soldier: Vanishing Earth", "AeroFighters Assault", "Starshot Space Circus", "Super Mario 64", "Starcraft 64", "Rocket: Robot on Wheels", "Space Station Silicon Valley", "Star Wars: Shadows of the Empire", "Tigger's Honey Hunt", "1080º Snowboarding", "Tom & Jerry in Fists of Furry", "Mischief Makers", "All-Star Tennis '99", "Tetrisphere", "V-Rally Edition '99", "V-Rally Edition '99", "WCW/NWO Revenge", "WWF: No Mercy", "Waialae Country Club: True Golf Classics", "Wave Race 64", "Worms Armageddon", "WWF: Wrestlemania 2000", "Cruis'n Exotica", "Yoshi's Story", "Harvest Moon 64", "Legend of Zelda: Ocarina of Time, The", "Legend of Zelda: Majora's Mask, The", "Airboarder 64", "Bakuretsu Muteki Bangaioh", "Choro-Q 64 II", "Custom Robo", "Custom Robo V2", "Densha de Go! 64", "Doraemon: Mittsu no Seireiseki", "Dezaemon 3D", "Transformers Beast Wars", "Transformers Beast Wars Metals", "64 Trump Collection", "Bass Rush", "ECW Hardcore Revolution", "40 Winks", "Aero Gauge", "Aidyn Chronicles The First Mage", "Derby Stallion 64", "Doraemon 2 - Hikari no Shinden", "Doraemon 3 - Nobi Dai No Machi SOS", "F-1 World Grand Prix II", "Fushigi no Dungeon - Furai no Shiren 2", "Heiwa Pachinko World 64", "Neon Genesis Evangelion", "Racing Simulation", "Tsumi to Batsu", "Sonic Wings Assault", "Virtual Pro Wrestling", "Virtual Pro Wrestling 2", "Wild Choppers"}; - char *cartIDs[] = {"DZ", "B6", "ZY", "ZZ", "AD", "AL", "B7", "BC", "BD", "BH", "BK", "BM", "BV", "CC", "CH", "CK", "CR", "CT", "CU", "CW", "DL", "DO", "DP", "DQ", "DU", "DY", "EA", "EP", "ER", "FH", "FU", "FW", "FX", "FZ", "GC", "GE", "GV", "HA", "IC", "IJ", "JD", "JF", "JM", "K2", "K4", "KA", "KG", "KI", "KJ", "KT", "LB", "LR", "M6", "M8", "MF", "MI", "ML", "MO", "MQ", "MR", "MU", "MV", "MW", "MX", "N6", "NA", "NB", "NX", "OB", "P2", "P3", "PD", "PF", "PG", "PH", "PN", "PO", "PS", "PW", "RC", "RE", "RI", "RS", "RZ", "S6", "SA", "SC", "SM", "SQ", "SU", "SV", "SW", "T9", "TE", "TJ", "TM", "TN", "TP", "VL", "VY", "W2", "W4", "WL", "WR", "WU", "WX", "XO", "YS", "YW", "ZL", "ZS", "AB", "BN", "CG", "CX", "CZ", "D6", "DR", "DZ", "OH", "TB", "TC", "VB", "WI", "4W", "AG", "AY", "DA", "D2", "3D", "F2", "SI", "HP", "EV", "MG", "GU", "SA", "VP", "A2", "WC"}; - - //int saveTypes[] = {5, 1, 6, 5, 5, 5, 5, 5, 5, 4, 5, 4, 5, 5, 5, 6, 4, 6, 6, 5, 5, 5, 5, 6, 5, 5, 6, 5, 5, 1, 5, 5, 5, 5, 5, 5, 4, 4, 5, 5, 5, 5, 1, 5, 4, 5, 5, 5, 4, 6, 1, 5, 5, 5, 4, 5, 5, 6, 5, 6, 5, 5, 6, 6, 1, 4, 4, 6, 4, 5, 4, 4, 4, 4, 5, 5, 1, 1, 5, 6, 5, 5, 5, 5, 4, 5, 5, 5, 4, 1, 5, 5, 5, 5, 5, 5, 1, 4, 5, 5, 5, 1, 5, 6, 1, 1, 4, 5, 5, 5, 5, 6, 1, 5, 1, 5, 5, 5, 1, 1, 5, 5, 1, 1, 6, 6, 6, 4, 5, 6, 5, 5, 5, 1, 1, 5}; - // Banjo-Tooie B7 -> set to sram 'cause crk converts ek16->sram - int saveTypes[] = {2, 1, 5, 1, 3, 1, 1, 3, 3, 3, 3, 3, 3, 5, 3, 5, 3, 3, 3, 4, 5, 4, 4, 3, 3, 3, 3, 4, 3, 3, 4, 3, 3, 1, 3, 3, 3, 3, 3, 3, 5, 5, 3, 3, 3, 3, 1, 3, 5, 3, 3, 3, 5, 4, 1, 3, 3, 3, 5, 3, 3, 4, 3, 4, 3, 3, 4, 4, 1, 5, 5, 4, 5, 3, 5, 5, 5, 5, 3, 3, 1, 1, 3, 4, 3, 3, 3, 3, 5, 3, 3, 3, 5, 1, 3, 3, 3, 3, 3, 3, 1, 5, 3, 3, 3, 1, 3, 4, 1, 1, 5, 3, 3, 3, 3, 4, 1, 3, 1, 3, 3, 3, 1, 1, 3, 3, 1, 1, 4, 4, 4, 5, 3, 4, 3, 3, 3, 1, 1, 3}; + /* + char *names[] = { + "gnuboy64lite", "FRAMTestRom", "SRAMTestRom", "Worms Armageddon", + "Super Smash Bros.", "Banjo-Tooie", "Blast Corps", "Bomberman Hero", + "Body Harvest", "Banjo-Kazooie", "Bomberman 64", + "Bomberman 64: Second Attack", "Command & Conquer", "Chopper Attack", + "NBA Courtside 2 featuring Kobe Bryant", "Penny Racers", + "Chameleon Twist", "Cruis'n USA", "Cruis'n World", + "Legend of Zelda: Majora's Mask, The", "Donkey Kong 64", + "Donkey Kong 64", "Donald Duck: Goin' Quackers", + "Loony Toons: Duck Dodgers", "Diddy Kong Racing", "PGA European Tour", + "Star Wars Episode 1 Racer", "AeroFighters Assault", "Bass Hunter 64", + "Conker's Bad Fur Day", "F-1 World Grand Prix", "Star Fox 64", + "F-Zero X", "GT64 Championship Edition", "GoldenEye 007", "Glover", + "Bomberman 64", "Indy Racing 2000", + "Indiana Jones and the Infernal Machine", "Jet Force Gemini", + "Jet Force Gemini", "Earthworm Jim 3D", "Snowboard Kids 2", + "Kirby 64: The Crystal Shards", "Fighters Destiny", + "Major League Baseball featuring Ken Griffey Jr.", + "Killer Instinct Gold", "Ken Griffey Jr's Slugfest", "Mario Kart 64", + "Mario Party", "Lode Runner 3D", "Megaman 64", "Mario Tennis", + "Mario Golf", "Mission: Impossible", "Mickey's Speedway USA", + "Monopoly", "Paper Mario", "Multi-Racing Championship", + "Big Mountain 2000", "Mario Party 3", "Mario Party 2", "Excitebike 64", + "Dr. Mario 64", "Star Wars Episode 1: Battle for Naboo", + "Kobe Bryant in NBA Courtside", "Excitebike 64", + "Ogre Battle 64: Person of Lordly Caliber", "Pokémon Stadium 2", + "Pokémon Stadium 2", "Perfect Dark", "Pokémon Snap", + "Hey you, Pikachu!", "Pokémon Snap", "Pokémon Puzzle League", + "Pokémon Stadium", "Pokémon Stadium", "Pilotwings 64", + "Top Gear Overdrive", "Resident Evil 2", "New Tetris, The", + "Star Wars: Rogue Squadron", "Ridge Racer 64", + "Star Soldier: Vanishing Earth", "AeroFighters Assault", + "Starshot Space Circus", "Super Mario 64", "Starcraft 64", + "Rocket: Robot on Wheels", "Space Station Silicon Valley", + "Star Wars: Shadows of the Empire", "Tigger's Honey Hunt", + "1080º Snowboarding", "Tom & Jerry in Fists of Furry", + "Mischief Makers", "All-Star Tennis '99", "Tetrisphere", + "V-Rally Edition '99", "V-Rally Edition '99", "WCW/NWO Revenge", + "WWF: No Mercy", "Waialae Country Club: True Golf Classics", + "Wave Race 64", "Worms Armageddon", "WWF: Wrestlemania 2000", + "Cruis'n Exotica", "Yoshi's Story", "Harvest Moon 64", + "Legend of Zelda: Ocarina of Time, The", + "Legend of Zelda: Majora's Mask, The", "Airboarder 64", + "Bakuretsu Muteki Bangaioh", "Choro-Q 64 II", "Custom Robo", + "Custom Robo V2", "Densha de Go! 64", "Doraemon: Mittsu no Seireiseki", + "Dezaemon 3D", "Transformers Beast Wars", + "Transformers Beast Wars Metals", "64 Trump Collection", "Bass Rush", + "ECW Hardcore Revolution", "40 Winks", "Aero Gauge", + "Aidyn Chronicles The First Mage", "Derby Stallion 64", + "Doraemon 2 - Hikari no Shinden", "Doraemon 3 - Nobi Dai No Machi SOS", + "F-1 World Grand Prix II", "Fushigi no Dungeon - Furai no Shiren 2", + "Heiwa Pachinko World 64", "Neon Genesis Evangelion", + "Racing Simulation", "Tsumi to Batsu", "Sonic Wings Assault", + "Virtual Pro Wrestling", "Virtual Pro Wrestling 2", "Wild Choppers" + }; + */ + char *cartIDs[] = { + "DZ", "B6", "ZY", "ZZ", "AD", "AL", "B7", "BC", "BD", "BH", "BK", "BM", + "BV", "CC", "CH", "CK", "CR", "CT", "CU", "CW", "DL", "DO", "DP", "DQ", + "DU", "DY", "EA", "EP", "ER", "FH", "FU", "FW", "FX", "FZ", "GC", "GE", + "GV", "HA", "IC", "IJ", "JD", "JF", "JM", "K2", "K4", "KA", "KG", "KI", + "KJ", "KT", "LB", "LR", "M6", "M8", "MF", "MI", "ML", "MO", "MQ", "MR", + "MU", "MV", "MW", "MX", "N6", "NA", "NB", "NX", "OB", "P2", "P3", "PD", + "PF", "PG", "PH", "PN", "PO", "PS", "PW", "RC", "RE", "RI", "RS", "RZ", + "S6", "SA", "SC", "SM", "SQ", "SU", "SV", "SW", "T9", "TE", "TJ", "TM", + "TN", "TP", "VL", "VY", "W2", "W4", "WL", "WR", "WU", "WX", "XO", "YS", + "YW", "ZL", "ZS", "AB", "BN", "CG", "CX", "CZ", "D6", "DR", "DZ", "OH", + "TB", "TC", "VB", "WI", "4W", "AG", "AY", "DA", "D2", "3D", "F2", "SI", + "HP", "EV", "MG", "GU", "SA", "VP", "A2", "WC" + }; - //bt cic to 2 pos6 was 5 - int cicTypes[] = {2, 2, 2, 2, 2, 3, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, 6, 5, 5, 5, 2, 2, 3, 2, 2, 2, 2, 5, 2, 1, 6, 2, 2, 2, 2, 2, 2, 5, 5, 2, 2, 3, 2, 3, 2, 3, 2, 2, 2, 2, 2, 2, 2, 5, 2, 3, 2, 2, 2, 2, 3, 2, 2, 3, 3, 2, 3, 3, 5, 3, 2, 3, 2, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 6, 2, 5, 5, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2}; + /* + int saveTypes[] = { + 5, 1, 6, 5, 5, 5, 5, 5, 5, 4, 5, 4, 5, 5, 5, 6, 4, 6, 6, 5, 5, 5, 5, 6, + 5, 5, 6, 5, 5, 1, 5, 5, 5, 5, 5, 5, 4, 4, 5, 5, 5, 5, 1, 5, 4, 5, 5, 5, + 4, 6, 1, 5, 5, 5, 4, 5, 5, 6, 5, 6, 5, 5, 6, 6, 1, 4, 4, 6, 4, 5, 4, 4, + 4, 4, 5, 5, 1, 1, 5, 6, 5, 5, 5, 5, 4, 5, 5, 5, 4, 1, 5, 5, 5, 5, 5, 5, + 1, 4, 5, 5, 5, 1, 5, 6, 1, 1, 4, 5, 5, 5, 5, 6, 1, 5, 1, 5, 5, 5, 1, 1, + 5, 5, 1, 1, 6, 6, 6, 4, 5, 6, 5, 5, 5, 1, 1, 5 + }; + */ + // Banjo-Tooie B7 -> set to sram 'cause crk converts ek16->sram + int saveTypes[] = { + 2, 1, 5, 1, 3, 1, 1, 3, 3, 3, 3, 3, 3, 5, 3, 5, 3, 3, 3, 4, 5, 4, 4, 3, + 3, 3, 3, 4, 3, 3, 4, 3, 3, 1, 3, 3, 3, 3, 3, 3, 5, 5, 3, 3, 3, 3, 1, 3, + 5, 3, 3, 3, 5, 4, 1, 3, 3, 3, 5, 3, 3, 4, 3, 4, 3, 3, 4, 4, 1, 5, 5, 4, + 5, 3, 5, 5, 5, 5, 3, 3, 1, 1, 3, 4, 3, 3, 3, 3, 5, 3, 3, 3, 5, 1, 3, 3, + 3, 3, 3, 3, 1, 5, 3, 3, 3, 1, 3, 4, 1, 1, 5, 3, 3, 3, 3, 4, 1, 3, 1, 3, + 3, 3, 1, 1, 3, 3, 1, 1, 4, 4, 4, 5, 3, 4, 3, 3, 3, 1, 1, 3 + }; + + //bt cic to 2 pos6 was 5 + int cicTypes[] = { + 2, 2, 2, 2, 2, 3, 2, 2, 2, 2, 3, 2, 2, 2, 2, 2, 2, 2, 2, 6, 5, 5, 5, 2, + 2, 3, 2, 2, 2, 2, 5, 2, 1, 6, 2, 2, 2, 2, 2, 2, 5, 5, 2, 2, 3, 2, 3, 2, + 3, 2, 2, 2, 2, 2, 2, 2, 5, 2, 3, 2, 2, 2, 2, 3, 2, 2, 3, 3, 2, 3, 3, 5, + 3, 2, 3, 2, 3, 3, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 6, 2, 5, 5, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 + }; // search for cartid for (i=0; i - IO_WRITE(PI_BSD_DOM1_LAT_REG, 0x40); +void restoreTiming(void) { + //n64 timing restore :> + IO_WRITE(PI_BSD_DOM1_LAT_REG, 0x40); IO_WRITE(PI_BSD_DOM1_PWD_REG, 0x12); IO_WRITE(PI_BSD_DOM1_PGS_REG, 0x07); IO_WRITE(PI_BSD_DOM1_RLS_REG, 0x03); @@ -525,8 +540,7 @@ void restoreTiming(void){ * Load an image from the rom filesystem, returning a pointer to the * sprite that hold the image. */ -sprite_t *loadImageDFS(char *fname) -{ +sprite_t *loadImageDFS(char *fname) { int size, x, y, n, fd; u8 *tbuf; u8 *ibuf; @@ -538,8 +552,7 @@ sprite_t *loadImageDFS(char *fname) size = dfs_size(fd); tbuf = malloc(size); - if (!tbuf) - { + if (!tbuf) { dfs_close(fd); return 0; // out of memory } @@ -553,8 +566,7 @@ sprite_t *loadImageDFS(char *fname) return 0; // couldn't decode image sbuf = (sprite_t*)malloc(sizeof(sprite_t) + x * y * 2); - if (!sbuf) - { + if (!sbuf) { stbi_image_free(ibuf); return 0; // out of memory } @@ -571,37 +583,35 @@ sprite_t *loadImageDFS(char *fname) for (int j=0; jdata, sbuf->width * sbuf->height * sbuf->bitdepth ); - //data_cache_writeback_invalidate( sbuf->data, sbuf->width * sbuf->height * sbuf->bitdepth ); - // data_cache_hit_writeback_invalidate(buffer,size); stbi_image_free(ibuf); return sbuf; } -sprite_t *loadImage32(u8 *png, int size) -{ +sprite_t *loadImage32(u8 *png, int size) { int x, y, n, fd; u8 *tbuf; u32 *ibuf; sprite_t *sbuf; - tbuf = malloc(size); - memcpy(tbuf,png,size); - + tbuf = malloc(size); + memcpy(tbuf,png,size); + ibuf = stbi_load_from_memory(tbuf, size, &x, &y, &n, 4); free(tbuf); if (!ibuf) return 0; // couldn't decode image sbuf = (sprite_t*)malloc(sizeof(sprite_t) + x * y * 4); - if (!sbuf) - { + if (!sbuf) { stbi_image_free(ibuf); return 0; // out of memory } + sbuf->width = x; sbuf->height = y; sbuf->bitdepth = 4; @@ -615,18 +625,15 @@ sprite_t *loadImage32(u8 *png, int size) for (int j=0; jdata, sbuf->width * sbuf->height * sbuf->bitdepth ); - //data_cache_writeback_invalidate( sbuf->data, sbuf->width * sbuf->height * sbuf->bitdepth ); - // data_cache_hit_writeback_invalidate(buffer,size); stbi_image_free(ibuf); return sbuf; } - -sprite_t *loadImage32DFS(char *fname) -{ +sprite_t *loadImage32DFS(char *fname) { int size, x, y, n, fd; u8 *tbuf; u32 *ibuf; @@ -638,8 +645,7 @@ sprite_t *loadImage32DFS(char *fname) size = dfs_size(fd); tbuf = malloc(size); - if (!tbuf) - { + if (!tbuf) { dfs_close(fd); return 0; // out of memory } @@ -653,11 +659,11 @@ sprite_t *loadImage32DFS(char *fname) return 0; // couldn't decode image sbuf = (sprite_t*)malloc(sizeof(sprite_t) + x * y * 4); - if (!sbuf) - { + if (!sbuf) { stbi_image_free(ibuf); return 0; // out of memory } + sbuf->width = x; sbuf->height = y; sbuf->bitdepth = 4; @@ -671,10 +677,9 @@ sprite_t *loadImage32DFS(char *fname) for (int j=0; jdata, sbuf->width * sbuf->height * sbuf->bitdepth ); - //data_cache_writeback_invalidate( sbuf->data, sbuf->width * sbuf->height * sbuf->bitdepth ); - // data_cache_hit_writeback_invalidate(buffer,size); stbi_image_free(ibuf); return sbuf; @@ -683,8 +688,7 @@ sprite_t *loadImage32DFS(char *fname) /* * Draw an image to the screen using the sprite passed. */ -void drawImage(display_context_t dcon, sprite_t *sprite) -{ +void drawImage(display_context_t dcon, sprite_t *sprite) { int x, y = 0; rdp_sync(SYNC_PIPE); @@ -692,11 +696,9 @@ void drawImage(display_context_t dcon, sprite_t *sprite) rdp_enable_texture_copy(); rdp_attach_display(dcon); // Draw image - for (int j=0; jvslices; j++) - { + for (int j=0; jvslices; j++) { x = 0; - for (int i=0; ihslices; i++) - { + for (int i=0; ihslices; i++) { rdp_sync(SYNC_PIPE); rdp_load_texture_stride(0, 0, MIRROR_DISABLED, sprite, j*sprite->hslices + i); rdp_draw_sprite(0, x, y); @@ -716,24 +718,19 @@ void drawImage(display_context_t dcon, sprite_t *sprite) #define CIC_6106 6 -void globalTest(void){ - -gCheats=1; - +void globalTest(void) { + gCheats=1; } -void simulate_boot(u32 cic_chip, u8 gBootCic) -{ - - if (cic_chip == CIC_6104) - cic_chip = CIC_6102; - +void simulate_boot(u32 cic_chip, u8 gBootCic) { + if (cic_chip == CIC_6104) + cic_chip = CIC_6102; + u32 ix, sz, cart, country; vu32 *src, *dst; u32 info = *(vu32 *)0xB000003C; vu64 *gGPR = (vu64 *)0xA03E0000; - //vu64 *gGPR = (vu64 *)0xA0080000; //n vu32 *codes = (vu32 *)0xA0000180; u64 bootAddr = 0xFFFFFFFFA4000040LL; char *cp, *vp, *tp; @@ -744,18 +741,17 @@ void simulate_boot(u32 cic_chip, u8 gBootCic) cart = info >> 16; country = (info >> 8) & 0xFF; - if(boot_country!=0){ - switch(boot_country){ - case 1: country = 0x45; break; //ntsc region - case 2: country = 0x50; break; //pal region - default: break; - } - } + if(boot_country!=0){ + switch(boot_country){ + case 1: country = 0x45; break; //ntsc region + case 2: country = 0x50; break; //pal region + default: break; + } + } // clear XBUS/Flush/Freeze ((vu32 *)0xA4100000)[3] = 0x15; - - + sz = (gBootCic != CIC_6105) ? *(vu32 *)0xA0000318 : *(vu32 *)0xA00003F0; if (cic_chip == CIC_6105) *(vu32 *)0xA00003F0 = sz; @@ -766,11 +762,7 @@ void simulate_boot(u32 cic_chip, u8 gBootCic) *(vu32 *)0xA000030C = 0; // cold boot memset((void *)0xA000031C, 0, 64); // clear app nmi buffer - - - if (gCheats) - { - + if (gCheats) { u16 xv, yv, zv; u32 xx; vu32 *sp, *dp; @@ -814,17 +806,14 @@ void simulate_boot(u32 cic_chip, u8 gBootCic) *codes++ = 0x00000000; // nop // process cheats - while (gGSCodes[curr_cheat].count != 0xFFFF) - { - if (!gGSCodes[curr_cheat].state || !gGSCodes[curr_cheat].count) - { + while (gGSCodes[curr_cheat].count != 0xFFFF) { + if (!gGSCodes[curr_cheat].state || !gGSCodes[curr_cheat].count) { // cheat not enabled or no codes, skip curr_cheat++; continue; } - for (i=0; i boot address = 800XXXXX, msn ignored @@ -1094,6 +1085,7 @@ void simulate_boot(u32 cic_chip, u8 gBootCic) val = strtol(temp, (char **)NULL, 16); bootAddr = 0xFFFFFFFF80000000LL | (val & 0xFFFFF); break; + case 0xEE: // deactivate expansion ram using 1st method // EE000000 0000 @@ -1102,6 +1094,7 @@ void simulate_boot(u32 cic_chip, u8 gBootCic) else *(vu32 *)0xA0000318 = 0x00400000; break; + case 0xF0: // write 8-bit value to ram before boot // F0XXXXXX 00YY @@ -1115,12 +1108,10 @@ void simulate_boot(u32 cic_chip, u8 gBootCic) val = strtol(temp, (char **)NULL, 16); val -= (bootAddr & 0xFFFFFF); tp = (char *)(0xFFFFFFFFA02A0000LL + val); - if (gGSCodes[curr_cheat].mask) - { + if (gGSCodes[curr_cheat].mask) { val = gGSCodes[curr_cheat].value & gGSCodes[curr_cheat].mask; } - else - { + else { temp[0] = vp[2]; temp[1] = vp[3]; temp[2] = 0; @@ -1128,6 +1119,7 @@ void simulate_boot(u32 cic_chip, u8 gBootCic) } *tp = val & 0x00FF; break; + case 0xF1: // write 16-bit value to ram before boot // F1XXXXXX YYYY @@ -1141,12 +1133,10 @@ void simulate_boot(u32 cic_chip, u8 gBootCic) val = strtol(temp, (char **)NULL, 16); val -= (bootAddr & 0xFFFFFF); tp = (char *)(0xFFFFFFFFA02A0000LL + val); - if (gGSCodes[curr_cheat].mask) - { + if (gGSCodes[curr_cheat].mask) { val = gGSCodes[curr_cheat].value & gGSCodes[curr_cheat].mask; } - else - { + else { temp[0] = vp[0]; temp[1] = vp[1]; temp[2] = vp[2]; @@ -1157,6 +1147,7 @@ void simulate_boot(u32 cic_chip, u8 gBootCic) *tp++ = (val >> 8) & 0x00FF; *tp = val & 0x00FF; break; + case 0xFF: // set code base // FFXXXXXX 0000 @@ -1223,8 +1214,7 @@ void simulate_boot(u32 cic_chip, u8 gBootCic) gGPR[29]=0xFFFFFFFFA4001FF0LL; gGPR[30]=0x0000000000000000LL; - switch (country) - { + switch (country) { case 0x44: //Germany case 0x46: //french case 0x49: //Italian @@ -1233,31 +1223,31 @@ void simulate_boot(u32 cic_chip, u8 gBootCic) case 0x55: //Australia case 0x58: // ???? case 0x59: // X (PAL) - { - - if(force_tv!=0) - *(u32 *) 0x80000300 = force_tv; //pal - else - *(u32 *) 0x80000300 = 2; - - switch (cic_chip) - { + if(force_tv!=0) + *(u32 *) 0x80000300 = force_tv; //pal + else + *(u32 *) 0x80000300 = 2; + + switch (cic_chip) { case CIC_6102: gGPR[5]=0xFFFFFFFFC0F1D859LL; gGPR[14]=0x000000002DE108EALL; gGPR[24]=0x0000000000000000LL; break; + case CIC_6103: gGPR[5]=0xFFFFFFFFD4646273LL; gGPR[14]=0x000000001AF99984LL; gGPR[24]=0x0000000000000000LL; break; + case CIC_6105: dst[0x04>>2] = 0xBDA807FC; gGPR[5]=0xFFFFFFFFDECAAAD1LL; gGPR[14]=0x000000000CF85C13LL; gGPR[24]=0x0000000000000002LL; break; + case CIC_6106: gGPR[5]=0xFFFFFFFFB04DC903LL; gGPR[14]=0x000000001AF99984LL; @@ -1269,34 +1259,36 @@ void simulate_boot(u32 cic_chip, u8 gBootCic) gGPR[23]=0x0000000000000006LL; gGPR[31]=0xFFFFFFFFA4001554LL; break; - } + case 0x37: // 7 (Beta) case 0x41: // ???? case 0x45: //USA case 0x4A: //Japan - - if(force_tv!=0) - *(u32 *) 0x80000300 = force_tv; //pal - else - *(u32 *) 0x80000300 = 1; //ntsc - + if(force_tv!=0) + *(u32 *) 0x80000300 = force_tv; //pal + else + *(u32 *) 0x80000300 = 1; //ntsc + + // Fall-through + default: - { - switch (cic_chip) - { + switch (cic_chip) { case CIC_6102: gGPR[5]=0xFFFFFFFFC95973D5LL; gGPR[14]=0x000000002449A366LL; break; + case CIC_6103: gGPR[5]=0xFFFFFFFF95315A28LL; gGPR[14]=0x000000005BACA1DFLL; break; + case CIC_6105: dst[0x04>>2] = 0x8DA807FC; gGPR[5]=0x000000005493FB9ALL; gGPR[14]=0xFFFFFFFFC2C20384LL; break; + case CIC_6106: gGPR[5]=0xFFFFFFFFE067221FLL; gGPR[14]=0x000000005CD2B70FLL; @@ -1308,14 +1300,13 @@ void simulate_boot(u32 cic_chip, u8 gBootCic) gGPR[24]=0x0000000000000003LL; gGPR[31]=0xFFFFFFFFA4001550LL; break; - } } - switch (cic_chip) - { + switch (cic_chip) { case CIC_6101: gGPR[22]=0x000000000000003FLL; break; + case CIC_6102: gGPR[1]=0x0000000000000001LL; gGPR[2]=0x000000000EBDA536LL; @@ -1327,6 +1318,7 @@ void simulate_boot(u32 cic_chip, u8 gBootCic) gGPR[22]=0x000000000000003FLL; gGPR[25]=0xFFFFFFFF9DEBB54FLL; break; + case CIC_6103: gGPR[1]=0x0000000000000001LL; gGPR[2]=0x0000000049A5EE96LL; @@ -1338,6 +1330,7 @@ void simulate_boot(u32 cic_chip, u8 gBootCic) gGPR[22]=0x0000000000000078LL; gGPR[25]=0xFFFFFFFF825B21C9LL; break; + case CIC_6105: dst[0x00>>2] = 0x3C0DBFC0; dst[0x08>>2] = 0x25AD07C0; @@ -1356,6 +1349,7 @@ void simulate_boot(u32 cic_chip, u8 gBootCic) gGPR[22]=0x0000000000000091LL; gGPR[25]=0xFFFFFFFFCDCE565FLL; break; + case CIC_6106: gGPR[1]=0x0000000000000000LL; gGPR[2]=0xFFFFFFFFA95930A4LL; @@ -1369,78 +1363,66 @@ void simulate_boot(u32 cic_chip, u8 gBootCic) break; } - // set HW registers IO_WRITE(PI_STATUS_REG, 0x03); - switch (cart) - { + switch (cart) { case 0x4258: // 'BX' - Battle Tanx - IO_WRITE(PI_BSD_DOM1_LAT_REG, 0x80); IO_WRITE(PI_BSD_DOM1_RLS_REG, 0x37); IO_WRITE(PI_BSD_DOM1_PWD_REG, 0x12); IO_WRITE(PI_BSD_DOM1_PGS_REG, 0x40); - break; - - case 0x4237: // 'B7' - Banjo Tooie - + + case 0x4237: // 'B7' - Banjo Tooie IO_WRITE(PI_BSD_DOM1_LAT_REG, 0x80); IO_WRITE(PI_BSD_DOM1_RLS_REG, 0x37); IO_WRITE(PI_BSD_DOM1_PWD_REG, 0x12); IO_WRITE(PI_BSD_DOM1_PGS_REG, 0x40); - - break; - - - case 0x5A4C: // 'ZL' - Zelda OOT + break; + case 0x5A4C: // 'ZL' - Zelda OOT /* - IO_WRITE(PI_BSD_DOM2_LAT_REG, 0x00000005); - IO_WRITE(PI_BSD_DOM2_PWD_REG, 0x0000000C); - IO_WRITE(PI_BSD_DOM2_PGS_REG, 0x0000000D); - IO_WRITE(PI_BSD_DOM2_RLS_REG, 0x00000002); + IO_WRITE(PI_BSD_DOM2_LAT_REG, 0x00000005); + IO_WRITE(PI_BSD_DOM2_PWD_REG, 0x0000000C); + IO_WRITE(PI_BSD_DOM2_PGS_REG, 0x0000000D); + IO_WRITE(PI_BSD_DOM2_RLS_REG, 0x00000002); */ /* unstable IO_WRITE(PI_BSD_DOM1_LAT_REG, 0x00000040); IO_WRITE(PI_BSD_DOM1_RLS_REG, 0x00803712); IO_WRITE(PI_BSD_DOM1_PWD_REG, 0x00008037); - IO_WRITE(PI_BSD_DOM1_PGS_REG, 0x00000803); - */ + IO_WRITE(PI_BSD_DOM1_PGS_REG, 0x00000803); +*/ break; + default: break; } - - - /* - - load immediate: li register_destination, value #load immediate value into destination register - + --- - - Registers in coprocessor 0 cannot be used directly by MIPS instructions. Instead, there are two - instructions that work much like load and store instructions. The mfc0 (move from coprocessor 0) instruction + + Registers in coprocessor 0 cannot be used directly by MIPS instructions. Instead, there are two + instructions that work much like load and store instructions. The mfc0 (move from coprocessor 0) instruction loads data from a coprocessor 0 register into a CPU register. The mtc0 likewise stores data in a cp0 register. Note -The mtc0 instruction, like the store instruction has the destination last. This is especially important to note, - since the syntax for cp0 registers looks the same as the syntax for CPU registers. For example, the following copies +The mtc0 instruction, like the store instruction has the destination last. This is especially important to note, + since the syntax for cp0 registers looks the same as the syntax for CPU registers. For example, the following copies the contents of CPU register 13 to cp0 register 12. - mtc0 $13, $12 - - - mthi 010001 MoveTo hi = $s + mtc0 $13, $12 + + + mthi 010001 MoveTo hi = $s + - LUI -- Load upper immediate Description: @@ -1456,8 +1438,7 @@ Encoding: // now set MIPS registers - set CP0, and then GPRs, then jump thru gpr11 (which is usually 0xA400040) if (!gCheats) - - asm(".set noat\n\t" + asm(".set noat\n\t" ".set noreorder\n\t" "li $8,0x34000000\n\t" "mtc0 $8,$12\n\t" @@ -1466,20 +1447,20 @@ Encoding: "li $9,0x0006E463\n\t" "mtc0 $9,$16\n\t" "nop\n\t" - "nop\n\t" + "nop\n\t" "li $8,0x00005000\n\t" "mtc0 $8,$9\n\t" "nop\n\t" - "nop\n\t" + "nop\n\t" "li $9,0x0000005C\n\t" "mtc0 $9,$13\n\t" "nop\n\t" - "nop\n\t" + "nop\n\t" "li $8,0x007FFFF0\n\t" "mtc0 $8,$4\n\t" "nop\n\t" - "nop\n\t" - "nop\n\t" + "nop\n\t" + "nop\n\t" "li $9,0xFFFFFFFF\n\t" "mtc0 $9,$14\n\t" "nop\n\t" @@ -1493,10 +1474,10 @@ Encoding: "lui $8,0\n\t" "mthi $8\n\t" "nop\n\t" - "nop\n\t" + "nop\n\t" "mtlo $8\n\t" "nop\n\t" - "nop\n\t" + "nop\n\t" "ctc1 $8,$31\n\t" "nop\n\t" "lui $31,0xA03E\n\t" @@ -1535,10 +1516,7 @@ Encoding: "jr $11\n\t" "nop" ::: "$8" ); - - - - + else asm(".set noreorder\n\t" "li $8,0x34000000\n\t"