AVR specific changes

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@639 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/src/asm.c b/src/asm.c
index 8d92b3778410c9d4654ce3e58964112a585e599a..df9fb385722332842f4a497a7449e9e49c4b04ce 100644 (file)
--- a/src/asm.c
+++ b/src/asm.c
@@ -280,15 +280,15 @@ void
 asm_addTree (const ASM_MAPPINGS * pMappings)
 {
   const ASM_MAPPING *pMap;
+
   /* Traverse down first */
   if (pMappings->pParent)
     asm_addTree (pMappings->pParent);
   pMap = pMappings->pMappings;
-  while (pMap->szKey && pMap->szValue)
-    {
+  while (pMap->szKey && pMap->szValue) {
       shash_add (&_h, pMap->szKey, pMap->szValue);
       pMap++;
-    }
+  }
 }
 
 static const ASM_MAPPING _asxxxx_mapping[] =
@@ -330,8 +330,53 @@ static const ASM_MAPPING _asxxxx_mapping[] =
   {NULL, NULL}
 };
 
+static const ASM_MAPPING _gas_mapping[] =
+{
+  {"labeldef", "%s::"},
+  {"slabeldef", "%s:"},
+  {"tlabeldef", "%05d$:"},
+  {"tlabel", "%05d$"},
+  {"immed", "#"},
+  {"zero", "#0x00"},
+  {"one", "#0x01"},
+  {"area", ".section %s"},
+  {"areacode", ".section %s"},
+  {"areadata", ".section %s"},
+  {"areahome", ".section %s"},
+  {"ascii", ".ascii \"%s\""},
+  {"ds", ".ds %d"},
+  {"db", ".db"},
+  {"dbs", ".db %s"},
+  {"dw", ".dw"},
+  {"dws", ".dw %s"},
+  {"constbyte", "0x%02X"},
+  {"constword", "0x%04X"},
+  {"immedword", "#0x%04X"},
+  {"immedbyte", "#0x%02X"},
+  {"hashedstr", "#%s"},
+  {"lsbimmeds", "#<%s"},
+  {"msbimmeds", "#>%s"},
+  {"module", ".file \"%s.c\""},
+  {"global", ".globl %s"},
+  {"fileprelude", ""},
+  {"functionheader",
+   "; ---------------------------------\n"
+   "; Function %s\n"
+   "; ---------------------------------"
+  },
+  {"functionlabeldef", "%s:"},
+  {"bankimmeds", "0    ; PENDING: bank support"},
+  {NULL, NULL}
+};
+
 const ASM_MAPPINGS asm_asxxxx_mapping =
 {
   NULL,
   _asxxxx_mapping
 };
+
+const ASM_MAPPINGS asm_gas_mapping =
+{
+  NULL,
+  _gas_mapping
+};

diff --git a/src/asm.h b/src/asm.h
index 7a0431d4ee6635fee1de46f1a7fc366877f2d0a5..2ebefe13c2a5f5642c2401ddeae647cf1714f125 100644 (file)
--- a/src/asm.h
+++ b/src/asm.h
@@ -25,6 +25,7 @@ struct _ASM_MAPPINGS
 /* The default asxxxx token mapping.
  */
 extern const ASM_MAPPINGS asm_asxxxx_mapping;
+extern const ASM_MAPPINGS asm_gas_mapping;
 
 /** Last entry has szKey = NULL.
  */

diff --git a/src/avr/gen.c b/src/avr/gen.c
index 191a13d9ae0ed35dbca880a3600251ce7a67309a..b88398cce2ede45d03da66118e8603433b6f8e61 100644 (file)
--- a/src/avr/gen.c
+++ b/src/avr/gen.c
@@ -3740,91 +3740,114 @@ R0Rsh (int shCount)
 static void
 genUnpackBits (operand * result, char *rname, int ptype)
 {
-  int shCnt;
-  int rlen = 0;
-  sym_link *etype;
-  int offset = 0;
-
-  etype = getSpec (operandType (result));
-
-  /* read the first byte  */
-  switch (ptype)
-    {
-
-    case POINTER:
-    case IPOINTER:
-    case PPOINTER:
-    case FPOINTER:
-      emitcode ("ld", "r0,%s+", rname);
-      break;
-
-    case CPOINTER:
-      emitcode ("ldm", "r0,%s+", rname);
-      break;
-
-    case GPOINTER:
-      emitcode ("call", "__gptrget_pi");
-      break;
-    }
-
-  /* if we have bitdisplacement then it fits   */
-  /* into this byte completely or if length is */
-  /* less than a byte                          */
-  if ((shCnt = SPEC_BSTR (etype)) || (SPEC_BLEN (etype) <= 8))
-    {
+       int shCnt;
+       int rlen = 0;
+       sym_link *etype;
+       int offset = 0;
+       int rsize;
 
-      /* shift right r0 */
-      R0Rsh (shCnt);
-      emitcode ("andi", "r0,0x%02x",
-               ((unsigned char) -1) >> (8 - SPEC_BLEN (etype)));
+       etype = getSpec (operandType (result));
+       rsize = getSize (operandType (result));
+       /* read the first byte  */
+       switch (ptype) {
 
-      aopPut (AOP (result), "r0", offset);
-      return;
-    }
-
-  /* bit field did not fit in a byte  */
-  rlen = SPEC_BLEN (etype) - 8;
-  aopPut (AOP (result), "a", offset++);
-
-  while (1)
-    {
-
-      switch (ptype)
-       {
        case POINTER:
        case IPOINTER:
+               emitcode ("mov", "a,@%s", rname);
+               break;
+
        case PPOINTER:
+               emitcode ("movx", "a,@%s", rname);
+               break;
+
        case FPOINTER:
-         emitcode ("ld", "r0,%s+", rname);
-         break;
+               emitcode ("movx", "a,@dptr");
+               break;
 
        case CPOINTER:
-         emitcode ("ldm", "r0,%s+", rname);
-         break;
+               emitcode ("clr", "a");
+               emitcode ("movc", "a", "@a+dptr");
+               break;
 
        case GPOINTER:
-         emitcode ("lcall", "__gptrget_pi");
-         break;
+               emitcode ("lcall", "__gptrget");
+               break;
        }
 
-      rlen -= 8;
-      /* if we are done */
-      if (rlen <= 0)
-       break;
+       rlen = SPEC_BLEN (etype);
 
-      aopPut (AOP (result), "r0", offset++);
+       /* if we have bitdisplacement then it fits   */
+       /* into this byte completely or if length is */
+       /* less than a byte                          */
+       if ((shCnt = SPEC_BSTR (etype)) || (SPEC_BLEN (etype) <= 8)) {
 
-    }
+               /* shift right acc */
+               AccRsh (shCnt);
 
-  if (rlen)
-    {
-      emitcode ("andi", "r0,#0x%02x", ((unsigned char) -1) >> (-rlen));
-      aopPut (AOP (result), "r0", offset);
-    }
+               emitcode ("anl", "a,#0x%02x",
+                         ((unsigned char) -1) >> (8 - SPEC_BLEN (etype)));
+               aopPut (AOP (result), "a", offset++);
+               goto finish;
+       }
 
-  return;
-}
+       /* bit field did not fit in a byte  */
+       aopPut (AOP (result), "a", offset++);
+  
+       while (1) {
+
+               switch (ptype) {
+
+               case POINTER:
+               case IPOINTER:
+                       emitcode ("inc", "%s", rname);
+                       emitcode ("mov", "a,@%s", rname);
+                       break;
+
+               case PPOINTER:
+                       emitcode ("inc", "%s", rname);
+                       emitcode ("movx", "a,@%s", rname);
+                       break;
+
+               case FPOINTER:
+                       emitcode ("inc", "dptr");
+                       emitcode ("movx", "a,@dptr");
+                       break;
+
+               case CPOINTER:
+                       emitcode ("clr", "a");
+                       emitcode ("inc", "dptr");
+                       emitcode ("movc", "a", "@a+dptr");
+                       break;
+
+               case GPOINTER:
+                       emitcode ("inc", "dptr");
+                       emitcode ("lcall", "__gptrget");
+                       break;
+               }
 
+               rlen -= 8;
+               /* if we are done */
+               if (rlen < 8)
+                       break;
+
+               aopPut (AOP (result), "a", offset++);
+
+       }
+
+       if (rlen) {
+               //  emitcode("anl","a,#0x%02x",((unsigned char)-1)>>(rlen));
+               AccLsh (8 - rlen);
+               aopPut (AOP (result), "a", offset++);
+       }
+
+ finish:
+       if (offset < rsize) {
+               rsize -= offset;
+               while (rsize--)
+                       aopPut (AOP (result), zero, offset++);
+       }
+       return;
+}
 
 /*-----------------------------------------------------------------*/
 /* genDataPointerGet - generates code when ptr offset is known     */
@@ -3834,25 +3857,24 @@ genDataPointerGet (operand * left,
                   operand * result,
                   iCode * ic)
 {
-  char *l;
-  char buffer[256];
-  int size, offset = 0;
-  aopOp (result, ic, TRUE);
-
-  /* get the string representation of the name */
-  l = aopGet (AOP (left), 0);
-  size = AOP_SIZE (result);
-  while (size--)
-    {
-      if (offset)
-       sprintf (buffer, "(%s + %d)", l + 1, offset);
-      else
-       sprintf (buffer, "%s", l + 1);
-      emitcode ("lds", "%s,%s", aopGet (AOP (result), offset++), buffer);
-    }
-
-  freeAsmop (left, NULL, ic, TRUE);
-  freeAsmop (result, NULL, ic, TRUE);
+       char *l;
+       char buffer[256];
+       int size, offset = 0;
+       aopOp (result, ic, TRUE);
+
+       /* get the string representation of the name */
+       l = aopGet (AOP (left), 0);
+       size = AOP_SIZE (result);
+       while (size--) {
+               if (offset)
+                       sprintf (buffer, "(%s + %d)", l + 1, offset);
+               else
+                       sprintf (buffer, "%s", l + 1);
+               emitcode ("lds", "%s,%s", aopGet (AOP (result), offset++), buffer);
+       }
+
+       freeAsmop (left, NULL, ic, TRUE);
+       freeAsmop (result, NULL, ic, TRUE);
 }
 
 /*-----------------------------------------------------------------*/
@@ -3881,16 +3903,14 @@ genNearPointerGet (operand * left,
      lower 128 bytes of space */
   if (AOP_TYPE (left) == AOP_IMMD &&
       !IS_BITVAR (retype) &&
-      DCL_TYPE (ltype) == POINTER)
-    {
+      DCL_TYPE (ltype) == POINTER) {
       genDataPointerGet (left, result, ic);
       return;
     }
 
   /* if the value is already in a pointer register
      then don't need anything more */
-  if (!AOP_INPREG (AOP (left)))
-    {
+  if (!AOP_INPREG (AOP (left))) {
       /* otherwise get a free pointer register */
       aop = newAsmop (0);
       preg = getFreePtr (ic, &aop, FALSE, 0);
@@ -3908,16 +3928,13 @@ genNearPointerGet (operand * left,
   /* if bitfield then unpack the bits */
   if (IS_BITVAR (retype))
     genUnpackBits (result, rname, POINTER);
-  else
-    {
+  else {
       /* we have can just get the values */
       int size = AOP_SIZE (result);
       int offset = 0;
 
-      while (size--)
-       {
-         if (IS_AOP_PREG (result) || AOP_TYPE (result) == AOP_STK)
-           {
+      while (size--) {
+         if (IS_AOP_PREG (result) || AOP_TYPE (result) == AOP_STK) {
 
              emitcode ("mov", "a,@%s", rname);
              aopPut (AOP (result), "a", offset);