the10thwiz/cc65
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

One more place where OutputNameUsed must be flagged.

Browse Source 
git-svn-id: svn://svn.cc65.org/cc65/trunk@4844 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
uz
2010-11-09 22:07:45 +00:00
parent fa1b5047dd
commit 7bd19b737a
1 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/ld65/config.c
View File

@@ -448,47 +448,47 @@ static void ParseMemory (void)
M->SizeExpr = CfgExpr (); M->SizeExpr = CfgExpr ();
break; break;
case CFGTOK_TYPE: case CFGTOK_TYPE:
FlagAttr (&M->Attr, MA_TYPE, "TYPE"); FlagAttr (&M->Attr, MA_TYPE, "TYPE");
CfgSpecialToken (Types, ENTRY_COUNT (Types), "Type"); CfgSpecialToken (Types, ENTRY_COUNT (Types), "Type");
if (CfgTok == CFGTOK_RO) { if (CfgTok == CFGTOK_RO) {
M->Flags |= MF_RO; M->Flags |= MF_RO;
} }
CfgNextTok (); CfgNextTok ();
break; break;
case CFGTOK_FILE: case CFGTOK_FILE:
FlagAttr (&M->Attr, MA_FILE, "FILE"); FlagAttr (&M->Attr, MA_FILE, "FILE");
CfgAssureStr (); CfgAssureStr ();
/* Get the file entry and insert the memory area */ /* Get the file entry and insert the memory area */
FileInsert (GetFile (GetStrBufId (&CfgSVal)), M); FileInsert (GetFile (GetStrBufId (&CfgSVal)), M);
CfgNextTok (); CfgNextTok ();
break; break;
case CFGTOK_DEFINE: case CFGTOK_DEFINE:
FlagAttr (&M->Attr, MA_DEFINE, "DEFINE"); FlagAttr (&M->Attr, MA_DEFINE, "DEFINE");
/* Map the token to a boolean */ /* Map the token to a boolean */
CfgBoolToken (); CfgBoolToken ();
if (CfgTok == CFGTOK_TRUE) { if (CfgTok == CFGTOK_TRUE) {
M->Flags |= MF_DEFINE; M->Flags |= MF_DEFINE;
} }
CfgNextTok (); CfgNextTok ();
break; break;
case CFGTOK_FILL: case CFGTOK_FILL:
FlagAttr (&M->Attr, MA_FILL, "FILL"); FlagAttr (&M->Attr, MA_FILL, "FILL");
/* Map the token to a boolean */ /* Map the token to a boolean */
CfgBoolToken (); CfgBoolToken ();
if (CfgTok == CFGTOK_TRUE) { if (CfgTok == CFGTOK_TRUE) {
M->Flags |= MF_FILL; M->Flags |= MF_FILL;
} }
CfgNextTok (); CfgNextTok ();
break; break;
case CFGTOK_FILLVAL: case CFGTOK_FILLVAL:
FlagAttr (&M->Attr, MA_FILLVAL, "FILLVAL"); FlagAttr (&M->Attr, MA_FILLVAL, "FILLVAL");
M->FillVal = (unsigned char) CfgCheckedConstExpr (0, 0xFF); M->FillVal = (unsigned char) CfgCheckedConstExpr (0, 0xFF);
break; break;
default: default:
FAIL ("Unexpected attribute token"); FAIL ("Unexpected attribute token");
@@ -511,6 +511,7 @@ static void ParseMemory (void)
*/ */
if ((M->Attr & MA_FILE) == 0) { if ((M->Attr & MA_FILE) == 0) {
FileInsert (GetFile (GetStringId (OutputName)), M); FileInsert (GetFile (GetStringId (OutputName)), M);
OutputNameUsed = 1;
} }
} }