X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fcc65%2Fcodegen.c;h=81f4ecfb3dcb8ffb5cfa350187e65466dcdbfffc;hb=32164ea8e5222e3c9f40980dca307ac96c84a922;hp=aafefa532ea5300e9adeae89cefa2ee593c3ac80;hpb=30e8306e055b8b570d10e39015f96bb67e77e61b;p=cc65 diff --git a/src/cc65/codegen.c b/src/cc65/codegen.c index aafefa532..81f4ecfb3 100644 --- a/src/cc65/codegen.c +++ b/src/cc65/codegen.c @@ -1,15 +1,15 @@ /*****************************************************************************/ /* */ -/* codegen.c */ +/* codegen.c */ /* */ -/* 6502 code generator */ +/* 6502 code generator */ /* */ /* */ /* */ -/* (C) 1998-2001 Ullrich von Bassewitz */ -/* Wacholderweg 14 */ -/* D-70597 Stuttgart */ -/* EMail: uz@musoftware.de */ +/* (C) 1998-2004 Ullrich von Bassewitz */ +/* Römerstraße 52 */ +/* D-70794 Filderstadt */ +/* EMail: uz@cc65.org */ /* */ /* */ /* This software is provided 'as-is', without any expressed or implied */ @@ -39,6 +39,8 @@ /* common */ #include "check.h" +#include "cpu.h" +#include "strbuf.h" #include "version.h" #include "xmalloc.h" #include "xsprintf.h" @@ -46,55 +48,25 @@ /* cc65 */ #include "asmcode.h" #include "asmlabel.h" -#include "cpu.h" +#include "casenode.h" +#include "codeseg.h" +#include "dataseg.h" #include "error.h" #include "global.h" -#include "segname.h" +#include "segments.h" +#include "stackptr.h" +#include "textseg.h" #include "util.h" #include "codegen.h" /*****************************************************************************/ -/* Data */ -/*****************************************************************************/ - - - -/* Compiler relative stack pointer */ -int oursp = 0; - -/* Segments */ -DataSeg* DS = 0; -CodeSeg* CS = 0; - -/* Current segment */ -segment_t CurSeg = SEG_INV; - - - -/*****************************************************************************/ -/* Helpers */ +/* Helpers */ /*****************************************************************************/ -static void AddCodeLine (const char* Format, ...) -{ - va_list ap; - char Buf [1024]; - va_start (ap, Format); - xvsprintf (Buf, sizeof (Buf), Format, ap); - va_end (ap); - if (CurSeg == SEG_CODE) { - AddCodeSegLine (CS, "%s", Buf); - } else { - AddDataSegLine (DS, "%s", Buf); - } -} - - - static void typeerror (unsigned type) /* Print an error message about an invalid operand type */ { @@ -107,53 +79,60 @@ static void CheckLocalOffs (unsigned Offs) /* Check the offset into the stack for 8bit range */ { if (Offs >= 256) { - /* Too many local vars */ - AddCodeLine (";*** Too many locals"); - Error ("Too many local variables"); + /* Too many local vars */ + Error ("Too many local variables"); } } -static char* GetLabelName (unsigned flags, unsigned long label, unsigned offs) +static const char* GetLabelName (unsigned Flags, unsigned long Label, long Offs) { - static char lbuf [128]; /* Label name */ + static char Buf [256]; /* Label name */ /* Create the correct label name */ - switch (flags & CF_ADDRMASK) { - - case CF_STATIC: - /* Static memory cell */ - sprintf (lbuf, "L%04X+%u", (unsigned)(label & 0xFFFF), offs); - break; - - case CF_EXTERNAL: - /* External label */ - sprintf (lbuf, "_%s+%u", (char*) label, offs); - break; - - case CF_ABSOLUTE: - /* Absolute address */ - sprintf (lbuf, "$%04X", (unsigned)((label+offs) & 0xFFFF)); - break; - - case CF_REGVAR: - /* Variable in register bank */ - sprintf (lbuf, "regbank+%u", (unsigned)((label+offs) & 0xFFFF)); - break; - - default: - Internal ("Invalid address flags"); + switch (Flags & CF_ADDRMASK) { + + case CF_STATIC: + /* Static memory cell */ + if (Offs) { + xsprintf (Buf, sizeof (Buf), "%s%+ld", LocalLabelName (Label), Offs); + } else { + xsprintf (Buf, sizeof (Buf), "%s", LocalLabelName (Label)); + } + break; + + case CF_EXTERNAL: + /* External label */ + if (Offs) { + xsprintf (Buf, sizeof (Buf), "_%s%+ld", (char*) Label, Offs); + } else { + xsprintf (Buf, sizeof (Buf), "_%s", (char*) Label); + } + break; + + case CF_ABSOLUTE: + /* Absolute address */ + xsprintf (Buf, sizeof (Buf), "$%04X", (int)((Label+Offs) & 0xFFFF)); + break; + + case CF_REGVAR: + /* Variable in register bank */ + xsprintf (Buf, sizeof (Buf), "regbank+%u", (unsigned)((Label+Offs) & 0xFFFF)); + break; + + default: + Internal ("Invalid address flags: %04X", Flags); } /* Return a pointer to the static buffer */ - return lbuf; + return Buf; } /*****************************************************************************/ -/* Pre- and postamble */ +/* Pre- and postamble */ /*****************************************************************************/ @@ -161,69 +140,75 @@ static char* GetLabelName (unsigned flags, unsigned long label, unsigned offs) void g_preamble (void) /* Generate the assembler code preamble */ { - /* ### */ - CS = NewCodeSeg ("CODE"); - DS = NewDataSeg (); + /* Create a new (global) segment list and remember it */ + PushSegments (0); + GS = CS; - AddCodeLine ("; File generated by cc65 v %u.%u.%u", VER_MAJOR, VER_MINOR, VER_PATCH); + /* Identify the compiler version */ + AddTextLine (";"); + AddTextLine ("; File generated by cc65 v %u.%u.%u", + VER_MAJOR, VER_MINOR, VER_PATCH); + AddTextLine (";"); /* Insert some object file options */ - AddCodeLine (".fopt\t\tcompiler,\"cc65 v %u.%u.%u\"", VER_MAJOR, VER_MINOR, VER_PATCH); + AddTextLine ("\t.fopt\t\tcompiler,\"cc65 v %u.%u.%u\"", + VER_MAJOR, VER_MINOR, VER_PATCH); /* If we're producing code for some other CPU, switch the command set */ - if (CPU == CPU_65C02) { - AddCodeLine (".pc02"); + switch (CPU) { + case CPU_6502: AddTextLine ("\t.setcpu\t\t\"6502\""); break; + case CPU_6502X: AddTextLine ("\t.setcpu\t\t\"6502X\""); break; + case CPU_65SC02: AddTextLine ("\t.setcpu\t\t\"65SC02\""); break; + case CPU_65C02: AddTextLine ("\t.setcpu\t\t\"65C02\""); break; + case CPU_65816: AddTextLine ("\t.setcpu\t\t\"65816\""); break; + case CPU_HUC6280: AddTextLine ("\t.setcpu\t\t\"HUC6280\""); break; + default: Internal ("Unknown CPU: %d", CPU); } + /* Use smart mode */ + AddTextLine ("\t.smart\t\ton"); + /* Allow auto import for runtime library routines */ - AddCodeLine (".autoimport\ton"); + AddTextLine ("\t.autoimport\ton"); /* Switch the assembler into case sensitive mode */ - AddCodeLine (".case\t\ton"); + AddTextLine ("\t.case\t\ton"); /* Tell the assembler if we want to generate debug info */ - AddCodeLine (".debuginfo\t%s", (DebugInfo != 0)? "on" : "off"); + AddTextLine ("\t.debuginfo\t%s", (DebugInfo != 0)? "on" : "off"); /* Import the stack pointer for direct auto variable access */ - AddCodeLine (".importzp\tsp, sreg, regsave, regbank, tmp1, ptr1"); + AddTextLine ("\t.importzp\tsp, sreg, regsave, regbank, tmp1, ptr1, ptr2"); /* Define long branch macros */ - AddCodeLine (".macpack\tlongbranch"); + AddTextLine ("\t.macpack\tlongbranch"); } -/*****************************************************************************/ -/* Segment support */ -/*****************************************************************************/ - - - -static void UseSeg (int NewSeg) -/* Switch to a specific segment */ +void g_fileinfo (const char* Name, unsigned long Size, unsigned long MTime) +/* If debug info is enabled, place a file info into the source */ { - if (CurSeg != NewSeg) { - CurSeg = (segment_t) NewSeg; - if (CurSeg != SEG_CODE) { - AddCodeLine (".segment\t\"%s\"", SegmentNames [CurSeg]); - } + if (DebugInfo) { + /* We have to place this into the global text segment, so it will + * appear before all .dbg line statements. + */ + TS_AddLine (GS->Text, "\t.dbg\t\tfile, \"%s\", %lu, %lu", Name, Size, MTime); } } -void g_usecode (void) -/* Switch to the code segment */ -{ - UseSeg (SEG_CODE); -} +/*****************************************************************************/ +/* Segment support */ +/*****************************************************************************/ void g_userodata (void) /* Switch to the read only data segment */ { - UseSeg (SEG_RODATA); + UseDataSeg (SEG_RODATA); } @@ -231,7 +216,7 @@ void g_userodata (void) void g_usedata (void) /* Switch to the data segment */ { - UseSeg (SEG_DATA); + UseDataSeg (SEG_DATA); } @@ -239,62 +224,31 @@ void g_usedata (void) void g_usebss (void) /* Switch to the bss segment */ { - UseSeg (SEG_BSS); + UseDataSeg (SEG_BSS); } -static void SegName (segment_t Seg, const char* Name) -/* Set the name of a segment */ +void g_segname (segment_t Seg) +/* Emit the name of a segment if necessary */ { - /* Free the old name and set a new one */ - NewSegName (Seg, Name); - - /* If the new segment is the current segment, emit a segment directive - * with the new name. - */ - if (Seg == CurSeg) { - CurSeg = SEG_INV; /* Invalidate */ - UseSeg (Seg); + /* Emit a segment directive for the data style segments */ + DataSeg* S; + switch (Seg) { + case SEG_RODATA: S = CS->ROData; break; + case SEG_DATA: S = CS->Data; break; + case SEG_BSS: S = CS->BSS; break; + default: S = 0; break; + } + if (S) { + DS_AddLine (S, ".segment\t\"%s\"", GetSegName (Seg)); } -} - - - -void g_codename (const char* Name) -/* Set the name of the CODE segment */ -{ - SegName (SEG_CODE, Name); -} - - - -void g_rodataname (const char* Name) -/* Set the name of the RODATA segment */ -{ - SegName (SEG_RODATA, Name); -} - - - -void g_dataname (const char* Name) -/* Set the name of the DATA segment */ -{ - SegName (SEG_DATA, Name); -} - - - -void g_bssname (const char* Name) -/* Set the name of the BSS segment */ -{ - SegName (SEG_BSS, Name); } /*****************************************************************************/ -/* Code */ +/* Code */ /*****************************************************************************/ @@ -304,19 +258,22 @@ unsigned sizeofarg (unsigned flags) { switch (flags & CF_TYPE) { - case CF_CHAR: - return (flags & CF_FORCECHAR)? 1 : 2; + case CF_CHAR: + return (flags & CF_FORCECHAR)? 1 : 2; - case CF_INT: - return 2; + case CF_INT: + return 2; + + case CF_LONG: + return 4; - case CF_LONG: - return 4; + case CF_FLOAT: + return 4; - default: - typeerror (flags); - /* NOTREACHED */ - return 2; + default: + typeerror (flags); + /* NOTREACHED */ + return 2; } } @@ -325,7 +282,7 @@ unsigned sizeofarg (unsigned flags) int pop (unsigned flags) /* Pop an argument of the given size */ { - return oursp += sizeofarg (flags); + return StackPtr += sizeofarg (flags); } @@ -333,7 +290,7 @@ int pop (unsigned flags) int push (unsigned flags) /* Push an argument of the given size */ { - return oursp -= sizeofarg (flags); + return StackPtr -= sizeofarg (flags); } @@ -351,14 +308,14 @@ static unsigned MakeByteOffs (unsigned Flags, unsigned Offs) */ unsigned O = Offs & ~0xFFU; if ((Offs & 0xFF) > 256 - sizeofarg (Flags)) { - /* We need to add the low byte also */ - O += Offs & 0xFF; + /* We need to add the low byte also */ + O += Offs & 0xFF; } /* Do the correction if we need one */ if (O != 0) { - g_inc (CF_INT | CF_CONST, O); - Offs -= O; + g_inc (CF_INT | CF_CONST, O); + Offs -= O; } /* Return the new offset */ @@ -368,25 +325,29 @@ static unsigned MakeByteOffs (unsigned Flags, unsigned Offs) /*****************************************************************************/ -/* Functions handling local labels */ +/* Functions handling local labels */ /*****************************************************************************/ -void g_defloclabel (unsigned label) -/* Define a local label */ +void g_defcodelabel (unsigned label) +/* Define a local code label */ { - if (CurSeg == SEG_CODE) { - AddLocCodeLabel (CS, LocalLabelName (label)); - } else { - AddDataSegLine (DS, "%s:", LocalLabelName (label)); - } + CS_AddLabel (CS->Code, LocalLabelName (label)); +} + + + +void g_defdatalabel (unsigned label) +/* Define a local data label */ +{ + AddDataLine ("%s:", LocalLabelName (label)); } /*****************************************************************************/ -/* Functions handling global labels */ +/* Functions handling global labels */ /*****************************************************************************/ @@ -394,14 +355,8 @@ void g_defloclabel (unsigned label) void g_defgloblabel (const char* Name) /* Define a global label with the given name */ { - if (CurSeg == SEG_CODE) { - /* ##### */ - char Buf[64]; - xsprintf (Buf, sizeof (Buf), "_%s", Name); - AddExtCodeLabel (CS, Buf); - } else { - AddDataSegLine (DS, "_%s:", Name); - } + /* Global labels are always data labels */ + AddDataLine ("_%s:", Name); } @@ -410,9 +365,9 @@ void g_defexport (const char* Name, int ZP) /* Export the given label */ { if (ZP) { - AddDataSegLine (DS, "\t.exportzp\t_%s", Name); + AddTextLine ("\t.exportzp\t_%s", Name); } else { - AddDataSegLine (DS, "\t.export\t\t_%s", Name); + AddTextLine ("\t.export\t\t_%s", Name); } } @@ -422,16 +377,24 @@ void g_defimport (const char* Name, int ZP) /* Import the given label */ { if (ZP) { - AddDataSegLine (DS, "\t.importzp\t_%s", Name); + AddTextLine ("\t.importzp\t_%s", Name); } else { - AddDataSegLine (DS, "\t.import\t\t_%s", Name); + AddTextLine ("\t.import\t\t_%s", Name); } } +void g_importmainargs (void) +/* Forced import of a special symbol that handles arguments to main */ +{ + AddTextLine ("\t.forceimport\tinitmainargs"); +} + + + /*****************************************************************************/ -/* Load functions for various registers */ +/* Load functions for various registers */ /*****************************************************************************/ @@ -439,7 +402,7 @@ void g_defimport (const char* Name, int ZP) static void ldaconst (unsigned val) /* Load a with a constant */ { - AddCodeSegLine (CS, "lda #$%02X", val & 0xFF); + AddCodeLine ("lda #$%02X", val & 0xFF); } @@ -447,7 +410,7 @@ static void ldaconst (unsigned val) static void ldxconst (unsigned val) /* Load x with a constant */ { - AddCodeSegLine (CS, "ldx #$%02X", val & 0xFF); + AddCodeLine ("ldx #$%02X", val & 0xFF); } @@ -455,13 +418,13 @@ static void ldxconst (unsigned val) static void ldyconst (unsigned val) /* Load y with a constant */ { - AddCodeSegLine (CS, "ldy #$%02X", val & 0xFF); + AddCodeLine ("ldy #$%02X", val & 0xFF); } /*****************************************************************************/ -/* Function entry and exit */ +/* Function entry and exit */ /*****************************************************************************/ @@ -478,130 +441,140 @@ void g_enter (unsigned flags, unsigned argsize) /* Function prologue */ { if ((flags & CF_FIXARGC) != 0) { - /* Just remember the argument size for the leave */ - funcargs = argsize; + /* Just remember the argument size for the leave */ + funcargs = argsize; } else { - funcargs = -1; - AddCodeSegLine (CS, "jsr enter"); + funcargs = -1; + AddCodeLine ("jsr enter"); } } -void g_leave (int flags, int val) +void g_leave (void) /* Function epilogue */ { - int k; - char buf [40]; - - /* CF_REG is set if we're returning a value from the function */ - if ((flags & CF_REG) == 0) { - AddCodeHint ("x:-"); - AddCodeHint ("a:-"); - } - /* How many bytes of locals do we have to drop? */ - k = -oursp; + unsigned k = (unsigned) -StackPtr; /* If we didn't have a variable argument list, don't call leave */ if (funcargs >= 0) { - /* Load a function return code if needed */ - if ((flags & CF_CONST) != 0) { - g_getimmed (flags, val, 0); - } - - /* Drop stackframe or leave with rts */ - k += funcargs; - if (k == 0) { - AddCodeHint ("y:-"); /* Y register no longer used */ - AddCodeSegLine (CS, "rts"); - } else if (k <= 8) { - AddCodeHint ("y:-"); /* Y register no longer used */ - AddCodeSegLine (CS, "jmp incsp%d", k); - } else { - CheckLocalOffs (k); - ldyconst (k); - AddCodeSegLine (CS, "jmp addysp"); - } + /* Drop stackframe if needed. We can only drop 255 bytes at a time. */ + k += funcargs; + while (k > 0) { + unsigned ToDrop = (k > 255)? 255 : k; + if (ToDrop <= 8) { + AddCodeLine ("jsr incsp%d", k); + } else { + ldyconst (ToDrop); + AddCodeLine ("jsr addysp"); + } + k -= ToDrop; + } } else { - strcpy (buf, "\tjmp\tleave"); - if (k) { - /* We've a stack frame to drop */ - ldyconst (k); - strcat (buf, "y"); - } else { - /* Y register no longer used */ - AddCodeHint ("y:-"); - } - if (flags & CF_CONST) { - if ((flags & CF_TYPE) != CF_LONG) { - /* Constant int sized value given for return code */ - if (val == 0) { - /* Special case: return 0 */ - strcat (buf, "00"); - } else if (((val >> 8) & 0xFF) == 0) { - /* Special case: constant with high byte zero */ - ldaconst (val); /* Load low byte */ - strcat (buf, "0"); - } else { - /* Others: arbitrary constant value */ - g_getimmed (flags, val, 0); /* Load value */ - } - } else { - /* Constant long value: No shortcut possible */ - g_getimmed (flags, val, 0); - } - } - - /* Output the jump */ - AddCodeLine (buf); + if (k == 0) { + /* Nothing to drop */ + AddCodeLine ("jsr leave"); + } else { + /* We've a stack frame to drop */ + while (k > 255) { + ldyconst (255); + AddCodeLine ("jsr addysp"); + k -= 255; + } + ldyconst (k); + AddCodeLine ("jsr leavey"); + } } + + /* Add the final rts */ + AddCodeLine ("rts"); } /*****************************************************************************/ -/* Register variables */ +/* Register variables */ /*****************************************************************************/ +void g_swap_regvars (int StackOffs, int RegOffs, unsigned Bytes) +/* Swap a register variable with a location on the stack */ +{ + /* Calculate the actual stack offset and check it */ + StackOffs -= StackPtr; + CheckLocalOffs (StackOffs); + + /* Generate code */ + if (Bytes == 1) { + + if (IS_Get (&CodeSizeFactor) < 165) { + ldyconst (StackOffs); + ldxconst (RegOffs); + AddCodeLine ("jsr regswap1"); + } else { + ldyconst (StackOffs); + AddCodeLine ("lda (sp),y"); + AddCodeLine ("ldx regbank%+d", RegOffs); + AddCodeLine ("sta regbank%+d", RegOffs); + AddCodeLine ("txa"); + AddCodeLine ("sta (sp),y"); + } + + } else if (Bytes == 2) { + + ldyconst (StackOffs); + ldxconst (RegOffs); + AddCodeLine ("jsr regswap2"); + + } else { + + ldyconst (StackOffs); + ldxconst (RegOffs); + ldaconst (Bytes); + AddCodeLine ("jsr regswap"); + } +} + + + void g_save_regvars (int RegOffs, unsigned Bytes) /* Save register variables */ { /* Don't loop for up to two bytes */ if (Bytes == 1) { - AddCodeSegLine (CS, "lda regbank%+d", RegOffs); - AddCodeSegLine (CS, "jsr pusha"); + AddCodeLine ("lda regbank%+d", RegOffs); + AddCodeLine ("jsr pusha"); } else if (Bytes == 2) { - AddCodeSegLine (CS, "lda regbank%+d", RegOffs); - AddCodeSegLine (CS, "ldx regbank%+d", RegOffs+1); - AddCodeSegLine (CS, "jsr pushax"); + AddCodeLine ("lda regbank%+d", RegOffs); + AddCodeLine ("ldx regbank%+d", RegOffs+1); + AddCodeLine ("jsr pushax"); } else { - /* More than two bytes - loop */ - unsigned Label = GetLocalLabel (); - g_space (Bytes); - ldyconst (Bytes - 1); - ldxconst (Bytes); - g_defloclabel (Label); - AddCodeSegLine (CS, "lda regbank%+d,x", RegOffs-1); - AddCodeSegLine (CS, "sta (sp),y"); - AddCodeSegLine (CS, "dey"); - AddCodeSegLine (CS, "dex"); - AddCodeSegLine (CS, "bne L%04X", Label); + /* More than two bytes - loop */ + unsigned Label = GetLocalLabel (); + g_space (Bytes); + ldyconst (Bytes - 1); + ldxconst (Bytes); + g_defcodelabel (Label); + AddCodeLine ("lda regbank%+d,x", RegOffs-1); + AddCodeLine ("sta (sp),y"); + AddCodeLine ("dey"); + AddCodeLine ("dex"); + AddCodeLine ("bne %s", LocalLabelName (Label)); } /* We pushed stuff, correct the stack pointer */ - oursp -= Bytes; + StackPtr -= Bytes; } @@ -610,37 +583,68 @@ void g_restore_regvars (int StackOffs, int RegOffs, unsigned Bytes) /* Restore register variables */ { /* Calculate the actual stack offset and check it */ - StackOffs -= oursp; + StackOffs -= StackPtr; CheckLocalOffs (StackOffs); /* Don't loop for up to two bytes */ if (Bytes == 1) { - ldyconst (StackOffs); - AddCodeSegLine (CS, "lda (sp),y"); - AddCodeSegLine (CS, "sta regbank%+d", RegOffs); + ldyconst (StackOffs); + AddCodeLine ("lda (sp),y"); + AddCodeLine ("sta regbank%+d", RegOffs); } else if (Bytes == 2) { - ldyconst (StackOffs); - AddCodeSegLine (CS, "lda (sp),y"); - AddCodeSegLine (CS, "sta regbank%+d", RegOffs); - AddCodeSegLine (CS, "iny"); - AddCodeSegLine (CS, "lda (sp),y"); - AddCodeSegLine (CS, "sta regbank%+d", RegOffs+1); + ldyconst (StackOffs); + AddCodeLine ("lda (sp),y"); + AddCodeLine ("sta regbank%+d", RegOffs); + AddCodeLine ("iny"); + AddCodeLine ("lda (sp),y"); + AddCodeLine ("sta regbank%+d", RegOffs+1); + + } else if (Bytes == 3 && IS_Get (&CodeSizeFactor) >= 133) { + + ldyconst (StackOffs); + AddCodeLine ("lda (sp),y"); + AddCodeLine ("sta regbank%+d", RegOffs); + AddCodeLine ("iny"); + AddCodeLine ("lda (sp),y"); + AddCodeLine ("sta regbank%+d", RegOffs+1); + AddCodeLine ("iny"); + AddCodeLine ("lda (sp),y"); + AddCodeLine ("sta regbank%+d", RegOffs+2); + + } else if (StackOffs <= RegOffs) { + + /* More bytes, but the relation between the register offset in the + * register bank and the stack offset allows us to generate short + * code that uses just one index register. + */ + unsigned Label = GetLocalLabel (); + ldyconst (StackOffs); + g_defcodelabel (Label); + AddCodeLine ("lda (sp),y"); + AddCodeLine ("sta regbank%+d,y", RegOffs - StackOffs); + AddCodeLine ("iny"); + AddCodeLine ("cpy #$%02X", StackOffs + Bytes); + AddCodeLine ("bne %s", LocalLabelName (Label)); } else { - /* More than two bytes - loop */ - unsigned Label = GetLocalLabel (); - ldyconst (StackOffs+Bytes-1); - ldxconst (Bytes); - g_defloclabel (Label); - AddCodeSegLine (CS, "lda (sp),y"); - AddCodeSegLine (CS, "sta regbank%+d,x", RegOffs-1); - AddCodeSegLine (CS, "dey"); - AddCodeSegLine (CS, "dex"); - AddCodeSegLine (CS, "bne L%04X", Label); + /* Ok, this is the generic code. We need to save X because the + * caller will only save A. + */ + unsigned Label = GetLocalLabel (); + AddCodeLine ("stx tmp1"); + ldyconst (StackOffs + Bytes - 1); + ldxconst (Bytes - 1); + g_defcodelabel (Label); + AddCodeLine ("lda (sp),y"); + AddCodeLine ("sta regbank%+d,x", RegOffs); + AddCodeLine ("dey"); + AddCodeLine ("dex"); + AddCodeLine ("bpl %s", LocalLabelName (Label)); + AddCodeLine ("ldx tmp1"); } } @@ -648,139 +652,149 @@ void g_restore_regvars (int StackOffs, int RegOffs, unsigned Bytes) /*****************************************************************************/ -/* Fetching memory cells */ +/* Fetching memory cells */ /*****************************************************************************/ -void g_getimmed (unsigned flags, unsigned long val, unsigned offs) +void g_getimmed (unsigned Flags, unsigned long Val, long Offs) /* Load a constant into the primary register */ { - if ((flags & CF_CONST) != 0) { - - /* Numeric constant */ - switch (flags & CF_TYPE) { - - case CF_CHAR: - if ((flags & CF_FORCECHAR) != 0) { - ldaconst (val); - break; - } - /* FALL THROUGH */ - case CF_INT: - ldxconst ((val >> 8) & 0xFF); - ldaconst (val & 0xFF); - break; - - case CF_LONG: - if (val < 0x100) { - AddCodeSegLine (CS, "ldx #$00"); - AddCodeSegLine (CS, "stx sreg+1"); - AddCodeSegLine (CS, "stx sreg"); - AddCodeSegLine (CS, "lda #$%02X", (unsigned char) val); - } else if ((val & 0xFFFF00FF) == 0) { - AddCodeSegLine (CS, "lda #$00"); - AddCodeSegLine (CS, "sta sreg+1"); - AddCodeSegLine (CS, "sta sreg"); - AddCodeSegLine (CS, "ldx #$%02X", (unsigned char) (val >> 8)); - } else if ((val & 0xFFFF0000) == 0 && CodeSizeFactor > 140) { - AddCodeSegLine (CS, "lda #$00"); - AddCodeSegLine (CS, "sta sreg+1"); - AddCodeSegLine (CS, "sta sreg"); - AddCodeSegLine (CS, "lda #$%02X", (unsigned char) val); - AddCodeSegLine (CS, "ldx #$%02X", (unsigned char) (val >> 8)); - } else if ((val & 0xFFFFFF00) == 0xFFFFFF00) { - AddCodeSegLine (CS, "ldx #$FF"); - AddCodeSegLine (CS, "stx sreg+1"); - AddCodeSegLine (CS, "stx sreg"); - if ((val & 0xFF) == 0xFF) { - AddCodeSegLine (CS, "txa"); - } else { - AddCodeSegLine (CS, "lda #$%02X", (unsigned char) val); - } - } else if ((val & 0xFFFF00FF) == 0xFFFF00FF) { - AddCodeSegLine (CS, "lda #$FF"); - AddCodeSegLine (CS, "sta sreg+1"); - AddCodeSegLine (CS, "sta sreg"); - AddCodeSegLine (CS, "ldx #$%02X", (unsigned char) (val >> 8)); - } else { - /* Call a subroutine that will load following value */ - AddCodeSegLine (CS, "jsr ldeax"); - AddCodeSegLine (CS, ".dword $%08lX", val & 0xFFFFFFFF); - } - break; - - default: - typeerror (flags); - break; - - } + unsigned char B1, B2, B3, B4; + unsigned Done; + + + if ((Flags & CF_CONST) != 0) { + + /* Numeric constant */ + switch (Flags & CF_TYPE) { + + case CF_CHAR: + if ((Flags & CF_FORCECHAR) != 0) { + ldaconst (Val); + break; + } + /* FALL THROUGH */ + case CF_INT: + ldxconst ((Val >> 8) & 0xFF); + ldaconst (Val & 0xFF); + break; + + case CF_LONG: + /* Split the value into 4 bytes */ + B1 = (unsigned char) (Val >> 0); + B2 = (unsigned char) (Val >> 8); + B3 = (unsigned char) (Val >> 16); + B4 = (unsigned char) (Val >> 24); + + /* Remember which bytes are done */ + Done = 0; + + /* Load the value */ + AddCodeLine ("ldx #$%02X", B2); + Done |= 0x02; + if (B2 == B3) { + AddCodeLine ("stx sreg"); + Done |= 0x04; + } + if (B2 == B4) { + AddCodeLine ("stx sreg+1"); + Done |= 0x08; + } + if ((Done & 0x04) == 0 && B1 != B3) { + AddCodeLine ("lda #$%02X", B3); + AddCodeLine ("sta sreg"); + Done |= 0x04; + } + if ((Done & 0x08) == 0 && B1 != B4) { + AddCodeLine ("lda #$%02X", B4); + AddCodeLine ("sta sreg+1"); + Done |= 0x08; + } + AddCodeLine ("lda #$%02X", B1); + Done |= 0x01; + if ((Done & 0x04) == 0) { + CHECK (B1 == B3); + AddCodeLine ("sta sreg"); + } + if ((Done & 0x08) == 0) { + CHECK (B1 == B4); + AddCodeLine ("sta sreg+1"); + } + break; + + default: + typeerror (Flags); + break; + + } } else { - /* Some sort of label */ - const char* Label = GetLabelName (flags, val, offs); + /* Some sort of label */ + const char* Label = GetLabelName (Flags, Val, Offs); - /* Load the address into the primary */ - AddCodeSegLine (CS, "lda #<(%s)", Label); - AddCodeSegLine (CS, "ldx #>(%s)", Label); + /* Load the address into the primary */ + AddCodeLine ("lda #<(%s)", Label); + AddCodeLine ("ldx #>(%s)", Label); } } -void g_getstatic (unsigned flags, unsigned long label, unsigned offs) +void g_getstatic (unsigned flags, unsigned long label, long offs) /* Fetch an static memory cell into the primary register */ { /* Create the correct label name */ - char* lbuf = GetLabelName (flags, label, offs); + const char* lbuf = GetLabelName (flags, label, offs); /* Check the size and generate the correct load operation */ switch (flags & CF_TYPE) { - case CF_CHAR: - if ((flags & CF_FORCECHAR) || (flags & CF_TEST)) { - AddCodeSegLine (CS, "lda %s", lbuf); /* load A from the label */ - } else { - ldxconst (0); - AddCodeSegLine (CS, "lda %s", lbuf); /* load A from the label */ - if (!(flags & CF_UNSIGNED)) { - /* Must sign extend */ - AddCodeSegLine (CS, "bpl *+3"); - AddCodeSegLine (CS, "dex"); - AddCodeHint ("x:!"); /* X is invalid now */ - } - } - break; - - case CF_INT: - AddCodeSegLine (CS, "lda %s", lbuf); - if (flags & CF_TEST) { - AddCodeSegLine (CS, "ora %s+1", lbuf); - } else { - AddCodeSegLine (CS, "ldx %s+1", lbuf); - } - break; - - case CF_LONG: - if (flags & CF_TEST) { - AddCodeSegLine (CS, "lda %s+3", lbuf); - AddCodeSegLine (CS, "ora %s+2", lbuf); - AddCodeSegLine (CS, "ora %s+1", lbuf); - AddCodeSegLine (CS, "ora %s+0", lbuf); - } else { - AddCodeSegLine (CS, "lda %s+3", lbuf); - AddCodeSegLine (CS, "sta sreg+1"); - AddCodeSegLine (CS, "lda %s+2", lbuf); - AddCodeSegLine (CS, "sta sreg"); - AddCodeSegLine (CS, "ldx %s+1", lbuf); - AddCodeSegLine (CS, "lda %s", lbuf); - } - break; - - default: - typeerror (flags); + case CF_CHAR: + if ((flags & CF_FORCECHAR) || (flags & CF_TEST)) { + AddCodeLine ("lda %s", lbuf); /* load A from the label */ + } else { + ldxconst (0); + AddCodeLine ("lda %s", lbuf); /* load A from the label */ + if (!(flags & CF_UNSIGNED)) { + /* Must sign extend */ + unsigned L = GetLocalLabel (); + AddCodeLine ("bpl %s", LocalLabelName (L)); + AddCodeLine ("dex"); + g_defcodelabel (L); + } + } + break; + + case CF_INT: + AddCodeLine ("lda %s", lbuf); + if (flags & CF_TEST) { + AddCodeLine ("ora %s+1", lbuf); + } else { + AddCodeLine ("ldx %s+1", lbuf); + } + break; + + case CF_LONG: + if (flags & CF_TEST) { + AddCodeLine ("lda %s+3", lbuf); + AddCodeLine ("ora %s+2", lbuf); + AddCodeLine ("ora %s+1", lbuf); + AddCodeLine ("ora %s+0", lbuf); + } else { + AddCodeLine ("lda %s+3", lbuf); + AddCodeLine ("sta sreg+1"); + AddCodeLine ("lda %s+2", lbuf); + AddCodeLine ("sta sreg"); + AddCodeLine ("ldx %s+1", lbuf); + AddCodeLine ("lda %s", lbuf); + } + break; + + default: + typeerror (flags); } } @@ -790,71 +804,50 @@ void g_getstatic (unsigned flags, unsigned long label, unsigned offs) void g_getlocal (unsigned flags, int offs) /* Fetch specified local object (local var). */ { - offs -= oursp; + offs -= StackPtr; CheckLocalOffs (offs); switch (flags & CF_TYPE) { - case CF_CHAR: - if ((flags & CF_FORCECHAR) || (flags & CF_TEST)) { - if (CPU == CPU_65C02 && offs == 0) { - AddCodeSegLine (CS, "lda (sp)"); - } else { - ldyconst (offs); - AddCodeSegLine (CS, "lda (sp),y"); - } - } else { - if (offs == 0) { - AddCodeSegLine (CS, "ldx #$00"); - AddCodeSegLine (CS, "lda (sp,x)"); - } else { - ldyconst (offs); - AddCodeSegLine (CS, "ldx #$00"); - AddCodeSegLine (CS, "lda (sp),y"); - } - if ((flags & CF_UNSIGNED) == 0) { - AddCodeSegLine (CS, "bpl *+3"); - AddCodeSegLine (CS, "dex"); - AddCodeHint ("x:!"); /* X is invalid now */ - } - } - break; - - case CF_INT: - CheckLocalOffs (offs + 1); - if (flags & CF_TEST) { - ldyconst (offs + 1); - AddCodeSegLine (CS, "lda (sp),y"); - AddCodeSegLine (CS, "dey"); - AddCodeSegLine (CS, "ora (sp),y"); - } else { - if (CodeSizeFactor > 180) { - ldyconst (offs + 1); - AddCodeSegLine (CS, "lda (sp),y"); - AddCodeSegLine (CS, "tax"); - AddCodeSegLine (CS, "dey"); - AddCodeSegLine (CS, "lda (sp),y"); - } else { - if (offs) { - ldyconst (offs+1); - AddCodeSegLine (CS, "jsr ldaxysp"); - } else { - AddCodeSegLine (CS, "jsr ldax0sp"); - } - } - } - break; - - case CF_LONG: - if (offs) { - ldyconst (offs+3); - AddCodeSegLine (CS, "jsr ldeaxysp"); - } else { - AddCodeSegLine (CS, "jsr ldeax0sp"); - } - break; - - default: - typeerror (flags); + case CF_CHAR: + if ((flags & CF_FORCECHAR) || (flags & CF_TEST)) { + ldyconst (offs); + AddCodeLine ("lda (sp),y"); + } else { + ldyconst (offs); + AddCodeLine ("ldx #$00"); + AddCodeLine ("lda (sp),y"); + if ((flags & CF_UNSIGNED) == 0) { + unsigned L = GetLocalLabel(); + AddCodeLine ("bpl %s", LocalLabelName (L)); + AddCodeLine ("dex"); + g_defcodelabel (L); + } + } + break; + + case CF_INT: + CheckLocalOffs (offs + 1); + if (flags & CF_TEST) { + ldyconst (offs + 1); + AddCodeLine ("lda (sp),y"); + AddCodeLine ("dey"); + AddCodeLine ("ora (sp),y"); + } else { + ldyconst (offs+1); + AddCodeLine ("jsr ldaxysp"); + } + break; + + case CF_LONG: + ldyconst (offs+3); + AddCodeLine ("jsr ldeaxysp"); + if (flags & CF_TEST) { + g_test (flags); + } + break; + + default: + typeerror (flags); } } @@ -874,63 +867,41 @@ void g_getind (unsigned flags, unsigned offs) /* Handle the indirect fetch */ switch (flags & CF_TYPE) { - case CF_CHAR: - /* Character sized */ - if (offs) { - ldyconst (offs); - if (flags & CF_UNSIGNED) { - AddCodeSegLine (CS, "jsr ldauidx"); - } else { - AddCodeSegLine (CS, "jsr ldaidx"); - } - } else { - if (flags & CF_UNSIGNED) { - if (CodeSizeFactor > 250) { - AddCodeSegLine (CS, "sta ptr1"); - AddCodeSegLine (CS, "stx ptr1+1"); - AddCodeSegLine (CS, "ldx #$00"); - AddCodeSegLine (CS, "lda (ptr1,x)"); - } else { - AddCodeSegLine (CS, "jsr ldaui"); - } - } else { - AddCodeSegLine (CS, "jsr ldai"); - } - } - break; - - case CF_INT: - if (flags & CF_TEST) { - ldyconst (offs); - AddCodeSegLine (CS, "sta ptr1"); - AddCodeSegLine (CS, "stx ptr1+1"); - AddCodeSegLine (CS, "lda (ptr1),y"); - AddCodeSegLine (CS, "iny"); - AddCodeSegLine (CS, "ora (ptr1),y"); - } else { - if (offs == 0) { - AddCodeSegLine (CS, "jsr ldaxi"); - } else { - ldyconst (offs+1); - AddCodeSegLine (CS, "jsr ldaxidx"); - } - } - break; - - case CF_LONG: - if (offs == 0) { - AddCodeSegLine (CS, "jsr ldeaxi"); - } else { - ldyconst (offs+3); - AddCodeSegLine (CS, "jsr ldeaxidx"); - } - if (flags & CF_TEST) { - AddCodeSegLine (CS, "jsr tsteax"); - } - break; - - default: - typeerror (flags); + case CF_CHAR: + /* Character sized */ + if (flags & CF_UNSIGNED) { + ldyconst (offs); + AddCodeLine ("jsr ldauidx"); + } else { + ldyconst (offs); + AddCodeLine ("jsr ldaidx"); + } + break; + + case CF_INT: + if (flags & CF_TEST) { + ldyconst (offs); + AddCodeLine ("sta ptr1"); + AddCodeLine ("stx ptr1+1"); + AddCodeLine ("lda (ptr1),y"); + AddCodeLine ("iny"); + AddCodeLine ("ora (ptr1),y"); + } else { + ldyconst (offs+1); + AddCodeLine ("jsr ldaxidx"); + } + break; + + case CF_LONG: + ldyconst (offs+3); + AddCodeLine ("jsr ldeaxidx"); + if (flags & CF_TEST) { + g_test (flags); + } + break; + + default: + typeerror (flags); } } @@ -941,34 +912,34 @@ void g_leasp (int offs) /* Fetch the address of the specified symbol into the primary register */ { /* Calculate the offset relative to sp */ - offs -= oursp; + offs -= StackPtr; /* For value 0 we do direct code */ if (offs == 0) { - AddCodeSegLine (CS, "lda sp"); - AddCodeSegLine (CS, "ldx sp+1"); + AddCodeLine ("lda sp"); + AddCodeLine ("ldx sp+1"); } else { - if (CodeSizeFactor < 300) { - ldaconst (offs); /* Load A with offset value */ - AddCodeSegLine (CS, "jsr leaasp"); /* Load effective address */ - } else { - if (CPU == CPU_65C02 && offs == 1) { - AddCodeSegLine (CS, "lda sp"); - AddCodeSegLine (CS, "ldx sp+1"); - AddCodeSegLine (CS, "ina"); - AddCodeSegLine (CS, "bne *+3"); - AddCodeSegLine (CS, "inx"); - AddCodeHint ("x:!"); /* Invalidate X */ - } else { - ldaconst (offs); - AddCodeSegLine (CS, "clc"); - AddCodeSegLine (CS, "ldx sp+1"); - AddCodeSegLine (CS, "adc sp"); - AddCodeSegLine (CS, "bcc *+3"); - AddCodeSegLine (CS, "inx"); - AddCodeHint ("x:!"); /* Invalidate X */ - } - } + if (IS_Get (&CodeSizeFactor) < 300) { + ldaconst (offs); /* Load A with offset value */ + AddCodeLine ("jsr leaasp"); /* Load effective address */ + } else { + unsigned L = GetLocalLabel (); + if ((CPUIsets[CPU] & CPU_ISET_65SC02) != 0 && offs == 1) { + AddCodeLine ("lda sp"); + AddCodeLine ("ldx sp+1"); + AddCodeLine ("ina"); + AddCodeLine ("bne %s", LocalLabelName (L)); + AddCodeLine ("inx"); + } else { + ldaconst (offs); + AddCodeLine ("clc"); + AddCodeLine ("ldx sp+1"); + AddCodeLine ("adc sp"); + AddCodeLine ("bcc %s", LocalLabelName (L)); + AddCodeLine ("inx"); + } + g_defcodelabel (L); + } } } @@ -982,80 +953,77 @@ void g_leavariadic (int Offs) unsigned ArgSizeOffs; /* Calculate the offset relative to sp */ - Offs -= oursp; + Offs -= StackPtr; /* Get the offset of the parameter which is stored at sp+0 on function * entry and check if this offset is reachable with a byte offset. */ - CHECK (oursp <= 0); - ArgSizeOffs = -oursp; + CHECK (StackPtr <= 0); + ArgSizeOffs = -StackPtr; CheckLocalOffs (ArgSizeOffs); /* Get the size of all parameters. */ - if (ArgSizeOffs == 0 && CPU == CPU_65C02) { - AddCodeSegLine (CS, "lda (sp)"); - } else { - ldyconst (ArgSizeOffs); - AddCodeSegLine (CS, "lda (sp),y"); - } + ldyconst (ArgSizeOffs); + AddCodeLine ("lda (sp),y"); /* Add the value of the stackpointer */ - if (CodeSizeFactor > 250) { - AddCodeSegLine (CS, "ldx sp+1"); - AddCodeSegLine (CS, "clc"); - AddCodeSegLine (CS, "adc sp"); - AddCodeSegLine (CS, "bcc *+3"); - AddCodeSegLine (CS, "inx"); - AddCodeHint ("x:!"); /* Invalidate X */ + if (IS_Get (&CodeSizeFactor) > 250) { + unsigned L = GetLocalLabel(); + AddCodeLine ("ldx sp+1"); + AddCodeLine ("clc"); + AddCodeLine ("adc sp"); + AddCodeLine ("bcc %s", LocalLabelName (L)); + AddCodeLine ("inx"); + g_defcodelabel (L); } else { - AddCodeSegLine (CS, "jsr leaasp"); + AddCodeLine ("jsr leaasp"); } /* Add the offset to the primary */ if (Offs > 0) { - g_inc (CF_INT | CF_CONST, Offs); + g_inc (CF_INT | CF_CONST, Offs); } else if (Offs < 0) { - g_dec (CF_INT | CF_CONST, -Offs); + g_dec (CF_INT | CF_CONST, -Offs); } } /*****************************************************************************/ -/* Store into memory */ +/* Store into memory */ /*****************************************************************************/ -void g_putstatic (unsigned flags, unsigned long label, unsigned offs) +void g_putstatic (unsigned flags, unsigned long label, long offs) /* Store the primary register into the specified static memory cell */ { /* Create the correct label name */ - char* lbuf = GetLabelName (flags, label, offs); + const char* lbuf = GetLabelName (flags, label, offs); /* Check the size and generate the correct store operation */ switch (flags & CF_TYPE) { - case CF_CHAR: - AddCodeSegLine (CS, "sta %s", lbuf); - break; + case CF_CHAR: + AddCodeLine ("sta %s", lbuf); + break; - case CF_INT: - AddCodeSegLine (CS, "sta %s", lbuf); - AddCodeSegLine (CS, "stx %s+1", lbuf); - break; + case CF_INT: + AddCodeLine ("sta %s", lbuf); + AddCodeLine ("stx %s+1", lbuf); + break; - case CF_LONG: - AddCodeSegLine (CS, "sta %s", lbuf); - AddCodeSegLine (CS, "stx %s+1", lbuf); - AddCodeSegLine (CS, "ldy sreg"); - AddCodeSegLine (CS, "sty %s+2", lbuf); - AddCodeSegLine (CS, "ldy sreg+1"); - AddCodeSegLine (CS, "sty %s+3", lbuf); - break; + case CF_LONG: + AddCodeLine ("sta %s", lbuf); + AddCodeLine ("stx %s+1", lbuf); + AddCodeLine ("ldy sreg"); + AddCodeLine ("sty %s+2", lbuf); + AddCodeLine ("ldy sreg+1"); + AddCodeLine ("sty %s+3", lbuf); + break; - default: - typeerror (flags); + default: + typeerror (flags); } } @@ -1065,84 +1033,60 @@ void g_putstatic (unsigned flags, unsigned long label, unsigned offs) void g_putlocal (unsigned Flags, int Offs, long Val) /* Put data into local object. */ { - Offs -= oursp; + Offs -= StackPtr; CheckLocalOffs (Offs); switch (Flags & CF_TYPE) { - case CF_CHAR: - if (Flags & CF_CONST) { - AddCodeSegLine (CS, "lda #$%02X", (unsigned char) Val); - } - if (CPU == CPU_65C02 && Offs == 0) { - AddCodeSegLine (CS, "sta (sp)"); - } else { - ldyconst (Offs); - AddCodeSegLine (CS, "sta (sp),y"); - } - break; - - case CF_INT: - if (Flags & CF_CONST) { - ldyconst (Offs+1); - AddCodeSegLine (CS, "lda #$%02X", (unsigned char) (Val >> 8)); - AddCodeSegLine (CS, "sta (sp),y"); - if ((Flags & CF_NOKEEP) == 0) { - /* Place high byte into X */ - AddCodeSegLine (CS, "tax"); - } - if (CPU == CPU_65C02 && Offs == 0) { - AddCodeSegLine (CS, "lda #$%02X", (unsigned char) Val); - AddCodeSegLine (CS, "sta (sp)"); - } else { - if ((Val & 0xFF) == Offs+1) { - /* The value we need is already in Y */ - AddCodeSegLine (CS, "tya"); - AddCodeSegLine (CS, "dey"); - } else { - AddCodeSegLine (CS, "dey"); - AddCodeSegLine (CS, "lda #$%02X", (unsigned char) Val); - } - AddCodeSegLine (CS, "sta (sp),y"); - } - } else { - if ((Flags & CF_NOKEEP) == 0 || CodeSizeFactor < 160) { - if (Offs) { - ldyconst (Offs); - AddCodeSegLine (CS, "jsr staxysp"); - } else { - AddCodeSegLine (CS, "jsr stax0sp"); - } - } else { - if (CPU == CPU_65C02 && Offs == 0) { - AddCodeSegLine (CS, "sta (sp)"); - ldyconst (1); - AddCodeSegLine (CS, "txa"); - AddCodeSegLine (CS, "sta (sp),y"); - } else { - ldyconst (Offs); - AddCodeSegLine (CS, "sta (sp),y"); - AddCodeSegLine (CS, "iny"); - AddCodeSegLine (CS, "txa"); - AddCodeSegLine (CS, "sta (sp),y"); - } - } - } - break; - - case CF_LONG: - if (Flags & CF_CONST) { - g_getimmed (Flags, Val, 0); - } - if (Offs) { - ldyconst (Offs); - AddCodeSegLine (CS, "jsr steaxysp"); - } else { - AddCodeSegLine (CS, "jsr steax0sp"); - } - break; - - default: - typeerror (Flags); + case CF_CHAR: + if (Flags & CF_CONST) { + AddCodeLine ("lda #$%02X", (unsigned char) Val); + } + ldyconst (Offs); + AddCodeLine ("sta (sp),y"); + break; + + case CF_INT: + if (Flags & CF_CONST) { + ldyconst (Offs+1); + AddCodeLine ("lda #$%02X", (unsigned char) (Val >> 8)); + AddCodeLine ("sta (sp),y"); + if ((Flags & CF_NOKEEP) == 0) { + /* Place high byte into X */ + AddCodeLine ("tax"); + } + if ((Val & 0xFF) == Offs+1) { + /* The value we need is already in Y */ + AddCodeLine ("tya"); + AddCodeLine ("dey"); + } else { + AddCodeLine ("dey"); + AddCodeLine ("lda #$%02X", (unsigned char) Val); + } + AddCodeLine ("sta (sp),y"); + } else { + if ((Flags & CF_NOKEEP) == 0 || IS_Get (&CodeSizeFactor) < 160) { + ldyconst (Offs); + AddCodeLine ("jsr staxysp"); + } else { + ldyconst (Offs); + AddCodeLine ("sta (sp),y"); + AddCodeLine ("iny"); + AddCodeLine ("txa"); + AddCodeLine ("sta (sp),y"); + } + } + break; + + case CF_LONG: + if (Flags & CF_CONST) { + g_getimmed (Flags, Val, 0); + } + ldyconst (Offs); + AddCodeLine ("jsr steaxysp"); + break; + + default: + typeerror (Flags); } } @@ -1161,69 +1105,57 @@ void g_putind (unsigned Flags, unsigned Offs) */ if ((Offs & 0xFF) > 256 - sizeofarg (Flags | CF_FORCECHAR)) { - /* Overflow - we need to add the low byte also */ - AddCodeSegLine (CS, "ldy #$00"); - AddCodeSegLine (CS, "clc"); - AddCodeSegLine (CS, "pha"); - AddCodeSegLine (CS, "lda #$%02X", Offs & 0xFF); - AddCodeSegLine (CS, "adc (sp),y"); - AddCodeSegLine (CS, "sta (sp),y"); - AddCodeSegLine (CS, "iny"); - AddCodeSegLine (CS, "lda #$%02X", (Offs >> 8) & 0xFF); - AddCodeSegLine (CS, "adc (sp),y"); - AddCodeSegLine (CS, "sta (sp),y"); - AddCodeSegLine (CS, "pla"); - - /* Complete address is on stack, new offset is zero */ - Offs = 0; + /* Overflow - we need to add the low byte also */ + AddCodeLine ("ldy #$00"); + AddCodeLine ("clc"); + AddCodeLine ("pha"); + AddCodeLine ("lda #$%02X", Offs & 0xFF); + AddCodeLine ("adc (sp),y"); + AddCodeLine ("sta (sp),y"); + AddCodeLine ("iny"); + AddCodeLine ("lda #$%02X", (Offs >> 8) & 0xFF); + AddCodeLine ("adc (sp),y"); + AddCodeLine ("sta (sp),y"); + AddCodeLine ("pla"); + + /* Complete address is on stack, new offset is zero */ + Offs = 0; } else if ((Offs & 0xFF00) != 0) { - /* We can just add the high byte */ - AddCodeSegLine (CS, "ldy #$01"); - AddCodeSegLine (CS, "clc"); - AddCodeSegLine (CS, "pha"); - AddCodeSegLine (CS, "lda #$%02X", (Offs >> 8) & 0xFF); - AddCodeSegLine (CS, "adc (sp),y"); - AddCodeSegLine (CS, "sta (sp),y"); - AddCodeSegLine (CS, "pla"); - - /* Offset is now just the low byte */ - Offs &= 0x00FF; + /* We can just add the high byte */ + AddCodeLine ("ldy #$01"); + AddCodeLine ("clc"); + AddCodeLine ("pha"); + AddCodeLine ("lda #$%02X", (Offs >> 8) & 0xFF); + AddCodeLine ("adc (sp),y"); + AddCodeLine ("sta (sp),y"); + AddCodeLine ("pla"); + + /* Offset is now just the low byte */ + Offs &= 0x00FF; } /* Check the size and determine operation */ switch (Flags & CF_TYPE) { - case CF_CHAR: - if (Offs) { - ldyconst (Offs); - AddCodeSegLine (CS, "jsr staspidx"); - } else { - AddCodeSegLine (CS, "jsr staspp"); - } - break; - - case CF_INT: - if (Offs) { - ldyconst (Offs); - AddCodeSegLine (CS, "jsr staxspidx"); - } else { - AddCodeSegLine (CS, "jsr staxspp"); - } - break; - - case CF_LONG: - if (Offs) { - ldyconst (Offs); - AddCodeSegLine (CS, "jsr steaxspidx"); - } else { - AddCodeSegLine (CS, "jsr steaxspp"); - } - break; - - default: - typeerror (Flags); + case CF_CHAR: + ldyconst (Offs); + AddCodeLine ("jsr staspidx"); + break; + + case CF_INT: + ldyconst (Offs); + AddCodeLine ("jsr staxspidx"); + break; + + case CF_LONG: + ldyconst (Offs); + AddCodeLine ("jsr steaxspidx"); + break; + + default: + typeerror (Flags); } @@ -1234,7 +1166,7 @@ void g_putind (unsigned Flags, unsigned Offs) /*****************************************************************************/ -/* type conversion and similiar stuff */ +/* type conversion and similiar stuff */ /*****************************************************************************/ @@ -1244,21 +1176,21 @@ void g_toslong (unsigned flags) { switch (flags & CF_TYPE) { - case CF_CHAR: - case CF_INT: - if (flags & CF_UNSIGNED) { - AddCodeSegLine (CS, "jsr tosulong"); - } else { - AddCodeSegLine (CS, "jsr toslong"); - } - push (CF_INT); - break; + case CF_CHAR: + case CF_INT: + if (flags & CF_UNSIGNED) { + AddCodeLine ("jsr tosulong"); + } else { + AddCodeLine ("jsr toslong"); + } + push (CF_INT); + break; - case CF_LONG: - break; + case CF_LONG: + break; - default: - typeerror (flags); + default: + typeerror (flags); } } @@ -1269,47 +1201,110 @@ void g_tosint (unsigned flags) { switch (flags & CF_TYPE) { - case CF_CHAR: - case CF_INT: - break; + case CF_CHAR: + case CF_INT: + break; + + case CF_LONG: + AddCodeLine ("jsr tosint"); + pop (CF_INT); + break; + + default: + typeerror (flags); + } +} + - case CF_LONG: - AddCodeSegLine (CS, "jsr tosint"); - pop (CF_INT); - break; - default: - typeerror (flags); +void g_regint (unsigned Flags) +/* Make sure, the value in the primary register an int. Convert if necessary */ +{ + unsigned L; + + switch (Flags & CF_TYPE) { + + case CF_CHAR: + if (Flags & CF_FORCECHAR) { + /* Conversion is from char */ + if (Flags & CF_UNSIGNED) { + AddCodeLine ("ldx #$00"); + } else { + L = GetLocalLabel(); + AddCodeLine ("ldx #$00"); + AddCodeLine ("cmp #$80"); + AddCodeLine ("bcc %s", LocalLabelName (L)); + AddCodeLine ("dex"); + g_defcodelabel (L); + } + } + /* FALLTHROUGH */ + + case CF_INT: + case CF_LONG: + break; + + default: + typeerror (Flags); } } -void g_reglong (unsigned flags) +void g_reglong (unsigned Flags) /* Make sure, the value in the primary register a long. Convert if necessary */ { - switch (flags & CF_TYPE) { + unsigned L; - case CF_CHAR: - case CF_INT: - if (flags & CF_UNSIGNED) { - if (CodeSizeFactor >= 200) { - ldyconst (0); - AddCodeSegLine (CS, "sty sreg"); - AddCodeSegLine (CS, "sty sreg+1"); - } else { - AddCodeSegLine (CS, "jsr axulong"); - } - } else { - AddCodeSegLine (CS, "jsr axlong"); - } - break; + switch (Flags & CF_TYPE) { + + case CF_CHAR: + if (Flags & CF_FORCECHAR) { + /* Conversion is from char */ + if (Flags & CF_UNSIGNED) { + if (IS_Get (&CodeSizeFactor) >= 200) { + AddCodeLine ("ldx #$00"); + AddCodeLine ("stx sreg"); + AddCodeLine ("stx sreg+1"); + } else { + AddCodeLine ("jsr aulong"); + } + } else { + if (IS_Get (&CodeSizeFactor) >= 366) { + L = GetLocalLabel(); + AddCodeLine ("ldx #$00"); + AddCodeLine ("cmp #$80"); + AddCodeLine ("bcc %s", LocalLabelName (L)); + AddCodeLine ("dex"); + g_defcodelabel (L); + AddCodeLine ("stx sreg"); + AddCodeLine ("stx sreg+1"); + } else { + AddCodeLine ("jsr along"); + } + } + } + /* FALLTHROUGH */ + + case CF_INT: + if (Flags & CF_UNSIGNED) { + if (IS_Get (&CodeSizeFactor) >= 200) { + ldyconst (0); + AddCodeLine ("sty sreg"); + AddCodeLine ("sty sreg+1"); + } else { + AddCodeLine ("jsr axulong"); + } + } else { + AddCodeLine ("jsr axlong"); + } + break; - case CF_LONG: - break; + case CF_LONG: + break; - default: - typeerror (flags); + default: + typeerror (Flags); } } @@ -1330,35 +1325,35 @@ unsigned g_typeadjust (unsigned lhs, unsigned rhs) /* Check if a conversion is needed */ if (ltype == CF_LONG && rtype != CF_LONG && (rhs & CF_CONST) == 0) { - /* We must promote the primary register to long */ - g_reglong (rhs); - /* Get the new rhs type */ - rhs = (rhs & ~CF_TYPE) | CF_LONG; - rtype = CF_LONG; + /* We must promote the primary register to long */ + g_reglong (rhs); + /* Get the new rhs type */ + rhs = (rhs & ~CF_TYPE) | CF_LONG; + rtype = CF_LONG; } else if (ltype != CF_LONG && (lhs & CF_CONST) == 0 && rtype == CF_LONG) { - /* We must promote the lhs to long */ - if (lhs & CF_REG) { - g_reglong (lhs); - } else { - g_toslong (lhs); - } - /* Get the new rhs type */ - lhs = (lhs & ~CF_TYPE) | CF_LONG; - ltype = CF_LONG; + /* We must promote the lhs to long */ + if (lhs & CF_REG) { + g_reglong (lhs); + } else { + g_toslong (lhs); + } + /* Get the new rhs type */ + lhs = (lhs & ~CF_TYPE) | CF_LONG; + ltype = CF_LONG; } /* Determine the result type for the operation: - * - The result is const if both operands are const. - * - The result is unsigned if one of the operands is unsigned. - * - The result is long if one of the operands is long. - * - Otherwise the result is int sized. + * - The result is const if both operands are const. + * - The result is unsigned if one of the operands is unsigned. + * - The result is long if one of the operands is long. + * - Otherwise the result is int sized. */ result = (lhs & CF_CONST) & (rhs & CF_CONST); result |= (lhs & CF_UNSIGNED) | (rhs & CF_UNSIGNED); if (rtype == CF_LONG || ltype == CF_LONG) { - result |= CF_LONG; + result |= CF_LONG; } else { - result |= CF_INT; + result |= CF_INT; } return result; } @@ -1377,9 +1372,14 @@ unsigned g_typecast (unsigned lhs, unsigned rhs) rtype = rhs & CF_TYPE; /* Check if a conversion is needed */ - if (ltype == CF_LONG && rtype != CF_LONG && (rhs & CF_CONST) == 0) { - /* We must promote the primary register to long */ - g_reglong (rhs); + if ((rhs & CF_CONST) == 0) { + if (ltype == CF_LONG && rtype != CF_LONG) { + /* We must promote the primary register to long */ + g_reglong (rhs); + } else if (ltype == CF_INT && rtype != CF_INT) { + /* We must promote the primary register to int */ + g_regint (rhs); + } } /* Do not need any other action. If the left type is int, and the primary @@ -1410,138 +1410,138 @@ void g_scale (unsigned flags, long val) /* Value may not be zero */ if (val == 0) { - Internal ("Data type has no size"); + Internal ("Data type has no size"); } else if (val > 0) { - /* Scale up */ - if ((p2 = powerof2 (val)) > 0 && p2 <= 3) { - - /* Factor is 2, 4 or 8, use special function */ - switch (flags & CF_TYPE) { - - case CF_CHAR: - if (flags & CF_FORCECHAR) { - while (p2--) { - AddCodeSegLine (CS, "asl a"); - } - break; - } - /* FALLTHROUGH */ - - case CF_INT: - if (CodeSizeFactor >= (p2+1)*130U) { - AddCodeSegLine (CS, "stx tmp1"); - while (p2--) { - AddCodeSegLine (CS, "asl a"); - AddCodeSegLine (CS, "rol tmp1"); - } - AddCodeSegLine (CS, "ldx tmp1"); - } else { - if (flags & CF_UNSIGNED) { - AddCodeSegLine (CS, "jsr shlax%d", p2); - } else { - AddCodeSegLine (CS, "jsr aslax%d", p2); - } - } - break; - - case CF_LONG: - if (flags & CF_UNSIGNED) { - AddCodeSegLine (CS, "jsr shleax%d", p2); - } else { - AddCodeSegLine (CS, "jsr asleax%d", p2); - } - break; - - default: - typeerror (flags); - - } - - } else if (val != 1) { - - /* Use a multiplication instead */ - g_mul (flags | CF_CONST, val); - - } + /* Scale up */ + if ((p2 = PowerOf2 (val)) > 0 && p2 <= 4) { + + /* Factor is 2, 4, 8 and 16, use special function */ + switch (flags & CF_TYPE) { + + case CF_CHAR: + if (flags & CF_FORCECHAR) { + while (p2--) { + AddCodeLine ("asl a"); + } + break; + } + /* FALLTHROUGH */ + + case CF_INT: + if (IS_Get (&CodeSizeFactor) >= (p2+1)*130) { + AddCodeLine ("stx tmp1"); + while (p2--) { + AddCodeLine ("asl a"); + AddCodeLine ("rol tmp1"); + } + AddCodeLine ("ldx tmp1"); + } else { + if (flags & CF_UNSIGNED) { + AddCodeLine ("jsr shlax%d", p2); + } else { + AddCodeLine ("jsr aslax%d", p2); + } + } + break; + + case CF_LONG: + if (flags & CF_UNSIGNED) { + AddCodeLine ("jsr shleax%d", p2); + } else { + AddCodeLine ("jsr asleax%d", p2); + } + break; + + default: + typeerror (flags); + + } + + } else if (val != 1) { + + /* Use a multiplication instead */ + g_mul (flags | CF_CONST, val); + + } } else { - /* Scale down */ - val = -val; - if ((p2 = powerof2 (val)) > 0 && p2 <= 3) { - - /* Factor is 2, 4 or 8, use special function */ - switch (flags & CF_TYPE) { - - case CF_CHAR: - if (flags & CF_FORCECHAR) { - if (flags & CF_UNSIGNED) { - while (p2--) { - AddCodeSegLine (CS, "lsr a"); - } - break; - } else if (p2 <= 2) { - AddCodeSegLine (CS, "cmp #$80"); - AddCodeSegLine (CS, "ror a"); - break; - } - } - /* FALLTHROUGH */ - - case CF_INT: - if (flags & CF_UNSIGNED) { - if (CodeSizeFactor >= (p2+1)*130U) { - AddCodeSegLine (CS, "stx tmp1"); - while (p2--) { - AddCodeSegLine (CS, "lsr tmp1"); - AddCodeSegLine (CS, "ror a"); - } - AddCodeSegLine (CS, "ldx tmp1"); - } else { - AddCodeSegLine (CS, "jsr lsrax%d", p2); - } - } else { - if (CodeSizeFactor >= (p2+1)*150U) { - AddCodeSegLine (CS, "stx tmp1"); - while (p2--) { - AddCodeSegLine (CS, "cpx #$80"); - AddCodeSegLine (CS, "ror tmp1"); - AddCodeSegLine (CS, "ror a"); - } - AddCodeSegLine (CS, "ldx tmp1"); - } else { - AddCodeSegLine (CS, "jsr asrax%d", p2); - } - } - break; - - case CF_LONG: - if (flags & CF_UNSIGNED) { - AddCodeSegLine (CS, "jsr lsreax%d", p2); - } else { - AddCodeSegLine (CS, "jsr asreax%d", p2); - } - break; - - default: - typeerror (flags); - - } - - } else if (val != 1) { - - /* Use a division instead */ - g_div (flags | CF_CONST, val); - - } + /* Scale down */ + val = -val; + if ((p2 = PowerOf2 (val)) > 0 && p2 <= 4) { + + /* Factor is 2, 4, 8 and 16 use special function */ + switch (flags & CF_TYPE) { + + case CF_CHAR: + if (flags & CF_FORCECHAR) { + if (flags & CF_UNSIGNED) { + while (p2--) { + AddCodeLine ("lsr a"); + } + break; + } else if (p2 <= 2) { + AddCodeLine ("cmp #$80"); + AddCodeLine ("ror a"); + break; + } + } + /* FALLTHROUGH */ + + case CF_INT: + if (flags & CF_UNSIGNED) { + if (IS_Get (&CodeSizeFactor) >= (p2+1)*130) { + AddCodeLine ("stx tmp1"); + while (p2--) { + AddCodeLine ("lsr tmp1"); + AddCodeLine ("ror a"); + } + AddCodeLine ("ldx tmp1"); + } else { + AddCodeLine ("jsr lsrax%d", p2); + } + } else { + if (IS_Get (&CodeSizeFactor) >= (p2+1)*150) { + AddCodeLine ("stx tmp1"); + while (p2--) { + AddCodeLine ("cpx #$80"); + AddCodeLine ("ror tmp1"); + AddCodeLine ("ror a"); + } + AddCodeLine ("ldx tmp1"); + } else { + AddCodeLine ("jsr asrax%d", p2); + } + } + break; + + case CF_LONG: + if (flags & CF_UNSIGNED) { + AddCodeLine ("jsr lsreax%d", p2); + } else { + AddCodeLine ("jsr asreax%d", p2); + } + break; + + default: + typeerror (flags); + + } + + } else if (val != 1) { + + /* Use a division instead */ + g_div (flags | CF_CONST, val); + + } } } /*****************************************************************************/ -/* Adds and subs of variables fix a fixed address */ +/* Adds and subs of variables fix a fixed address */ /*****************************************************************************/ @@ -1549,83 +1549,89 @@ void g_scale (unsigned flags, long val) void g_addlocal (unsigned flags, int offs) /* Add a local variable to ax */ { + unsigned L; + /* Correct the offset and check it */ - offs -= oursp; + offs -= StackPtr; CheckLocalOffs (offs); switch (flags & CF_TYPE) { - case CF_CHAR: - AddCodeSegLine (CS, "ldy #$%02X", offs & 0xFF); - AddCodeSegLine (CS, "clc"); - AddCodeSegLine (CS, "adc (sp),y"); - AddCodeSegLine (CS, "bcc *+3"); - AddCodeSegLine (CS, "inx"); - AddCodeHint ("x:!"); - break; + case CF_CHAR: + L = GetLocalLabel(); + AddCodeLine ("ldy #$%02X", offs & 0xFF); + AddCodeLine ("clc"); + AddCodeLine ("adc (sp),y"); + AddCodeLine ("bcc %s", LocalLabelName (L)); + AddCodeLine ("inx"); + g_defcodelabel (L); + break; + + case CF_INT: + AddCodeLine ("ldy #$%02X", offs & 0xFF); + AddCodeLine ("clc"); + AddCodeLine ("adc (sp),y"); + AddCodeLine ("pha"); + AddCodeLine ("txa"); + AddCodeLine ("iny"); + AddCodeLine ("adc (sp),y"); + AddCodeLine ("tax"); + AddCodeLine ("pla"); + break; - case CF_INT: - AddCodeSegLine (CS, "ldy #$%02X", offs & 0xFF); - AddCodeSegLine (CS, "clc"); - AddCodeSegLine (CS, "adc (sp),y"); - AddCodeSegLine (CS, "pha"); - AddCodeSegLine (CS, "txa"); - AddCodeSegLine (CS, "iny"); - AddCodeSegLine (CS, "adc (sp),y"); - AddCodeSegLine (CS, "tax"); - AddCodeSegLine (CS, "pla"); - break; - - case CF_LONG: - /* Do it the old way */ - g_push (flags, 0); - g_getlocal (flags, offs); - g_add (flags, 0); - break; + case CF_LONG: + /* Do it the old way */ + g_push (flags, 0); + g_getlocal (flags, offs); + g_add (flags, 0); + break; - default: - typeerror (flags); + default: + typeerror (flags); } } -void g_addstatic (unsigned flags, unsigned long label, unsigned offs) +void g_addstatic (unsigned flags, unsigned long label, long offs) /* Add a static variable to ax */ { + unsigned L; + /* Create the correct label name */ - char* lbuf = GetLabelName (flags, label, offs); + const char* lbuf = GetLabelName (flags, label, offs); switch (flags & CF_TYPE) { - case CF_CHAR: - AddCodeSegLine (CS, "clc"); - AddCodeSegLine (CS, "adc %s", lbuf); - AddCodeSegLine (CS, "bcc *+3"); - AddCodeSegLine (CS, "inx"); - AddCodeHint ("x:!"); - break; - - case CF_INT: - AddCodeSegLine (CS, "clc"); - AddCodeSegLine (CS, "adc %s", lbuf); - AddCodeSegLine (CS, "tay"); - AddCodeSegLine (CS, "txa"); - AddCodeSegLine (CS, "adc %s+1", lbuf); - AddCodeSegLine (CS, "tax"); - AddCodeSegLine (CS, "tya"); - break; + case CF_CHAR: + L = GetLocalLabel(); + AddCodeLine ("clc"); + AddCodeLine ("adc %s", lbuf); + AddCodeLine ("bcc %s", LocalLabelName (L)); + AddCodeLine ("inx"); + g_defcodelabel (L); + break; + + case CF_INT: + AddCodeLine ("clc"); + AddCodeLine ("adc %s", lbuf); + AddCodeLine ("tay"); + AddCodeLine ("txa"); + AddCodeLine ("adc %s+1", lbuf); + AddCodeLine ("tax"); + AddCodeLine ("tya"); + break; - case CF_LONG: - /* Do it the old way */ - g_push (flags, 0); - g_getstatic (flags, label, offs); - g_add (flags, 0); - break; + case CF_LONG: + /* Do it the old way */ + g_push (flags, 0); + g_getstatic (flags, label, offs); + g_add (flags, 0); + break; - default: - typeerror (flags); + default: + typeerror (flags); } } @@ -1633,138 +1639,117 @@ void g_addstatic (unsigned flags, unsigned long label, unsigned offs) /*****************************************************************************/ -/* Compares of ax with a variable with fixed address */ +/* Special op= functions */ /*****************************************************************************/ -void g_cmplocal (unsigned flags, int offs) -/* Compare a local variable to ax */ -{ - Internal ("g_cmplocal not implemented"); -} - - - -void g_cmpstatic (unsigned flags, unsigned label, unsigned offs) -/* Compare a static variable to ax */ -{ - Internal ("g_cmpstatic not implemented"); -} - - - -/*****************************************************************************/ -/* Special op= functions */ -/*****************************************************************************/ - - - -void g_addeqstatic (unsigned flags, unsigned long label, unsigned offs, - unsigned long val) +void g_addeqstatic (unsigned flags, unsigned long label, long offs, + unsigned long val) /* Emit += for a static variable */ { /* Create the correct label name */ - char* lbuf = GetLabelName (flags, label, offs); + const char* lbuf = GetLabelName (flags, label, offs); /* Check the size and determine operation */ switch (flags & CF_TYPE) { - case CF_CHAR: - if (flags & CF_FORCECHAR) { - AddCodeSegLine (CS, "ldx #$00"); - if (flags & CF_CONST) { - if (val == 1) { - AddCodeSegLine (CS, "inc %s", lbuf); - AddCodeSegLine (CS, "lda %s", lbuf); - } else { - AddCodeSegLine (CS, "lda #$%02X", (int)(val & 0xFF)); - AddCodeSegLine (CS, "clc"); - AddCodeSegLine (CS, "adc %s", lbuf); - AddCodeSegLine (CS, "sta %s", lbuf); - } - } else { - AddCodeSegLine (CS, "clc"); - AddCodeSegLine (CS, "adc %s", lbuf); - AddCodeSegLine (CS, "sta %s", lbuf); - } - if ((flags & CF_UNSIGNED) == 0) { - AddCodeSegLine (CS, "bpl *+3"); - AddCodeSegLine (CS, "dex"); - AddCodeHint ("x:!"); /* Invalidate X */ - } - break; - } - /* FALLTHROUGH */ - - case CF_INT: - if (flags & CF_CONST) { - if (val == 1) { - label = GetLocalLabel (); - AddCodeSegLine (CS, "inc %s", lbuf); - AddCodeSegLine (CS, "bne L%04X", (int)label); - AddCodeSegLine (CS, "inc %s+1", lbuf); - g_defloclabel (label); - AddCodeSegLine (CS, "lda %s", lbuf); /* Hmmm... */ - AddCodeSegLine (CS, "ldx %s+1", lbuf); - } else { - AddCodeSegLine (CS, "lda #$%02X", (int)(val & 0xFF)); - AddCodeSegLine (CS, "clc"); - AddCodeSegLine (CS, "adc %s", lbuf); - AddCodeSegLine (CS, "sta %s", lbuf); - if (val < 0x100) { - label = GetLocalLabel (); - AddCodeSegLine (CS, "bcc L%04X", (int)label); - AddCodeSegLine (CS, "inc %s+1", lbuf); - g_defloclabel (label); - AddCodeSegLine (CS, "ldx %s+1", lbuf); - } else { - AddCodeSegLine (CS, "lda #$%02X", (unsigned char)(val >> 8)); - AddCodeSegLine (CS, "adc %s+1", lbuf); - AddCodeSegLine (CS, "sta %s+1", lbuf); - AddCodeSegLine (CS, "tax"); - AddCodeSegLine (CS, "lda %s", lbuf); - } - } - } else { - AddCodeSegLine (CS, "clc"); - AddCodeSegLine (CS, "adc %s", lbuf); - AddCodeSegLine (CS, "sta %s", lbuf); - AddCodeSegLine (CS, "txa"); - AddCodeSegLine (CS, "adc %s+1", lbuf); - AddCodeSegLine (CS, "sta %s+1", lbuf); - AddCodeSegLine (CS, "tax"); - AddCodeSegLine (CS, "lda %s", lbuf); - } - break; - - case CF_LONG: - if (flags & CF_CONST) { - if (val < 0x100) { - AddCodeSegLine (CS, "ldy #<(%s)", lbuf); - AddCodeSegLine (CS, "sty ptr1"); - AddCodeSegLine (CS, "ldy #>(%s+1)", lbuf); - if (val == 1) { - AddCodeSegLine (CS, "jsr laddeq1"); - } else { - AddCodeSegLine (CS, "lda #$%02X", (int)(val & 0xFF)); - AddCodeSegLine (CS, "jsr laddeqa"); - } - } else { - g_getstatic (flags, label, offs); - g_inc (flags, val); - g_putstatic (flags, label, offs); - } - } else { - AddCodeSegLine (CS, "ldy #<(%s)", lbuf); - AddCodeSegLine (CS, "sty ptr1"); - AddCodeSegLine (CS, "ldy #>(%s+1)", lbuf); - AddCodeSegLine (CS, "jsr laddeq"); - } - break; - - default: - typeerror (flags); + case CF_CHAR: + if (flags & CF_FORCECHAR) { + AddCodeLine ("ldx #$00"); + if (flags & CF_CONST) { + if (val == 1) { + AddCodeLine ("inc %s", lbuf); + AddCodeLine ("lda %s", lbuf); + } else { + AddCodeLine ("lda #$%02X", (int)(val & 0xFF)); + AddCodeLine ("clc"); + AddCodeLine ("adc %s", lbuf); + AddCodeLine ("sta %s", lbuf); + } + } else { + AddCodeLine ("clc"); + AddCodeLine ("adc %s", lbuf); + AddCodeLine ("sta %s", lbuf); + } + if ((flags & CF_UNSIGNED) == 0) { + unsigned L = GetLocalLabel(); + AddCodeLine ("bpl %s", LocalLabelName (L)); + AddCodeLine ("dex"); + g_defcodelabel (L); + } + break; + } + /* FALLTHROUGH */ + + case CF_INT: + if (flags & CF_CONST) { + if (val == 1) { + unsigned L = GetLocalLabel (); + AddCodeLine ("inc %s", lbuf); + AddCodeLine ("bne %s", LocalLabelName (L)); + AddCodeLine ("inc %s+1", lbuf); + g_defcodelabel (L); + AddCodeLine ("lda %s", lbuf); /* Hmmm... */ + AddCodeLine ("ldx %s+1", lbuf); + } else { + AddCodeLine ("lda #$%02X", (int)(val & 0xFF)); + AddCodeLine ("clc"); + AddCodeLine ("adc %s", lbuf); + AddCodeLine ("sta %s", lbuf); + if (val < 0x100) { + unsigned L = GetLocalLabel (); + AddCodeLine ("bcc %s", LocalLabelName (L)); + AddCodeLine ("inc %s+1", lbuf); + g_defcodelabel (L); + AddCodeLine ("ldx %s+1", lbuf); + } else { + AddCodeLine ("lda #$%02X", (unsigned char)(val >> 8)); + AddCodeLine ("adc %s+1", lbuf); + AddCodeLine ("sta %s+1", lbuf); + AddCodeLine ("tax"); + AddCodeLine ("lda %s", lbuf); + } + } + } else { + AddCodeLine ("clc"); + AddCodeLine ("adc %s", lbuf); + AddCodeLine ("sta %s", lbuf); + AddCodeLine ("txa"); + AddCodeLine ("adc %s+1", lbuf); + AddCodeLine ("sta %s+1", lbuf); + AddCodeLine ("tax"); + AddCodeLine ("lda %s", lbuf); + } + break; + + case CF_LONG: + if (flags & CF_CONST) { + if (val < 0x100) { + AddCodeLine ("ldy #<(%s)", lbuf); + AddCodeLine ("sty ptr1"); + AddCodeLine ("ldy #>(%s)", lbuf); + if (val == 1) { + AddCodeLine ("jsr laddeq1"); + } else { + AddCodeLine ("lda #$%02X", (int)(val & 0xFF)); + AddCodeLine ("jsr laddeqa"); + } + } else { + g_getstatic (flags, label, offs); + g_inc (flags, val); + g_putstatic (flags, label, offs); + } + } else { + AddCodeLine ("ldy #<(%s)", lbuf); + AddCodeLine ("sty ptr1"); + AddCodeLine ("ldy #>(%s)", lbuf); + AddCodeLine ("jsr laddeq"); + } + break; + + default: + typeerror (flags); } } @@ -1774,75 +1759,70 @@ void g_addeqlocal (unsigned flags, int offs, unsigned long val) /* Emit += for a local variable */ { /* Calculate the true offset, check it, load it into Y */ - offs -= oursp; + offs -= StackPtr; CheckLocalOffs (offs); /* Check the size and determine operation */ switch (flags & CF_TYPE) { - case CF_CHAR: - if (flags & CF_FORCECHAR) { - if (offs == 0) { - AddCodeSegLine (CS, "ldx #$00"); - if (flags & CF_CONST) { - AddCodeSegLine (CS, "clc"); - AddCodeSegLine (CS, "lda #$%02X", (int)(val & 0xFF)); - AddCodeSegLine (CS, "adc (sp,x)"); - AddCodeSegLine (CS, "sta (sp,x)"); - } else { - AddCodeSegLine (CS, "clc"); - AddCodeSegLine (CS, "adc (sp,x)"); - AddCodeSegLine (CS, "sta (sp,x)"); - } - } else { - ldyconst (offs); - AddCodeSegLine (CS, "ldx #$00"); - if (flags & CF_CONST) { - AddCodeSegLine (CS, "clc"); - AddCodeSegLine (CS, "lda #$%02X", (int)(val & 0xFF)); - AddCodeSegLine (CS, "adc (sp),y"); - AddCodeSegLine (CS, "sta (sp),y"); - } else { - AddCodeSegLine (CS, "clc"); - AddCodeSegLine (CS, "adc (sp),y"); - AddCodeSegLine (CS, "sta (sp),y"); - } - } - if ((flags & CF_UNSIGNED) == 0) { - AddCodeSegLine (CS, "bpl *+3"); - AddCodeSegLine (CS, "dex"); - AddCodeHint ("x:!"); /* Invalidate X */ - } - break; - } - /* FALLTHROUGH */ - - case CF_INT: - if (flags & CF_CONST) { - g_getimmed (flags, val, 0); - } - if (offs == 0) { - AddCodeSegLine (CS, "jsr addeq0sp"); - } else { - ldyconst (offs); - AddCodeSegLine (CS, "jsr addeqysp"); - } - break; - - case CF_LONG: - if (flags & CF_CONST) { - g_getimmed (flags, val, 0); - } - if (offs == 0) { - AddCodeSegLine (CS, "jsr laddeq0sp"); - } else { - ldyconst (offs); - AddCodeSegLine (CS, "jsr laddeqysp"); - } - break; - - default: - typeerror (flags); + case CF_CHAR: + if (flags & CF_FORCECHAR) { + ldyconst (offs); + AddCodeLine ("ldx #$00"); + if (flags & CF_CONST) { + AddCodeLine ("clc"); + AddCodeLine ("lda #$%02X", (int)(val & 0xFF)); + AddCodeLine ("adc (sp),y"); + AddCodeLine ("sta (sp),y"); + } else { + AddCodeLine ("clc"); + AddCodeLine ("adc (sp),y"); + AddCodeLine ("sta (sp),y"); + } + if ((flags & CF_UNSIGNED) == 0) { + unsigned L = GetLocalLabel(); + AddCodeLine ("bpl %s", LocalLabelName (L)); + AddCodeLine ("dex"); + g_defcodelabel (L); + } + break; + } + /* FALLTHROUGH */ + + case CF_INT: + ldyconst (offs); + if (flags & CF_CONST) { + if (IS_Get (&CodeSizeFactor) >= 400) { + AddCodeLine ("clc"); + AddCodeLine ("lda #$%02X", (int)(val & 0xFF)); + AddCodeLine ("adc (sp),y"); + AddCodeLine ("sta (sp),y"); + AddCodeLine ("iny"); + AddCodeLine ("lda #$%02X", (int) ((val >> 8) & 0xFF)); + AddCodeLine ("adc (sp),y"); + AddCodeLine ("sta (sp),y"); + AddCodeLine ("tax"); + AddCodeLine ("dey"); + AddCodeLine ("lda (sp),y"); + } else { + g_getimmed (flags, val, 0); + AddCodeLine ("jsr addeqysp"); + } + } else { + AddCodeLine ("jsr addeqysp"); + } + break; + + case CF_LONG: + if (flags & CF_CONST) { + g_getimmed (flags, val, 0); + } + ldyconst (offs); + AddCodeLine ("jsr laddeqysp"); + break; + + default: + typeerror (flags); } } @@ -1860,160 +1840,147 @@ void g_addeqind (unsigned flags, unsigned offs, unsigned long val) /* Check the size and determine operation */ switch (flags & CF_TYPE) { - case CF_CHAR: - AddCodeSegLine (CS, "sta ptr1"); - AddCodeSegLine (CS, "stx ptr1+1"); - if (offs == 0) { - AddCodeSegLine (CS, "ldx #$00"); - AddCodeSegLine (CS, "lda #$%02X", (int)(val & 0xFF)); - AddCodeSegLine (CS, "clc"); - AddCodeSegLine (CS, "adc (ptr1,x)"); - AddCodeSegLine (CS, "sta (ptr1,x)"); - } else { - AddCodeSegLine (CS, "ldy #$%02X", offs); - AddCodeSegLine (CS, "ldx #$00"); - AddCodeSegLine (CS, "lda #$%02X", (int)(val & 0xFF)); - AddCodeSegLine (CS, "clc"); - AddCodeSegLine (CS, "adc (ptr1),y"); - AddCodeSegLine (CS, "sta (ptr1),y"); - } - break; - - case CF_INT: - if (CodeSizeFactor >= 200) { - /* Lots of code, use only if size is not important */ - AddCodeSegLine (CS, "sta ptr1"); - AddCodeSegLine (CS, "stx ptr1+1"); - AddCodeSegLine (CS, "ldy #$%02X", offs); - AddCodeSegLine (CS, "lda #$%02X", (int)(val & 0xFF)); - AddCodeSegLine (CS, "clc"); - AddCodeSegLine (CS, "adc (ptr1),y"); - AddCodeSegLine (CS, "sta (ptr1),y"); - AddCodeSegLine (CS, "pha"); - AddCodeSegLine (CS, "iny"); - AddCodeSegLine (CS, "lda #$%02X", (unsigned char)(val >> 8)); - AddCodeSegLine (CS, "adc (ptr1),y"); - AddCodeSegLine (CS, "sta (ptr1),y"); - AddCodeSegLine (CS, "tax"); - AddCodeSegLine (CS, "pla"); - break; - } - /* FALL THROUGH */ - - case CF_LONG: - AddCodeSegLine (CS, "jsr pushax"); /* Push the address */ - push (flags); /* Correct the internal sp */ - g_getind (flags, offs); /* Fetch the value */ - g_inc (flags, val); /* Increment value in primary */ - g_putind (flags, offs); /* Store the value back */ - break; - - default: - typeerror (flags); - } -} - - - -void g_subeqstatic (unsigned flags, unsigned long label, unsigned offs, - unsigned long val) + case CF_CHAR: + AddCodeLine ("sta ptr1"); + AddCodeLine ("stx ptr1+1"); + AddCodeLine ("ldy #$%02X", offs); + AddCodeLine ("ldx #$00"); + AddCodeLine ("lda #$%02X", (int)(val & 0xFF)); + AddCodeLine ("clc"); + AddCodeLine ("adc (ptr1),y"); + AddCodeLine ("sta (ptr1),y"); + break; + + case CF_INT: + if (IS_Get (&CodeSizeFactor) >= 200) { + /* Lots of code, use only if size is not important */ + AddCodeLine ("sta ptr1"); + AddCodeLine ("stx ptr1+1"); + AddCodeLine ("ldy #$%02X", offs); + AddCodeLine ("lda #$%02X", (int)(val & 0xFF)); + AddCodeLine ("clc"); + AddCodeLine ("adc (ptr1),y"); + AddCodeLine ("sta (ptr1),y"); + AddCodeLine ("pha"); + AddCodeLine ("iny"); + AddCodeLine ("lda #$%02X", (unsigned char)(val >> 8)); + AddCodeLine ("adc (ptr1),y"); + AddCodeLine ("sta (ptr1),y"); + AddCodeLine ("tax"); + AddCodeLine ("pla"); + break; + } + /* FALL THROUGH */ + + case CF_LONG: + AddCodeLine ("jsr pushax"); /* Push the address */ + push (CF_PTR); /* Correct the internal sp */ + g_getind (flags, offs); /* Fetch the value */ + g_inc (flags, val); /* Increment value in primary */ + g_putind (flags, offs); /* Store the value back */ + break; + + default: + typeerror (flags); + } +} + + + +void g_subeqstatic (unsigned flags, unsigned long label, long offs, + unsigned long val) /* Emit -= for a static variable */ { /* Create the correct label name */ - char* lbuf = GetLabelName (flags, label, offs); + const char* lbuf = GetLabelName (flags, label, offs); /* Check the size and determine operation */ switch (flags & CF_TYPE) { - case CF_CHAR: - if (flags & CF_FORCECHAR) { - AddCodeSegLine (CS, "ldx #$00"); - if (flags & CF_CONST) { - if (val == 1) { - AddCodeSegLine (CS, "dec %s", lbuf); - AddCodeSegLine (CS, "lda %s", lbuf); - } else { - AddCodeSegLine (CS, "sec"); - AddCodeSegLine (CS, "lda %s", lbuf); - AddCodeSegLine (CS, "sbc #$%02X", (int)(val & 0xFF)); - AddCodeSegLine (CS, "sta %s", lbuf); - } - } else { - AddCodeSegLine (CS, "sec"); - AddCodeSegLine (CS, "sta tmp1"); - AddCodeSegLine (CS, "lda %s", lbuf); - AddCodeSegLine (CS, "sbc tmp1"); - AddCodeSegLine (CS, "sta %s", lbuf); - } - if ((flags & CF_UNSIGNED) == 0) { - AddCodeSegLine (CS, "bpl *+3"); - AddCodeSegLine (CS, "dex"); - AddCodeHint ("x:!"); /* Invalidate X */ - } - break; - } - /* FALLTHROUGH */ - - case CF_INT: - AddCodeSegLine (CS, "sec"); - if (flags & CF_CONST) { - AddCodeSegLine (CS, "lda %s", lbuf); - AddCodeSegLine (CS, "sbc #$%02X", (unsigned char)val); - AddCodeSegLine (CS, "sta %s", lbuf); - if (val < 0x100) { - label = GetLocalLabel (); - AddCodeSegLine (CS, "bcs L%04X", (unsigned)label); - AddCodeSegLine (CS, "dec %s+1", lbuf); - g_defloclabel (label); - AddCodeSegLine (CS, "ldx %s+1", lbuf); - } else { - AddCodeSegLine (CS, "lda %s+1", lbuf); - AddCodeSegLine (CS, "sbc #$%02X", (unsigned char)(val >> 8)); - AddCodeSegLine (CS, "sta %s+1", lbuf); - AddCodeSegLine (CS, "tax"); - AddCodeSegLine (CS, "lda %s", lbuf); - } - } else { - AddCodeSegLine (CS, "sta tmp1"); - AddCodeSegLine (CS, "lda %s", lbuf); - AddCodeSegLine (CS, "sbc tmp1"); - AddCodeSegLine (CS, "sta %s", lbuf); - AddCodeSegLine (CS, "stx tmp1"); - AddCodeSegLine (CS, "lda %s+1", lbuf); - AddCodeSegLine (CS, "sbc tmp1"); - AddCodeSegLine (CS, "sta %s+1", lbuf); - AddCodeSegLine (CS, "tax"); - AddCodeSegLine (CS, "lda %s", lbuf); - } - break; - - case CF_LONG: - if (flags & CF_CONST) { - if (val < 0x100) { - AddCodeSegLine (CS, "ldy #<(%s)", lbuf); - AddCodeSegLine (CS, "sty ptr1"); - AddCodeSegLine (CS, "ldy #>(%s+1)", lbuf); - if (val == 1) { - AddCodeSegLine (CS, "jsr lsubeq1"); - } else { - AddCodeSegLine (CS, "lda #$%02X", (unsigned char)val); - AddCodeSegLine (CS, "jsr lsubeqa"); - } - } else { - g_getstatic (flags, label, offs); - g_dec (flags, val); - g_putstatic (flags, label, offs); - } - } else { - AddCodeSegLine (CS, "ldy #<(%s)", lbuf); - AddCodeSegLine (CS, "sty ptr1"); - AddCodeSegLine (CS, "ldy #>(%s+1)", lbuf); - AddCodeSegLine (CS, "jsr lsubeq"); - } - break; - - default: - typeerror (flags); + case CF_CHAR: + if (flags & CF_FORCECHAR) { + AddCodeLine ("ldx #$00"); + if (flags & CF_CONST) { + if (val == 1) { + AddCodeLine ("dec %s", lbuf); + AddCodeLine ("lda %s", lbuf); + } else { + AddCodeLine ("sec"); + AddCodeLine ("lda %s", lbuf); + AddCodeLine ("sbc #$%02X", (int)(val & 0xFF)); + AddCodeLine ("sta %s", lbuf); + } + } else { + AddCodeLine ("eor #$FF"); + AddCodeLine ("sec"); + AddCodeLine ("adc %s", lbuf); + AddCodeLine ("sta %s", lbuf); + } + if ((flags & CF_UNSIGNED) == 0) { + unsigned L = GetLocalLabel(); + AddCodeLine ("bpl %s", LocalLabelName (L)); + AddCodeLine ("dex"); + g_defcodelabel (L); + } + break; + } + /* FALLTHROUGH */ + + case CF_INT: + AddCodeLine ("sec"); + if (flags & CF_CONST) { + AddCodeLine ("lda %s", lbuf); + AddCodeLine ("sbc #$%02X", (unsigned char)val); + AddCodeLine ("sta %s", lbuf); + if (val < 0x100) { + unsigned L = GetLocalLabel (); + AddCodeLine ("bcs %s", LocalLabelName (L)); + AddCodeLine ("dec %s+1", lbuf); + g_defcodelabel (L); + AddCodeLine ("ldx %s+1", lbuf); + } else { + AddCodeLine ("lda %s+1", lbuf); + AddCodeLine ("sbc #$%02X", (unsigned char)(val >> 8)); + AddCodeLine ("sta %s+1", lbuf); + AddCodeLine ("tax"); + AddCodeLine ("lda %s", lbuf); + } + } else { + AddCodeLine ("eor #$FF"); + AddCodeLine ("adc %s", lbuf); + AddCodeLine ("sta %s", lbuf); + AddCodeLine ("txa"); + AddCodeLine ("eor #$FF"); + AddCodeLine ("adc %s+1", lbuf); + AddCodeLine ("sta %s+1", lbuf); + AddCodeLine ("tax"); + AddCodeLine ("lda %s", lbuf); + } + break; + + case CF_LONG: + if (flags & CF_CONST) { + if (val < 0x100) { + AddCodeLine ("ldy #<(%s)", lbuf); + AddCodeLine ("sty ptr1"); + AddCodeLine ("ldy #>(%s)", lbuf); + AddCodeLine ("lda #$%02X", (unsigned char)val); + AddCodeLine ("jsr lsubeqa"); + } else { + g_getstatic (flags, label, offs); + g_dec (flags, val); + g_putstatic (flags, label, offs); + } + } else { + AddCodeLine ("ldy #<(%s)", lbuf); + AddCodeLine ("sty ptr1"); + AddCodeLine ("ldy #>(%s)", lbuf); + AddCodeLine ("jsr lsubeq"); + } + break; + + default: + typeerror (flags); } } @@ -2023,61 +1990,53 @@ void g_subeqlocal (unsigned flags, int offs, unsigned long val) /* Emit -= for a local variable */ { /* Calculate the true offset, check it, load it into Y */ - offs -= oursp; + offs -= StackPtr; CheckLocalOffs (offs); /* Check the size and determine operation */ switch (flags & CF_TYPE) { - case CF_CHAR: - if (flags & CF_FORCECHAR) { - ldyconst (offs); - AddCodeSegLine (CS, "ldx #$00"); - AddCodeSegLine (CS, "sec"); - if (flags & CF_CONST) { - AddCodeSegLine (CS, "lda (sp),y"); - AddCodeSegLine (CS, "sbc #$%02X", (unsigned char)val); - } else { - AddCodeSegLine (CS, "sta tmp1"); - AddCodeSegLine (CS, "lda (sp),y"); - AddCodeSegLine (CS, "sbc tmp1"); - } - AddCodeSegLine (CS, "sta (sp),y"); - if ((flags & CF_UNSIGNED) == 0) { - AddCodeSegLine (CS, "bpl *+3"); - AddCodeSegLine (CS, "dex"); - AddCodeHint ("x:!"); /* Invalidate X */ - } - break; - } - /* FALLTHROUGH */ - - case CF_INT: - if (flags & CF_CONST) { - g_getimmed (flags, val, 0); - } - if (offs == 0) { - AddCodeSegLine (CS, "jsr subeq0sp"); - } else { - ldyconst (offs); - AddCodeSegLine (CS, "jsr subeqysp"); - } - break; - - case CF_LONG: - if (flags & CF_CONST) { - g_getimmed (flags, val, 0); - } - if (offs == 0) { - AddCodeSegLine (CS, "jsr lsubeq0sp"); - } else { - ldyconst (offs); - AddCodeSegLine (CS, "jsr lsubeqysp"); - } - break; - - default: - typeerror (flags); + case CF_CHAR: + if (flags & CF_FORCECHAR) { + ldyconst (offs); + AddCodeLine ("ldx #$00"); + AddCodeLine ("sec"); + if (flags & CF_CONST) { + AddCodeLine ("lda (sp),y"); + AddCodeLine ("sbc #$%02X", (unsigned char)val); + } else { + AddCodeLine ("eor #$FF"); + AddCodeLine ("adc (sp),y"); + } + AddCodeLine ("sta (sp),y"); + if ((flags & CF_UNSIGNED) == 0) { + unsigned L = GetLocalLabel(); + AddCodeLine ("bpl %s", LocalLabelName (L)); + AddCodeLine ("dex"); + g_defcodelabel (L); + } + break; + } + /* FALLTHROUGH */ + + case CF_INT: + if (flags & CF_CONST) { + g_getimmed (flags, val, 0); + } + ldyconst (offs); + AddCodeLine ("jsr subeqysp"); + break; + + case CF_LONG: + if (flags & CF_CONST) { + g_getimmed (flags, val, 0); + } + ldyconst (offs); + AddCodeLine ("jsr lsubeqysp"); + break; + + default: + typeerror (flags); } } @@ -2095,114 +2054,113 @@ void g_subeqind (unsigned flags, unsigned offs, unsigned long val) /* Check the size and determine operation */ switch (flags & CF_TYPE) { - case CF_CHAR: - AddCodeSegLine (CS, "sta ptr1"); - AddCodeSegLine (CS, "stx ptr1+1"); - if (offs == 0) { - AddCodeSegLine (CS, "ldx #$00"); - AddCodeSegLine (CS, "lda (ptr1,x)"); - AddCodeSegLine (CS, "sec"); - AddCodeSegLine (CS, "sbc #$%02X", (unsigned char)val); - AddCodeSegLine (CS, "sta (ptr1,x)"); - } else { - AddCodeSegLine (CS, "ldy #$%02X", offs); - AddCodeSegLine (CS, "ldx #$00"); - AddCodeSegLine (CS, "lda (ptr1),y"); - AddCodeSegLine (CS, "sec"); - AddCodeSegLine (CS, "sbc #$%02X", (unsigned char)val); - AddCodeSegLine (CS, "sta (ptr1),y"); - } - break; - - case CF_INT: - if (CodeSizeFactor >= 200) { - /* Lots of code, use only if size is not important */ - AddCodeSegLine (CS, "sta ptr1"); - AddCodeSegLine (CS, "stx ptr1+1"); - AddCodeSegLine (CS, "ldy #$%02X", offs); - AddCodeSegLine (CS, "lda (ptr1),y"); - AddCodeSegLine (CS, "sec"); - AddCodeSegLine (CS, "sbc #$%02X", (unsigned char)val); - AddCodeSegLine (CS, "sta (ptr1),y"); - AddCodeSegLine (CS, "pha"); - AddCodeSegLine (CS, "iny"); - AddCodeSegLine (CS, "lda (ptr1),y"); - AddCodeSegLine (CS, "sbc #$%02X", (unsigned char)(val >> 8)); - AddCodeSegLine (CS, "sta (ptr1),y"); - AddCodeSegLine (CS, "tax"); - AddCodeSegLine (CS, "pla"); - break; - } - /* FALL THROUGH */ - - case CF_LONG: - AddCodeSegLine (CS, "jsr pushax"); /* Push the address */ - push (flags); /* Correct the internal sp */ - g_getind (flags, offs); /* Fetch the value */ - g_dec (flags, val); /* Increment value in primary */ - g_putind (flags, offs); /* Store the value back */ - break; - - default: - typeerror (flags); + case CF_CHAR: + AddCodeLine ("sta ptr1"); + AddCodeLine ("stx ptr1+1"); + AddCodeLine ("ldy #$%02X", offs); + AddCodeLine ("ldx #$00"); + AddCodeLine ("lda (ptr1),y"); + AddCodeLine ("sec"); + AddCodeLine ("sbc #$%02X", (unsigned char)val); + AddCodeLine ("sta (ptr1),y"); + break; + + case CF_INT: + if (IS_Get (&CodeSizeFactor) >= 200) { + /* Lots of code, use only if size is not important */ + AddCodeLine ("sta ptr1"); + AddCodeLine ("stx ptr1+1"); + AddCodeLine ("ldy #$%02X", offs); + AddCodeLine ("lda (ptr1),y"); + AddCodeLine ("sec"); + AddCodeLine ("sbc #$%02X", (unsigned char)val); + AddCodeLine ("sta (ptr1),y"); + AddCodeLine ("pha"); + AddCodeLine ("iny"); + AddCodeLine ("lda (ptr1),y"); + AddCodeLine ("sbc #$%02X", (unsigned char)(val >> 8)); + AddCodeLine ("sta (ptr1),y"); + AddCodeLine ("tax"); + AddCodeLine ("pla"); + break; + } + /* FALL THROUGH */ + + case CF_LONG: + AddCodeLine ("jsr pushax"); /* Push the address */ + push (CF_PTR); /* Correct the internal sp */ + g_getind (flags, offs); /* Fetch the value */ + g_dec (flags, val); /* Increment value in primary */ + g_putind (flags, offs); /* Store the value back */ + break; + + default: + typeerror (flags); } } /*****************************************************************************/ -/* Add a variable address to the value in ax */ +/* Add a variable address to the value in ax */ /*****************************************************************************/ -void g_addaddr_local (unsigned flags, int offs) +void g_addaddr_local (unsigned flags attribute ((unused)), int offs) /* Add the address of a local variable to ax */ { + unsigned L = 0; + /* Add the offset */ - offs -= oursp; + offs -= StackPtr; if (offs != 0) { - /* We cannot address more then 256 bytes of locals anyway */ - CheckLocalOffs (offs); - AddCodeSegLine (CS, "clc"); - AddCodeSegLine (CS, "adc #$%02X", offs & 0xFF); - AddCodeSegLine (CS, "bcc *+4"); /* Do also skip the CLC insn below */ - AddCodeSegLine (CS, "inx"); - AddCodeHint ("x:!"); /* Invalidate X */ + /* We cannot address more then 256 bytes of locals anyway */ + L = GetLocalLabel(); + CheckLocalOffs (offs); + AddCodeLine ("clc"); + AddCodeLine ("adc #$%02X", offs & 0xFF); + /* Do also skip the CLC insn below */ + AddCodeLine ("bcc %s", LocalLabelName (L)); + AddCodeLine ("inx"); } /* Add the current stackpointer value */ - AddCodeSegLine (CS, "clc"); - AddCodeSegLine (CS, "adc sp"); - AddCodeSegLine (CS, "tay"); - AddCodeSegLine (CS, "txa"); - AddCodeSegLine (CS, "adc sp+1"); - AddCodeSegLine (CS, "tax"); - AddCodeSegLine (CS, "tya"); + AddCodeLine ("clc"); + if (L != 0) { + /* Label was used above */ + g_defcodelabel (L); + } + AddCodeLine ("adc sp"); + AddCodeLine ("tay"); + AddCodeLine ("txa"); + AddCodeLine ("adc sp+1"); + AddCodeLine ("tax"); + AddCodeLine ("tya"); } -void g_addaddr_static (unsigned flags, unsigned long label, unsigned offs) +void g_addaddr_static (unsigned flags, unsigned long label, long offs) /* Add the address of a static variable to ax */ { /* Create the correct label name */ - char* lbuf = GetLabelName (flags, label, offs); + const char* lbuf = GetLabelName (flags, label, offs); /* Add the address to the current ax value */ - AddCodeSegLine (CS, "clc"); - AddCodeSegLine (CS, "adc #<(%s)", lbuf); - AddCodeSegLine (CS, "tay"); - AddCodeSegLine (CS, "txa"); - AddCodeSegLine (CS, "adc #>(%s)", lbuf); - AddCodeSegLine (CS, "tax"); - AddCodeSegLine (CS, "tya"); + AddCodeLine ("clc"); + AddCodeLine ("adc #<(%s)", lbuf); + AddCodeLine ("tay"); + AddCodeLine ("txa"); + AddCodeLine ("adc #>(%s)", lbuf); + AddCodeLine ("tax"); + AddCodeLine ("tya"); } /*****************************************************************************/ -/* */ +/* */ /*****************************************************************************/ @@ -2213,53 +2171,53 @@ void g_save (unsigned flags) /* Check the size and determine operation */ switch (flags & CF_TYPE) { - case CF_CHAR: - if (flags & CF_FORCECHAR) { - AddCodeSegLine (CS, "pha"); - break; - } - /* FALLTHROUGH */ + case CF_CHAR: + if (flags & CF_FORCECHAR) { + AddCodeLine ("pha"); + break; + } + /* FALLTHROUGH */ - case CF_INT: - AddCodeSegLine (CS, "sta regsave"); - AddCodeSegLine (CS, "stx regsave+1"); - break; + case CF_INT: + AddCodeLine ("sta regsave"); + AddCodeLine ("stx regsave+1"); + break; - case CF_LONG: - AddCodeSegLine (CS, "jsr saveeax"); - break; + case CF_LONG: + AddCodeLine ("jsr saveeax"); + break; - default: - typeerror (flags); + default: + typeerror (flags); } } void g_restore (unsigned flags) -/* Copy hold register to P. */ +/* Copy hold register to primary. */ { /* Check the size and determine operation */ switch (flags & CF_TYPE) { - case CF_CHAR: - if (flags & CF_FORCECHAR) { - AddCodeSegLine (CS, "pla"); - break; - } - /* FALLTHROUGH */ + case CF_CHAR: + if (flags & CF_FORCECHAR) { + AddCodeLine ("pla"); + break; + } + /* FALLTHROUGH */ - case CF_INT: - AddCodeSegLine (CS, "lda regsave"); - AddCodeSegLine (CS, "ldx regsave+1"); - break; + case CF_INT: + AddCodeLine ("lda regsave"); + AddCodeLine ("ldx regsave+1"); + break; - case CF_LONG: - AddCodeSegLine (CS, "jsr resteax"); - break; + case CF_LONG: + AddCodeLine ("jsr resteax"); + break; - default: - typeerror (flags); + default: + typeerror (flags); } } @@ -2270,28 +2228,32 @@ void g_cmp (unsigned flags, unsigned long val) * will be set. */ { + unsigned L; + /* Check the size and determine operation */ switch (flags & CF_TYPE) { - case CF_CHAR: - if (flags & CF_FORCECHAR) { - AddCodeSegLine (CS, "cmp #$%02X", (unsigned char)val); - break; - } - /* FALLTHROUGH */ - - case CF_INT: - AddCodeSegLine (CS, "cmp #$%02X", (unsigned char)val); - AddCodeSegLine (CS, "bne *+4"); - AddCodeSegLine (CS, "cpx #$%02X", (unsigned char)(val >> 8)); - break; + case CF_CHAR: + if (flags & CF_FORCECHAR) { + AddCodeLine ("cmp #$%02X", (unsigned char)val); + break; + } + /* FALLTHROUGH */ + + case CF_INT: + L = GetLocalLabel(); + AddCodeLine ("cmp #$%02X", (unsigned char)val); + AddCodeLine ("bne %s", LocalLabelName (L)); + AddCodeLine ("cpx #$%02X", (unsigned char)(val >> 8)); + g_defcodelabel (L); + break; case CF_LONG: - Internal ("g_cmp: Long compares not implemented"); - break; + Internal ("g_cmp: Long compares not implemented"); + break; - default: - typeerror (flags); + default: + typeerror (flags); } } @@ -2300,10 +2262,10 @@ void g_cmp (unsigned flags, unsigned long val) static void oper (unsigned flags, unsigned long val, char** subs) /* Encode a binary operation. subs is a pointer to four groups of three * strings: - * 0-2 --> Operate on ints - * 3-5 --> Operate on unsigneds - * 6-8 --> Operate on longs - * 9-11 --> Operate on unsigned longs + * 0-2 --> Operate on ints + * 3-5 --> Operate on unsigneds + * 6-8 --> Operate on longs + * 9-11 --> Operate on unsigned longs * * The first subroutine names in each string group is used to encode an * operation with a zero constant, the second to encode an operation with @@ -2315,36 +2277,36 @@ static void oper (unsigned flags, unsigned long val, char** subs) /* Determine the offset into the array */ offs = (flags & CF_UNSIGNED)? 3 : 0; switch (flags & CF_TYPE) { - case CF_CHAR: - case CF_INT: - break; + case CF_CHAR: + case CF_INT: + break; - case CF_LONG: - offs += 6; - break; + case CF_LONG: + offs += 6; + break; - default: - typeerror (flags); + default: + typeerror (flags); } /* Encode the operation */ if (flags & CF_CONST) { - /* Constant value given */ - if (val == 0 && subs [offs+0]) { - /* Special case: constant with value zero */ - AddCodeSegLine (CS, "jsr %s", subs [offs+0]); - } else if (val < 0x100 && subs [offs+1]) { - /* Special case: constant with high byte zero */ - ldaconst (val); /* Load low byte */ - AddCodeSegLine (CS, "jsr %s", subs [offs+1]); - } else { - /* Others: arbitrary constant value */ - g_getimmed (flags, val, 0); /* Load value */ - AddCodeSegLine (CS, "jsr %s", subs [offs+2]); - } + /* Constant value given */ + if (val == 0 && subs [offs+0]) { + /* Special case: constant with value zero */ + AddCodeLine ("jsr %s", subs [offs+0]); + } else if (val < 0x100 && subs [offs+1]) { + /* Special case: constant with high byte zero */ + ldaconst (val); /* Load low byte */ + AddCodeLine ("jsr %s", subs [offs+1]); + } else { + /* Others: arbitrary constant value */ + g_getimmed (flags, val, 0); /* Load value */ + AddCodeLine ("jsr %s", subs [offs+2]); + } } else { - /* Value not constant (is already in (e)ax) */ - AddCodeSegLine (CS, "jsr %s", subs [offs+2]); + /* Value not constant (is already in (e)ax) */ + AddCodeLine ("jsr %s", subs [offs+2]); } /* The operation will pop it's argument */ @@ -2354,32 +2316,32 @@ static void oper (unsigned flags, unsigned long val, char** subs) void g_test (unsigned flags) -/* Force a test to set cond codes right */ +/* Test the value in the primary and set the condition codes */ { switch (flags & CF_TYPE) { - case CF_CHAR: - if (flags & CF_FORCECHAR) { - AddCodeSegLine (CS, "tax"); - break; - } - /* FALLTHROUGH */ + case CF_CHAR: + if (flags & CF_FORCECHAR) { + AddCodeLine ("tax"); + break; + } + /* FALLTHROUGH */ - case CF_INT: - AddCodeSegLine (CS, "stx tmp1"); - AddCodeSegLine (CS, "ora tmp1"); - break; + case CF_INT: + AddCodeLine ("stx tmp1"); + AddCodeLine ("ora tmp1"); + break; - case CF_LONG: - if (flags & CF_UNSIGNED) { - AddCodeSegLine (CS, "jsr utsteax"); - } else { - AddCodeSegLine (CS, "jsr tsteax"); - } - break; + case CF_LONG: + if (flags & CF_UNSIGNED) { + AddCodeLine ("jsr utsteax"); + } else { + AddCodeLine ("jsr tsteax"); + } + break; - default: - typeerror (flags); + default: + typeerror (flags); } } @@ -2389,68 +2351,52 @@ void g_test (unsigned flags) void g_push (unsigned flags, unsigned long val) /* Push the primary register or a constant value onto the stack */ { - unsigned char hi; - if (flags & CF_CONST && (flags & CF_TYPE) != CF_LONG) { - /* We have a constant 8 or 16 bit value */ - if ((flags & CF_TYPE) == CF_CHAR && (flags & CF_FORCECHAR)) { - - /* Handle as 8 bit value */ - if (CodeSizeFactor >= 165 || val > 2) { - ldaconst (val); - AddCodeSegLine (CS, "jsr pusha"); - } else { - AddCodeSegLine (CS, "jsr pushc%d", (int) val); - } - - } else { - - /* Handle as 16 bit value */ - hi = (unsigned char) (val >> 8); - if (val <= 7) { - AddCodeSegLine (CS, "jsr push%u", (unsigned) val); - } else if (hi == 0 || hi == 0xFF) { - /* Use special function */ - ldaconst (val); - AddCodeSegLine (CS, "jsr %s", (hi == 0)? "pusha0" : "pushaFF"); - } else { - /* Long way ... */ - g_getimmed (flags, val, 0); - AddCodeSegLine (CS, "jsr pushax"); - } - } + /* We have a constant 8 or 16 bit value */ + if ((flags & CF_TYPE) == CF_CHAR && (flags & CF_FORCECHAR)) { + + /* Handle as 8 bit value */ + ldaconst (val); + AddCodeLine ("jsr pusha"); + + } else { + + /* Handle as 16 bit value */ + g_getimmed (flags, val, 0); + AddCodeLine ("jsr pushax"); + } } else { - /* Value is not 16 bit or not constant */ - if (flags & CF_CONST) { - /* Constant 32 bit value, load into eax */ - g_getimmed (flags, val, 0); - } + /* Value is not 16 bit or not constant */ + if (flags & CF_CONST) { + /* Constant 32 bit value, load into eax */ + g_getimmed (flags, val, 0); + } - /* Push the primary register */ - switch (flags & CF_TYPE) { + /* Push the primary register */ + switch (flags & CF_TYPE) { - case CF_CHAR: - if (flags & CF_FORCECHAR) { - /* Handle as char */ - AddCodeSegLine (CS, "jsr pusha"); - break; - } - /* FALL THROUGH */ - case CF_INT: - AddCodeSegLine (CS, "jsr pushax"); - break; + case CF_CHAR: + if (flags & CF_FORCECHAR) { + /* Handle as char */ + AddCodeLine ("jsr pusha"); + break; + } + /* FALL THROUGH */ + case CF_INT: + AddCodeLine ("jsr pushax"); + break; - case CF_LONG: - AddCodeSegLine (CS, "jsr pusheax"); - break; + case CF_LONG: + AddCodeLine ("jsr pusheax"); + break; - default: - typeerror (flags); + default: + typeerror (flags); - } + } } @@ -2467,17 +2413,17 @@ void g_swap (unsigned flags) { switch (flags & CF_TYPE) { - case CF_CHAR: - case CF_INT: - AddCodeSegLine (CS, "jsr swapstk"); - break; + case CF_CHAR: + case CF_INT: + AddCodeLine ("jsr swapstk"); + break; - case CF_LONG: - AddCodeSegLine (CS, "jsr swapestk"); - break; + case CF_LONG: + AddCodeLine ("jsr swapestk"); + break; - default: - typeerror (flags); + default: + typeerror (flags); } } @@ -2488,24 +2434,42 @@ void g_call (unsigned Flags, const char* Label, unsigned ArgSize) /* Call the specified subroutine name */ { if ((Flags & CF_FIXARGC) == 0) { - /* Pass the argument count */ - ldyconst (ArgSize); + /* Pass the argument count */ + ldyconst (ArgSize); } - AddCodeSegLine (CS, "jsr _%s", Label); - oursp += ArgSize; /* callee pops args */ + AddCodeLine ("jsr _%s", Label); + StackPtr += ArgSize; /* callee pops args */ } -void g_callind (unsigned Flags, unsigned ArgSize) -/* Call subroutine with address in AX */ +void g_callind (unsigned Flags, unsigned ArgSize, int Offs) +/* Call subroutine indirect */ { - if ((Flags & CF_FIXARGC) == 0) { - /* Pass arg count */ - ldyconst (ArgSize); + if ((Flags & CF_LOCAL) == 0) { + /* Address is in a/x */ + if ((Flags & CF_FIXARGC) == 0) { + /* Pass arg count */ + ldyconst (ArgSize); + } + AddCodeLine ("jsr callax"); + } else { + /* The address is on stack, offset is on Val */ + Offs -= StackPtr; + CheckLocalOffs (Offs); + AddCodeLine ("pha"); + AddCodeLine ("ldy #$%02X", Offs); + AddCodeLine ("lda (sp),y"); + AddCodeLine ("sta jmpvec+1"); + AddCodeLine ("iny"); + AddCodeLine ("lda (sp),y"); + AddCodeLine ("sta jmpvec+2"); + AddCodeLine ("pla"); + AddCodeLine ("jsr jmpvec"); } - AddCodeSegLine (CS, "jsr callax"); /* do the call */ - oursp += ArgSize; /* callee pops args */ + + /* Callee pops args */ + StackPtr += ArgSize; } @@ -2513,78 +2477,23 @@ void g_callind (unsigned Flags, unsigned ArgSize) void g_jump (unsigned Label) /* Jump to specified internal label number */ { - AddCodeSegLine (CS, "jmp L%04X", Label); -} - - - -void g_switch (unsigned Flags) -/* Output switch statement preamble */ -{ - switch (Flags & CF_TYPE) { - - case CF_CHAR: - case CF_INT: - AddCodeSegLine (CS, "jsr switch"); - break; - - case CF_LONG: - AddCodeSegLine (CS, "jsr lswitch"); - break; - - default: - typeerror (Flags); - - } + AddCodeLine ("jmp %s", LocalLabelName (Label)); } -void g_case (unsigned flags, unsigned label, unsigned long val) -/* Create table code for one case selector */ -{ - switch (flags & CF_TYPE) { - - case CF_CHAR: - case CF_INT: - AddCodeSegLine (CS, ".word $%04X, L%04X", - (unsigned)(val & 0xFFFF), - (unsigned)(label & 0xFFFF)); - break; - - case CF_LONG: - AddCodeSegLine (CS, ".dword $%08lX", val); - AddCodeSegLine (CS, ".word L%04X", label & 0xFFFF); - break; - - default: - typeerror (flags); - - } -} - - - -void g_truejump (unsigned flags, unsigned label) +void g_truejump (unsigned flags attribute ((unused)), unsigned label) /* Jump to label if zero flag clear */ { - if (flags & CF_SHORT) { - AddCodeSegLine (CS, "bne L%04X", label); - } else { - AddCodeSegLine (CS, "jne L%04X", label); - } + AddCodeLine ("jne %s", LocalLabelName (label)); } -void g_falsejump (unsigned flags, unsigned label) +void g_falsejump (unsigned flags attribute ((unused)), unsigned label) /* Jump to label if zero flag set */ { - if (flags & CF_SHORT) { - AddCodeSegLine (CS, "beq L%04X", label); - } else { - AddCodeSegLine (CS, "jeq L%04X", label); - } + AddCodeLine ("jeq %s", LocalLabelName (label)); } @@ -2592,11 +2501,11 @@ void g_falsejump (unsigned flags, unsigned label) static void mod_internal (int k, char* verb1, char* verb2) { if (k <= 8) { - AddCodeSegLine (CS, "jsr %ssp%c", verb1, k + '0'); + AddCodeLine ("jsr %ssp%c", verb1, k + '0'); } else { - CheckLocalOffs (k); - ldyconst (k); - AddCodeSegLine (CS, "jsr %ssp", verb2); + CheckLocalOffs (k); + ldyconst (k); + AddCodeLine ("jsr %ssp", verb2); } } @@ -2606,9 +2515,9 @@ void g_space (int space) /* Create or drop space on the stack */ { if (space < 0) { - mod_internal (-space, "inc", "addy"); + mod_internal (-space, "inc", "addy"); } else if (space > 0) { - mod_internal (space, "dec", "suby"); + mod_internal (space, "dec", "suby"); } } @@ -2617,7 +2526,7 @@ void g_space (int space) void g_cstackcheck (void) /* Check for a C stack overflow */ { - AddCodeSegLine (CS, "jsr cstkchk"); + AddCodeLine ("jsr cstkchk"); } @@ -2625,7 +2534,7 @@ void g_cstackcheck (void) void g_stackcheck (void) /* Check for a stack overflow */ { - AddCodeSegLine (CS, "jsr stkchk"); + AddCodeLine ("jsr stkchk"); } @@ -2634,15 +2543,15 @@ void g_add (unsigned flags, unsigned long val) /* Primary = TOS + Primary */ { static char* ops [12] = { - 0, "tosadda0", "tosaddax", - 0, "tosadda0", "tosaddax", - 0, 0, "tosaddeax", - 0, 0, "tosaddeax", + 0, "tosadda0", "tosaddax", + 0, "tosadda0", "tosaddax", + 0, 0, "tosaddeax", + 0, 0, "tosaddeax", }; if (flags & CF_CONST) { - flags &= ~CF_FORCECHAR; /* Handle chars as ints */ - g_push (flags & ~CF_CONST, 0); + flags &= ~CF_FORCECHAR; /* Handle chars as ints */ + g_push (flags & ~CF_CONST, 0); } oper (flags, val, ops); } @@ -2653,15 +2562,15 @@ void g_sub (unsigned flags, unsigned long val) /* Primary = TOS - Primary */ { static char* ops [12] = { - 0, "tossuba0", "tossubax", - 0, "tossuba0", "tossubax", - 0, 0, "tossubeax", - 0, 0, "tossubeax", + 0, "tossuba0", "tossubax", + 0, "tossuba0", "tossubax", + 0, 0, "tossubeax", + 0, 0, "tossubeax", }; if (flags & CF_CONST) { - flags &= ~CF_FORCECHAR; /* Handle chars as ints */ - g_push (flags & ~CF_CONST, 0); + flags &= ~CF_FORCECHAR; /* Handle chars as ints */ + g_push (flags & ~CF_CONST, 0); } oper (flags, val, ops); } @@ -2672,10 +2581,10 @@ void g_rsub (unsigned flags, unsigned long val) /* Primary = Primary - TOS */ { static char* ops [12] = { - 0, "tosrsuba0", "tosrsubax", - 0, "tosrsuba0", "tosrsubax", - 0, 0, "tosrsubeax", - 0, 0, "tosrsubeax", + 0, "tosrsuba0", "tosrsubax", + 0, "tosrsuba0", "tosrsubax", + 0, 0, "tosrsubeax", + 0, 0, "tosrsubeax", }; oper (flags, val, ops); } @@ -2686,19 +2595,19 @@ void g_mul (unsigned flags, unsigned long val) /* Primary = TOS * Primary */ { static char* ops [12] = { - 0, "tosmula0", "tosmulax", - 0, "tosumula0", "tosumulax", - 0, 0, "tosmuleax", - 0, 0, "tosumuleax", + 0, "tosmula0", "tosmulax", + 0, "tosumula0", "tosumulax", + 0, 0, "tosmuleax", + 0, 0, "tosumuleax", }; int p2; /* Do strength reduction if the value is constant and a power of two */ - if (flags & CF_CONST && (p2 = powerof2 (val)) >= 0) { - /* Generate a shift instead */ - g_asl (flags, p2); - return; + if (flags & CF_CONST && (p2 = PowerOf2 (val)) >= 0) { + /* Generate a shift instead */ + g_asl (flags, p2); + return; } /* If the right hand side is const, the lhs is not on stack but still @@ -2706,55 +2615,83 @@ void g_mul (unsigned flags, unsigned long val) */ if (flags & CF_CONST) { - switch (flags & CF_TYPE) { - - case CF_CHAR: - if (flags & CF_FORCECHAR) { - /* Handle some special cases */ - switch (val) { - - case 3: - AddCodeSegLine (CS, "sta tmp1"); - AddCodeSegLine (CS, "asl a"); - AddCodeSegLine (CS, "clc"); - AddCodeSegLine (CS, "adc tmp1"); - return; - - case 5: - AddCodeSegLine (CS, "sta tmp1"); - AddCodeSegLine (CS, "asl a"); - AddCodeSegLine (CS, "asl a"); - AddCodeSegLine (CS, "clc"); - AddCodeSegLine (CS, "adc tmp1"); - return; - - case 10: - AddCodeSegLine (CS, "sta tmp1"); - AddCodeSegLine (CS, "asl a"); - AddCodeSegLine (CS, "asl a"); - AddCodeSegLine (CS, "clc"); - AddCodeSegLine (CS, "adc tmp1"); - AddCodeSegLine (CS, "asl a"); - return; - } - } - /* FALLTHROUGH */ - - case CF_INT: - break; - - case CF_LONG: - break; - - default: - typeerror (flags); - } - - /* If we go here, we didn't emit code. Push the lhs on stack and fall - * into the normal, non-optimized stuff. - */ - flags &= ~CF_FORCECHAR; /* Handle chars as ints */ - g_push (flags & ~CF_CONST, 0); + switch (flags & CF_TYPE) { + + case CF_CHAR: + if (flags & CF_FORCECHAR) { + /* Handle some special cases */ + switch (val) { + + case 3: + AddCodeLine ("sta tmp1"); + AddCodeLine ("asl a"); + AddCodeLine ("clc"); + AddCodeLine ("adc tmp1"); + return; + + case 5: + AddCodeLine ("sta tmp1"); + AddCodeLine ("asl a"); + AddCodeLine ("asl a"); + AddCodeLine ("clc"); + AddCodeLine ("adc tmp1"); + return; + + case 6: + AddCodeLine ("sta tmp1"); + AddCodeLine ("asl a"); + AddCodeLine ("clc"); + AddCodeLine ("adc tmp1"); + AddCodeLine ("asl a"); + return; + + case 10: + AddCodeLine ("sta tmp1"); + AddCodeLine ("asl a"); + AddCodeLine ("asl a"); + AddCodeLine ("clc"); + AddCodeLine ("adc tmp1"); + AddCodeLine ("asl a"); + return; + } + } + /* FALLTHROUGH */ + + case CF_INT: + switch (val) { + case 3: + AddCodeLine ("jsr mulax3"); + return; + case 5: + AddCodeLine ("jsr mulax5"); + return; + case 6: + AddCodeLine ("jsr mulax6"); + return; + case 7: + AddCodeLine ("jsr mulax7"); + return; + case 9: + AddCodeLine ("jsr mulax9"); + return; + case 10: + AddCodeLine ("jsr mulax10"); + return; + } + break; + + case CF_LONG: + break; + + default: + typeerror (flags); + } + + /* If we go here, we didn't emit code. Push the lhs on stack and fall + * into the normal, non-optimized stuff. + */ + flags &= ~CF_FORCECHAR; /* Handle chars as ints */ + g_push (flags & ~CF_CONST, 0); } @@ -2768,25 +2705,25 @@ void g_div (unsigned flags, unsigned long val) /* Primary = TOS / Primary */ { static char* ops [12] = { - 0, "tosdiva0", "tosdivax", - 0, "tosudiva0", "tosudivax", - 0, 0, "tosdiveax", - 0, 0, "tosudiveax", + 0, "tosdiva0", "tosdivax", + 0, "tosudiva0", "tosudivax", + 0, 0, "tosdiveax", + 0, 0, "tosudiveax", }; /* Do strength reduction if the value is constant and a power of two */ int p2; - if ((flags & CF_CONST) && (p2 = powerof2 (val)) >= 0) { - /* Generate a shift instead */ - g_asr (flags, p2); + if ((flags & CF_CONST) && (p2 = PowerOf2 (val)) >= 0) { + /* Generate a shift instead */ + g_asr (flags, p2); } else { - /* Generate a division */ - if (flags & CF_CONST) { - /* lhs is not on stack */ - flags &= ~CF_FORCECHAR; /* Handle chars as ints */ - g_push (flags & ~CF_CONST, 0); - } - oper (flags, val, ops); + /* Generate a division */ + if (flags & CF_CONST) { + /* lhs is not on stack */ + flags &= ~CF_FORCECHAR; /* Handle chars as ints */ + g_push (flags & ~CF_CONST, 0); + } + oper (flags, val, ops); } } @@ -2796,25 +2733,25 @@ void g_mod (unsigned flags, unsigned long val) /* Primary = TOS % Primary */ { static char* ops [12] = { - 0, "tosmoda0", "tosmodax", - 0, "tosumoda0", "tosumodax", - 0, 0, "tosmodeax", - 0, 0, "tosumodeax", + 0, "tosmoda0", "tosmodax", + 0, "tosumoda0", "tosumodax", + 0, 0, "tosmodeax", + 0, 0, "tosumodeax", }; int p2; /* Check if we can do some cost reduction */ - if ((flags & CF_CONST) && (flags & CF_UNSIGNED) && val != 0xFFFFFFFF && (p2 = powerof2 (val)) >= 0) { - /* We can do that with an AND operation */ - g_and (flags, val - 1); + if ((flags & CF_CONST) && (flags & CF_UNSIGNED) && val != 0xFFFFFFFF && (p2 = PowerOf2 (val)) >= 0) { + /* We can do that with an AND operation */ + g_and (flags, val - 1); } else { - /* Do it the hard way... */ - if (flags & CF_CONST) { - /* lhs is not on stack */ - flags &= ~CF_FORCECHAR; /* Handle chars as ints */ - g_push (flags & ~CF_CONST, 0); - } - oper (flags, val, ops); + /* Do it the hard way... */ + if (flags & CF_CONST) { + /* lhs is not on stack */ + flags &= ~CF_FORCECHAR; /* Handle chars as ints */ + g_push (flags & ~CF_CONST, 0); + } + oper (flags, val, ops); } } @@ -2824,10 +2761,10 @@ void g_or (unsigned flags, unsigned long val) /* Primary = TOS | Primary */ { static char* ops [12] = { - 0, "tosora0", "tosorax", - 0, "tosora0", "tosorax", - 0, 0, "tosoreax", - 0, 0, "tosoreax", + 0, "tosora0", "tosorax", + 0, "tosora0", "tosorax", + 0, 0, "tosoreax", + 0, 0, "tosoreax", }; /* If the right hand side is const, the lhs is not on stack but still @@ -2835,40 +2772,56 @@ void g_or (unsigned flags, unsigned long val) */ if (flags & CF_CONST) { - switch (flags & CF_TYPE) { - - case CF_CHAR: - if (flags & CF_FORCECHAR) { - if ((val & 0xFF) != 0xFF) { - AddCodeSegLine (CS, "ora #$%02X", (unsigned char)val); - } - return; - } - /* FALLTHROUGH */ - - case CF_INT: - if (val <= 0xFF) { - AddCodeSegLine (CS, "ora #$%02X", (unsigned char)val); - return; - } - break; - - case CF_LONG: - if (val <= 0xFF) { - AddCodeSegLine (CS, "ora #$%02X", (unsigned char)val); - return; - } - break; - - default: - typeerror (flags); - } - - /* If we go here, we didn't emit code. Push the lhs on stack and fall - * into the normal, non-optimized stuff. - */ - g_push (flags & ~CF_CONST, 0); - + switch (flags & CF_TYPE) { + + case CF_CHAR: + if (flags & CF_FORCECHAR) { + if ((val & 0xFF) != 0) { + AddCodeLine ("ora #$%02X", (unsigned char)val); + } + return; + } + /* FALLTHROUGH */ + + case CF_INT: + if (val <= 0xFF) { + if ((val & 0xFF) != 0) { + AddCodeLine ("ora #$%02X", (unsigned char)val); + } + } else if ((val & 0xFF00) == 0xFF00) { + if ((val & 0xFF) != 0) { + AddCodeLine ("ora #$%02X", (unsigned char)val); + } + ldxconst (0xFF); + } else if (val != 0) { + AddCodeLine ("ora #$%02X", (unsigned char)val); + AddCodeLine ("pha"); + AddCodeLine ("txa"); + AddCodeLine ("ora #$%02X", (unsigned char)(val >> 8)); + AddCodeLine ("tax"); + AddCodeLine ("pla"); + } + return; + + case CF_LONG: + if (val <= 0xFF) { + if ((val & 0xFF) != 0) { + AddCodeLine ("ora #$%02X", (unsigned char)val); + } + return; + } + break; + + default: + typeerror (flags); + } + + /* If we go here, we didn't emit code. Push the lhs on stack and fall + * into the normal, non-optimized stuff. Note: The standard stuff will + * always work with ints. + */ + flags &= ~CF_FORCECHAR; + g_push (flags & ~CF_CONST, 0); } /* Use long way over the stack */ @@ -2881,10 +2834,10 @@ void g_xor (unsigned flags, unsigned long val) /* Primary = TOS ^ Primary */ { static char* ops [12] = { - 0, "tosxora0", "tosxorax", - 0, "tosxora0", "tosxorax", - 0, 0, "tosxoreax", - 0, 0, "tosxoreax", + 0, "tosxora0", "tosxorax", + 0, "tosxora0", "tosxorax", + 0, 0, "tosxoreax", + 0, 0, "tosxoreax", }; @@ -2893,51 +2846,53 @@ void g_xor (unsigned flags, unsigned long val) */ if (flags & CF_CONST) { - switch (flags & CF_TYPE) { - - case CF_CHAR: - if (flags & CF_FORCECHAR) { - if ((val & 0xFF) != 0) { - AddCodeSegLine (CS, "eor #$%02X", (unsigned char)val); - } - return; - } - /* FALLTHROUGH */ - - case CF_INT: - if (val <= 0xFF) { - if (val != 0) { - AddCodeSegLine (CS, "eor #$%02X", (unsigned char)val); - } - return; - } else if ((val & 0xFF) == 0) { - AddCodeSegLine (CS, "pha"); - AddCodeSegLine (CS, "txa"); - AddCodeSegLine (CS, "eor #$%02X", (unsigned char)(val >> 8)); - AddCodeSegLine (CS, "tax"); - AddCodeSegLine (CS, "pla"); - return; - } - break; - - case CF_LONG: - if (val <= 0xFF) { - if (val != 0) { - AddCodeSegLine (CS, "eor #$%02X", (unsigned char)val); - } - return; - } - break; - - default: - typeerror (flags); - } - - /* If we go here, we didn't emit code. Push the lhs on stack and fall - * into the normal, non-optimized stuff. - */ - g_push (flags & ~CF_CONST, 0); - + switch (flags & CF_TYPE) { + + case CF_CHAR: + if (flags & CF_FORCECHAR) { + if ((val & 0xFF) != 0) { + AddCodeLine ("eor #$%02X", (unsigned char)val); + } + return; + } + /* FALLTHROUGH */ + + case CF_INT: + if (val <= 0xFF) { + if (val != 0) { + AddCodeLine ("eor #$%02X", (unsigned char)val); + } + } else if (val != 0) { + if ((val & 0xFF) != 0) { + AddCodeLine ("eor #$%02X", (unsigned char)val); + } + AddCodeLine ("pha"); + AddCodeLine ("txa"); + AddCodeLine ("eor #$%02X", (unsigned char)(val >> 8)); + AddCodeLine ("tax"); + AddCodeLine ("pla"); + } + return; + + case CF_LONG: + if (val <= 0xFF) { + if (val != 0) { + AddCodeLine ("eor #$%02X", (unsigned char)val); + } + return; + } + break; + + default: + typeerror (flags); + } + + /* If we go here, we didn't emit code. Push the lhs on stack and fall + * into the normal, non-optimized stuff. Note: The standard stuff will + * always work with ints. + */ + flags &= ~CF_FORCECHAR; + g_push (flags & ~CF_CONST, 0); } /* Use long way over the stack */ @@ -2946,88 +2901,91 @@ void g_xor (unsigned flags, unsigned long val) -void g_and (unsigned flags, unsigned long val) +void g_and (unsigned Flags, unsigned long Val) /* Primary = TOS & Primary */ { static char* ops [12] = { - 0, "tosanda0", "tosandax", - 0, "tosanda0", "tosandax", - 0, 0, "tosandeax", - 0, 0, "tosandeax", + 0, "tosanda0", "tosandax", + 0, "tosanda0", "tosandax", + 0, 0, "tosandeax", + 0, 0, "tosandeax", }; /* If the right hand side is const, the lhs is not on stack but still * in the primary register. */ - if (flags & CF_CONST) { - - switch (flags & CF_TYPE) { - - case CF_CHAR: - if (flags & CF_FORCECHAR) { - AddCodeSegLine (CS, "and #$%02X", (unsigned char)val); - return; - } - /* FALLTHROUGH */ - case CF_INT: - if ((val & 0xFFFF) != 0xFFFF) { - if (val <= 0xFF) { - ldxconst (0); - if (val == 0) { - ldaconst (0); - } else if (val != 0xFF) { - AddCodeSegLine (CS, "and #$%02X", (unsigned char)val); - } - } else if ((val & 0xFF00) == 0xFF00) { - AddCodeSegLine (CS, "and #$%02X", (unsigned char)val); - } else if ((val & 0x00FF) == 0x0000) { - AddCodeSegLine (CS, "txa"); - AddCodeSegLine (CS, "and #$%02X", (unsigned char)(val >> 8)); - AddCodeSegLine (CS, "tax"); - ldaconst (0); - } else { - AddCodeSegLine (CS, "tay"); - AddCodeSegLine (CS, "txa"); - AddCodeSegLine (CS, "and #$%02X", (unsigned char)(val >> 8)); - AddCodeSegLine (CS, "tax"); - AddCodeSegLine (CS, "tya"); - if ((val & 0x00FF) != 0x00FF) { - AddCodeSegLine (CS, "and #$%02X", (unsigned char)val); - } - } - } - return; - - case CF_LONG: - if (val <= 0xFF) { - ldxconst (0); - AddCodeSegLine (CS, "stx sreg+1"); - AddCodeSegLine (CS, "stx sreg"); - if ((val & 0xFF) != 0xFF) { - AddCodeSegLine (CS, "and #$%02X", (unsigned char)val); - } - return; - } else if (val == 0xFF00) { - ldaconst (0); - AddCodeSegLine (CS, "sta sreg+1"); - AddCodeSegLine (CS, "sta sreg"); - return; - } - break; - - default: - typeerror (flags); - } - - /* If we go here, we didn't emit code. Push the lhs on stack and fall - * into the normal, non-optimized stuff. - */ - g_push (flags & ~CF_CONST, 0); - + if (Flags & CF_CONST) { + + switch (Flags & CF_TYPE) { + + case CF_CHAR: + if (Flags & CF_FORCECHAR) { + if ((Val & 0xFF) != 0xFF) { + AddCodeLine ("and #$%02X", (unsigned char)Val); + } + return; + } + /* FALLTHROUGH */ + case CF_INT: + if ((Val & 0xFFFF) != 0xFFFF) { + if (Val <= 0xFF) { + ldxconst (0); + if (Val == 0) { + ldaconst (0); + } else if (Val != 0xFF) { + AddCodeLine ("and #$%02X", (unsigned char)Val); + } + } else if ((Val & 0xFF00) == 0xFF00) { + AddCodeLine ("and #$%02X", (unsigned char)Val); + } else if ((Val & 0x00FF) == 0x0000) { + AddCodeLine ("txa"); + AddCodeLine ("and #$%02X", (unsigned char)(Val >> 8)); + AddCodeLine ("tax"); + ldaconst (0); + } else { + AddCodeLine ("tay"); + AddCodeLine ("txa"); + AddCodeLine ("and #$%02X", (unsigned char)(Val >> 8)); + AddCodeLine ("tax"); + AddCodeLine ("tya"); + if ((Val & 0x00FF) != 0x00FF) { + AddCodeLine ("and #$%02X", (unsigned char)Val); + } + } + } + return; + + case CF_LONG: + if (Val <= 0xFF) { + ldxconst (0); + AddCodeLine ("stx sreg+1"); + AddCodeLine ("stx sreg"); + if ((Val & 0xFF) != 0xFF) { + AddCodeLine ("and #$%02X", (unsigned char)Val); + } + return; + } else if (Val == 0xFF00) { + ldaconst (0); + AddCodeLine ("sta sreg+1"); + AddCodeLine ("sta sreg"); + return; + } + break; + + default: + typeerror (Flags); + } + + /* If we go here, we didn't emit code. Push the lhs on stack and fall + * into the normal, non-optimized stuff. Note: The standard stuff will + * always work with ints. + */ + Flags &= ~CF_FORCECHAR; + g_push (Flags & ~CF_CONST, 0); } /* Use long way over the stack */ - oper (flags, val, ops); + oper (Flags, Val, ops); } @@ -3036,10 +2994,10 @@ void g_asr (unsigned flags, unsigned long val) /* Primary = TOS >> Primary */ { static char* ops [12] = { - 0, "tosasra0", "tosasrax", - 0, "tosshra0", "tosshrax", - 0, 0, "tosasreax", - 0, 0, "tosshreax", + 0, 0, "tosasrax", + 0, 0, "tosshrax", + 0, 0, "tosasreax", + 0, 0, "tosshreax", }; /* If the right hand side is const, the lhs is not on stack but still @@ -3047,64 +3005,73 @@ void g_asr (unsigned flags, unsigned long val) */ if (flags & CF_CONST) { - switch (flags & CF_TYPE) { - - case CF_CHAR: - case CF_INT: - if (val >= 1 && val <= 3) { - if (flags & CF_UNSIGNED) { - AddCodeSegLine (CS, "jsr shrax%ld", val); - } else { - AddCodeSegLine (CS, "jsr asrax%ld", val); - } - return; - } else if (val == 8 && (flags & CF_UNSIGNED)) { - AddCodeSegLine (CS, "txa"); - ldxconst (0); - return; - } - break; - - case CF_LONG: - if (val >= 1 && val <= 3) { - if (flags & CF_UNSIGNED) { - AddCodeSegLine (CS, "jsr shreax%ld", val); - } else { - AddCodeSegLine (CS, "jsr asreax%ld", val); - } - return; - } else if (val == 8 && (flags & CF_UNSIGNED)) { - AddCodeSegLine (CS, "txa"); - AddCodeSegLine (CS, "ldx sreg"); - AddCodeSegLine (CS, "ldy sreg+1"); - AddCodeSegLine (CS, "sty sreg"); - AddCodeSegLine (CS, "ldy #$00"); - AddCodeSegLine (CS, "sty sreg+1"); - return; - } else if (val == 16) { - AddCodeSegLine (CS, "ldy #$00"); - AddCodeSegLine (CS, "ldx sreg+1"); - if ((flags & CF_UNSIGNED) == 0) { - AddCodeSegLine (CS, "bpl *+3"); - AddCodeSegLine (CS, "dey"); - AddCodeHint ("y:!"); - } - AddCodeSegLine (CS, "lda sreg"); - AddCodeSegLine (CS, "sty sreg+1"); - AddCodeSegLine (CS, "sty sreg"); - return; - } - break; - - default: - typeerror (flags); - } - - /* If we go here, we didn't emit code. Push the lhs on stack and fall - * into the normal, non-optimized stuff. - */ - g_push (flags & ~CF_CONST, 0); - + switch (flags & CF_TYPE) { + + case CF_CHAR: + case CF_INT: + if (val >= 8 && (flags & CF_UNSIGNED)) { + AddCodeLine ("txa"); + ldxconst (0); + val -= 8; + } + if (val == 0) { + /* Done */ + return; + } else if (val >= 1 && val <= 4) { + if (flags & CF_UNSIGNED) { + AddCodeLine ("jsr shrax%ld", val); + } else { + AddCodeLine ("jsr asrax%ld", val); + } + return; + } + break; + + case CF_LONG: + if (val == 0) { + /* Nothing to do */ + return; + } else if (val >= 1 && val <= 4) { + if (flags & CF_UNSIGNED) { + AddCodeLine ("jsr shreax%ld", val); + } else { + AddCodeLine ("jsr asreax%ld", val); + } + return; + } else if (val == 8 && (flags & CF_UNSIGNED)) { + AddCodeLine ("txa"); + AddCodeLine ("ldx sreg"); + AddCodeLine ("ldy sreg+1"); + AddCodeLine ("sty sreg"); + AddCodeLine ("ldy #$00"); + AddCodeLine ("sty sreg+1"); + return; + } else if (val == 16) { + AddCodeLine ("ldy #$00"); + AddCodeLine ("ldx sreg+1"); + if ((flags & CF_UNSIGNED) == 0) { + unsigned L = GetLocalLabel(); + AddCodeLine ("bpl %s", LocalLabelName (L)); + AddCodeLine ("dey"); + g_defcodelabel (L); + } + AddCodeLine ("lda sreg"); + AddCodeLine ("sty sreg+1"); + AddCodeLine ("sty sreg"); + return; + } + break; + + default: + typeerror (flags); + } + + /* If we go here, we didn't emit code. Push the lhs on stack and fall + * into the normal, non-optimized stuff. Note: The standard stuff will + * always work with ints. + */ + flags &= ~CF_FORCECHAR; + g_push (flags & ~CF_CONST, 0); } /* Use long way over the stack */ @@ -3117,10 +3084,10 @@ void g_asl (unsigned flags, unsigned long val) /* Primary = TOS << Primary */ { static char* ops [12] = { - 0, "tosasla0", "tosaslax", - 0, "tosshla0", "tosshlax", - 0, 0, "tosasleax", - 0, 0, "tosshleax", + 0, 0, "tosaslax", + 0, 0, "tosshlax", + 0, 0, "tosasleax", + 0, 0, "tosshleax", }; @@ -3129,57 +3096,65 @@ void g_asl (unsigned flags, unsigned long val) */ if (flags & CF_CONST) { - switch (flags & CF_TYPE) { - - case CF_CHAR: - case CF_INT: - if (val >= 1 && val <= 3) { - if (flags & CF_UNSIGNED) { - AddCodeSegLine (CS, "jsr shlax%ld", val); - } else { - AddCodeSegLine (CS, "jsr aslax%ld", val); - } - return; - } else if (val == 8) { - AddCodeSegLine (CS, "tax"); - AddCodeSegLine (CS, "lda #$00"); - return; - } - break; - - case CF_LONG: - if (val >= 1 && val <= 3) { - if (flags & CF_UNSIGNED) { - AddCodeSegLine (CS, "jsr shleax%ld", val); - } else { - AddCodeSegLine (CS, "jsr asleax%ld", val); - } - return; - } else if (val == 8) { - AddCodeSegLine (CS, "ldy sreg"); - AddCodeSegLine (CS, "sty sreg+1"); - AddCodeSegLine (CS, "stx sreg"); - AddCodeSegLine (CS, "tax"); - AddCodeSegLine (CS, "lda #$00"); - return; - } else if (val == 16) { - AddCodeSegLine (CS, "stx sreg+1"); - AddCodeSegLine (CS, "sta sreg"); - AddCodeSegLine (CS, "lda #$00"); - AddCodeSegLine (CS, "tax"); - return; - } - break; - - default: - typeerror (flags); - } - - /* If we go here, we didn't emit code. Push the lhs on stack and fall - * into the normal, non-optimized stuff. - */ - g_push (flags & ~CF_CONST, 0); - + switch (flags & CF_TYPE) { + + case CF_CHAR: + case CF_INT: + if (val >= 8) { + AddCodeLine ("tax"); + AddCodeLine ("lda #$00"); + val -= 8; + } + if (val == 0) { + /* Done */ + return; + } else if (val >= 1 && val <= 4) { + if (flags & CF_UNSIGNED) { + AddCodeLine ("jsr shlax%ld", val); + } else { + AddCodeLine ("jsr aslax%ld", val); + } + return; + } + break; + + case CF_LONG: + if (val == 0) { + /* Nothing to do */ + return; + } else if (val >= 1 && val <= 4) { + if (flags & CF_UNSIGNED) { + AddCodeLine ("jsr shleax%ld", val); + } else { + AddCodeLine ("jsr asleax%ld", val); + } + return; + } else if (val == 8) { + AddCodeLine ("ldy sreg"); + AddCodeLine ("sty sreg+1"); + AddCodeLine ("stx sreg"); + AddCodeLine ("tax"); + AddCodeLine ("lda #$00"); + return; + } else if (val == 16) { + AddCodeLine ("stx sreg+1"); + AddCodeLine ("sta sreg"); + AddCodeLine ("lda #$00"); + AddCodeLine ("tax"); + return; + } + break; + + default: + typeerror (flags); + } + + /* If we go here, we didn't emit code. Push the lhs on stack and fall + * into the normal, non-optimized stuff. Note: The standard stuff will + * always work with ints. + */ + flags &= ~CF_FORCECHAR; + g_push (flags & ~CF_CONST, 0); } /* Use long way over the stack */ @@ -3188,22 +3163,30 @@ void g_asl (unsigned flags, unsigned long val) -void g_neg (unsigned flags) +void g_neg (unsigned Flags) /* Primary = -Primary */ { - switch (flags & CF_TYPE) { + switch (Flags & CF_TYPE) { - case CF_CHAR: - case CF_INT: - AddCodeSegLine (CS, "jsr negax"); - break; + case CF_CHAR: + if (Flags & CF_FORCECHAR) { + AddCodeLine ("eor #$FF"); + AddCodeLine ("clc"); + AddCodeLine ("adc #$01"); + return; + } + /* FALLTHROUGH */ - case CF_LONG: - AddCodeSegLine (CS, "jsr negeax"); - break; + case CF_INT: + AddCodeLine ("jsr negax"); + break; - default: - typeerror (flags); + case CF_LONG: + AddCodeLine ("jsr negeax"); + break; + + default: + typeerror (Flags); } } @@ -3214,41 +3197,47 @@ void g_bneg (unsigned flags) { switch (flags & CF_TYPE) { - case CF_CHAR: - AddCodeSegLine (CS, "jsr bnega"); - break; + case CF_CHAR: + AddCodeLine ("jsr bnega"); + break; - case CF_INT: - AddCodeSegLine (CS, "jsr bnegax"); - break; + case CF_INT: + AddCodeLine ("jsr bnegax"); + break; - case CF_LONG: - AddCodeSegLine (CS, "jsr bnegeax"); - break; + case CF_LONG: + AddCodeLine ("jsr bnegeax"); + break; - default: - typeerror (flags); + default: + typeerror (flags); } } -void g_com (unsigned flags) +void g_com (unsigned Flags) /* Primary = ~Primary */ { - switch (flags & CF_TYPE) { + switch (Flags & CF_TYPE) { - case CF_CHAR: - case CF_INT: - AddCodeSegLine (CS, "jsr complax"); - break; + case CF_CHAR: + if (Flags & CF_FORCECHAR) { + AddCodeLine ("eor #$FF"); + return; + } + /* FALLTHROUGH */ - case CF_LONG: - AddCodeSegLine (CS, "jsr compleax"); - break; + case CF_INT: + AddCodeLine ("jsr complax"); + break; + + case CF_LONG: + AddCodeLine ("jsr compleax"); + break; - default: - typeerror (flags); + default: + typeerror (Flags); } } @@ -3259,88 +3248,89 @@ void g_inc (unsigned flags, unsigned long val) { /* Don't inc by zero */ if (val == 0) { - return; + return; } /* Generate code for the supported types */ flags &= ~CF_CONST; switch (flags & CF_TYPE) { - case CF_CHAR: - if (flags & CF_FORCECHAR) { - if (CPU == CPU_65C02 && val <= 2) { - while (val--) { - AddCodeSegLine (CS, "ina"); - } - } else { - AddCodeSegLine (CS, "clc"); - AddCodeSegLine (CS, "adc #$%02X", (unsigned char)val); - } - break; - } - /* FALLTHROUGH */ - - case CF_INT: - if (CPU == CPU_65C02 && val == 1) { - AddCodeSegLine (CS, "ina"); - AddCodeSegLine (CS, "bne *+3"); - AddCodeSegLine (CS, "inx"); - /* Tell the optimizer that the X register may be invalid */ - AddCodeHint ("x:!"); - } else if (CodeSizeFactor < 200) { - /* Use jsr calls */ - if (val <= 8) { - AddCodeSegLine (CS, "jsr incax%lu", val); - } else if (val <= 255) { - ldyconst (val); - AddCodeSegLine (CS, "jsr incaxy"); - } else { - g_add (flags | CF_CONST, val); - } - } else { - /* Inline the code */ - if (val < 0x300) { - if ((val & 0xFF) != 0) { - AddCodeSegLine (CS, "clc"); - AddCodeSegLine (CS, "adc #$%02X", (unsigned char) val); - AddCodeSegLine (CS, "bcc *+3"); - AddCodeSegLine (CS, "inx"); - /* Tell the optimizer that the X register may be invalid */ - AddCodeHint ("x:!"); - } - if (val >= 0x100) { - AddCodeSegLine (CS, "inx"); - } - if (val >= 0x200) { - AddCodeSegLine (CS, "inx"); - } - } else { - AddCodeSegLine (CS, "clc"); - if ((val & 0xFF) != 0) { - AddCodeSegLine (CS, "adc #$%02X", (unsigned char) val); - /* Tell the optimizer that the X register may be invalid */ - AddCodeHint ("x:!"); - } - AddCodeSegLine (CS, "pha"); - AddCodeSegLine (CS, "txa"); - AddCodeSegLine (CS, "adc #$%02X", (unsigned char) (val >> 8)); - AddCodeSegLine (CS, "tax"); - AddCodeSegLine (CS, "pla"); - } - } - break; - - case CF_LONG: - if (val <= 255) { - ldyconst (val); - AddCodeSegLine (CS, "jsr inceaxy"); - } else { - g_add (flags | CF_CONST, val); - } - break; - - default: - typeerror (flags); + case CF_CHAR: + if (flags & CF_FORCECHAR) { + if ((CPUIsets[CPU] & CPU_ISET_65SC02) != 0 && val <= 2) { + while (val--) { + AddCodeLine ("ina"); + } + } else { + AddCodeLine ("clc"); + AddCodeLine ("adc #$%02X", (unsigned char)val); + } + break; + } + /* FALLTHROUGH */ + + case CF_INT: + if ((CPUIsets[CPU] & CPU_ISET_65SC02) != 0 && val == 1) { + unsigned L = GetLocalLabel(); + AddCodeLine ("ina"); + AddCodeLine ("bne %s", LocalLabelName (L)); + AddCodeLine ("inx"); + g_defcodelabel (L); + } else if (IS_Get (&CodeSizeFactor) < 200) { + /* Use jsr calls */ + if (val <= 8) { + AddCodeLine ("jsr incax%lu", val); + } else if (val <= 255) { + ldyconst (val); + AddCodeLine ("jsr incaxy"); + } else { + g_add (flags | CF_CONST, val); + } + } else { + /* Inline the code */ + if (val <= 0x300) { + if ((val & 0xFF) != 0) { + unsigned L = GetLocalLabel(); + AddCodeLine ("clc"); + AddCodeLine ("adc #$%02X", (unsigned char) val); + AddCodeLine ("bcc %s", LocalLabelName (L)); + AddCodeLine ("inx"); + g_defcodelabel (L); + } + if (val >= 0x100) { + AddCodeLine ("inx"); + } + if (val >= 0x200) { + AddCodeLine ("inx"); + } + if (val >= 0x300) { + AddCodeLine ("inx"); + } + } else { + AddCodeLine ("clc"); + if ((val & 0xFF) != 0) { + AddCodeLine ("adc #$%02X", (unsigned char) val); + } + AddCodeLine ("pha"); + AddCodeLine ("txa"); + AddCodeLine ("adc #$%02X", (unsigned char) (val >> 8)); + AddCodeLine ("tax"); + AddCodeLine ("pla"); + } + } + break; + + case CF_LONG: + if (val <= 255) { + ldyconst (val); + AddCodeLine ("jsr inceaxy"); + } else { + g_add (flags | CF_CONST, val); + } + break; + + default: + typeerror (flags); } } @@ -3352,82 +3342,80 @@ void g_dec (unsigned flags, unsigned long val) { /* Don't dec by zero */ if (val == 0) { - return; + return; } /* Generate code for the supported types */ flags &= ~CF_CONST; switch (flags & CF_TYPE) { - case CF_CHAR: - if (flags & CF_FORCECHAR) { - if (CPU == CPU_65C02 && val <= 2) { - while (val--) { - AddCodeSegLine (CS, "dea"); - } - } else { - AddCodeSegLine (CS, "sec"); - AddCodeSegLine (CS, "sbc #$%02X", (unsigned char)val); - } - break; - } - /* FALLTHROUGH */ - - case CF_INT: - if (CodeSizeFactor < 200) { - /* Use subroutines */ - if (val <= 8) { - AddCodeSegLine (CS, "jsr decax%d", (int) val); - } else if (val <= 255) { - ldyconst (val); - AddCodeSegLine (CS, "jsr decaxy"); - } else { - g_sub (flags | CF_CONST, val); - } - } else { - /* Inline the code */ - if (val < 0x300) { - if ((val & 0xFF) != 0) { - AddCodeSegLine (CS, "sec"); - AddCodeSegLine (CS, "sbc #$%02X", (unsigned char) val); - AddCodeSegLine (CS, "bcs *+3"); - AddCodeSegLine (CS, "dex"); - /* Tell the optimizer that the X register may be invalid */ - AddCodeHint ("x:!"); - } - if (val >= 0x100) { - AddCodeSegLine (CS, "dex"); - } - if (val >= 0x200) { - AddCodeSegLine (CS, "dex"); - } - } else { - AddCodeSegLine (CS, "sec"); - if ((val & 0xFF) != 0) { - AddCodeSegLine (CS, "sbc #$%02X", (unsigned char) val); - /* Tell the optimizer that the X register may be invalid */ - AddCodeHint ("x:!"); - } - AddCodeSegLine (CS, "pha"); - AddCodeSegLine (CS, "txa"); - AddCodeSegLine (CS, "sbc #$%02X", (unsigned char) (val >> 8)); - AddCodeSegLine (CS, "tax"); - AddCodeSegLine (CS, "pla"); - } - } - break; - - case CF_LONG: - if (val <= 255) { - ldyconst (val); - AddCodeSegLine (CS, "jsr deceaxy"); - } else { - g_sub (flags | CF_CONST, val); - } - break; - - default: - typeerror (flags); + case CF_CHAR: + if (flags & CF_FORCECHAR) { + if ((CPUIsets[CPU] & CPU_ISET_65SC02) != 0 && val <= 2) { + while (val--) { + AddCodeLine ("dea"); + } + } else { + AddCodeLine ("sec"); + AddCodeLine ("sbc #$%02X", (unsigned char)val); + } + break; + } + /* FALLTHROUGH */ + + case CF_INT: + if (IS_Get (&CodeSizeFactor) < 200) { + /* Use subroutines */ + if (val <= 8) { + AddCodeLine ("jsr decax%d", (int) val); + } else if (val <= 255) { + ldyconst (val); + AddCodeLine ("jsr decaxy"); + } else { + g_sub (flags | CF_CONST, val); + } + } else { + /* Inline the code */ + if (val < 0x300) { + if ((val & 0xFF) != 0) { + unsigned L = GetLocalLabel(); + AddCodeLine ("sec"); + AddCodeLine ("sbc #$%02X", (unsigned char) val); + AddCodeLine ("bcs %s", LocalLabelName (L)); + AddCodeLine ("dex"); + g_defcodelabel (L); + } + if (val >= 0x100) { + AddCodeLine ("dex"); + } + if (val >= 0x200) { + AddCodeLine ("dex"); + } + } else { + AddCodeLine ("sec"); + if ((val & 0xFF) != 0) { + AddCodeLine ("sbc #$%02X", (unsigned char) val); + } + AddCodeLine ("pha"); + AddCodeLine ("txa"); + AddCodeLine ("sbc #$%02X", (unsigned char) (val >> 8)); + AddCodeLine ("tax"); + AddCodeLine ("pla"); + } + } + break; + + case CF_LONG: + if (val <= 255) { + ldyconst (val); + AddCodeLine ("jsr deceaxy"); + } else { + g_sub (flags | CF_CONST, val); + } + break; + + default: + typeerror (flags); } } @@ -3446,46 +3434,51 @@ void g_eq (unsigned flags, unsigned long val) /* Test for equal */ { static char* ops [12] = { - "toseq00", "toseqa0", "toseqax", - "toseq00", "toseqa0", "toseqax", - 0, 0, "toseqeax", - 0, 0, "toseqeax", + "toseq00", "toseqa0", "toseqax", + "toseq00", "toseqa0", "toseqax", + 0, 0, "toseqeax", + 0, 0, "toseqeax", }; + unsigned L; + /* If the right hand side is const, the lhs is not on stack but still * in the primary register. */ if (flags & CF_CONST) { - switch (flags & CF_TYPE) { - - case CF_CHAR: - if (flags & CF_FORCECHAR) { - AddCodeSegLine (CS, "cmp #$%02X", (unsigned char)val); - AddCodeSegLine (CS, "jsr booleq"); - return; - } - /* FALLTHROUGH */ - - case CF_INT: - AddCodeSegLine (CS, "cpx #$%02X", (unsigned char)(val >> 8)); - AddCodeSegLine (CS, "bne *+4"); - AddCodeSegLine (CS, "cmp #$%02X", (unsigned char)val); - AddCodeSegLine (CS, "jsr booleq"); - return; - - case CF_LONG: - break; - - default: - typeerror (flags); - } - - /* If we go here, we didn't emit code. Push the lhs on stack and fall - * into the normal, non-optimized stuff. - */ - g_push (flags & ~CF_CONST, 0); - + switch (flags & CF_TYPE) { + + case CF_CHAR: + if (flags & CF_FORCECHAR) { + AddCodeLine ("cmp #$%02X", (unsigned char)val); + AddCodeLine ("jsr booleq"); + return; + } + /* FALLTHROUGH */ + + case CF_INT: + L = GetLocalLabel(); + AddCodeLine ("cpx #$%02X", (unsigned char)(val >> 8)); + AddCodeLine ("bne %s", LocalLabelName (L)); + AddCodeLine ("cmp #$%02X", (unsigned char)val); + g_defcodelabel (L); + AddCodeLine ("jsr booleq"); + return; + + case CF_LONG: + break; + + default: + typeerror (flags); + } + + /* If we go here, we didn't emit code. Push the lhs on stack and fall + * into the normal, non-optimized stuff. Note: The standard stuff will + * always work with ints. + */ + flags &= ~CF_FORCECHAR; + g_push (flags & ~CF_CONST, 0); } /* Use long way over the stack */ @@ -3498,47 +3491,51 @@ void g_ne (unsigned flags, unsigned long val) /* Test for not equal */ { static char* ops [12] = { - "tosne00", "tosnea0", "tosneax", - "tosne00", "tosnea0", "tosneax", - 0, 0, "tosneeax", - 0, 0, "tosneeax", + "tosne00", "tosnea0", "tosneax", + "tosne00", "tosnea0", "tosneax", + 0, 0, "tosneeax", + 0, 0, "tosneeax", }; + unsigned L; /* If the right hand side is const, the lhs is not on stack but still * in the primary register. */ if (flags & CF_CONST) { - switch (flags & CF_TYPE) { - - case CF_CHAR: - if (flags & CF_FORCECHAR) { - AddCodeSegLine (CS, "cmp #$%02X", (unsigned char)val); - AddCodeSegLine (CS, "jsr boolne"); - return; - } - /* FALLTHROUGH */ - - case CF_INT: - AddCodeSegLine (CS, "cpx #$%02X", (unsigned char)(val >> 8)); - AddCodeSegLine (CS, "bne *+4"); - AddCodeSegLine (CS, "cmp #$%02X", (unsigned char)val); - AddCodeSegLine (CS, "jsr boolne"); - return; - - case CF_LONG: - break; - - default: - typeerror (flags); - } - - /* If we go here, we didn't emit code. Push the lhs on stack and fall - * into the normal, non-optimized stuff. - */ - g_push (flags & ~CF_CONST, 0); - + switch (flags & CF_TYPE) { + + case CF_CHAR: + if (flags & CF_FORCECHAR) { + AddCodeLine ("cmp #$%02X", (unsigned char)val); + AddCodeLine ("jsr boolne"); + return; + } + /* FALLTHROUGH */ + + case CF_INT: + L = GetLocalLabel(); + AddCodeLine ("cpx #$%02X", (unsigned char)(val >> 8)); + AddCodeLine ("bne %s", LocalLabelName (L)); + AddCodeLine ("cmp #$%02X", (unsigned char)val); + g_defcodelabel (L); + AddCodeLine ("jsr boolne"); + return; + + case CF_LONG: + break; + + default: + typeerror (flags); + } + + /* If we go here, we didn't emit code. Push the lhs on stack and fall + * into the normal, non-optimized stuff. Note: The standard stuff will + * always work with ints. + */ + flags &= ~CF_FORCECHAR; + g_push (flags & ~CF_CONST, 0); } /* Use long way over the stack */ @@ -3551,10 +3548,10 @@ void g_lt (unsigned flags, unsigned long val) /* Test for less than */ { static char* ops [12] = { - "toslt00", "toslta0", "tosltax", - "tosult00", "tosulta0", "tosultax", - 0, 0, "toslteax", - 0, 0, "tosulteax", + "toslt00", "toslta0", "tosltax", + "tosult00", "tosulta0", "tosultax", + 0, 0, "toslteax", + 0, 0, "tosulteax", }; /* If the right hand side is const, the lhs is not on stack but still @@ -3562,57 +3559,94 @@ void g_lt (unsigned flags, unsigned long val) */ if (flags & CF_CONST) { - /* Give a warning in some special cases */ - if ((flags & CF_UNSIGNED) && val == 0) { - Warning ("Condition is never true"); - } - - /* Look at the type */ - switch (flags & CF_TYPE) { - - case CF_CHAR: - if (flags & CF_FORCECHAR) { - AddCodeSegLine (CS, "cmp #$%02X", (unsigned char)val); - if (flags & CF_UNSIGNED) { - AddCodeSegLine (CS, "jsr boolult"); - } else { - AddCodeSegLine (CS, "jsr boollt"); - } - return; - } - /* FALLTHROUGH */ - - case CF_INT: - if ((flags & CF_UNSIGNED) == 0 && val == 0) { - /* If we have a signed compare against zero, we only need to - * test the high byte. - */ - AddCodeSegLine (CS, "txa"); - AddCodeSegLine (CS, "jsr boollt"); - return; - } - /* Direct code only for unsigned data types */ - if (flags & CF_UNSIGNED) { - AddCodeSegLine (CS, "cpx #$%02X", (unsigned char)(val >> 8)); - AddCodeSegLine (CS, "bne *+4"); - AddCodeSegLine (CS, "cmp #$%02X", (unsigned char)val); - AddCodeSegLine (CS, "jsr boolult"); - return; - } - break; - - case CF_LONG: - break; - - default: - typeerror (flags); - } - - /* If we go here, we didn't emit code. Push the lhs on stack and fall - * into the normal, non-optimized stuff. - */ - g_push (flags & ~CF_CONST, 0); - + /* Because the handling of the overflow flag is too complex for + * inlining, we can handle only unsigned compares, and signed + * compares against zero here. + */ + if (flags & CF_UNSIGNED) { + + /* Give a warning in some special cases */ + if (val == 0) { + Warning ("Condition is never true"); + AddCodeLine ("jsr return0"); + return; + } + + /* Look at the type */ + switch (flags & CF_TYPE) { + + case CF_CHAR: + if (flags & CF_FORCECHAR) { + AddCodeLine ("cmp #$%02X", (unsigned char)val); + AddCodeLine ("jsr boolult"); + return; + } + /* FALLTHROUGH */ + + case CF_INT: + /* If the low byte is zero, we must only test the high byte */ + AddCodeLine ("cpx #$%02X", (unsigned char)(val >> 8)); + if ((val & 0xFF) != 0) { + unsigned L = GetLocalLabel(); + AddCodeLine ("bne %s", LocalLabelName (L)); + AddCodeLine ("cmp #$%02X", (unsigned char)val); + g_defcodelabel (L); + } + AddCodeLine ("jsr boolult"); + return; + + case CF_LONG: + /* Do a subtraction */ + AddCodeLine ("cmp #$%02X", (unsigned char)val); + AddCodeLine ("txa"); + AddCodeLine ("sbc #$%02X", (unsigned char)(val >> 8)); + AddCodeLine ("lda sreg"); + AddCodeLine ("sbc #$%02X", (unsigned char)(val >> 16)); + AddCodeLine ("lda sreg+1"); + AddCodeLine ("sbc #$%02X", (unsigned char)(val >> 24)); + AddCodeLine ("jsr boolult"); + return; + + default: + typeerror (flags); + } + + } else if (val == 0) { + + /* Look at the type */ + switch (flags & CF_TYPE) { + + case CF_CHAR: + if (flags & CF_FORCECHAR) { + AddCodeLine ("tax"); + AddCodeLine ("jsr boollt"); + return; + } + /* FALLTHROUGH */ + + case CF_INT: + /* Just check the high byte */ + AddCodeLine ("txa"); + AddCodeLine ("jsr boollt"); + return; + + case CF_LONG: + /* Just check the high byte */ + AddCodeLine ("lda sreg+1"); + AddCodeLine ("jsr boollt"); + return; + + default: + typeerror (flags); + } + } + + /* If we go here, we didn't emit code. Push the lhs on stack and fall + * into the normal, non-optimized stuff. Note: The standard stuff will + * always work with ints. + */ + flags &= ~CF_FORCECHAR; + g_push (flags & ~CF_CONST, 0); } /* Use long way over the stack */ @@ -3625,10 +3659,10 @@ void g_le (unsigned flags, unsigned long val) /* Test for less than or equal to */ { static char* ops [12] = { - "tosle00", "toslea0", "tosleax", - "tosule00", "tosulea0", "tosuleax", - 0, 0, "tosleeax", - 0, 0, "tosuleeax", + "tosle00", "toslea0", "tosleax", + "tosule00", "tosulea0", "tosuleax", + 0, 0, "tosleeax", + 0, 0, "tosuleeax", }; @@ -3637,43 +3671,100 @@ void g_le (unsigned flags, unsigned long val) */ if (flags & CF_CONST) { - /* Look at the type */ - switch (flags & CF_TYPE) { - - case CF_CHAR: - if (flags & CF_FORCECHAR) { - AddCodeSegLine (CS, "cmp #$%02X", (unsigned char)val); - if (flags & CF_UNSIGNED) { - AddCodeSegLine (CS, "jsr boolule"); - } else { - AddCodeSegLine (CS, "jsr boolle"); - } - return; - } - /* FALLTHROUGH */ - - case CF_INT: - if (flags & CF_UNSIGNED) { - AddCodeSegLine (CS, "cpx #$%02X", (unsigned char)(val >> 8)); - AddCodeSegLine (CS, "bne *+4"); - AddCodeSegLine (CS, "cmp #$%02X", (unsigned char)val); - AddCodeSegLine (CS, "jsr boolule"); - return; - } - break; - - case CF_LONG: - break; - - default: - typeerror (flags); - } - - /* If we go here, we didn't emit code. Push the lhs on stack and fall - * into the normal, non-optimized stuff. - */ - g_push (flags & ~CF_CONST, 0); - + /* Look at the type */ + switch (flags & CF_TYPE) { + + case CF_CHAR: + if (flags & CF_FORCECHAR) { + if (flags & CF_UNSIGNED) { + /* Unsigned compare */ + if (val < 0xFF) { + /* Use < instead of <= because the former gives + * better code on the 6502 than the latter. + */ + g_lt (flags, val+1); + } else { + /* Always true */ + Warning ("Condition is always true"); + AddCodeLine ("jsr return1"); + } + } else { + /* Signed compare */ + if ((long) val < 0x7F) { + /* Use < instead of <= because the former gives + * better code on the 6502 than the latter. + */ + g_lt (flags, val+1); + } else { + /* Always true */ + Warning ("Condition is always true"); + AddCodeLine ("jsr return1"); + } + } + return; + } + /* FALLTHROUGH */ + + case CF_INT: + if (flags & CF_UNSIGNED) { + /* Unsigned compare */ + if (val < 0xFFFF) { + /* Use < instead of <= because the former gives + * better code on the 6502 than the latter. + */ + g_lt (flags, val+1); + } else { + /* Always true */ + Warning ("Condition is always true"); + AddCodeLine ("jsr return1"); + } + } else { + /* Signed compare */ + if ((long) val < 0x7FFF) { + g_lt (flags, val+1); + } else { + /* Always true */ + Warning ("Condition is always true"); + AddCodeLine ("jsr return1"); + } + } + return; + + case CF_LONG: + if (flags & CF_UNSIGNED) { + /* Unsigned compare */ + if (val < 0xFFFFFFFF) { + /* Use < instead of <= because the former gives + * better code on the 6502 than the latter. + */ + g_lt (flags, val+1); + } else { + /* Always true */ + Warning ("Condition is always true"); + AddCodeLine ("jsr return1"); + } + } else { + /* Signed compare */ + if ((long) val < 0x7FFFFFFF) { + g_lt (flags, val+1); + } else { + /* Always true */ + Warning ("Condition is always true"); + AddCodeLine ("jsr return1"); + } + } + return; + + default: + typeerror (flags); + } + + /* If we go here, we didn't emit code. Push the lhs on stack and fall + * into the normal, non-optimized stuff. Note: The standard stuff will + * always work with ints. + */ + flags &= ~CF_FORCECHAR; + g_push (flags & ~CF_CONST, 0); } /* Use long way over the stack */ @@ -3686,10 +3777,10 @@ void g_gt (unsigned flags, unsigned long val) /* Test for greater than */ { static char* ops [12] = { - "tosgt00", "tosgta0", "tosgtax", - "tosugt00", "tosugta0", "tosugtax", - 0, 0, "tosgteax", - 0, 0, "tosugteax", + "tosgt00", "tosgta0", "tosgtax", + "tosugt00", "tosugta0", "tosugtax", + 0, 0, "tosgteax", + 0, 0, "tosugteax", }; @@ -3698,61 +3789,116 @@ void g_gt (unsigned flags, unsigned long val) */ if (flags & CF_CONST) { - /* Look at the type */ - switch (flags & CF_TYPE) { - - case CF_CHAR: - if (flags & CF_FORCECHAR) { - AddCodeSegLine (CS, "cmp #$%02X", (unsigned char)val); - if (flags & CF_UNSIGNED) { - /* If we have a compare > 0, we will replace it by - * != 0 here, since both are identical but the latter - * is easier to optimize. - */ - if (val & 0xFF) { - AddCodeSegLine (CS, "jsr boolugt"); - } else { - AddCodeSegLine (CS, "jsr boolne"); - } - } else { - AddCodeSegLine (CS, "jsr boolgt"); - } - return; - } - /* FALLTHROUGH */ - - case CF_INT: - if (flags & CF_UNSIGNED) { - /* If we have a compare > 0, we will replace it by - * != 0 here, since both are identical but the latter - * is easier to optimize. - */ - if ((val & 0xFFFF) == 0) { - AddCodeSegLine (CS, "stx tmp1"); - AddCodeSegLine (CS, "ora tmp1"); - AddCodeSegLine (CS, "jsr boolne"); - } else { - AddCodeSegLine (CS, "cpx #$%02X", (unsigned char)(val >> 8)); - AddCodeSegLine (CS, "bne *+4"); - AddCodeSegLine (CS, "cmp #$%02X", (unsigned char)val); - AddCodeSegLine (CS, "jsr boolugt"); - } - return; - } - break; - - case CF_LONG: - break; - - default: - typeerror (flags); - } - - /* If we go here, we didn't emit code. Push the lhs on stack and fall - * into the normal, non-optimized stuff. - */ - g_push (flags & ~CF_CONST, 0); - + /* Look at the type */ + switch (flags & CF_TYPE) { + + case CF_CHAR: + if (flags & CF_FORCECHAR) { + if (flags & CF_UNSIGNED) { + if (val == 0) { + /* If we have a compare > 0, we will replace it by + * != 0 here, since both are identical but the + * latter is easier to optimize. + */ + g_ne (flags, val); + } else if (val < 0xFF) { + /* Use >= instead of > because the former gives + * better code on the 6502 than the latter. + */ + g_ge (flags, val+1); + } else { + /* Never true */ + Warning ("Condition is never true"); + AddCodeLine ("jsr return0"); + } + } else { + if ((long) val < 0x7F) { + /* Use >= instead of > because the former gives + * better code on the 6502 than the latter. + */ + g_ge (flags, val+1); + } else { + /* Never true */ + Warning ("Condition is never true"); + AddCodeLine ("jsr return0"); + } + } + return; + } + /* FALLTHROUGH */ + + case CF_INT: + if (flags & CF_UNSIGNED) { + /* Unsigned compare */ + if (val == 0) { + /* If we have a compare > 0, we will replace it by + * != 0 here, since both are identical but the latter + * is easier to optimize. + */ + g_ne (flags, val); + } else if (val < 0xFFFF) { + /* Use >= instead of > because the former gives better + * code on the 6502 than the latter. + */ + g_ge (flags, val+1); + } else { + /* Never true */ + Warning ("Condition is never true"); + AddCodeLine ("jsr return0"); + } + } else { + /* Signed compare */ + if ((long) val < 0x7FFF) { + g_ge (flags, val+1); + } else { + /* Never true */ + Warning ("Condition is never true"); + AddCodeLine ("jsr return0"); + } + } + return; + + case CF_LONG: + if (flags & CF_UNSIGNED) { + /* Unsigned compare */ + if (val == 0) { + /* If we have a compare > 0, we will replace it by + * != 0 here, since both are identical but the latter + * is easier to optimize. + */ + g_ne (flags, val); + } else if (val < 0xFFFFFFFF) { + /* Use >= instead of > because the former gives better + * code on the 6502 than the latter. + */ + g_ge (flags, val+1); + } else { + /* Never true */ + Warning ("Condition is never true"); + AddCodeLine ("jsr return0"); + } + } else { + /* Signed compare */ + if ((long) val < 0x7FFFFFFF) { + g_ge (flags, val+1); + } else { + /* Never true */ + Warning ("Condition is never true"); + AddCodeLine ("jsr return0"); + } + } + return; + + default: + typeerror (flags); + } + + /* If we go here, we didn't emit code. Push the lhs on stack and fall + * into the normal, non-optimized stuff. Note: The standard stuff will + * always work with ints. + */ + flags &= ~CF_FORCECHAR; + g_push (flags & ~CF_CONST, 0); } /* Use long way over the stack */ @@ -3765,10 +3911,10 @@ void g_ge (unsigned flags, unsigned long val) /* Test for greater than or equal to */ { static char* ops [12] = { - "tosge00", "tosgea0", "tosgeax", - "tosuge00", "tosugea0", "tosugeax", - 0, 0, "tosgeeax", - 0, 0, "tosugeeax", + "tosge00", "tosgea0", "tosgeax", + "tosuge00", "tosugea0", "tosugeax", + 0, 0, "tosgeeax", + 0, 0, "tosugeeax", }; @@ -3777,48 +3923,95 @@ void g_ge (unsigned flags, unsigned long val) */ if (flags & CF_CONST) { - /* Give a warning in some special cases */ - if ((flags & CF_UNSIGNED) && val == 0) { - Warning ("Condition is always true"); - } - - /* Look at the type */ - switch (flags & CF_TYPE) { - - case CF_CHAR: - if (flags & CF_FORCECHAR) { - AddCodeSegLine (CS, "cmp #$%02X", (unsigned char)val); - if (flags & CF_UNSIGNED) { - AddCodeSegLine (CS, "jsr booluge"); - } else { - AddCodeSegLine (CS, "jsr boolge"); - } - return; - } - /* FALLTHROUGH */ - - case CF_INT: - if (flags & CF_UNSIGNED) { - AddCodeSegLine (CS, "cpx #$%02X", (unsigned char)(val >> 8)); - AddCodeSegLine (CS, "bne *+4"); - AddCodeSegLine (CS, "cmp #$%02X", (unsigned char)val); - AddCodeSegLine (CS, "jsr booluge"); - return; - } - break; - - case CF_LONG: - break; - - default: - typeerror (flags); - } - - /* If we go here, we didn't emit code. Push the lhs on stack and fall - * into the normal, non-optimized stuff. - */ - g_push (flags & ~CF_CONST, 0); - + /* Because the handling of the overflow flag is too complex for + * inlining, we can handle only unsigned compares, and signed + * compares against zero here. + */ + if (flags & CF_UNSIGNED) { + + /* Give a warning in some special cases */ + if (val == 0) { + Warning ("Condition is always true"); + AddCodeLine ("jsr return1"); + return; + } + + /* Look at the type */ + switch (flags & CF_TYPE) { + + case CF_CHAR: + if (flags & CF_FORCECHAR) { + AddCodeLine ("cmp #$%02X", (unsigned char)val); + AddCodeLine ("jsr booluge"); + return; + } + /* FALLTHROUGH */ + + case CF_INT: + /* If the low byte is zero, we must only test the high byte */ + AddCodeLine ("cpx #$%02X", (unsigned char)(val >> 8)); + if ((val & 0xFF) != 0) { + unsigned L = GetLocalLabel(); + AddCodeLine ("bne %s", LocalLabelName (L)); + AddCodeLine ("cmp #$%02X", (unsigned char)val); + g_defcodelabel (L); + } + AddCodeLine ("jsr booluge"); + return; + + case CF_LONG: + /* Do a subtraction */ + AddCodeLine ("cmp #$%02X", (unsigned char)val); + AddCodeLine ("txa"); + AddCodeLine ("sbc #$%02X", (unsigned char)(val >> 8)); + AddCodeLine ("lda sreg"); + AddCodeLine ("sbc #$%02X", (unsigned char)(val >> 16)); + AddCodeLine ("lda sreg+1"); + AddCodeLine ("sbc #$%02X", (unsigned char)(val >> 24)); + AddCodeLine ("jsr booluge"); + return; + + default: + typeerror (flags); + } + + } else if (val == 0) { + + /* Look at the type */ + switch (flags & CF_TYPE) { + + case CF_CHAR: + if (flags & CF_FORCECHAR) { + AddCodeLine ("tax"); + AddCodeLine ("jsr boolge"); + return; + } + /* FALLTHROUGH */ + + case CF_INT: + /* Just test the high byte */ + AddCodeLine ("txa"); + AddCodeLine ("jsr boolge"); + return; + + case CF_LONG: + /* Just test the high byte */ + AddCodeLine ("lda sreg+1"); + AddCodeLine ("jsr boolge"); + return; + + default: + typeerror (flags); + } + } + + + /* If we go here, we didn't emit code. Push the lhs on stack and fall + * into the normal, non-optimized stuff. Note: The standard stuff will + * always work with ints. + */ + flags &= ~CF_FORCECHAR; + g_push (flags & ~CF_CONST, 0); } /* Use long way over the stack */ @@ -3828,7 +4021,7 @@ void g_ge (unsigned flags, unsigned long val) /*****************************************************************************/ -/* Allocating static storage */ +/* Allocating static storage */ /*****************************************************************************/ @@ -3836,44 +4029,44 @@ void g_ge (unsigned flags, unsigned long val) void g_res (unsigned n) /* Reserve static storage, n bytes */ { - AddDataSegLine (DS, "\t.res\t%u,$00", n); + AddDataLine ("\t.res\t%u,$00", n); } -void g_defdata (unsigned flags, unsigned long val, unsigned offs) +void g_defdata (unsigned flags, unsigned long val, long offs) /* Define data with the size given in flags */ { if (flags & CF_CONST) { - /* Numeric constant */ - switch (flags & CF_TYPE) { + /* Numeric constant */ + switch (flags & CF_TYPE) { - case CF_CHAR: - AddDataSegLine (DS, "\t.byte\t$%02lX", val & 0xFF); - break; + case CF_CHAR: + AddDataLine ("\t.byte\t$%02lX", val & 0xFF); + break; - case CF_INT: - AddDataSegLine (DS, "\t.word\t$%04lX", val & 0xFFFF); - break; + case CF_INT: + AddDataLine ("\t.word\t$%04lX", val & 0xFFFF); + break; - case CF_LONG: - AddDataSegLine (DS, "\t.dword\t$%08lX", val & 0xFFFFFFFF); - break; + case CF_LONG: + AddDataLine ("\t.dword\t$%08lX", val & 0xFFFFFFFF); + break; - default: - typeerror (flags); - break; + default: + typeerror (flags); + break; - } + } } else { - /* Create the correct label name */ - const char* Label = GetLabelName (flags, val, offs); + /* Create the correct label name */ + const char* Label = GetLabelName (flags, val, offs); - /* Labels are always 16 bit */ - AddDataSegLine (DS, "\t.word\t%s", Label); + /* Labels are always 16 bit */ + AddDataLine ("\t.addr\t%s", Label); } } @@ -3893,103 +4086,201 @@ void g_defbytes (const void* Bytes, unsigned Count) /* Output the stuff */ while (Count) { - /* How many go into this line? */ - if ((Chunk = Count) > 16) { - Chunk = 16; - } - Count -= Chunk; + /* How many go into this line? */ + if ((Chunk = Count) > 16) { + Chunk = 16; + } + Count -= Chunk; + + /* Output one line */ + strcpy (Buf, "\t.byte\t"); + B = Buf + 7; + do { + B += sprintf (B, "$%02X", *Data++); + if (--Chunk) { + *B++ = ','; + } + } while (Chunk); + + /* Output the line */ + AddDataLine (Buf); + } +} - /* Output one line */ - strcpy (Buf, "\t.byte\t"); - B = Buf + 7; - do { - B += sprintf (B, "$%02X", *Data++); - if (--Chunk) { - *B++ = ','; - } - } while (Chunk); - /* Output the line */ - AddCodeLine (Buf); + +void g_zerobytes (unsigned Count) +/* Output Count bytes of data initialized with zero */ +{ + if (Count > 0) { + AddDataLine ("\t.res\t%u,$00", Count); } } -void g_zerobytes (unsigned n) -/* Output n bytes of data initialized with zero */ +void g_initregister (unsigned Label, unsigned Reg, unsigned Size) +/* Initialize a register variable from static initialization data */ { - AddDataSegLine (DS, "\t.res\t%u,$00", n); -} + /* Register variables do always have less than 128 bytes */ + unsigned CodeLabel = GetLocalLabel (); + ldxconst (Size-1); + g_defcodelabel (CodeLabel); + AddCodeLine ("lda %s,x", GetLabelName (CF_STATIC, Label, 0)); + AddCodeLine ("sta %s,x", GetLabelName (CF_REGVAR, Reg, 0)); + AddCodeLine ("dex"); + AddCodeLine ("bpl %s", LocalLabelName (CodeLabel)); +} -/*****************************************************************************/ -/* User supplied assembler code */ -/*****************************************************************************/ +void g_initauto (unsigned Label, unsigned Size) +/* Initialize a local variable at stack offset zero from static data */ +{ + unsigned CodeLabel = GetLocalLabel (); + + CheckLocalOffs (Size); + if (Size <= 128) { + ldyconst (Size-1); + g_defcodelabel (CodeLabel); + AddCodeLine ("lda %s,y", GetLabelName (CF_STATIC, Label, 0)); + AddCodeLine ("sta (sp),y"); + AddCodeLine ("dey"); + AddCodeLine ("bpl %s", LocalLabelName (CodeLabel)); + } else if (Size <= 256) { + ldyconst (0); + g_defcodelabel (CodeLabel); + AddCodeLine ("lda %s,y", GetLabelName (CF_STATIC, Label, 0)); + AddCodeLine ("sta (sp),y"); + AddCodeLine ("iny"); + AddCodeLine ("cpy #$%02X", (unsigned char) Size); + AddCodeLine ("bne %s", LocalLabelName (CodeLabel)); + } +} -void g_asmcode (const char* Line, int Len) -/* Output one line of assembler code. If Len is greater than zero, it is used - * as the maximum number of characters to use from Line. - */ +void g_initstatic (unsigned InitLabel, unsigned VarLabel, unsigned Size) +/* Initialize a static local variable from static initialization data */ { - if (Len >= 0) { - AddCodeSegLine (CS, "%.*s", Len, Line); + if (Size <= 128) { + unsigned CodeLabel = GetLocalLabel (); + ldyconst (Size-1); + g_defcodelabel (CodeLabel); + AddCodeLine ("lda %s,y", GetLabelName (CF_STATIC, InitLabel, 0)); + AddCodeLine ("sta %s,y", GetLabelName (CF_STATIC, VarLabel, 0)); + AddCodeLine ("dey"); + AddCodeLine ("bpl %s", LocalLabelName (CodeLabel)); + } else if (Size <= 256) { + unsigned CodeLabel = GetLocalLabel (); + ldyconst (0); + g_defcodelabel (CodeLabel); + AddCodeLine ("lda %s,y", GetLabelName (CF_STATIC, InitLabel, 0)); + AddCodeLine ("sta %s,y", GetLabelName (CF_STATIC, VarLabel, 0)); + AddCodeLine ("iny"); + AddCodeLine ("cpy #$%02X", (unsigned char) Size); + AddCodeLine ("bne %s", LocalLabelName (CodeLabel)); } else { - AddCodeSegLine (CS, "%s", Line); + /* Use the easy way here: memcpy */ + g_getimmed (CF_STATIC, VarLabel, 0); + AddCodeLine ("jsr pushax"); + g_getimmed (CF_STATIC, InitLabel, 0); + AddCodeLine ("jsr pushax"); + g_getimmed (CF_INT | CF_UNSIGNED | CF_CONST, Size, 0); + AddCodeLine ("jsr %s", GetLabelName (CF_EXTERNAL, (unsigned long) "memcpy", 0)); } } /*****************************************************************************/ -/* Inlined known functions */ +/* Switch statement */ /*****************************************************************************/ -void g_strlen (unsigned flags, unsigned long val, unsigned offs) -/* Inline the strlen() function */ +void g_switch (Collection* Nodes, unsigned DefaultLabel, unsigned Depth) +/* Generate code for a switch statement */ { - /* We need a label in both cases */ - unsigned label = GetLocalLabel (); + unsigned NextLabel = 0; + unsigned I; + + /* Setup registers and determine which compare insn to use */ + const char* Compare; + switch (Depth) { + case 1: + Compare = "cmp #$%02X"; + break; + case 2: + Compare = "cpx #$%02X"; + break; + case 3: + AddCodeLine ("ldy sreg"); + Compare = "cpy #$%02X"; + break; + case 4: + AddCodeLine ("ldy sreg+1"); + Compare = "cpy #$%02X"; + break; + default: + Internal ("Invalid depth in g_switch: %u", Depth); + } - /* Two different encodings */ - if (flags & CF_CONST) { + /* Walk over all nodes */ + for (I = 0; I < CollCount (Nodes); ++I) { - /* The address of the string is constant. Create the correct label name */ - char* lbuf = GetLabelName (flags, val, offs); + /* Get the next case node */ + CaseNode* N = CollAtUnchecked (Nodes, I); - /* Generate the strlen code */ - AddCodeSegLine (CS, "ldy #$FF"); - g_defloclabel (label); - AddCodeSegLine (CS, "iny"); - AddCodeSegLine (CS, "lda %s,y", lbuf); - AddCodeSegLine (CS, "bne L%04X", label); - AddCodeSegLine (CS, "tax"); - AddCodeSegLine (CS, "tya"); + /* If we have a next label, define it */ + if (NextLabel) { + g_defcodelabel (NextLabel); + NextLabel = 0; + } - } else { + /* Do the compare */ + AddCodeLine (Compare, CN_GetValue (N)); + + /* If this is the last level, jump directly to the case code if found */ + if (Depth == 1) { + + /* Branch if equal */ + g_falsejump (0, CN_GetLabel (N)); + + } else { + + /* Determine the next label */ + if (I == CollCount (Nodes) - 1) { + /* Last node means not found */ + g_truejump (0, DefaultLabel); + } else { + /* Jump to the next check */ + NextLabel = GetLocalLabel (); + g_truejump (0, NextLabel); + } - /* Address not constant but in primary */ - if (CodeSizeFactor < 400) { - /* This is too much code, so call strlen instead of inlining */ - AddCodeSegLine (CS, "jsr _strlen"); - } else { - /* Inline the function */ - AddCodeSegLine (CS, "sta ptr1"); - AddCodeSegLine (CS, "stx ptr1+1"); - AddCodeSegLine (CS, "ldy #$FF"); - g_defloclabel (label); - AddCodeSegLine (CS, "iny"); - AddCodeSegLine (CS, "lda (ptr1),y"); - AddCodeSegLine (CS, "bne L%04X", label); - AddCodeSegLine (CS, "tax"); - AddCodeSegLine (CS, "tya"); - } + /* Check the next level */ + g_switch (N->Nodes, DefaultLabel, Depth-1); + + } } + + /* If we go here, we haven't found the label */ + g_jump (DefaultLabel); +} + + + +/*****************************************************************************/ +/* User supplied assembler code */ +/*****************************************************************************/ + + + +void g_asmcode (struct StrBuf* B) +/* Output one line of assembler code. */ +{ + AddCodeLine ("%.*s", SB_GetLen (B), SB_GetConstBuf (B)); }