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

Fixed cc65's generation of char-type bit-shift code.

Browse Source 
Fixed CHAR-to-INT type conversions in the right-shift code generator.  Also fixed some printf-style format specifiers.
This commit is contained in:
Greg King
2020-11-15 15:22:23 -05:00
parent 5f65252fa6
commit 2915464667
1 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/cc65/codegen.c
View File

@@ -3104,16 +3104,14 @@ void g_asr (unsigned flags, unsigned long val)
"tosasrax", "tosshrax", "tosasreax", "tosshreax" "tosasrax", "tosshrax", "tosasreax", "tosshreax"
}; };
/* If the right hand side is const, the lhs is not on stack but still /* If the right hand side is const, the lhs is not on stack, but still
** in the primary register. ** in the primary register.
*/ */
if (flags & CF_CONST) { if (flags & CF_CONST) {
switch (flags & CF_TYPEMASK) { switch (flags & CF_TYPEMASK) {
case CF_CHAR: case CF_CHAR:
if (flags & CF_FORCECHAR) { if (flags & CF_FORCECHAR) {
if ((flags & CF_UNSIGNED) != 0 && val <= 4) { if ((flags & CF_UNSIGNED) != 0 && val < 8) {
while (val--) { while (val--) {
AddCodeLine ("lsr a"); AddCodeLine ("lsr a");
} }
@@ -3125,19 +3123,28 @@ void g_asr (unsigned flags, unsigned long val)
} }
return; return;
} }
AddCodeLine ("ldx #$00");
if ((flags & CF_UNSIGNED) == 0) {
unsigned L = GetLocalLabel ();
AddCodeLine ("cmp #$80"); /* Sign bit into carry */
AddCodeLine ("bcc %s", LocalLabelName (L));
AddCodeLine ("dex"); /* Make $FF */
g_defcodelabel (L);
}
} }
/* FALLTHROUGH */ /* FALLTHROUGH */
case CF_INT: case CF_INT:
val &= 0x0F; val &= 0x0F;
if (val >= 8) { if (val >= 8) {
AddCodeLine ("txa");
if (flags & CF_UNSIGNED) { if (flags & CF_UNSIGNED) {
AddCodeLine ("txa");
AddCodeLine ("ldx #$00"); AddCodeLine ("ldx #$00");
} else { } else {
unsigned L = GetLocalLabel(); unsigned L = GetLocalLabel ();
AddCodeLine ("cpx #$80"); /* Sign bit into carry */ AddCodeLine ("cpx #$80"); /* Sign bit into carry */
AddCodeLine ("txa");
AddCodeLine ("ldx #$00"); AddCodeLine ("ldx #$00");
AddCodeLine ("bcc %s", LocalLabelName (L)); AddCodeLine ("bcc %s", LocalLabelName (L));
AddCodeLine ("dex"); /* Make $FF */ AddCodeLine ("dex"); /* Make $FF */
@@ -3155,9 +3162,9 @@ void g_asr (unsigned flags, unsigned long val)
} }
if (val > 0) { if (val > 0) {
if (flags & CF_UNSIGNED) { if (flags & CF_UNSIGNED) {
AddCodeLine ("jsr shrax%ld", val); AddCodeLine ("jsr shrax%lu", val);
} else { } else {
AddCodeLine ("jsr asrax%ld", val); AddCodeLine ("jsr asrax%lu", val);
} }
} }
return; return;
@@ -3168,7 +3175,8 @@ void g_asr (unsigned flags, unsigned long val)
AddCodeLine ("ldx #$00"); AddCodeLine ("ldx #$00");
AddCodeLine ("lda sreg+1"); AddCodeLine ("lda sreg+1");
if ((flags & CF_UNSIGNED) == 0) { if ((flags & CF_UNSIGNED) == 0) {
unsigned L = GetLocalLabel(); unsigned L = GetLocalLabel ();
AddCodeLine ("bpl %s", LocalLabelName (L)); AddCodeLine ("bpl %s", LocalLabelName (L));
AddCodeLine ("dex"); AddCodeLine ("dex");
g_defcodelabel (L); g_defcodelabel (L);
@@ -3181,7 +3189,8 @@ void g_asr (unsigned flags, unsigned long val)
AddCodeLine ("ldy #$00"); AddCodeLine ("ldy #$00");
AddCodeLine ("ldx sreg+1"); AddCodeLine ("ldx sreg+1");
if ((flags & CF_UNSIGNED) == 0) { if ((flags & CF_UNSIGNED) == 0) {
unsigned L = GetLocalLabel(); unsigned L = GetLocalLabel ();
AddCodeLine ("bpl %s", LocalLabelName (L)); AddCodeLine ("bpl %s", LocalLabelName (L));
AddCodeLine ("dey"); AddCodeLine ("dey");
g_defcodelabel (L); g_defcodelabel (L);
@@ -3197,7 +3206,8 @@ void g_asr (unsigned flags, unsigned long val)
AddCodeLine ("ldy sreg+1"); AddCodeLine ("ldy sreg+1");
AddCodeLine ("sty sreg"); AddCodeLine ("sty sreg");
if ((flags & CF_UNSIGNED) == 0) { if ((flags & CF_UNSIGNED) == 0) {
unsigned L = GetLocalLabel(); unsigned L = GetLocalLabel ();
AddCodeLine ("cpy #$80"); AddCodeLine ("cpy #$80");
AddCodeLine ("ldy #$00"); AddCodeLine ("ldy #$00");
AddCodeLine ("bcc %s", LocalLabelName (L)); AddCodeLine ("bcc %s", LocalLabelName (L));
@@ -3219,9 +3229,9 @@ void g_asr (unsigned flags, unsigned long val)
} }
if (val > 0) { if (val > 0) {
if (flags & CF_UNSIGNED) { if (flags & CF_UNSIGNED) {
AddCodeLine ("jsr shreax%ld", val); AddCodeLine ("jsr shreax%lu", val);
} else { } else {
AddCodeLine ("jsr asreax%ld", val); AddCodeLine ("jsr asreax%lu", val);
} }
} }
return; return;
@@ -3251,15 +3261,13 @@ void g_asl (unsigned flags, unsigned long val)
"tosaslax", "tosshlax", "tosasleax", "tosshleax" "tosaslax", "tosshlax", "tosasleax", "tosshleax"
}; };
/* If the right hand side is const, the lhs is not on stack but still /* If the right hand side is const, the lhs is not on stack, but still
** in the primary register. ** in the primary register.
*/ */
if (flags & CF_CONST) { if (flags & CF_CONST) {
switch (flags & CF_TYPEMASK) { switch (flags & CF_TYPEMASK) {
case CF_CHAR: case CF_CHAR:
if ((flags & CF_FORCECHAR) != 0 && val <= 4) { if ((flags & CF_FORCECHAR) != 0 && val <= 6) {
while (val--) { while (val--) {
AddCodeLine ("asl a"); AddCodeLine ("asl a");
} }
@@ -3284,9 +3292,9 @@ void g_asl (unsigned flags, unsigned long val)
} }
if (val > 0) { if (val > 0) {
if (flags & CF_UNSIGNED) { if (flags & CF_UNSIGNED) {
AddCodeLine ("jsr shlax%ld", val); AddCodeLine ("jsr shlax%lu", val);
} else { } else {
AddCodeLine ("jsr aslax%ld", val); AddCodeLine ("jsr aslax%lu", val);
} }
} }
return; return;
@@ -3325,9 +3333,9 @@ void g_asl (unsigned flags, unsigned long val)
} }
if (val > 0) { if (val > 0) {
if (flags & CF_UNSIGNED) { if (flags & CF_UNSIGNED) {
AddCodeLine ("jsr shleax%ld", val); AddCodeLine ("jsr shleax%lu", val);
} else { } else {
AddCodeLine ("jsr asleax%ld", val); AddCodeLine ("jsr asleax%lu", val);
} }
} }
return; return;