Applied patch #2762516

[fw/sdcc] / src / avr / main.c

diff --git a/src/avr/main.c b/src/avr/main.c
index 5ddc571edb913f02886b5e2474415998c047fe6a..efde4d2beaef53048b1dd4eb7b1471ae7c74d8be 100644 (file)
--- a/src/avr/main.c
+++ b/src/avr/main.c
@@ -38,17 +38,17 @@ static int regParmFlg = 0;  /* determine if we can register a parameter */
 static void
 _avr_init (void)
 {
-       asm_addTree (&asm_gas_mapping);
+       asm_addTree (&asm_asxxxx_mapping);
 }
 
 static void
-_avr_reset_regparm ()
+_avr_reset_regparm (void)
 {
        regParmFlg = 0;
 }
 
 static int
-_avr_regparm (sym_link * l)
+_avr_regparm (sym_link * l, bool reentrant)
 {
        /* the first eight bytes will be passed in
           registers r16-r23. but we won't split variables
@@ -69,7 +69,7 @@ _avr_regparm (sym_link * l)
        return 0;
 }
 
-void avr_assignRegisters (eBBlock ** ebbs, int count);
+void avr_assignRegisters (ebbIndex *);
 
 static bool
 _avr_parseOptions (int *pargc, char **argv, int *i)
@@ -126,9 +126,32 @@ _avr_genAssemblerPreamble (FILE * of)
 
 /* Generate interrupt vector table. */
 static int
-_avr_genIVT (FILE * of, symbol ** interrupts, int maxInterrupts)
+_avr_genIVT (struct dbuf_s * oBuf, symbol ** interrupts, int maxInterrupts)
 {
-       return TRUE;
+  return TRUE;
+}
+
+/* Indicate which extended bit operations this port supports */
+static bool
+hasExtBitOp (int op, int size)
+{
+  if (op == RRC
+      || op == RLC
+      || op == GETHBIT
+     )
+    return TRUE;
+  else
+    return FALSE;
+}
+
+/* Indicate the expense of an access to an output storage class */
+static int
+oclsExpense (struct memmap *oclass)
+{
+  if (IN_FARSPACE(oclass))
+    return 1;
+    
+  return 0;
 }
 
 /** $1 is always the basename.
@@ -138,11 +161,12 @@ _avr_genIVT (FILE * of, symbol ** interrupts, int maxInterrupts)
     MUST be terminated with a NULL.
 */
 static const char *_linkCmd[] = {
-       "avr-ld", "", "$1", NULL
+       "linkavr", "", "\"$1\"", NULL
 };
 
+/* $3 is replaced by assembler.debug_opts resp. port->assembler.plain_opts */
 static const char *_asmCmd[] = {
-       "avr-as", "-mmcu=avr3" , "$1.s", NULL
+       "asavr", "$l" , "$3", "\"$1.s\"", NULL
 };
 
 /* Globals */
@@ -150,31 +174,44 @@ PORT avr_port = {
         TARGET_ID_AVR,
        "avr",
        "ATMEL AVR",            /* Target name */
+       NULL,                   /* processor */
        {
+         glue,
         TRUE,                  /* Emit glue around main */
         MODEL_LARGE | MODEL_SMALL,
-        MODEL_SMALL},
+        MODEL_SMALL
+       },
        {
         _asmCmd,
-        "-plosgffc",           /* Options with debug */
+         NULL,
+        "-plosgff",            /* Options with debug */
         "-plosgff",            /* Options without debug */
         0,
-       ".s"},
+       ".s",
+        NULL,                  /* no do_assemble */
+       },
        {
         _linkCmd,
+         NULL,
         NULL,
-        ".rel"},
+        ".rel",
+        1},
        {
         _defaultRules},
        {
         /* Sizes: char, short, int, long, ptr, fptr, gptr, bit, float, max */
         1, 2, 2, 4, 2, 2, 3, 1, 4, 4},
+       
+        /* tags for generic pointers */
+       { 0x00, 0x40, 0x60, 0x80 },             /* far, near, xstack, code */
+       
        {
         "XSEG",
         "STACK",
         "CSEG",
         "DSEG",
         "ISEG",
+        NULL, //PSEG
         "XSEG",
         "BSEG",
         "RSEG",
@@ -182,35 +219,71 @@ PORT avr_port = {
         "OSEG",
         "GSFINAL",
         "HOME",
+        NULL, // initialized xdata
+        NULL, // a code copy of xiseg
+        "CONST   (CODE)",           // const_name - const data (code or not)
+        "CABS    (ABS,CODE)",       // cabs_name - const absolute data (code or not)
+        "XABS    (ABS,XDATA)",      // xabs_name - absolute xdata/pdata
+        "IABS    (ABS,DATA)",       // iabs_name - absolute idata/data
         NULL,
         NULL,
         0,
         },
+        { NULL, NULL },
        {
         -1, 1, 4, 1, 1, 0},
        /* avr has an 8 bit mul */
        {
-        1, 0},
+          1, -1
+        },
+       {
+          avr_emitDebuggerSymbol
+       },
+       {
+         255/3,      /* maxCount */
+         3,          /* sizeofElement */
+         /* The rest of these costs are bogus. They approximate */
+         /* the behavior of src/SDCCicode.c 1.207 and earlier.  */
+         {4,4,4},    /* sizeofMatchJump[] */
+         {0,0,0},    /* sizeofRangeCompare[] */
+         0,          /* sizeofSubtract */
+         3,          /* sizeofDispatch */
+       },
        "_",
        _avr_init,
        _avr_parseOptions,
+       NULL,
+       NULL,
        _avr_finaliseOptions,
        _avr_setDefaultOptions,
        avr_assignRegisters,
        _avr_getRegName,
        _avr_keywords,
        _avr_genAssemblerPreamble,
+       NULL,                           /* no genAssemblerEnd */
        _avr_genIVT,
+       NULL, // _avr_genXINIT
+       NULL,                   /* genInitStartup */
        _avr_reset_regparm,
        _avr_regparm,
         NULL,
        NULL,
+        NULL,
+       hasExtBitOp,            /* hasExtBitOp */
+       oclsExpense,            /* oclsExpense */
        FALSE,
+       TRUE,                   /* little endian */
        0,                      /* leave lt */
        1,                      /* transform gt ==> not le */
        0,                      /* leave le */
        0,                      /* leave ge */
        0,                      /* leave !=  */
        0,                      /* leave == */
+       FALSE,                  /* No array initializer support. */
+       0,                      /* no CSE cost estimation yet */
+       NULL,                   /* no builtin functions */
+       GPOINTER,               /* treat unqualified pointers as "generic" pointers */
+       1,                      /* reset labelKey to 1 */
+       1,                      /* globals & local static allowed */
        PORT_MAGIC
 };