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

Fixed the definition of the long branch macros to avoid "Constant expression

Browse Source 
expected" errors when the branch target is outside the local scope.


git-svn-id: svn://svn.cc65.org/cc65/trunk@3176 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz
2004-08-16 10:04:09 +00:00
parent 5681334d52
commit d2999d9e7e
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/ca65/macpack.c
View File

@@ -76,7 +76,7 @@ static char MacLongBranch[] =
" .if .match(Target, 0)\n" " .if .match(Target, 0)\n"
" bne *+5\n" " bne *+5\n"
" jmp Target\n" " jmp Target\n"
" .elseif .def(Target) .and ((*+2)-(Target) <= 127)\n" " .elseif .def(Target) .and .const(Target) .and ((*+2)-(Target) <= 127)\n"
" beq Target\n" " beq Target\n"
" .else\n" " .else\n"
" bne *+5\n" " bne *+5\n"
@@ -87,7 +87,7 @@ static char MacLongBranch[] =
" .if .match(Target, 0)\n" " .if .match(Target, 0)\n"
" beq *+5\n" " beq *+5\n"
" jmp Target\n" " jmp Target\n"
" .elseif .def(Target) .and ((*+2)-(Target) <= 127)\n" " .elseif .def(Target) .and .const(Target) .and ((*+2)-(Target) <= 127)\n"
" bne Target\n" " bne Target\n"
" .else\n" " .else\n"
" beq *+5\n" " beq *+5\n"
@@ -98,7 +98,7 @@ static char MacLongBranch[] =
" .if .match(Target, 0)\n" " .if .match(Target, 0)\n"
" bpl *+5\n" " bpl *+5\n"
" jmp Target\n" " jmp Target\n"
" .elseif .def(Target) .and ((*+2)-(Target) <= 127)\n" " .elseif .def(Target) .and .const(Target) .and ((*+2)-(Target) <= 127)\n"
" bmi Target\n" " bmi Target\n"
" .else\n" " .else\n"
" bpl *+5\n" " bpl *+5\n"
@@ -109,7 +109,7 @@ static char MacLongBranch[] =
" .if .match(Target, 0)\n" " .if .match(Target, 0)\n"
" bmi *+5\n" " bmi *+5\n"
" jmp Target\n" " jmp Target\n"
" .elseif .def(Target) .and ((*+2)-(Target) <= 127)\n" " .elseif .def(Target) .and .const(Target) .and ((*+2)-(Target) <= 127)\n"
" bpl Target\n" " bpl Target\n"
" .else\n" " .else\n"
" bmi *+5\n" " bmi *+5\n"
@@ -120,7 +120,7 @@ static char MacLongBranch[] =
" .if .match(Target, 0)\n" " .if .match(Target, 0)\n"
" bcc *+5\n" " bcc *+5\n"
" jmp Target\n" " jmp Target\n"
" .elseif .def(Target) .and ((*+2)-(Target) <= 127)\n" " .elseif .def(Target) .and .const(Target) .and ((*+2)-(Target) <= 127)\n"
" bcs Target\n" " bcs Target\n"
" .else\n" " .else\n"
" bcc *+5\n" " bcc *+5\n"
@@ -131,7 +131,7 @@ static char MacLongBranch[] =
" .if .match(Target, 0)\n" " .if .match(Target, 0)\n"
" bcs *+5\n" " bcs *+5\n"
" jmp Target\n" " jmp Target\n"
" .elseif .def(Target) .and ((*+2)-(Target) <= 127)\n" " .elseif .def(Target) .and .const(Target) .and ((*+2)-(Target) <= 127)\n"
" bcc Target\n" " bcc Target\n"
" .else\n" " .else\n"
" bcs *+5\n" " bcs *+5\n"
@@ -142,7 +142,7 @@ static char MacLongBranch[] =
" .if .match(Target, 0)\n" " .if .match(Target, 0)\n"
" bvc *+5\n" " bvc *+5\n"
" jmp Target\n" " jmp Target\n"
" .elseif .def(Target) .and ((*+2)-(Target) <= 127)\n" " .elseif .def(Target) .and .const(Target) .and ((*+2)-(Target) <= 127)\n"
" bvs Target\n" " bvs Target\n"
" .else\n" " .else\n"
" bvc *+5\n" " bvc *+5\n"
@@ -153,7 +153,7 @@ static char MacLongBranch[] =
" .if .match(Target, 0)\n" " .if .match(Target, 0)\n"
" bvs *+5\n" " bvs *+5\n"
" jmp Target\n" " jmp Target\n"
" .elseif .def(Target) .and ((*+2)-(Target) <= 127)\n" " .elseif .def(Target) .and .const(Target) .and ((*+2)-(Target) <= 127)\n"
" bvc Target\n" " bvc Target\n"
" .else\n" " .else\n"
" bvs *+5\n" " bvs *+5\n"