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

Use a function pointer instead of a flag

Browse Source 
git-svn-id: svn://svn.cc65.org/cc65/trunk@1046 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz
2001-10-12 18:21:56 +00:00
parent 24a70bbcce
commit 0fcbb73439
1 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/cc65/codeseg.c
View File

@@ -160,7 +160,8 @@ static void CS_RemoveLabelFromHash (CodeSeg* S, CodeLabel* L)
static CodeLabel* CS_AddLabelInternal (CodeSeg* S, const char* Name, int UserCode) static CodeLabel* CS_AddLabelInternal (CodeSeg* S, const char* Name,
void (*ErrorFunc) (const char*, ...))
/* Add a code label for the next instruction to follow */ /* Add a code label for the next instruction to follow */
{ {
/* Calculate the hash from the name */ /* Calculate the hash from the name */
@@ -173,11 +174,7 @@ static CodeLabel* CS_AddLabelInternal (CodeSeg* S, const char* Name, int UserCod
if (L) { if (L) {
/* We found it - be sure it does not already have an owner */ /* We found it - be sure it does not already have an owner */
if (L->Owner) { if (L->Owner) {
if (UserCode) { ErrorFunc ("ASM label `%s' is already defined", Name);
Error ("ASM label `%s' is already defined", Name);
} else {
Internal ("CS_AddLabelInternal: Label `%s' already defined", Name);
}
} }
} else { } else {
/* Not found - create a new one */ /* Not found - create a new one */
@@ -186,11 +183,7 @@ static CodeLabel* CS_AddLabelInternal (CodeSeg* S, const char* Name, int UserCod
/* Safety. This call is quite costly, but safety is better */ /* Safety. This call is quite costly, but safety is better */
if (CollIndex (&S->Labels, L) >= 0) { if (CollIndex (&S->Labels, L) >= 0) {
if (UserCode) { ErrorFunc ("ASM label `%s' is already defined", Name);
Error ("ASM label `%s' is already defined", Name);
} else {
Internal ("CS_AddLabelInternal: Label `%s' already defined", Name);
}
} }
/* We do now have a valid label. Remember it for later */ /* We do now have a valid label. Remember it for later */
@@ -281,7 +274,7 @@ static CodeEntry* ParseInsn (CodeSeg* S, LineInfo* LI, const char* L)
L = SkipSpace (L+1); L = SkipSpace (L+1);
/* Add the label */ /* Add the label */
CS_AddLabelInternal (S, Mnemo, 1); CS_AddLabelInternal (S, Mnemo, Error);
/* If we have reached end of line, bail out, otherwise a mnemonic /* If we have reached end of line, bail out, otherwise a mnemonic
* may follow. * may follow.
@@ -735,7 +728,7 @@ unsigned CS_GetEntryIndex (CodeSeg* S, struct CodeEntry* E)
CodeLabel* CS_AddLabel (CodeSeg* S, const char* Name) CodeLabel* CS_AddLabel (CodeSeg* S, const char* Name)
/* Add a code label for the next instruction to follow */ /* Add a code label for the next instruction to follow */
{ {
return CS_AddLabelInternal (S, Name, 0); return CS_AddLabelInternal (S, Name, Internal);
} }