rgbfix: exit on invalid usage.

include/link/assign.h

@@ -5,11 +5,11 @@
 
 enum eBankDefine {
 	BANK_HOME = 0,
-	BANK_BSS = 256,
+	BANK_BSS = 512,
 	BANK_VRAM,
 	BANK_HRAM
 };
-#define MAXBANKS	259
+#define MAXBANKS	515
 
 extern SLONG area_Avail(SLONG bank);
 extern void AssignSections(void);

src/asm/gameboy/yaccprt4.y

@@ -1,48 +1,46 @@
-section			:	T_POP_SECTION string ',' sectiontype
-					{ out_NewSection($2,$4); }
-				|	T_POP_SECTION string ',' sectiontype '[' const ']'
-					{
-						if( $6>=0 && $6<0x10000 )
-							out_NewAbsSection($2,$4,$6,-1);
-						else
-							yyerror( "Address must be 16-bit" );
-					}
-				|	T_POP_SECTION string ',' sectiontype ',' T_OP_BANK '[' const ']'
-					{
-						if( $4==SECT_CODE )
-						{
-							if( $8>=1 && $8<=255 )
-								out_NewAbsSection($2,$4,-1,$8);
-							else
-								yyerror( "BANK value out of range" );
-						}
-						else
-							yyerror( "BANK only allowed for CODE/DATA" );
-					}
-				|	T_POP_SECTION string ',' sectiontype '[' const ']' ',' T_OP_BANK '[' const ']'
-					{
-						if( $4==SECT_CODE )
-						{
-							if( $6>=0 && $6<0x10000 )
-							{
-								if( $11>=1 && $11<=255 )
-									out_NewAbsSection($2,$4,$6,$11);
-								else
-									yyerror( "BANK value out of range" );
-							}
-							else
-								yyerror( "Address must be 16-bit" );
-						}
-						else
-							yyerror( "BANK only allowed for CODE/DATA" );
-					}
+section:
+		T_POP_SECTION string ',' sectiontype
+		{
+			out_NewSection($2,$4);
+		}
+	|	T_POP_SECTION string ',' sectiontype '[' const ']'
+		{
+			if( $6>=0 && $6<0x10000 )
+				out_NewAbsSection($2,$4,$6,-1);
+			else
+				yyerror( "Address must be 16-bit" );
+		}
+	|	T_POP_SECTION string ',' sectiontype ',' T_OP_BANK '[' const ']'
+		{
+			if( $4==SECT_CODE ) {
+				if( $8>=1 && $8<=0x1ff )
+					out_NewAbsSection($2,$4,-1,$8);
+				else
+					yyerror( "BANK value out of range" );
+			} else
+				yyerror( "BANK only allowed for CODE/DATA" );
+		}
+	|	T_POP_SECTION string ',' sectiontype '[' const ']' ',' T_OP_BANK '[' const ']'
+		{
+			if( $4==SECT_CODE ) {
+				if( $6>=0 && $6<0x10000 ) {
+					if( $11>=1 && $11<=0x1ff )
+						out_NewAbsSection($2,$4,$6,$11);
+					else
+						yyerror( "BANK value out of range" );
+				} else
+					yyerror( "Address must be 16-bit" );
+			} else
+				yyerror( "BANK only allowed for CODE/DATA" );
+		}
 ;
 
-sectiontype		:	T_SECT_BSS	{ $$=SECT_BSS; }
-				|	T_SECT_VRAM	{ $$=SECT_VRAM; }
-				|	T_SECT_CODE	{ $$=SECT_CODE; }
-				|	T_SECT_HOME	{ $$=SECT_HOME; }
-				|	T_SECT_HRAM	{ $$=SECT_HRAM; }
+sectiontype:
+		T_SECT_BSS	{ $$=SECT_BSS; }
+	|	T_SECT_VRAM	{ $$=SECT_VRAM; }
+	|	T_SECT_CODE	{ $$=SECT_CODE; }
+	|	T_SECT_HOME	{ $$=SECT_HOME; }
+	|	T_SECT_HRAM	{ $$=SECT_HRAM; }
 ;
 
 

src/fix/main.c

@@ -29,6 +29,7 @@ usage(void)
 	    "[-l licensee_id]\n" "              [-m mbc_type] [-n rom_version] "
 	    "[-p pad_value] [-r ram_size]\n"
 	    "              [-t title_str] file.gb\n");
+	exit(1);
 }
 
 int

src/link/assign.c

@@ -90,7 +90,7 @@ area_AllocAbsCODEAnyBank(SLONG org, SLONG size)
 {
 	SLONG i;
 
-	for (i = 1; i <= 255; i += 1) {
+	for (i = 1; i <= 511; i += 1) {
 		if (area_AllocAbs(&BankFree[i], org, size) == org)
 			return (i);
 	}
@@ -126,7 +126,7 @@ area_AllocCODEAnyBank(SLONG size)
 {
 	SLONG i, org;
 
-	for (i = 1; i <= 255; i += 1) {
+	for (i = 1; i <= 511; i += 1) {
 		if ((org = area_Alloc(&BankFree[i], size)) != -1)
 			return ((i << 16) | org);
 	}
@@ -204,7 +204,7 @@ AssignSections(void)
 				BankFree[i]->nSize = 0x4000;
 				MaxAvail[i] = 0x4000;
 			}
-		} else if (i >= 1 && i <= 255) {
+		} else if (i >= 1 && i <= 511) {
 			BankFree[i]->nOrg = 0x4000;
 			/*
 			 * Now, this shouldn't really be necessary... but for
@@ -327,7 +327,7 @@ AssignSections(void)
 						 */
 
 						if (pSection->nBank >= 1
-						    && pSection->nBank <= 255) {
+						    && pSection->nBank <= 511) {
 							if (area_AllocAbs
 							    (&BankFree
 								[pSection->nBank],
@@ -365,7 +365,7 @@ AssignSections(void)
 		    && pSection->Type == SECT_CODE
 		    && pSection->nOrg == -1 && pSection->nBank != -1) {
 			/* User wants to have a say... and he's pissed */
-			if (pSection->nBank >= 1 && pSection->nBank <= 255) {
+			if (pSection->nBank >= 1 && pSection->nBank <= 511) {
 				if ((pSection->nOrg =
 					area_Alloc(&BankFree[pSection->nBank],
 					    pSection->nByteSize)) == -1) {

src/link/mapfile.c

@@ -59,7 +59,7 @@ MapfileInitBank(SLONG bank)
 		currentbank = bank;
 		if (bank == 0)
 			fprintf(mf, "Bank #0 (HOME):\n");
-		else if (bank <= 255)
+		else if (bank < BANK_BSS)
 			fprintf(mf, "Bank #%ld:\n", bank);
 		else if (bank == BANK_BSS)
 			fprintf(mf, "BSS:\n");
@@ -69,7 +69,7 @@ MapfileInitBank(SLONG bank)
 			fprintf(mf, "VRAM:\n");
 	}
 	if (sf) {
-		sfbank = (bank >= 1 && bank <= 255) ? bank : 0;
+		sfbank = (bank >= 1 && bank <= 511) ? bank : 0;
 	}
 }