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

Use a long for the offset of static variables, so negative offsets do work

Browse Source 
(even if this is not standard compliant).


git-svn-id: svn://svn.cc65.org/cc65/trunk@1077 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
cuz
2001-10-25 10:49:51 +00:00
parent e15f01a882
commit d796de8109
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/cc65/codegen.c
View File

@@ -96,7 +96,7 @@ static void CheckLocalOffs (unsigned Offs)
static char* GetLabelName (unsigned flags, unsigned long label, unsigned offs) static char* GetLabelName (unsigned flags, unsigned long label, long offs)
{ {
static char lbuf [128]; /* Label name */ static char lbuf [128]; /* Label name */
@@ -105,12 +105,12 @@ static char* GetLabelName (unsigned flags, unsigned long label, unsigned offs)
case CF_STATIC: case CF_STATIC:
/* Static memory cell */ /* Static memory cell */
sprintf (lbuf, "%s+%u", LocalLabelName (label), offs); sprintf (lbuf, "%s%+ld", LocalLabelName (label), offs);
break; break;
case CF_EXTERNAL: case CF_EXTERNAL:
/* External label */ /* External label */
sprintf (lbuf, "_%s+%u", (char*) label, offs); sprintf (lbuf, "_%s%+ld", (char*) label, offs);
break; break;
case CF_ABSOLUTE: case CF_ABSOLUTE:
@@ -566,7 +566,7 @@ void g_restore_regvars (int StackOffs, int RegOffs, unsigned Bytes)
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 */ /* Load a constant into the primary register */
{ {
unsigned char B1, B2, B3, B4; unsigned char B1, B2, B3, B4;
@@ -652,7 +652,7 @@ void g_getimmed (unsigned Flags, unsigned long Val, unsigned Offs)
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 */ /* Fetch an static memory cell into the primary register */
{ {
/* Create the correct label name */ /* Create the correct label name */
@@ -901,7 +901,7 @@ void g_leavariadic (int Offs)
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 */ /* Store the primary register into the specified static memory cell */
{ {
/* Create the correct label name */ /* Create the correct label name */
@@ -1202,7 +1202,7 @@ unsigned g_typeadjust (unsigned lhs, unsigned rhs)
} }
unsigned g_typecast (unsigned lhs, unsigned rhs) unsigned g_typecast (unsigned lhs, unsigned rhs)
/* Cast the value in the primary register to the operand size that is flagged /* Cast the value in the primary register to the operand size that is flagged
* by the lhs value. Return the result value. * by the lhs value. Return the result value.
@@ -1432,7 +1432,7 @@ void g_addlocal (unsigned flags, int offs)
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 */ /* Add a static variable to ax */
{ {
unsigned L; unsigned L;
@@ -1467,7 +1467,7 @@ void g_addstatic (unsigned flags, unsigned long label, unsigned offs)
g_getstatic (flags, label, offs); g_getstatic (flags, label, offs);
g_add (flags, 0); g_add (flags, 0);
break; break;
default: default:
typeerror (flags); typeerror (flags);
@@ -1482,7 +1482,7 @@ void g_addstatic (unsigned flags, unsigned long label, unsigned offs)
void g_addeqstatic (unsigned flags, unsigned long label, unsigned offs, void g_addeqstatic (unsigned flags, unsigned long label, long offs,
unsigned long val) unsigned long val)
/* Emit += for a static variable */ /* Emit += for a static variable */
{ {
@@ -1725,7 +1725,7 @@ void g_addeqind (unsigned flags, unsigned offs, unsigned long val)
void g_subeqstatic (unsigned flags, unsigned long label, unsigned offs, void g_subeqstatic (unsigned flags, unsigned long label, long offs,
unsigned long val) unsigned long val)
/* Emit -= for a static variable */ /* Emit -= for a static variable */
{ {
@@ -1982,7 +1982,7 @@ void g_addaddr_local (unsigned flags attribute ((unused)), int offs)
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 */ /* Add the address of a static variable to ax */
{ {
/* Create the correct label name */ /* Create the correct label name */
@@ -3695,7 +3695,7 @@ void g_res (unsigned 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 */ /* Define data with the size given in flags */
{ {
if (flags & CF_CONST) { if (flags & CF_CONST) {
@@ -3876,7 +3876,7 @@ void g_asmcode (struct StrBuf* B)
void g_strlen (unsigned flags, unsigned long val, unsigned offs) void g_strlen (unsigned flags, unsigned long val, long offs)
/* Inline the strlen() function */ /* Inline the strlen() function */
{ {
/* We need a label in both cases */ /* We need a label in both cases */

20
src/cc65/codegen.h
View File

@@ -243,10 +243,10 @@ void g_restore_regvars (int StackOffs, int RegOffs, unsigned Bytes);
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 */ /* Load a constant into the primary register */
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 */ /* Fetch an static memory cell into the primary register */
void g_getlocal (unsigned Flags, int Offs); void g_getlocal (unsigned Flags, int Offs);
@@ -273,7 +273,7 @@ void g_leavariadic (int Offs);
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 */ /* Store the primary register into the specified static memory cell */
void g_putlocal (unsigned Flags, int Offs, long Val); void g_putlocal (unsigned Flags, int Offs, long Val);
@@ -295,7 +295,7 @@ void g_putind (unsigned flags, unsigned offs);
void g_addlocal (unsigned flags, int offs); void g_addlocal (unsigned flags, int offs);
/* Add a local variable to ax */ /* Add a local variable to ax */
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 */ /* Add a static variable to ax */
@@ -306,7 +306,7 @@ void g_addstatic (unsigned flags, unsigned long label, unsigned offs);
void g_addeqstatic (unsigned flags, unsigned long label, unsigned offs, void g_addeqstatic (unsigned flags, unsigned long label, long offs,
unsigned long val); unsigned long val);
/* Emit += for a static variable */ /* Emit += for a static variable */
@@ -316,7 +316,7 @@ void g_addeqlocal (unsigned flags, int offs, unsigned long val);
void g_addeqind (unsigned flags, unsigned offs, unsigned long val); void g_addeqind (unsigned flags, unsigned offs, unsigned long val);
/* Emit += for the location with address in ax */ /* Emit += for the location with address in ax */
void g_subeqstatic (unsigned flags, unsigned long label, unsigned offs, void g_subeqstatic (unsigned flags, unsigned long label, long offs,
unsigned long val); unsigned long val);
/* Emit -= for a static variable */ /* Emit -= for a static variable */
@@ -329,7 +329,7 @@ void g_subeqind (unsigned flags, unsigned offs, unsigned long val);
/*****************************************************************************/ /*****************************************************************************/
/* Add a variable address to the value in ax */ /* Add a variable address to the value in ax */
/*****************************************************************************/ /*****************************************************************************/
@@ -337,7 +337,7 @@ void g_subeqind (unsigned flags, unsigned offs, unsigned long val);
void g_addaddr_local (unsigned flags, int offs); void g_addaddr_local (unsigned flags, int offs);
/* Add the address of a local variable to ax */ /* Add the address of a local variable to ax */
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 */ /* Add the address of a static variable to ax */
@@ -420,7 +420,7 @@ void g_ge (unsigned flags, unsigned long val);
void g_res (unsigned n); void g_res (unsigned n);
/* Reserve static storage, n bytes */ /* Reserve static storage, n bytes */
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 */ /* Define data with the size given in flags */
void g_defbytes (const void* bytes, unsigned count); void g_defbytes (const void* bytes, unsigned count);
@@ -459,7 +459,7 @@ void g_asmcode (struct StrBuf* B);
void g_strlen (unsigned flags, unsigned long val, unsigned offs); void g_strlen (unsigned flags, unsigned long val, long offs);
/* Inline the strlen() function */ /* Inline the strlen() function */