Increased maximum ROM size to 252/256 MiB.

Improved framebuffer size heuristic.

Author: Extrems

fileBrowser/fileBrowser-libfat.c

@@ -394,7 +394,11 @@ int fileBrowser_libfatROM_deinit(fileBrowser_file* f){
 int fileBrowser_libfatROM_readFile(fileBrowser_file* file, void* buffer, unsigned int length){
   if(stop)     //do this only in the menu
     pauseRemovalThread();
-	if(!fd) fd = fopen( file->name, "rb");
+	if(!fd) {
+		fd = fopen(file->name, "rb");
+		if(!fd) return FILE_BROWSER_ERROR;
+		setvbuf(fd, NULL, _IOFBF, 32*1024);
+	}
 
 	fseek(fd, file->offset, SEEK_SET);
 	int bytes_read = fread(buffer, 1, length, fd);

gc_memory/dma.c

@@ -148,7 +148,7 @@ void dma_pi_read()
      }
 
    longueur = (pi_register.pi_rd_len_reg & 0xFFFFFE)+2;
-   i = (pi_register.pi_cart_addr_reg-0x10000000)&0x3FFFFFE;
+   i = (pi_register.pi_cart_addr_reg-0x10000000)&0xFFFFFFE;
    longueur = (i + longueur) > rom_length ?
      (rom_length - i) : longueur;
    longueur = (pi_register.pi_dram_addr_reg + longueur) > MEMMASK ?
@@ -226,7 +226,7 @@ void dma_pi_write()
      }
 
    longueur = (pi_register.pi_wr_len_reg & 0xFFFFFE)+2;
-   i = (pi_register.pi_cart_addr_reg-0x10000000)&0x3FFFFFE;
+   i = (pi_register.pi_cart_addr_reg-0x10000000)&0xFFFFFFE;
    longueur = (i + longueur) > rom_length ?
      (rom_length - i) : longueur;
    longueur = (pi_register.pi_dram_addr_reg + longueur) > MEMMASK ?

gc_memory/memory.c

@@ -3076,22 +3076,22 @@ void read_rom()
 	rom_written = 0;
      }
    else
-     word = *(unsigned long *)ROMCache_pointer(address & 0x3FFFFFF);
+     word = *(unsigned long *)ROMCache_pointer(address & 0xFFFFFFF);
 }
 
 void read_romb()
 {
-   byte = *(unsigned char *)ROMCache_pointer(address & 0x3FFFFFF);
+   byte = *(unsigned char *)ROMCache_pointer(address & 0xFFFFFFF);
 }
 
 void read_romh()
 {
-   hword = *(unsigned short *)ROMCache_pointer(address & 0x3FFFFFF);
+   hword = *(unsigned short *)ROMCache_pointer(address & 0xFFFFFFF);
 }
 
 void read_romd()
 {
-   dword = *(unsigned long long *)ROMCache_pointer(address & 0x3FFFFFF);
+   dword = *(unsigned long long *)ROMCache_pointer(address & 0xFFFFFFF);
 }
 
 void write_rom()

glN64_GX/VI.cpp

@@ -72,15 +72,17 @@ void VI_UpdateSize()
 
 	u32 width = _SHIFTR( *REG.VI_WIDTH, 0, 12 );
 
-	VI.width = hEnd == hStart ? width : lrint(abs(hEnd - hStart) * xScale / 2) * 2;
+	VI.width = hEnd == hStart ? width : lrint(abs(hEnd - hStart) * xScale / 4) * 4;
+
+	if (VI.width > width) VI.width = width;
 
 	yScale *= width  / VI.width;
 	vEnd   += vStart % 2;
 	vStart += vEnd   % 2;
 	vStart  = vStart / 2 - 1;
 	vEnd    = vEnd   / 2 + 1;
 
-	VI.height = lrint(abs(vEnd - vStart) * yScale / 2) * 2;
+	VI.height = lrint(abs(vEnd - vStart) * yScale / 4) * 4;
 
 	if (VI.width == 0) VI.width = 320;
 	if (VI.height == 0) VI.height = 240;

main/ROM-Cache.c

@@ -53,7 +53,7 @@ static char *ROMCACHE_LO = &GC_ROM_CACHE[0];
 #define BLOCK_MASK  (BLOCK_SIZE-1)
 #define OFFSET_MASK (0xFFFFFFFF-BLOCK_MASK)
 #define BLOCK_SHIFT (16)	//only change ME and BLOCK_SIZE
-#define MAX_ROMSIZE (64*1024*1024)
+#define MAX_ROMSIZE (256*1024*1024)
 #define NUM_BLOCKS  (MAX_ROMSIZE/BLOCK_SIZE)
 
 static u32   ROMSize;