6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2024-12-23 19:29:37 +00:00
Code Issues Projects Releases Wiki Activity

Fixed #pragma charmap for string literals.

Browse Source
This commit is contained in:
acqn 2022-07-24 16:38:41 +08:00
parent fa9ec1fb71
commit 066a5e0fec
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cc65/expr.c
View File

@ -1263,6 +1263,8 @@ static void Primary (ExprDesc* E)
/* String literal */ /* String literal */
if ((Flags & E_EVAL_UNEVAL) != E_EVAL_UNEVAL) { if ((Flags & E_EVAL_UNEVAL) != E_EVAL_UNEVAL) {
E->V.LVal = UseLiteral (CurTok.SVal); E->V.LVal = UseLiteral (CurTok.SVal);
/* Translate into target charset */
TranslateLiteral (E->V.LVal);
} else { } else {
E->V.LVal = CurTok.SVal; E->V.LVal = CurTok.SVal;
} }

6
src/cc65/litpool.c
View File

@ -126,9 +126,6 @@ static void FreeLiteral (Literal* L)
static void OutputLiteral (Literal* L) static void OutputLiteral (Literal* L)
/* Output one literal to the currently active data segment */ /* Output one literal to the currently active data segment */
{ {
/* Translate the literal into the target charset */
TranslateLiteral (L);
/* Define the label for the literal */ /* Define the label for the literal */
g_defliterallabel (L->Label); g_defliterallabel (L->Label);
@ -387,9 +384,6 @@ static void OutputReadOnlyLiterals (Collection* Literals)
continue; continue;
} }
/* Translate the literal into the target charset */
TranslateLiteral (L);
/* Check if this literal is part of another one. Since the literals /* Check if this literal is part of another one. Since the literals
** are sorted by size (larger ones first), it can only be part of a ** are sorted by size (larger ones first), it can only be part of a
** literal with a smaller index. ** literal with a smaller index.