asl-current-142-bld164

Author: Alfred Arnold

as.res

@@ -183,6 +183,10 @@ Message ErrMsgTrapValidInstruction
  "TRAP-Nummer ist gültige Instruktion"
  "TRAP number represents valid instruction"
 
+Message ErrMsgPaddingAdded
+ "Padding hinzugefügt"
+ "Padding added"
+
 ;*****
 
 Message ErrMsgDoubleDef

asmallg.c

@@ -994,19 +994,18 @@ static void CodeMACEXP(Word Index)
   }
 }
 
-static Boolean DecodeSegment(char *pArg, Integer StartSeg, Integer *pResult)
+static Boolean DecodeSegment(const tStrComp *pArg, Integer StartSeg, Integer *pResult)
 {
   Integer SegZ;
   Word Mask;
 
-  NLS_UpString(pArg);
   for (SegZ = StartSeg, Mask = 1 << StartSeg; SegZ <= PCMax; SegZ++, Mask <<= 1)
-    if ((ValidSegs & Mask) && !strcmp(pArg, SegNames[SegZ]))
+    if ((ValidSegs & Mask) && !as_strcasecmp(pArg->Str, SegNames[SegZ]))
     {
       *pResult = SegZ;
       return True;
     }
-  WrXError(ErrNum_UnknownSegment, pArg);
+  WrStrErrorPos(ErrNum_UnknownSegment, pArg);
   return False;
 }
 
@@ -1016,7 +1015,7 @@ static void CodeSEGMENT(Word Index)
   UNUSED(Index);
 
   if (ChkArgCnt(1, 1)
-   && DecodeSegment(ArgStr[1].Str, SegCode, &NewSegment))
+   && DecodeSegment(&ArgStr[1], SegCode, &NewSegment))
     SetNSeg(NewSegment);
 }
 
@@ -1297,7 +1296,7 @@ static void CodeENUMCONF(Word Index)
     {
       Integer NewSegment;
 
-      if (DecodeSegment(ArgStr[2].Str, SegNone, &NewSegment))
+      if (DecodeSegment(&ArgStr[2], SegNone, &NewSegment))
         EnumSegment = NewSegment;
     }
   }
@@ -1854,6 +1853,7 @@ static void DecodeONOFF(Word Index)
   {
     NLS_UpString(ArgStr[1].Str);
     if (*AttrPart.Str != '\0') WrError(ErrNum_UseLessAttr);
+    else
     {
       Boolean IsON = !as_strcasecmp(ArgStr[1].Str, "ON");
       if ((!IsON) && (as_strcasecmp(ArgStr[1].Str, "OFF"))) WrStrErrorPos(ErrNum_OnlyOnOff, &ArgStr[1]);

asmdef.c

@@ -36,15 +36,13 @@ char *EnvName = "ASCMD";               /* Environment-Variable fuer Default-
 char *SegNames[PCMax + 2] =
 {
   "NOTHING", "CODE", "DATA", "IDATA", "XDATA", "YDATA",
-  "BITDATA", "IO", "REG", "ROMDATA", "STRUCT"
+  "BITDATA", "IO", "REG", "ROMDATA", "EEDATA", "STRUCT"
 };
 char SegShorts[PCMax + 2] =
 {
-  '-','C','D','I','X','Y','B','P','R','O','S'
+  '-','C','D','I','X','Y','B','P','R','O','E','S'
 };
 
-/** ValidSymChars:SET OF Char=['A'..'Z','a'..'z',#128..#165,'0'..'9','_','.']; **/
-
 StringPtr SourceFile;                    /* Hauptquelldatei */
 
 StringPtr ClrEol;       	            /* String fuer loeschen bis Zeilenende */

asmerr.c

@@ -240,6 +240,8 @@ static const char *ErrorNum2String(tErrorNum Num, char *Buf, int BufSize)
       msgno = Num_ErrMsgSrcLEThanDest; break;
     case ErrNum_TrapValidInstruction:
       msgno = Num_ErrMsgTrapValidInstruction; break;
+    case ErrNum_PaddingAdded:
+      msgno = Num_ErrMsgPaddingAdded; break;
     case ErrNum_DoubleDef:
       msgno = Num_ErrMsgDoubleDef; break;
     case ErrNum_SymbolUndef:

asmlist.c

@@ -50,6 +50,8 @@ void MakeList(const char *pSrcLine)
 
   if ((!ListToNull) && (ThisDoLst) && ((ListMask & 1) != 0) && (!IFListMask()))
   {
+    LargeWord ListPC;
+
     /* Zeilennummer / Programmzaehleradresse: */
 
     if (IncDepth == 0)
@@ -64,9 +66,9 @@ void MakeList(const char *pSrcLine)
       as_snprintf(h2, sizeof(h2), Integ32Format, CurrLine);
       as_snprcatf(h, sizeof(h), "%5s/", h2);
     }
+    ListPC = EProgCounter() - CodeLen;
     as_snprcatf(h, sizeof(h), "%8.*lllu %c ",
-                ListRadixBase, (LargeInt)(EProgCounter() - CodeLen),
-                Retracted? 'R' : ':');
+                ListRadixBase, ListPC, Retracted? 'R' : ':');
 
     /* Extrawurst in Listing ? */
 
@@ -117,10 +119,12 @@ void MakeList(const char *pSrcLine)
 
       do
       {
-        /* If not the first code line, prepend blanks to fill up space below line# and address: */
+        /* If not the first code line, prepend blanks to fill up space below line number: */
 
         if (!First)
-          as_snprintf(h, sizeof(h), "%*s", (ListMask & ListMask_LineNums) ? 20 : 14, "");
+          as_snprintf(h, sizeof(h), "%*s%8.*lllu %c ",
+                      (ListMask & ListMask_LineNums) ? 9 : 3, "",
+                      ListRadixBase, ListPC, Retracted? 'R' : ':');
 
         SumLen = 0;
         do
@@ -149,6 +153,7 @@ void MakeList(const char *pSrcLine)
 
           /* advance pointers & keep track of # of characters printed */
 
+          ListPC++;
           Index += CurrListGran;
           SumLen += SystemListLen + 1;
 

changelog

@@ -1,3 +1,12 @@
+2020-04-26 [1.42 Bld 164]
+
+- Bugfix      : correct encoding of 65816 MVP/MVN instructions
+- Addition    : Add DN instruction to dispose nibbles (because I can...)
+- Addition    : Support DB/DW/DD/DQ/DT instructions for Atmel AVR
+- Addition    : Add EEDATA segment for Atmel AVR and PIC16C8x
+- Addition    : Extend P2BIN & P2HEX to allow data conversion from
+                other segments than CODE
+
 2020-04-12 [1.42 Bld 163]
 
 - Change      : make codepage/character set handling more flexible

code16c8x.c

@@ -414,6 +414,13 @@ static void SwitchTo_16c8x(void)
   SegLimits[SegCode] += AddCodeSpace;
   Grans[SegData] = 1; ListGrans[SegData] = 1; SegInits[SegData] = 0;
   SegLimits[SegData] = 0x1ff;
+  Grans[SegEEData] = 1; ListGrans[SegEEData] = 1; SegInits[SegEEData] = 0;
+  if ((MomCPU == CPU16C877) || (MomCPU == CPU16C876))
+    SegLimits[SegEEData] = 0xff;
+  else if ((MomCPU == CPU16C874) || (MomCPU == CPU16C873))
+    SegLimits[SegEEData] = 0x7f;
+  else
+    SegLimits[SegEEData] = 0x3f;
   ChkPC = ChkPC_16c8x;
 
   MakeCode = MakeCode_16c8x;

code7700.c

@@ -1090,22 +1090,18 @@ static void DecodeMVN_MVP(Word Code)
   if (ChkArgCnt(2, 2))
   {
     Boolean OK;
-    LongInt AdrLong = EvalStrIntExpression(&ArgStr[1], Int32, &OK);
+    LongInt Src = EvalStrIntExpression(&ArgStr[1], UInt24, &OK);
 
     if (OK)
     {
-      LongInt Mask = EvalStrIntExpression(&ArgStr[2], Int32, &OK);
+      LongInt Dest = EvalStrIntExpression(&ArgStr[2], UInt24, &OK);
 
       if (OK)
       {
-        if (((Mask & 0xff000000) != 0) || ((AdrLong & 0xff000000) != 0)) WrError(ErrNum_OverRange);
-        else
-        {
-          BAsmCode[0] = Code;
-          BAsmCode[1] = AdrLong >> 16;
-          BAsmCode[2] = Mask >> 16;
-          CodeLen = 3;
-        }
+        BAsmCode[0] = Code;
+        BAsmCode[1] = Dest >> 16;
+        BAsmCode[2] = Src >> 16;
+        CodeLen = 3;
       }
     }
   }